From 399fc37446443bec0f03e12a80c07d6b87abb628 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 5 Mar 2021 15:49:36 +0000 Subject: [PATCH] Always use ART sources for Fuchsia. Fuchsia currently adds a number of ART internal packages in device/google/fuchsia/fuchsia.mk, so it cannot use prebuilts. Test: m TARGET_PRODUCT=fuchsia_arm64 \ TARGET_BUILD_VARIANT={user,eng} nothing with SOONG_CONFIG_art_module_source_build set to false by default. Bug: 172480615 Change-Id: I6af54accd8cc724b92072ae112960ace8faa70d5 --- core/android_soong_config_vars.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index cc369a3ad3..c9fcf4757e 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -44,6 +44,10 @@ 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 +else ifneq (,$(PRODUCT_FUCHSIA)) + # Fuchsia picks out ART internal packages that aren't available in the + # prebuilt. + SOONG_CONFIG_art_module_source_build := true else # This sets the default for building ART APEXes from source rather than # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in