diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:32:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 16:32:32 +0000 |
| commit | a268ba5f6bbbc67904124f7368f617dbb3fae6ef (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp | |
| parent | 4af45028b6b9761038a83a445d6d21137e8be2ef (diff) | |
| parent | c245592b0d472437ade15a22076c2193441f0eea (diff) | |
| download | sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.zip sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.gz sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.bz2 | |
am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'c245592b0d472437ade15a22076c2193441f0eea':
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/GLESv1_dec/GLDecoder.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp b/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp index 3c5bd70..7aa6ede 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp +++ b/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.cpp @@ -47,7 +47,7 @@ int GLDecoder::initGL(get_proc_func_t getProcFunc, void *getProcFuncData) libname = getenv(GLES_LIBNAME_VAR); } - m_glesDso = osUtils::dynLibrary::open(libname); + m_glesDso = emugl::SharedLibrary::open(libname); if (m_glesDso == NULL) { fprintf(stderr, "Couldn't find %s \n", GLES_LIBNAME); return -1; |