commit 36e5cbda7f644ca1d10a6aad87d21ca17d54f405
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 05 01:27:06 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 05 01:27:06 2024 +0000
tree 6e046ceb391119d56f4aa2012cb3154f05d92797
parent f56f1c6794ca7c982c082c45fa8d269d1b422b55
parent 343381d59388ca74003a6968f6a8c7447d051c6b

Merge "Make apex availability of some bionic libraries explicit" into main am: 343381d593

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2898302

Change-Id: I5dcda53c5231053ebe827cfc049a7d2a140dc862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/system_properties/Android.bp

diff --git a/libc/system_properties/Android.bp b/libc/system_properties/Android.bp
index af8bda9..a9bdeb5 100644
--- a/libc/system_properties/Android.bp
+++ b/libc/system_properties/Android.bp
@@ -32,6 +32,9 @@
         "bionic/libstdc++/include",
     ],
     export_include_dirs: ["include"],
+    apex_available: [
+        "com.android.runtime",
+    ],
 }
 
 cc_benchmark {

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 3bda856..c7d7cf3 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -47,6 +47,9 @@
     sanitize: {
         never: true,
     },
+    apex_available: [
+        "com.android.runtime",
+    ],
 }
 
 cc_library {

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index 2ca962a..4787d87 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -146,12 +146,18 @@
 
     // Ensure that the compiler won't insert string function calls before ifuncs are resolved.
     cflags: ["-ffreestanding"],
+    apex_available: [
+        "com.android.runtime",
+    ],
 }
 
 cc_library_static {
     name: "liblinker_malloc",
     defaults: ["linker_defaults", "linker_all_targets"],
     srcs: ["linker_memory.cpp"],
+    apex_available: [
+        "com.android.runtime",
+    ],
 }
 
 cc_library_static {