Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d70e8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." am: 530b39af 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2614febe66e93d485912f85488b2b1394e68f23
parents 14bd7995 530b39af

core/android_soong_config_vars.mk

+11 −1
Original line number Diff line number Diff line
@@ -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

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