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

Commit d332f155 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I3682ae9a,Id29e273c 

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

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE))) 
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

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ ifeq (true,$(EMMA_INSTRUMENT)) 
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