commit 3d0a68fbb585b4a5d4f379fdbb3babfcbdccc536
author Martin Stjernholm <mast@google.com> Mon Sep 06 15:14:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 06 15:14:52 2021 +0000
tree f613f980cebfe260c6a49446d437c613d74b3281
parent 2abad4ad41da12fa1d6aefb23f06e428f30eee87
parent e2ee9bc7fac7ecb84e8b8494350edf3740aab2ca

Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false."

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6fb14cd..6a0deae 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -44,7 +44,9 @@
   $(call add_soong_config_namespace,art_module)
   SOONG_CONFIG_art_module += source_build
 endif
-ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))
+ifneq (,$(SOONG_CONFIG_art_module_source_build))
+  # Keep an explicit setting.
+else ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))
   # Build ART modules from source if they are listed in TARGET_BUILD_APPS.
   SOONG_CONFIG_art_module_source_build := true
 else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))