diff options
| -rw-r--r-- | core/android_soong_config_vars.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 3a0c0f1b82..5b24881026 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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 |