diff options
| author | Martin Stjernholm <mast@google.com> | 2021-06-29 19:20:25 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-07-09 19:29:48 +0100 |
| commit | a877393386e54159ca15a77633076f819e430ee1 (patch) | |
| tree | d6f73b5ff62aa6cb0337a63ecd3a5f46eedfaa4e | |
| parent | 42b072f4a760c3818abfe5240152264e1581f380 (diff) | |
| download | platform_build-a877393386e54159ca15a77633076f819e430ee1.tar.gz platform_build-a877393386e54159ca15a77633076f819e430ee1.tar.bz2 platform_build-a877393386e54159ca15a77633076f819e430ee1.zip | |
Force building ART from source for AOSP products.
This is a workaround for the problem that we cannot control from make
which APEX gets picked for deapexing.
Cherry-picked from http://ag/15107826.
Test: env TARGET_PRODUCT=aosp_cf_x86_64_phone \
SOONG_CONFIG_art_module_source_build=false \
build/soong/soong_ui.bash \
--dumpvar-mode SOONG_CONFIG_art_module_source_build
This shows true
Test: env TARGET_PRODUCT=cf_x86_64_phone \
SOONG_CONFIG_art_module_source_build=false \
build/soong/soong_ui.bash \
--dumpvar-mode SOONG_CONFIG_art_module_source_build
This shows false in internal
Bug: 192006406
Bug: 172480615
Change-Id: I8990b726affeb08eabf130d20be45129a7c1c58d
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
| -rw-r--r-- | core/android_soong_config_vars.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 6c39b2b499..04a055dca8 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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 |