summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2021-01-12 12:43:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-12 12:43:50 +0000
commit9c514568fe34db7d375a7fd58d19dca31a5ee8c6 (patch)
treecf5b8f2f6e2e76a843b731f70ed27d2b82d820e3
parentfc923314d58ed31112407191ea0c563c120caf8e (diff)
parenta3a97078a4f9fb381c074332b95207216215ec1b (diff)
downloadart-9c514568fe34db7d375a7fd58d19dca31a5ee8c6.tar.gz
Use the functions intended for adding Soong config variables. am: 39c9c511cd am: a3a97078a4
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1533263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I276af8ffeba4d6c2f30ca9b903e394b608975607
-rw-r--r--BoardConfigCommon.mk5
-rw-r--r--art_module/art_module.mk5
2 files changed, 4 insertions, 6 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2dd5ec3..e741375 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -31,6 +31,5 @@ TARGET_FLATTEN_APEX := true
# tree.
# TODO(b/174997203): Clean this up when there is a better way to switch between
# prebuilts and sources.
-SOONG_CONFIG_NAMESPACES += art_module
-SOONG_CONFIG_art_module += source_build
-SOONG_CONFIG_art_module_source_build := true
+$(call add_soong_config_namespace,art_module)
+$(call add_soong_config_var_value,art_module,source_build,true)
diff --git a/art_module/art_module.mk b/art_module/art_module.mk
index 4366345..d8074ed 100644
--- a/art_module/art_module.mk
+++ b/art_module/art_module.mk
@@ -20,6 +20,5 @@
# tree.
# TODO(b/174997203): Clean up the art_module_* products when there is a better
# way to switch between prebuilts and sources.
-SOONG_CONFIG_NAMESPACES += art_module
-SOONG_CONFIG_art_module += source_build
-SOONG_CONFIG_art_module_source_build := true
+$(call add_soong_config_namespace,art_module)
+$(call add_soong_config_var_value,art_module,source_build,true)