commit f6cef7237827d04a3bdbbd6c0b4a80b6601e484c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 18 04:24:55 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 18 04:24:55 2020 +0000
tree a683a2d97f07dfc541c06028be2d11d2715b7131
parent 4a425fa3baa6655e611438033563b35366ddd448
parent 8d6a0ec5257cba1707160398bcdc8d18892aa803

Merge "Set apex_available property" into rvc-dev

libprocinfo/Android.bp

diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 0c9a2b8..15b0d89 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -51,6 +51,12 @@
             enabled: false,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Tests

libunwindstack/Android.bp

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 1f3ba59..563c2c2 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -135,6 +135,12 @@
             exclude_shared_libs: ["libdexfile_support"],
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Static library without DEX support to avoid dependencies on the ART APEX.

libziparchive/Android.bp

diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 1bbffaf..553136a 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -109,6 +109,12 @@
             enabled: true,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Tests.