Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 528fdc02 authored by Anton Hansson's avatar Anton Hansson
Browse files

Fix non-existing modules check 

This variable was accidentally changed to refer to the
shorthand PRODUCT_XYZ instead of PRODUCTS.<mk>.PRODUCT_XYZ
in a previous mass-migration, but that shorthand didn't
exist for these variables. Add it in.

Also whitelist the offender introduced since it was broken.

Test: lunch generic; m nothing
Change-Id: I29dd73c29796743e770afa0c2ceb4f8583dc6e1e
parent 9392fb39

core/product.mk

+7 −2
Original line number Diff line number Diff line
@@ -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

target/product/generic.mk

+2 −1
Original line number Diff line number Diff line
@@ -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))

target/product/mainline_arm64.mk

+2 −1
Original line number Diff line number Diff line
@@ -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