Disable AOSP prebuilt APEX for ART (reland).
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
diff --git a/Android.bp b/Android.bp
index fc39d89..9be2d10 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,14 @@
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",
