Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961

Merged-In: I1a095e8c3049420124baef139edacdfdd5747980
Change-Id: I30b71cd8e60526def44f87137037b965d969834c

1 files changed, 8 insertions, 0 deletions

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