From 2e5cfbc1a41f8a293d8cdeb95cbf9c4e7c6c98f5 Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Thu, 4 Jan 2024 01:34:40 +0000
Subject: [PATCH] Make apex availability of libpropertyinfoparser and
 libpropertyinfoparser explicit

The availability to runtime apex was done implicitly using a baseline map in
build/soong/apex/apex.go. Make this explicit in Android.bp

Bug: 281077552
Test: m nothing
Change-Id: Iba1f30ef57c0707189ec79813ef501029135eeba
---
 debuggerd/Android.bp                              | 1 +
 property_service/libpropertyinfoparser/Android.bp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index ad1eeb30d..7d20995d7 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -86,6 +86,7 @@ cc_library_static {
 
     export_header_lib_headers: ["libdebuggerd_common_headers"],
     export_include_dirs: ["tombstoned/include"],
+    apex_available: ["com.android.runtime"],
 }
 
 // Core implementation, linked into libdebuggerd_handler and the dynamic linker.
diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp
index 87646f99d..b4a16d38f 100644
--- a/property_service/libpropertyinfoparser/Android.bp
+++ b/property_service/libpropertyinfoparser/Android.bp
@@ -25,4 +25,8 @@ cc_library_static {
         },
     },
     export_include_dirs: ["include"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }