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

Commit 724a07ea authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Move to bionic platform include." 

am: 636c03ef

Change-Id: I3c69dc9d2086e193a344a036f8f373e30ae14dfa
parents bce5a0fb 636c03ef

opengl/libagl/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ cc_defaults { 
        "libnativewindow",

    ],



    // we need to access the private Bionic header <bionic_tls.h>

    include_dirs: ["bionic/libc/private"],

    header_libs: [

        "bionic_libc_platform_headers",

    ],



    arch: {

        arm: {

opengl/libagl/context.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sys/types.h>

#include <pthread.h>

#ifdef __ANDROID__

#include <bionic_tls.h>

#include <bionic/tls.h>

#endif



#include <private/pixelflinger/ggl_context.h>

opengl/libs/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -72,15 +72,13 @@ cc_defaults { 
        "libarect",

    ],

    header_libs: [

        "bionic_libc_platform_headers",

        "gl_headers",

        "libsystem_headers",

        "libhardware_headers",

        "libnativebase_headers",

    ],

    export_header_lib_headers: ["gl_headers"],



    // we need to access the private Bionic header <bionic_tls.h>

    include_dirs: ["bionic/libc/private"],

}



//##############################################################################

opengl/libs/hooks.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define MAX_NUMBER_OF_GL_EXTENSIONS 256





#include <bionic_tls.h>  /* special private C library header */

#include <bionic/tls.h>  /* special private C library header */



// ----------------------------------------------------------------------------

namespace android {

opengl/tests/EGLTest/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -28,9 +28,11 @@ cc_test { 
    ],



    include_dirs: [

        "bionic/libc/private",

        "frameworks/native/opengl/libs",

        "frameworks/native/opengl/libs/EGL",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

    ],

}