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

Merge "Make inherit-product loop over all files passed to it"

Browse Source
This commit is contained in:
Cole Faust
2022-03-15 19:31:35 +00:00
committed by Gerrit Code Review
parent 1b8a1490a9 725aab2c83
commit 2089403223
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/product.mk
View File

@@ -400,17 +400,20 @@ endef
# See e.g. product-graph.mk for an example of this. # See e.g. product-graph.mk for an example of this.
# #
define inherit-product define inherit-product
$(if $(findstring ../,$(1)),\ $(eval _inherit_product_wildcard := $(wildcard $(1)))\
$(eval np := $(call normalize-paths,$(1))),\ $(if $(_inherit_product_wildcard),,$(error $(1) does not exist.))\
$(eval np := $(strip $(1))))\ $(foreach part,$(_inherit_product_wildcard),\
$(foreach v,$(_product_var_list), \ $(if $(findstring ../,$(part)),\
$(eval $(v) := $($(v)) $(INHERIT_TAG)$(np))) \ $(eval np := $(call normalize-paths,$(part))),\
$(eval current_mk := $(strip $(word 1,$(_include_stack)))) \ $(eval np := $(strip $(part))))\
$(eval inherit_var := PRODUCTS.$(current_mk).INHERITS_FROM) \ $(foreach v,$(_product_var_list), \
$(eval $(inherit_var) := $(sort $($(inherit_var)) $(np))) \ $(eval $(v) := $($(v)) $(INHERIT_TAG)$(np))) \
$(eval PARENT_PRODUCT_FILES := $(sort $(PARENT_PRODUCT_FILES) $(current_mk))) \ $(eval current_mk := $(strip $(word 1,$(_include_stack)))) \
$(call dump-inherit,$(strip $(word 1,$(_include_stack))),$(1)) \ $(eval inherit_var := PRODUCTS.$(current_mk).INHERITS_FROM) \
$(call dump-config-vals,$(current_mk),inherit) $(eval $(inherit_var) := $(sort $($(inherit_var)) $(np))) \
$(eval PARENT_PRODUCT_FILES := $(sort $(PARENT_PRODUCT_FILES) $(current_mk))) \
$(call dump-inherit,$(strip $(word 1,$(_include_stack))),$(1)) \
$(call dump-config-vals,$(current_mk),inherit))
endef endef
# Specifies a number of path prefixes, relative to PRODUCT_OUT, where the # Specifies a number of path prefixes, relative to PRODUCT_OUT, where the