summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Ferris <cferris@google.com> 2019-09-26 08:27:25 -0700
committer Christopher Ferris <cferris@google.com> 2019-09-26 08:27:25 -0700
commitddd1d6b32c7b79ee8d5d1c00907a47d5d9834e9f (patch)
treece9c29643e78917a1f7b70419240ffa1fc4fc246
parentdb313f6b27743d37098159c0b4d50b91f84bda55 (diff)
Move to bionic platform include.
Bug: 141560639 Test: Builds. Change-Id: Iccc1cc09135399c6f7d4f33a0483762cd28ae43a
-rw-r--r--opengl/libs/Android.bp4
-rw-r--r--opengl/libs/hooks.h2
-rw-r--r--opengl/tests/EGLTest/Android.bp4
3 files changed, 5 insertions, 5 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index 693e48efac..48a68afc8e 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -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"],
}
//##############################################################################
diff --git a/opengl/libs/hooks.h b/opengl/libs/hooks.h
index 63a0e140cc..86fec21bae 100644
--- a/opengl/libs/hooks.h
+++ b/opengl/libs/hooks.h
@@ -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 {
diff --git a/opengl/tests/EGLTest/Android.bp b/opengl/tests/EGLTest/Android.bp
index 19c8b377ab..8bfe517812 100644
--- a/opengl/tests/EGLTest/Android.bp
+++ b/opengl/tests/EGLTest/Android.bp
@@ -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",
+ ],
}