diff options
| author | 2017-08-15 10:16:18 +0000 | |
|---|---|---|
| committer | 2017-08-15 10:16:18 +0000 | |
| commit | d2bc3ac8c4d7e71975a8c99762b63307a5e6e449 (patch) | |
| tree | dfa19617db99b5b7210ba57f803411193f1e4c0b /opengl/libs | |
| parent | 9afe0a990cdf1433e14340c8f5ba6b4ddd94ef60 (diff) | |
| parent | 00b15b8f223976d016e16536e4720771ef634695 (diff) | |
Merge "Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK" into oc-mr1-dev
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/Android.bp | 8 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/libEGL.map.txt | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index 1cfc5133c1..802b3b46e0 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -85,7 +85,6 @@ cc_defaults { cc_defaults { name: "egl_libs_defaults", defaults: ["gl_libs_defaults"], - vendor_available: true, cflags: [ "-DLOG_TAG=\"libEGL\"", ], @@ -117,9 +116,6 @@ cc_library_static { cc_library_shared { name: "libEGL", defaults: ["egl_libs_defaults"], - vndk: { - enabled: true, - }, srcs: [ "EGL/egl_tls.cpp", "EGL/egl_cache.cpp", @@ -155,7 +151,6 @@ cc_test { cc_defaults { name: "gles_libs_defaults", defaults: ["gl_libs_defaults"], - vendor_available: true, arch: { arm: { instruction_set: "arm", @@ -183,9 +178,6 @@ cc_library_shared { cc_library_shared { name: "libGLESv2", defaults: ["gles_libs_defaults"], - vndk: { - enabled: true, - }, srcs: ["GLES2/gl2.cpp"], cflags: ["-DLOG_TAG=\"libGLESv2\""], } diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 0214b0eb56..94dfe6a9de 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -1447,7 +1447,7 @@ const char* eglQueryString(EGLDisplay dpy, EGLint name) return setError(EGL_BAD_PARAMETER, (const char *)0); } -EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name) +extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name) { clearError(); diff --git a/opengl/libs/libEGL.map.txt b/opengl/libs/libEGL.map.txt index 89269a0231..fa26e33f39 100644 --- a/opengl/libs/libEGL.map.txt +++ b/opengl/libs/libEGL.map.txt @@ -21,6 +21,7 @@ LIBEGL { eglDestroyStreamKHR; # introduced=23 eglDestroySurface; eglDestroySyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21 + eglDupNativeFenceFDANDROID; # vndk eglGetConfigAttrib; eglGetConfigs; eglGetCurrentContext; @@ -44,6 +45,7 @@ LIBEGL { eglQueryStreamTimeKHR; # introduced=23 eglQueryStreamu64KHR; # introduced=23 eglQueryString; + eglQueryStringImplementationANDROID; # vndk eglQuerySurface; eglReleaseTexImage; eglReleaseThread; |