commit 0465490efcc7d3875c936d5bb8f332ad995ff998
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:09:20 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:09:20 2021 +0000
tree 59b6e5b89890f5dbfe1f6602b53e17ab3d642289
parent 5d4d1517c04f7bcb3ddb68e1b3e6e36ed73710a0
parent 2845ff202122f6e0c353bf799f7df3d029494616

Snap for 7524653 from 2845ff202122f6e0c353bf799f7df3d029494616 to sc-v2-release

Change-Id: Ie8925c960d21318fc9cfb543a3367c8328c7a325

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