diff options
| author | David 'Digit' Turner <digit@google.com> | 2015-03-20 22:16:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:16:47 +0000 |
| commit | 654f070478a652eebbf6560f593e8e7c97388e80 (patch) | |
| tree | 842029b9ec6fc084ddf70997e603a7bd8e530a8c /emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp | |
| parent | 5b69bb42bbdd028daae30d1b1258914f9cb9fa59 (diff) | |
| parent | a268ba5f6bbbc67904124f7368f617dbb3fae6ef (diff) | |
| download | sdk-654f070478a652eebbf6560f593e8e7c97388e80.zip sdk-654f070478a652eebbf6560f593e8e7c97388e80.tar.gz sdk-654f070478a652eebbf6560f593e8e7c97388e80.tar.bz2 | |
am a268ba5f: am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'a268ba5f6bbbc67904124f7368f617dbb3fae6ef':
emulator/opengl: Remove out-of-process handling code.
emulator/opengl: refactor Thread class.
emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp b/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp index cda205f..8c51a4e 100644 --- a/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp +++ b/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp @@ -17,12 +17,13 @@ #include "GL2Dispatch.h" #include <stdio.h> #include <stdlib.h> -#include "osDynLibrary.h" + +#include "emugl/common/shared_library.h" gl2_decoder_context_t s_gl2; int s_gl2_enabled; -static osUtils::dynLibrary *s_gles2_lib = NULL; +static emugl::SharedLibrary *s_gles2_lib = NULL; #define DEFAULT_GLES_V2_LIB EMUGL_LIBNAME("GLES_V2_translator") @@ -38,7 +39,7 @@ bool init_gl2_dispatch() // // Load the GLES library // - s_gles2_lib = osUtils::dynLibrary::open(libName); + s_gles2_lib = emugl::SharedLibrary::open(libName); if (!s_gles2_lib) return false; // |