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

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

Merge "Move to bionic platform include."

parents 3a4d3609 ddd1d6b3
Loading
Loading
Loading
Loading
+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"],
}

//##############################################################################
+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 {
+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",
    ],
}