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/EGLDispatch.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/EGLDispatch.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp b/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp index 3cf5dbc..7d514e8 100644 --- a/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp +++ b/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp @@ -16,7 +16,8 @@ #include "EGLDispatch.h" #include <stdio.h> #include <stdlib.h> -#include "osDynLibrary.h" + +#include "emugl/common/shared_library.h" EGLDispatch s_egl; @@ -28,7 +29,7 @@ bool init_egl_dispatch() const char *libName = getenv("ANDROID_EGL_LIB"); if (!libName) libName = DEFAULT_EGL_LIB; - osUtils::dynLibrary *lib = osUtils::dynLibrary::open(libName); + emugl::SharedLibrary *lib = emugl::SharedLibrary::open(libName); if (!lib) { printf("Failed to open %s\n", libName); return NULL; |