Merge changes I3682ae9a,Id29e273c am: d332f155aa

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

Change-Id: I6e2abe485241cf40dabe826c15ad1bba7d95137b
This commit is contained in:
Treehugger Robot
2021-08-02 13:42:55 +00:00
committed by Automerger Merge Worker

View File

@@ -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.