Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS." am: ae2af082ca am: 20c9c03ba7

Original change: https://android-review.googlesource.com/c/platform/build/+/1587752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e3fe5a88b3bbf9dc68d4c4a22c9dc9871a25e05
This commit is contained in:
Martin Stjernholm
2021-02-15 11:52:03 +00:00
committed by Automerger Merge Worker

View File

@@ -33,7 +33,10 @@ ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))
$(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.