commit aad91dcd1d919fffcee4886f61742c60a7f67420
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 08 05:33:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 08 05:33:29 2019 +0000
tree a411d10a361a174b01924a5f197a82117a76a543
parent 29ec2881a0a87ccda75c77fd967934d863d53cc1
parent e87e0dcbaec82aad9e2e3b441384a4b39a419105

Merge "Restrict the availability of the bionic libs"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 5f82b13..3653f45 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1713,6 +1713,11 @@
         versions: ["10000"],
     },
 
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
+
     // Sorting bss symbols by size usually results in less dirty pages at run
     // time, because small symbols are grouped together.
     sort_bss_symbols_by_size: true,

libc/malloc_debug/Android.bp

diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index 41c4f9d..ce80a97 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -39,6 +39,11 @@
         "-Werror",
         "-Wno-error=format-zero-length",
     ],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 // ==============================================================
@@ -102,6 +107,11 @@
         "-Wno-error=format-zero-length",
         "-Wthread-safety",
     ],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 // ==============================================================

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index e36ddc5..15263e9 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -111,6 +111,11 @@
         symbol_file: "libdl.map.txt",
         versions: ["10000"],
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 cc_library {

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index 59466e4..b7bae54 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -501,6 +501,11 @@
         symbol_file: "libm.map.txt",
         versions: ["10000"],
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 ndk_library {

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index e2cdd14..18f2527 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -303,6 +303,11 @@
     },
     compile_multilib: "both",
     xom: false,
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 sh_binary {
@@ -376,6 +381,11 @@
     sanitize: {
         never: true,
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 cc_test {