commit ae2af082ca30a5a2ae581ab5075856280bc0bbe6
author Martin Stjernholm <mast@google.com> Mon Feb 15 10:53:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 15 10:53:50 2021 +0000
tree e806b4384688dd9b5ea2b8d5e56118a45d33e221
parent b84604198c6f109f35b19ba7e82dc5e2349c4d55
parent f4bf5d5e62e2e2b45bea8fd9a0dfb5dbe6d04007

Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS."

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index ff33e0c..cc369a3 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -33,7 +33,10 @@
   $(call add_soong_config_namespace,art_module)
   SOONG_CONFIG_art_module += source_build
 endif
-ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))
+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 ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))
   # Always build ART APEXes from source in coverage builds since the prebuilts
   # aren't built with instrumentation.
   # TODO(b/172480617): Find another solution for this.