diff options
| author | Christopher Ferris <cferris@google.com> | 2019-09-30 16:15:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-30 16:15:33 +0000 |
| commit | 636c03ef9f96a1f932dc1e9cf092d25d4541372a (patch) | |
| tree | d91ce2d03f3d6cb28e172bb93d0cdcd9802d5254 | |
| parent | 79c73f4a9e36bb4d922375116eb5c171b3dada51 (diff) | |
| parent | 70d8ca784c36db55c56b6f63408c95d3aaab6bb6 (diff) | |
| download | native-636c03ef9f96a1f932dc1e9cf092d25d4541372a.tar.gz | |
Merge "Move to bionic platform include."
| -rw-r--r-- | opengl/libagl/Android.bp | 5 | ||||
| -rw-r--r-- | opengl/libagl/context.h | 2 | ||||
| -rw-r--r-- | opengl/libs/Android.bp | 4 | ||||
| -rw-r--r-- | opengl/libs/hooks.h | 2 | ||||
| -rw-r--r-- | opengl/tests/EGLTest/Android.bp | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/opengl/libagl/Android.bp b/opengl/libagl/Android.bp index 6ec24b3712..f5bf015bad 100644 --- a/opengl/libagl/Android.bp +++ b/opengl/libagl/Android.bp @@ -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: { diff --git a/opengl/libagl/context.h b/opengl/libagl/context.h index 18ef7d5716..6e77a2366f 100644 --- a/opengl/libagl/context.h +++ b/opengl/libagl/context.h @@ -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> diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index 342fb5983e..eb90c8b45b 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", + ], } |