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

Commit cdbb2504 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Always use ART sources for Fuchsia." am: b579ef2c am: 46fd61b0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f2f5993a30956a318ca9b6723a1daefa1f88c2
parents 3a8c5a58 46fd61b0

core/android_soong_config_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -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