diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
| commit | 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced (patch) | |
| tree | dd49d80843e153f72f8003561c893015478d67a1 /emulator/opengl/host/libs/GLESv2_dec | |
| parent | 956b01fd91a6a576e8c8e35b2d608408e866c5da (diff) | |
| download | sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.zip sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.gz sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.bz2 | |
emulator/opengl: Cleanup build files + remove obsolete tests.
This patch cleans up the build files for the GPU emulation libraries
(i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore,
filtering is now handled by the build system directly).
+ Remove a bunch obsolete tests, which were not unit tests, despite
their name beginning with ut_xxxx.
Which includes removing dependency on SDL too.
+ Remove -m64 and -fPIC flags from compilation. These are not
necessary anymore (again, the build system now takes charge of
placing them when necessary), and generated link-time warning
when building Windows executables.
+ Remove a few declarations related to the now-obsolete platform
build (these libraries are only built with the emulator's build
system now).
Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03
Diffstat (limited to 'emulator/opengl/host/libs/GLESv2_dec')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/Android.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/emulator/opengl/host/libs/GLESv2_dec/Android.mk b/emulator/opengl/host/libs/GLESv2_dec/Android.mk index f658f11..0ad6ddb 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv2_dec/Android.mk @@ -22,17 +22,15 @@ LOCAL_SRC_FILES := GL2Decoder.cpp $(call emugl-end-module) ### host library, 64-bit #################################### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64GLESv2_dec) - $(call emugl-import, lib64OpenglCodecCommon) - $(call emugl-gen-decoder,$(LOCAL_PATH),gl2) +$(call emugl-begin-host64-static-library,lib64GLESv2_dec) +$(call emugl-import, lib64OpenglCodecCommon) +$(call emugl-gen-decoder,$(LOCAL_PATH),gl2) - # For gl2_types.h ! - $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) +# For gl2_types.h ! +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) - $(call emugl-export,CFLAGS,$(host_common_debug_CFLAGS) -m64) +$(call emugl-export,CFLAGS,$(host_common_debug_CFLAGS)) - LOCAL_SRC_FILES := GL2Decoder.cpp +LOCAL_SRC_FILES := GL2Decoder.cpp - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-end-module) |