Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36469ac0 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Use bionic platform headers." 

am: 539d3767

Change-Id: Ib9b444ce9b8dc341e278e1e83aa0fa1587818b92
parents c1094520 539d3767

core/jni/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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>