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/shared | |
| 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/shared')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 15 | ||||
| -rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 32 |
2 files changed, 19 insertions, 28 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 0c3f827..ff680eb 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -34,14 +34,11 @@ $(call emugl-end-module) ### OpenglCodecCommon host, 64-bit ######################################### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) +$(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) - LOCAL_SRC_FILES := $(host_commonSources) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-import, lib64emugl_common) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) +$(call emugl-end-module) - $(call emugl-import, lib64emugl_common) - $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) - $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-export,LDLIBS,$(host_commonLdLibs)) - $(call emugl-end-module) -endif diff --git a/emulator/opengl/shared/emugl/common/Android.mk b/emulator/opengl/shared/emugl/common/Android.mk index fb9ab57..6aaa0d9 100644 --- a/emulator/opengl/shared/emugl/common/Android.mk +++ b/emulator/opengl/shared/emugl/common/Android.mk @@ -31,14 +31,11 @@ $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) $(call emugl-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64emugl_common) - LOCAL_SRC_FILES := $(host_commonSources) - $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) - $(call emugl-export,LDLIBS,$(host_commonLdLibs)) - $(call emugl-end-module) -endif +$(call emugl-begin-host64-static-library,lib64emugl_common) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) +$(call emugl-end-module) ### emugl_common_unittests ############################################## @@ -58,19 +55,16 @@ LOCAL_SRC_FILES := $(host_commonSources) $(call emugl-import,libemugl_common libemugl_gtest) $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-executable,emugl64_common_host_unittests) - LOCAL_SRC_FILES := $(host_commonSources) - $(call emugl-import,lib64emugl_common lib64emugl_gtest) - $(call emugl-end-module) -endif +$(call emugl-begin-host64-executable,emugl64_common_host_unittests) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-import,lib64emugl_common lib64emugl_gtest) +$(call emugl-end-module) + $(call emugl-begin-host-shared-library,libemugl_test_shared_library) LOCAL_SRC_FILES := testing/test_shared_library.cpp $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64emugl_test_shared_library) - LOCAL_SRC_FILES := testing/test_shared_library.cpp - $(call emugl-end-module) -endif +$(call emugl-begin-host64-shared-library,lib64emugl_test_shared_library) +LOCAL_SRC_FILES := testing/test_shared_library.cpp +$(call emugl-end-module) |