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

Merge "Fix non-existing modules check"

Browse Source
This commit is contained in:
Anton Hansson
2019-06-26 09:44:30 +00:00
committed by Gerrit Code Review
parent 7ec8749eb8 528fdc021f
commit c1d0bfef47
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/product.mk
View File

@@ -541,10 +541,15 @@ $(call readonly-variables,$(_readonly_late_variables))
endef 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 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)))) \ $(eval $(v) := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).$(v)))) \
) )
endef endef

3
target/product/generic.mk
View File

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

3
target/product/mainline_arm64.mk
View File

@@ -16,7 +16,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.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_NAME := mainline_arm64
PRODUCT_DEVICE := mainline_arm64 PRODUCT_DEVICE := mainline_arm64