Snap for 6188643 from 48e4f0e301f37c7ae740660cafb79c7771bb7035 to rvc-release

Change-Id: If34f43ffe2e5035cde340a05bcddea866088eaee

1 files changed, 14 insertions, 0 deletions

diff --git a/common/asm/Android.bp b/common/asm/Android.bp
index cbe3b4fa..66b61674 100644
--- a/common/asm/Android.bp
+++ b/common/asm/Android.bp
@@ -64,32 +64,46 @@ java_import {
     jars: ["asm-util-6.0.jar"],
 }
 
+java_defaults {
+    name: "asm-7.0-defaults",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
+}
+
 java_import {
     name: "asm-7.0",
     host_supported: true,
     jars: ["asm-7.0.jar"],
+    defaults: ["asm-7.0-defaults"],
 }
 
 java_import {
     name: "asm-analysis-7.0",
     host_supported: true,
     jars: ["asm-analysis-7.0.jar"],
+    defaults: ["asm-7.0-defaults"],
 }
 
 java_import {
     name: "asm-commons-7.0",
     host_supported: true,
     jars: ["asm-commons-7.0.jar"],
+    defaults: ["asm-7.0-defaults"],
 }
 
 java_import {
     name: "asm-tree-7.0",
     host_supported: true,
     jars: ["asm-tree-7.0.jar"],
+    defaults: ["asm-7.0-defaults"],
 }
 
 java_import {
     name: "asm-util-7.0",
     host_supported: true,
     jars: ["asm-util-7.0.jar"],
+    defaults: ["asm-7.0-defaults"],
 }