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

Commit 48f5a70c authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e3fe5a88b3bbf9dc68d4c4a22c9dc9871a25e05
parents 3a8d7138 20c9c03b

core/android_soong_config_vars.mk

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