From 15c0233afef710b979f5f8c60408a803a3d76a91 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Wed, 11 Sep 2019 19:08:52 -0700
Subject: [PATCH] Use bionic platform headers.

Bug: 130763340

Test: Builds.
Change-Id: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236
Merged-In: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236
(cherry picked from commit 8269f3a3770d83b139cc3b3571d72eb30f62191f)
---
 core/jni/Android.bp                                   | 6 ++----
 core/jni/android_app_ActivityThread.cpp               | 2 +-
 core/jni/android_ddm_DdmHandleNativeHeap.cpp          | 2 +-
 core/jni/android_os_Debug.cpp                         | 2 +-
 core/jni/com_android_internal_os_Zygote.cpp           | 2 +-
 services/core/jni/Android.bp                          | 5 ++++-
 services/core/jni/com_android_server_SystemServer.cpp | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 0e31ab9c5fbb..6dd6d45728ad 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -218,10 +218,6 @@ cc_library_shared {
     ],
 
     include_dirs: [
-        // we need to access the private Bionic header
-        // <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
-        "bionic/libc/private",
-
         "external/skia/include/private",
         "external/skia/src/codec",
         "external/skia/src/core",
@@ -233,6 +229,8 @@ cc_library_shared {
         "system/media/private/camera/include",
     ],
 
+    header_libs: ["bionic_libc_platform_headers"],
+
     static_libs: [
         "libasync_safe",
         "libgif",
diff --git a/core/jni/android_app_ActivityThread.cpp b/core/jni/android_app_ActivityThread.cpp
index 93f2525eb29d..fc88193a8502 100644
--- a/core/jni/android_app_ActivityThread.cpp
+++ b/core/jni/android_app_ActivityThread.cpp
@@ -24,7 +24,7 @@
 #include "core_jni_helpers.h"
 #include <unistd.h>
 
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 namespace android {
 
diff --git a/core/jni/android_ddm_DdmHandleNativeHeap.cpp b/core/jni/android_ddm_DdmHandleNativeHeap.cpp
index 076e99dd1fba..2ca4500991fa 100644
--- a/core/jni/android_ddm_DdmHandleNativeHeap.cpp
+++ b/core/jni/android_ddm_DdmHandleNativeHeap.cpp
@@ -23,7 +23,7 @@
 #include "core_jni_helpers.h"
 
 #include <android-base/logging.h>
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 #include <utils/Log.h>
 #include <utils/String8.h>
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 8a89ed9acace..f6385cbbcef7 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -34,7 +34,7 @@
 #include <vector>
 
 #include <android-base/logging.h>
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 #include <debuggerd/client.h>
 #include <log/log.h>
 #include <utils/misc.h>
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 82c27f02ba87..f7318b6bba41 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -73,7 +73,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 #include <cutils/ashmem.h>
 #include <cutils/fs.h>
 #include <cutils/multiuser.h>
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 0482069e1777..3bc239b53529 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -57,11 +57,14 @@ cc_library_static {
     ],
 
     include_dirs: [
-        "bionic/libc/private",
         "frameworks/base/libs",
         "frameworks/native/services",
         "system/gatekeeper/include",
     ],
+
+    header_libs: [
+        "bionic_libc_platform_headers",
+    ],
 }
 
 cc_defaults {
diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp
index 159a4960731d..78b64ca072ad 100644
--- a/services/core/jni/com_android_server_SystemServer.cpp
+++ b/services/core/jni/com_android_server_SystemServer.cpp
@@ -24,7 +24,7 @@
 #include <sensorservice/SensorService.h>
 #include <sensorservicehidl/SensorManager.h>
 
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 #include <cutils/properties.h>
 #include <utils/Log.h>
-- 
2.11.0