commit 07c5f98b13ab492dc24f3a9f38f9667f673da32c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:08:53 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:08:53 2021 +0000
tree 59b6e5b89890f5dbfe1f6602b53e17ab3d642289
parent b52ed643a62a62b4ec312b3ec5faa1339062293c
parent d1b8749c72abd1232518ecc7bbb05b0059357ee3

Snap for 7524638 from d1b8749c72abd1232518ecc7bbb05b0059357ee3 to sc-release

Change-Id: I3d8ebd05dd1da00ea261c1e11077a391a5f20bbc

Android.bp

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",