commit e4e328a2ae96b31e3b4ea5da6fe0343610a26679
author Martin Stjernholm <mast@google.com> Thu Dec 17 22:31:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 17 22:31:04 2020 +0000
tree 2e8e71629dee233e820f9be51d55dc9f798ef1c7
parent d51e4c473f1506f1ff5004863a4b5adb670c88e4
parent d6e9ea97a6e6244db7fc6b909f264c1ac1d225d0

Merge "Temporarily set default to keep building with ART sources."

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index ee12c8c..883f92d 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -27,3 +27,10 @@
 # Add variables to the namespace below:
 
 $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
+
+# TODO(b/172480615): Remove when platform uses ART Module prebuilts by default.
+ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))
+  $(call add_soong_config_namespace,art_module)
+  SOONG_CONFIG_art_module += source_build
+endif
+SOONG_CONFIG_art_module_source_build ?= true