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

Commit 1d40886b authored by Christopher Ferris's avatar Christopher Ferris Committed by Android (Google) Code Review
Browse files

Merge "Use bionic platform headers."

parents 4e76b767 8269f3a3

core/jni/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -42,10 +42,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",

        "frameworks/base/media/jni",

        "system/media/camera/include",
@@ -277,6 +273,7 @@ cc_library_shared { 
                "libnativewindow",

            ],

            generated_sources: ["android_util_StatsLogInternal.cpp"],

            header_libs: ["bionic_libc_platform_headers"],

        },

        host: {

            cflags: [

core/jni/android_app_ActivityThread.cpp

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