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

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

Merge "Force building ART from source for AOSP products." into sc-dev am: a18d4d84 

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

Change-Id: I68481c62627ac11692cfbce24ff4be93f8fde0e4
parents 1934968d a18d4d84

core/android_soong_config_vars.mk

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ 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 ifeq (,$(filter com.google.android.art,$(PRODUCT_PACKAGES)))

  # TODO(b/192006406): There is currently no good way to control which prebuilt

  # APEX (com.google.android.art or com.android.art) gets picked for deapexing

  # to provide dex jars for hiddenapi and dexpreopting. Instead the AOSP APEX is

  # completely disabled, and we build from source for AOSP products.

  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