diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:22:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-21 16:22:38 +0000 |
| commit | c245592b0d472437ade15a22076c2193441f0eea (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h | |
| parent | 245fae139423eb268ecb3eaa06f6ce8c7044c4f4 (diff) | |
| parent | 4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (diff) | |
| download | sdk-c245592b0d472437ade15a22076c2193441f0eea.zip sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.gz sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.bz2 | |
Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133
automerge: 4e42336
* commit '4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc':
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.h')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h b/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h index 14ca222..0d26090 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h +++ b/emulator/opengl/host/libs/GLESv1_dec/GLDecoder.h @@ -19,7 +19,7 @@ #include "gl_dec.h" #include "FixedBuffer.h" #include "GLDecoderContextData.h" -#include <osDynLibrary.h> +#include "emugl/common/shared_library.h" #define GLES_LIBNAME_VAR "ANDROID_GLESv1_LIB" #define GLES_LIBNAME "libGLES_CM.so" @@ -65,7 +65,7 @@ private: static void * s_getProc(const char *name, void *userData); GLDecoderContextData *m_contextData; - osUtils::dynLibrary* m_glesDso; + emugl::SharedLibrary* m_glesDso; }; #endif |