Merge 7754d8da7046839969c81465a3daba15fb8008dd on remote branch
Change-Id: Iafc7933f8dfeb7b61127cb1604fd944ed9b8235a
diff --git a/Android.bp b/Android.bp
index 60acf7e..625b503 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,11 @@
],
host_supported: true,
device_supported: true,
+
+ apex_available: [
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}
cc_library_headers {
@@ -50,6 +55,11 @@
"src/solaris/npt",
],
defaults: ["upstream-jdwp-defaults"],
+
+ apex_available: [
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}
cc_library {
@@ -79,6 +89,11 @@
generated_headers: ["jdwp_generated_headers"],
export_generated_headers: ["jdwp_generated_headers"],
defaults: ["upstream-jdwp-defaults"],
+
+ apex_available: [
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}
cc_library {