diff options
| author | Martin Stjernholm <mast@google.com> | 2021-07-09 12:06:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-09 12:06:52 +0000 |
| commit | acae1f344bae0435dde779b43112940fb128e6aa (patch) | |
| tree | 57cd8ba39f01b62a22830b0feb5a1718a83ff302 | |
| parent | d4dbd6cc01b2946f57d77bd2c7d806b41507698c (diff) | |
| parent | fa089f76e6d491797f7ad936abb5962b83852945 (diff) | |
| download | build-acae1f344bae0435dde779b43112940fb128e6aa.tar.gz | |
Add special cases for builds that cannot switch to ART prebuilts. am: fa089f76e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234811
Change-Id: I4b80651f21273c9f72ee25307b999f1034078635
| -rw-r--r-- | core/android_soong_config_vars.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 43d1aada94..2222ae4ff6 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -37,6 +37,10 @@ endif ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS))) # Build ART modules from source if they are listed in TARGET_BUILD_APPS. 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))) # Always build ART APEXes from source in coverage builds since the prebuilts # aren't built with instrumentation. @@ -49,6 +53,13 @@ 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 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))) # 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 |