commit 8269f3a3770d83b139cc3b3571d72eb30f62191f
author Christopher Ferris <cferris@google.com> Wed Sep 11 19:08:52 2019 -0700
committer Christopher Ferris <cferris@google.com> Wed Sep 11 19:08:52 2019 -0700
tree eb49df6e9578ca0323dad4f74f49b8feffeda434
parent 703ce15fef823e865ae8a1c14538e2887c3e17e0

Use bionic platform headers.

Bug: 130763340

Test: Builds.
Change-Id: Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236

services/core/jni/Android.bp

diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 97b2047..d9c7fed 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -57,12 +57,15 @@
     ],
 
     include_dirs: [
-        "bionic/libc/private",
         "frameworks/base/libs",
         "frameworks/native/services",
         "system/gatekeeper/include",
     ],
 
+    header_libs: [
+        "bionic_libc_platform_headers",
+    ],
+
     product_variables: {
         arc: {
             exclude_srcs: [

services/core/jni/com_android_server_SystemServer.cpp

diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp
index 159a496..78b64ca 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>