From 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 27 Aug 2014 19:01:06 +0200 Subject: 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 --- emulator/opengl/host/libs/GLESv1_dec/Android.mk | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'emulator/opengl/host/libs/GLESv1_dec') diff --git a/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/emulator/opengl/host/libs/GLESv1_dec/Android.mk index e0eca6e..c9db93e 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv1_dec/Android.mk @@ -24,18 +24,16 @@ $(call emugl-end-module) ### host library, 64-bit #################################### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64GLESv1_dec) +$(call emugl-begin-host64-static-library,lib64GLESv1_dec) - $(call emugl-import, lib64OpenglCodecCommon) - $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) +$(call emugl-import, lib64OpenglCodecCommon) +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) - $(call emugl-gen-decoder,$(LOCAL_PATH),gl) +$(call emugl-gen-decoder,$(LOCAL_PATH),gl) - LOCAL_SRC_FILES := GLDecoder.cpp +LOCAL_SRC_FILES := GLDecoder.cpp - $(call emugl-export,CFLAGS,$(host_common_debug_CFLAGS) -m64) - $(call emugl-export,LDLIBS,-lstdc++) +$(call emugl-export,CFLAGS,$(host_common_debug_CFLAGS)) +$(call emugl-export,LDLIBS,-lstdc++) - $(call emugl-end-module) -endif \ No newline at end of file +$(call emugl-end-module) -- cgit v1.1