diff options
| author | Martin Stjernholm <mast@google.com> | 2021-06-29 19:27:50 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-07-02 21:00:38 +0100 |
| commit | d1b8749c72abd1232518ecc7bbb05b0059357ee3 (patch) | |
| tree | 59b6e5b89890f5dbfe1f6602b53e17ab3d642289 /Android.bp | |
| parent | 45984f160ad8bdfd64862006a512b156ae83bcc7 (diff) | |
| download | platform_packages_modules_ArtPrebuilt-android12-dev.tar.gz platform_packages_modules_ArtPrebuilt-android12-dev.tar.bz2 platform_packages_modules_ArtPrebuilt-android12-dev.zip | |
Disable AOSP prebuilt APEX for ART (reland).android12-dev
Workaround for deapexer source selection issue in b/192006406.
This relands http://ag/15107825 after http://ag/15175111, which avoids
the Soong errors when neither internal nor AOSP prebuilt APEX is
present.
Test: m TARGET_PRODUCT=cf_x86_64_phone nothing
Test: m TARGET_PRODUCT=aosp_cf_x86_64_phone nothing
Test: rm vendor/unbundled_google/modules/ArtGooglePrebuilt/Android.bp
m TARGET_PRODUCT=cf_x86_64_phone droid
m TARGET_PRODUCT=aosp_cf_x86_64_phone droid
Test: TH run on aosp_bonito-userdebug on
git_sc-dev-plus-aosp-without-vendor
Bug: 192006406
Bug: 192542393
Change-Id: I21f85d56aa3c97dcce972ec372a6a791d0f55380
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -22,6 +22,14 @@ prebuilt_apex { prebuilt_apex { name: "com.android.art", + + // 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. + enabled: false, + arch: { arm: { src: "com.android.art-arm.apex", |