Merge "Fix non-existing modules check"

am: c1d0bfef47

Change-Id: I28e6a6e989936563967d0d8ba7ffdcd33159070a
This commit is contained in:
Anton Hansson 2019-06-26 03:06:48 -07:00 committed by android-build-merger
commit 0796c70deb
3 changed files with 11 additions and 4 deletions

View file

@ -541,10 +541,15 @@ $(call readonly-variables,$(_readonly_late_variables))
endef
#
# Strip the variables in _product_strip_var_list
# Strip the variables in _product_var_list and a few build-system
# internal variables, and assign the ones for the current product
# to a shorthand that is more convenient to read from elsewhere.
#
define strip-product-vars
$(foreach v,$(_product_var_list), \
$(foreach v,\
$(_product_var_list) \
PRODUCT_ENFORCE_PACKAGES_EXIST \
PRODUCT_ENFORCE_PACKAGES_EXIST_WHITELIST, \
$(eval $(v) := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).$(v)))) \
)
endef

View file

@ -25,4 +25,5 @@ PRODUCT_BRAND := generic
PRODUCT_DEVICE := generic
PRODUCT_NAME := generic
$(call enforce-product-packages-exist,)
whitelist := product_manifest.xml
$(call enforce-product-packages-exist,$(whitelist))

View file

@ -16,7 +16,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk)
$(call enforce-product-packages-exist,)
whitelist := product_manifest.xml
$(call enforce-product-packages-exist,$(whitelist))
PRODUCT_NAME := mainline_arm64
PRODUCT_DEVICE := mainline_arm64