From a2606921b2003991e8f58444c869a26e2426d92c Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 28 Apr 2020 18:22:23 +0900
Subject: [PATCH] Set apex_available property

The marked library(ies) were available to the APEXes via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Bug: 150999716
Test: m
Change-Id: I54db09314c7236a227f04281a439c1d5dc56ef2c
---
 libprocinfo/Android.bp    | 6 ++++++
 libunwindstack/Android.bp | 6 ++++++
 libziparchive/Android.bp  | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 0c9a2b8a8..15b0d89d8 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -51,6 +51,12 @@ cc_library {
             enabled: false,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Tests
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 1f3ba596a..563c2c296 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -135,6 +135,12 @@ cc_library {
             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.
diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 1bbffaf7a..553136af8 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -109,6 +109,12 @@ cc_library {
             enabled: true,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Tests.