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

Commit fd6bf07d authored by Alexander Smundak's avatar Alexander Smundak Committed by Automerger Merge Worker
Browse files

Merge "Fix add_soong_config_namespace/add_soong_config_var macros" am: ed266e5f am: 8fccb651

Original change: https://android-review.googlesource.com/c/platform/build/+/1804317

Change-Id: I0947413cbc2a676cc4354f5e7784ecb46012626b
parents ac007172 8fccb651
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ SOONG_CONFIG_NAMESPACES :=

define add_soong_config_namespace
$(eval SOONG_CONFIG_NAMESPACES += $1) \
$(eval SOONG_CONFIG_$1 :=)
$(eval SOONG_CONFIG_$(strip $1) :=)
endef

# 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.
# Ex: $(call add_soong_config_var,acme,COOL_FEATURE_A COOL_FEATURE_B)
define add_soong_config_var
$(eval SOONG_CONFIG_$1 += $2) \
$(foreach v,$2,$(eval SOONG_CONFIG_$1_$v := $($v)))
$(eval SOONG_CONFIG_$(strip $1) += $2) \
$(foreach v,$(strip $2),$(eval SOONG_CONFIG_$(strip $1)_$v := $($v)))
endef

# The add_soong_config_var_value function defines a make variable and also adds