commit d332f155aab890e0d159983ee854a5623c1c8fb4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 02 13:27:38 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 02 13:27:38 2021 +0000
tree 12cf840f5d9bc93a517e6181d90afae8a3a2c1b9
parent 9673304335028e737c4943263503041fe932199c
parent 99dffee4c6dd551e851a3a5e4b9feb915cdaa884

Merge changes I3682ae9a,Id29e273c

* changes:
  Don't use prebuilt modules for sanitizer builds.
  Don't use mainline prebuilts for coverage builds.

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 8c702b3..fe97047 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -54,6 +54,7 @@
 else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST))
   # Prebuilts aren't built with sanitizers either.
   SOONG_CONFIG_art_module_source_build := true
+  MODULE_BUILD_FROM_SOURCE := true
 else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH)))
   # We currently only provide prebuilts for x86 on host. This skips prebuilts in
   # cuttlefish builds for ARM servers.

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index cb97503..0822a6e 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -120,6 +120,9 @@
 ifndef SKIP_BOOT_JARS_CHECK
 SKIP_BOOT_JARS_CHECK := true
 endif
+# Mainline modules prebuilts do support coverage. Build them from source.
+# See b/159241638
+MODULE_BUILD_FROM_SOURCE := true
 endif
 
 ifdef TARGET_ARCH_SUITE