commit 0ace96d7544956b550a61816fd1c5c17bac69f2e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 16 02:09:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 02:09:44 2019 +0000
tree a9d46b5109e2a972342e6e3c9c94f603005cdcd8
parent 1fee3b210497901e3abc5c7ab25b570505056c8e
parent f302cfb26bd840a3b4adaa8aa7be0f369c68483b

Merge "libc_malloc_[debug|hooks] are not available for platform"

libc/malloc_debug/Android.bp

diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index ce80a97..7340f95 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -109,9 +109,13 @@
     ],
 
     apex_available: [
-        "//apex_available:platform",
         "com.android.runtime",
     ],
+    static: {
+        apex_available: [
+            "//apex_available:platform",
+        ],
+    },
 }
 
 // ==============================================================

libc/malloc_hooks/Android.bp

diff --git a/libc/malloc_hooks/Android.bp b/libc/malloc_hooks/Android.bp
index a0f8102..861c371 100644
--- a/libc/malloc_hooks/Android.bp
+++ b/libc/malloc_hooks/Android.bp
@@ -32,6 +32,15 @@
         "-Werror",
         "-fno-stack-protector",
     ],
+
+    apex_available: [
+        "com.android.runtime",
+    ],
+    static: {
+        apex_available: [
+            "//apex_available:platform",
+        ],
+    },
 }
 
 // ==============================================================