commit 748b82acceb09557187a69f1a161bf38d888c7ee
author Linux Build Service Account <lnxbuild@localhost> Mon May 25 13:13:13 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon May 25 13:13:13 2020 -0700
tree de6cac29cfdc33bcc8ffb16ef786f2a9ed1dc85a
parent 3a92c11e8468899526b7864e39fcb2b5d8218fcd
parent 13c1a2906b6df63e3164d5b8653f98c760681b2c

Merge 13c1a2906b6df63e3164d5b8653f98c760681b2c on remote branch

Change-Id: I54355d13f7ecef32148f9eecab9ec5addb549dfa

Android.bp

diff --git a/Android.bp b/Android.bp
index 8346942..0ea62e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -168,6 +168,11 @@
             },
         },
     },
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 art_cc_library {
@@ -179,6 +184,11 @@
         "vixl-arm",
         "vixl-arm64",
     ],
+
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }
 
 //######## VIXL HOST TESTS #########