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

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

Add special cases for builds that cannot switch to ART prebuilts. am: fa089f76 

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

Change-Id: I1ae6e8f80b21014467e47876d5ee0add2a13bad4
parents 7388ed30 fa089f76

core/android_soong_config_vars.mk

+11 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,10 @@ endif 
ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))

ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))

  # Build ART modules from source if they are listed in TARGET_BUILD_APPS.

  # Build ART modules from source if they are listed in TARGET_BUILD_APPS.

  SOONG_CONFIG_art_module_source_build := true

  SOONG_CONFIG_art_module_source_build := true

else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))

  # Always build from source for the module targets. This ought to be covered by

  # the TARGET_BUILD_APPS check above, but there are test builds that don't set it.

  SOONG_CONFIG_art_module_source_build := true

else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))

else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))

  # Always build ART APEXes from source in coverage builds since the prebuilts

  # Always build ART APEXes from source in coverage builds since the prebuilts

  # aren't built with instrumentation.

  # aren't built with instrumentation.
@@ -51,6 +55,13 @@ else ifneq (,$(PRODUCT_FUCHSIA)) 
  # Fuchsia picks out ART internal packages that aren't available in the

  # Fuchsia picks out ART internal packages that aren't available in the

  # prebuilt.

  # prebuilt.

  SOONG_CONFIG_art_module_source_build := true

  SOONG_CONFIG_art_module_source_build := 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.

  SOONG_CONFIG_art_module_source_build := true

else ifneq (,$(filter dex2oatds dex2oats,$(PRODUCT_HOST_PACKAGES)))

  # Some products depend on host tools that aren't available as prebuilts.

  SOONG_CONFIG_art_module_source_build := true

else ifeq (,$(filter com.google.android.art,$(PRODUCT_PACKAGES)))

else ifeq (,$(filter com.google.android.art,$(PRODUCT_PACKAGES)))

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

  # 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

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