commit 5d4d1517c04f7bcb3ddb68e1b3e6e36ed73710a0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 03 03:11:40 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 03 03:11:40 2021 +0000
tree 1416c3582c4a8fc670d772b503d1f48f911ac70a
parent b8d02cea04c16c690a48acbf56e2b4197ef427a6
parent 8b7e8c2cf89236c35438ec7825df640a44b0e88b

Snap for 7518237 from 8b7e8c2cf89236c35438ec7825df640a44b0e88b to sc-v2-release

Change-Id: I8bd743e2259c8c442d9004dc3cd738d4ef067489

Android.bp

diff --git a/Android.bp b/Android.bp
index 9be2d10..fc39d89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,14 +22,6 @@
 
 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",