Merge "Use bionic platform headers."

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",

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 {
 

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>

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>

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>

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 {

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>