Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." am: 530b39afc9 am: 83d70e8b9c am: 428a264719

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91240873df2757db86066e1a3bcec63fd8c685a9
This commit is contained in:
Treehugger Robot
2021-02-05 15:41:45 +00:00
committed by Automerger Merge Worker

View File

@@ -33,7 +33,17 @@ 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
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.
SOONG_CONFIG_art_module_source_build := true
else
# This sets the default for building ART APEXes from source rather than
# prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in
# all other platform builds.
SOONG_CONFIG_art_module_source_build ?= true
endif
# Apex build mode variables
ifdef APEX_BUILD_FOR_PRE_S_DEVICES