StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I3682ae9a,Id29e273c

Browse Source 
* changes:
  Don't use prebuilt modules for sanitizer builds.
  Don't use mainline prebuilts for coverage builds.
This commit is contained in:
Treehugger Robot
2021-08-02 13:27:38 +00:00
committed by Gerrit Code Review
parent 9673304335 99dffee4c6
commit d332f155aa
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/android_soong_config_vars.mk
View File

@@ -54,6 +54,7 @@ else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))
else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST)) else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST))
# Prebuilts aren't built with sanitizers either. # Prebuilts aren't built with sanitizers either.
SOONG_CONFIG_art_module_source_build := true SOONG_CONFIG_art_module_source_build := true
MODULE_BUILD_FROM_SOURCE := true
else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH))) else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH)))
# We currently only provide prebuilts for x86 on host. This skips prebuilts in # We currently only provide prebuilts for x86 on host. This skips prebuilts in
# cuttlefish builds for ARM servers. # cuttlefish builds for ARM servers.

3
core/main.mk
View File

@@ -120,6 +120,9 @@ ifeq (true,$(EMMA_INSTRUMENT))
ifndef SKIP_BOOT_JARS_CHECK ifndef SKIP_BOOT_JARS_CHECK
SKIP_BOOT_JARS_CHECK := true SKIP_BOOT_JARS_CHECK := true
endif endif
# Mainline modules prebuilts do support coverage. Build them from source.
# See b/159241638
MODULE_BUILD_FROM_SOURCE := true
endif endif
ifdef TARGET_ARCH_SUITE ifdef TARGET_ARCH_SUITE