commit 8f582ef2f8a77d953d0e9f33387f592d20f852e2
author Christopher Ferris <cferris@google.com> Wed Sep 11 19:05:29 2019 -0700
committer Christopher Ferris <cferris@google.com> Wed Sep 11 19:05:29 2019 -0700
tree bea668f7605903876618505b7aec795da94ea4ae
parent ba4192d0388d5c5153e108650a9e20531228bea0

Make bionic_malloc.h a platform header.

Instead of having platform directories directly include the
private header, create a platform header directory and export it.

Bug: 130763340

Test: Builds.
Change-Id: Ie0f092b3fe077a3de8b90266c0b28bfbc20d0dfa

libc/malloc_hooks/Android.bp

diff --git a/libc/malloc_hooks/Android.bp b/libc/malloc_hooks/Android.bp
index d119f89..a0f8102 100644
--- a/libc/malloc_hooks/Android.bp
+++ b/libc/malloc_hooks/Android.bp
@@ -49,7 +49,13 @@
     shared_libs: ["libbase"],
 
     local_include_dirs: ["tests"],
-    include_dirs: ["bionic/libc", "bionic"],
+    include_dirs: [
+        "bionic/libc",
+        "bionic"
+    ],
+    header_libs: [
+        "bionic_libc_platform_headers",
+    ],
 
     cflags: [
         "-Wall",

libc/malloc_hooks/tests/malloc_hooks_tests.cpp

diff --git a/libc/malloc_hooks/tests/malloc_hooks_tests.cpp b/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
index 86e20ea..1858781 100644
--- a/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
+++ b/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
@@ -38,7 +38,7 @@
 
 #include <gtest/gtest.h>
 
-#include <private/bionic_malloc.h>
+#include <bionic/malloc.h>
 #include <private/bionic_malloc_dispatch.h>
 #include <tests/utils.h>