From 18fd09998223d004a926b02938e4cb588e4cc934 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 24 Aug 2021 14:05:19 -0700 Subject: [PATCH] Suggest using add_soong_config_ macros instead of direct variable assignments Bug: 190051051 Test: treehugger Change-Id: Ib77d8af8f926412f6337173927cee6bb1deda2bb --- README.md | 13 ++++--------- android/soong_config_modules.go | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 10ddd73e5..e92349eb7 100644 --- a/README.md +++ b/README.md @@ -451,15 +451,10 @@ used. To specify that no properties should be amended for `soc_b`, you can set The values of the variables can be set from a product's `BoardConfig.mk` file: ``` -SOONG_CONFIG_NAMESPACES += acme -SOONG_CONFIG_acme += \ - board \ - feature \ - width \ - -SOONG_CONFIG_acme_board := soc_a -SOONG_CONFIG_acme_feature := true -SOONG_CONFIG_acme_width := 200 +$(call add_soong_config_namespace, acme) +$(call add_soong_config_var_value, acme, board, soc_a) +$(call add_soong_config_var_value, acme, feature, true) +$(call add_soong_config_var_value, acme, width, 200) ``` The `acme_cc_defaults` module type can be used anywhere after the definition in diff --git a/android/soong_config_modules.go b/android/soong_config_modules.go index 289e91088..17f6d66a8 100644 --- a/android/soong_config_modules.go +++ b/android/soong_config_modules.go @@ -122,15 +122,10 @@ type soongConfigModuleTypeImportProperties struct { // } // // If an acme BoardConfig.mk file contained: -// -// SOONG_CONFIG_NAMESPACES += acme -// SOONG_CONFIG_acme += \ -// board \ -// feature \ -// -// SOONG_CONFIG_acme_board := soc_a -// SOONG_CONFIG_acme_feature := true -// SOONG_CONFIG_acme_width := 200 +// $(call add_sonng_config_namespace, acme) +// $(call add_soong_config_var_value, acme, board, soc_a) +// $(call add_soong_config_var_value, acme, feature, true) +// $(call add_soong_config_var_value, acme, width, 200) // // Then libacme_foo would build with cflags "-DGENERIC -DSOC_A -DFEATURE -DWIDTH=200". //