StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing modules check for dont_bother goals"

Browse Source
This commit is contained in:
Anton Hansson
2019-03-20 10:11:50 +00:00
committed by Gerrit Code Review
parent 88e38f01ba fa7ddae29b
commit f9b6cd6593
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/main.mk
View File

@@ -1144,7 +1144,10 @@ $(if $(strip $(1)), \
)
endef
ifeq (true|,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST)|$(filter true,$(ALLOW_MISSING_DEPENDENCIES)))
ifdef FULL_BUILD
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
# Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST))
_whitelist := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST_WHITELIST)
_modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)
# Sanity check all modules in PRODUCT_PACKAGES exist. We check for the
@@ -1156,15 +1159,13 @@ ifeq (true|,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST)|$(fil
$(INTERNAL_PRODUCT) includes non-existant modules in PRODUCT_PACKAGES)
$(call maybe-print-list-and-error,$(filter-out $(_nonexistant_modules),$(_whitelist)),\
$(INTERNAL_PRODUCT) includes redundant whitelist entries for nonexistant PRODUCT_PACKAGES)
endif
endif
ifdef FULL_BUILD
# Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist
#
# Many host modules are Linux-only, so skip this check on Mac. If we ever have Mac-only modules,
# maybe it would make sense to have PRODUCT_HOST_PACKAGES_LINUX/_DARWIN?
ifneq ($(HOST_OS),darwin)
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
_modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES)
_nonexistant_modules := $(foreach m,$(_modules),\
$(if $(filter FAKE,$(ALL_MODULES.$(m).CLASS))$(filter $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,$(m)))