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

Merge "Fix m snod"

Browse Source 
am: 04f2896c88

Change-Id: Ie752f16d4dbf576df3329d87612ac2f6b2ac638b
This commit is contained in:
Dan Willemsen
2019-03-08 00:11:07 -08:00
committed by android-build-merger
parent 75720c81aa 04f2896c88
commit 28ac0cd338
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/main.mk
View File

@@ -1149,11 +1149,12 @@ ifeq (true|,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST)|$(fil
$(INTERNAL_PRODUCT) includes redundant whitelist entries for nonexistant PRODUCT_PACKAGES) $(INTERNAL_PRODUCT) includes redundant whitelist entries for nonexistant PRODUCT_PACKAGES)
endif endif
# Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist 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? # Many host modules are Linux-only, so skip this check on Mac. If we ever have Mac-only modules,
ifneq ($(HOST_OS),darwin) # maybe it would make sense to have PRODUCT_HOST_PACKAGES_LINUX/_DARWIN?
ifneq ($(HOST_OS),darwin)
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES)) ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
_modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES) _modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES)
_nonexistant_modules := $(foreach m,$(_modules),\ _nonexistant_modules := $(foreach m,$(_modules),\
@@ -1161,9 +1162,8 @@ ifneq ($(HOST_OS),darwin)
$(call maybe-print-list-and-error,$(_nonexistant_modules),\ $(call maybe-print-list-and-error,$(_nonexistant_modules),\
$(INTERNAL_PRODUCT) includes non-existant modules in PRODUCT_HOST_PACKAGES) $(INTERNAL_PRODUCT) includes non-existant modules in PRODUCT_HOST_PACKAGES)
endif endif
endif endif
ifdef FULL_BUILD
product_host_FILES := $(call host-installed-files,$(INTERNAL_PRODUCT)) product_host_FILES := $(call host-installed-files,$(INTERNAL_PRODUCT))
product_target_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT)) product_target_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT))
# WARNING: The product_MODULES variable is depended on by external files. # WARNING: The product_MODULES variable is depended on by external files.
@@ -1254,6 +1254,7 @@ else
# requested by the product, because we probably won't have rules # requested by the product, because we probably won't have rules
# to build them. # to build them.
product_target_FILES := product_target_FILES :=
product_host_FILES :=
endif endif
# TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES # TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES