diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-12 03:11:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-10 20:18:52 +0000 |
| commit | 4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (patch) | |
| tree | b8ea40c428b9d4cf3f842ab1c0cbe52a1fcd883c /emulator/opengl/host/libs/GLESv1_dec/Android.mk | |
| parent | d1dd8ee1e85f60569ddf6ebc7fe1cbde7ebb6f38 (diff) | |
| parent | d50eea1bfe3883072b4f8dfcb663f0d83c36bab1 (diff) | |
| download | sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.zip sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.tar.gz sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.tar.bz2 | |
Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133
* changes:
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) |