diff options
| -rw-r--r-- | opengl/libs/Android.bp | 5 | ||||
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 25 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_platform_entries.cpp | 7 |
3 files changed, 8 insertions, 29 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index e8d3684e4e..3c76c62f05 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -102,11 +102,6 @@ cc_defaults { "libbacktrace", "libbase", ], - target: { - vendor: { - exclude_shared_libs: ["libgraphicsenv"], - }, - }, } cc_library_static { diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index fc066a5a58..2ac02a71f9 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -17,27 +17,23 @@ //#define LOG_NDEBUG 0 #define ATRACE_TAG ATRACE_TAG_GRAPHICS -#include <EGL/Loader.h> - -#include <string> - -#include <dirent.h> -#include <dlfcn.h> +#include "EGL/Loader.h" #include <android-base/properties.h> #include <android/dlext.h> +#include <dirent.h> +#include <dlfcn.h> +#include <graphicsenv/GraphicsEnv.h> #include <log/log.h> #include <utils/Timers.h> - -#ifndef __ANDROID_VNDK__ -#include <graphicsenv/GraphicsEnv.h> -#endif #include <vndksupport/linker.h> +#include <string> + #include "egl_platform_entries.h" #include "egl_trace.h" #include "egldefs.h" -#include <EGL/eglext_angle.h> +#include "EGL/eglext_angle.h" namespace android { @@ -159,13 +155,11 @@ static bool should_unload_system_driver(egl_connection_t* cnx) { return true; } -#ifndef __ANDROID_VNDK__ // Return true if updated driver namespace is set. ns = android::GraphicsEnv::getInstance().getDriverNamespace(); if (ns) { return true; } -#endif return false; } @@ -569,7 +563,7 @@ void Loader::init_angle_backend(void* dso, egl_connection_t* cnx) { Loader::driver_t* Loader::attempt_to_load_updated_driver(egl_connection_t* cnx) { ATRACE_CALL(); -#ifndef __ANDROID_VNDK__ + android_namespace_t* ns = android::GraphicsEnv::getInstance().getDriverNamespace(); if (!ns) { return nullptr; @@ -599,9 +593,6 @@ Loader::driver_t* Loader::attempt_to_load_updated_driver(egl_connection_t* cnx) hnd->set(dso, GLESv2); } return hnd; -#else - return nullptr; -#endif } Loader::driver_t* Loader::attempt_to_load_system_driver(egl_connection_t* cnx, const char* suffix, diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp index 99283be6e1..b93afc4a10 100644 --- a/opengl/libs/EGL/egl_platform_entries.cpp +++ b/opengl/libs/EGL/egl_platform_entries.cpp @@ -2248,15 +2248,8 @@ EGLBoolean eglPresentationTimeANDROIDImpl(EGLDisplay dpy, EGLSurface surface, } EGLClientBuffer eglGetNativeClientBufferANDROIDImpl(const AHardwareBuffer *buffer) { - // AHardwareBuffer_to_ANativeWindowBuffer is a platform-only symbol and thus - // this function cannot be implemented when this libEGL is built for - // vendors. -#ifndef __ANDROID_VNDK__ if (!buffer) return setError(EGL_BAD_PARAMETER, (EGLClientBuffer) nullptr); return const_cast<ANativeWindowBuffer *>(AHardwareBuffer_to_ANativeWindowBuffer(buffer)); -#else - return setError(EGL_BAD_PARAMETER, (EGLClientBuffer) nullptr); -#endif } // ---------------------------------------------------------------------------- |