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

Commit 4a94bb88 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Fix add_soong_config_namespace/add_soong_config_var macros 

They were failing with an argument containing whitespace. That is,
calling `$(call add_soong_config_namespace, foo)` would result in
the attempt to assign to an empty variable. It went unnoticed
because `ckati` silently ignores such an assignment (`make` is
more diligent and fails).

Bug: 190051051
Test: treehugger
Change-Id: Ifcc168eaf2db725e705887889e732bcd4410db39
parent 23d5ae4f

core/config.mk

+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