diff options
| author | 2021-07-12 13:51:23 +0000 | |
|---|---|---|
| committer | 2021-07-12 13:51:23 +0000 | |
| commit | 37557784fde4deb3e263246a142fde2ec970dc60 (patch) | |
| tree | 339d59531d5c077a34a93ed77305c16cc87d6a34 | |
| parent | 91bb0d9e337725f70b3a2db0d6112a9a7adfb791 (diff) | |
| parent | 75b8f0a469dc7f3941758b66d96b48976d83f18f (diff) | |
Merge changes I544a0cfc,I8990b726
* changes:
Add special cases for builds that cannot switch to ART prebuilts.
Force building ART from source for AOSP products.
| -rw-r--r-- | core/android_soong_config_vars.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 6c39b2b499..64a6449e04 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -39,6 +39,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. @@ -51,6 +55,19 @@ 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 + # 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 |