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/Android.mk | |
| 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/Android.mk')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv1_dec/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/emulator/opengl/host/libs/GLESv1_dec/Android.mk index 7ab3f0a..e0eca6e 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv1_dec/Android.mk @@ -10,7 +10,7 @@ host_common_debug_CFLAGS := ### host library ######################################### $(call emugl-begin-host-static-library,libGLESv1_dec) -$(call emugl-import, libOpenglCodecCommon libOpenglOsUtils) +$(call emugl-import, libOpenglCodecCommon) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-gen-decoder,$(LOCAL_PATH),gl) @@ -27,7 +27,7 @@ $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS $(call emugl-begin-host64-static-library,lib64GLESv1_dec) - $(call emugl-import, lib64OpenglCodecCommon lib64OpenglOsUtils) + $(call emugl-import, lib64OpenglCodecCommon) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-gen-decoder,$(LOCAL_PATH),gl) |