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/GLESv2_dec/GL2Decoder.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/GLESv2_dec/GL2Decoder.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp b/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp index ccf2f06..2ef306e 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp +++ b/emulator/opengl/host/libs/GLESv2_dec/GL2Decoder.cpp @@ -60,7 +60,7 @@ int GL2Decoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData) libname = getenv(GLES2_LIBNAME_VAR); } - m_GL2library = osUtils::dynLibrary::open(libname); + m_GL2library = emugl::SharedLibrary::open(libname); if (m_GL2library == NULL) { fprintf(stderr, "%s: Couldn't find %s \n", __FUNCTION__, libname); return -1; |