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

Commit 20894032 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

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

parents 1b8a1490 725aab2c

core/product.mk

+14 −11
Original line number Diff line number Diff line
@@ -400,9 +400,12 @@ endef 
# See e.g. product-graph.mk for an example of this.

#

define inherit-product

  $(if $(findstring ../,$(1)),\

    $(eval np := $(call normalize-paths,$(1))),\

    $(eval np := $(strip $(1))))\

  $(eval _inherit_product_wildcard := $(wildcard $(1)))\

  $(if $(_inherit_product_wildcard),,$(error $(1) does not exist.))\

  $(foreach part,$(_inherit_product_wildcard),\

    $(if $(findstring ../,$(part)),\

      $(eval np := $(call normalize-paths,$(part))),\

      $(eval np := $(strip $(part))))\

    $(foreach v,$(_product_var_list), \

        $(eval $(v) := $($(v)) $(INHERIT_TAG)$(np))) \

    $(eval current_mk := $(strip $(word 1,$(_include_stack)))) \
@@ -410,7 +413,7 @@ define inherit-product 
    $(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)

    $(call dump-config-vals,$(current_mk),inherit))

endef



# Specifies a number of path prefixes, relative to PRODUCT_OUT, where the