Merge "Fix add_soong_config_namespace/add_soong_config_var macros"

This commit is contained in:
Alexander Smundak
2021-08-24 16:03:51 +00:00
committed by Gerrit Code Review

View File

@@ -259,7 +259,7 @@ SOONG_CONFIG_NAMESPACES :=
define add_soong_config_namespace define add_soong_config_namespace
$(eval SOONG_CONFIG_NAMESPACES += $1) \ $(eval SOONG_CONFIG_NAMESPACES += $1) \
$(eval SOONG_CONFIG_$1 :=) $(eval SOONG_CONFIG_$(strip $1) :=)
endef endef
# The add_soong_config_var function adds a a list of soong config variables to # The add_soong_config_var function adds a a list of soong config variables to
@@ -268,8 +268,8 @@ endef
# $1 is the namespace. $2 is the list of variables. # $1 is the namespace. $2 is the list of variables.
# Ex: $(call add_soong_config_var,acme,COOL_FEATURE_A COOL_FEATURE_B) # Ex: $(call add_soong_config_var,acme,COOL_FEATURE_A COOL_FEATURE_B)
define add_soong_config_var define add_soong_config_var
$(eval SOONG_CONFIG_$1 += $2) \ $(eval SOONG_CONFIG_$(strip $1) += $2) \
$(foreach v,$2,$(eval SOONG_CONFIG_$1_$v := $($v))) $(foreach v,$(strip $2),$(eval SOONG_CONFIG_$(strip $1)_$v := $($v)))
endef endef
# The add_soong_config_var_value function defines a make variable and also adds # The add_soong_config_var_value function defines a make variable and also adds