Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use bionic platform headers." am: 539d37679c

Browse Source 
am: 36469ac071

Change-Id: Ia9fd728b7e61aacff41811848c81f84ad1559c4a
This commit is contained in:
Christopher Ferris
2019-09-17 10:01:44 -07:00
committed by android-build-merger
parent 6479d51ebb 36469ac071
commit bf6df9ed52
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/Android.bp
View File

@@ -218,10 +218,6 @@ cc_library_shared {
], ],
include_dirs: [ 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/include/private",
"external/skia/src/codec", "external/skia/src/codec",
"external/skia/src/core", "external/skia/src/core",
@@ -233,6 +229,8 @@ cc_library_shared {
"system/media/private/camera/include", "system/media/private/camera/include",
], ],
header_libs: ["bionic_libc_platform_headers"],
static_libs: [ static_libs: [
"libasync_safe", "libasync_safe",
"libgif", "libgif",

2
core/jni/android_app_ActivityThread.cpp
View File

@@ -24,7 +24,7 @@
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include <unistd.h> #include <unistd.h>
#include <bionic_malloc.h> #include <bionic/malloc.h>
namespace android { namespace android {

2
core/jni/android_ddm_DdmHandleNativeHeap.cpp
View File

@@ -23,7 +23,7 @@
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <bionic_malloc.h> #include <bionic/malloc.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>

2
core/jni/android_os_Debug.cpp
View File

@@ -34,7 +34,7 @@
#include <vector> #include <vector>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <bionic_malloc.h> #include <bionic/malloc.h>
#include <debuggerd/client.h> #include <debuggerd/client.h>
#include <log/log.h> #include <log/log.h>
#include <utils/misc.h> #include <utils/misc.h>

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -73,7 +73,7 @@
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <bionic_malloc.h> #include <bionic/malloc.h>
#include <cutils/ashmem.h> #include <cutils/ashmem.h>
#include <cutils/fs.h> #include <cutils/fs.h>
#include <cutils/multiuser.h> #include <cutils/multiuser.h>

5
services/core/jni/Android.bp
View File

@@ -57,11 +57,14 @@ cc_library_static {
], ],
include_dirs: [ include_dirs: [
"bionic/libc/private",
"frameworks/base/libs", "frameworks/base/libs",
"frameworks/native/services", "frameworks/native/services",
"system/gatekeeper/include", "system/gatekeeper/include",
], ],
header_libs: [
"bionic_libc_platform_headers",
],
} }
cc_defaults { cc_defaults {

2
services/core/jni/com_android_server_SystemServer.cpp
View File

@@ -24,7 +24,7 @@
#include <sensorservice/SensorService.h> #include <sensorservice/SensorService.h>
#include <sensorservicehidl/SensorManager.h> #include <sensorservicehidl/SensorManager.h>
#include <bionic_malloc.h> #include <bionic/malloc.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <utils/Log.h> #include <utils/Log.h>