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/Android.mk | |
| 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/Android.mk')
| -rw-r--r-- | emulator/opengl/Android.mk | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/emulator/opengl/Android.mk b/emulator/opengl/Android.mk index 7906fdd..244b874 100644 --- a/emulator/opengl/Android.mk +++ b/emulator/opengl/Android.mk @@ -21,12 +21,6 @@ ifeq ($(BUILD_STANDALONE_EMULATOR),true) EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/libs/Translator/include endif -ifeq ($(BUILD_STANDALONE_EMULATOR),true) -EMUGL_BUILD_64BITS := $(strip $(EMULATOR_BUILD_64BITS)) -else -EMUGL_BUILD_64BITS := true -endif - # common cflags used by several modules # This is always set to a module's LOCAL_CFLAGS # See the definition of emugl-begin-module in common.mk @@ -79,25 +73,12 @@ include $(EMUGL_PATH)/shared/OpenglCodecCommon/Android.mk include $(EMUGL_PATH)/host/libs/GLESv1_dec/Android.mk include $(EMUGL_PATH)/host/libs/GLESv2_dec/Android.mk include $(EMUGL_PATH)/host/libs/renderControl_dec/Android.mk -include $(EMUGL_PATH)/tests/ut_rendercontrol_dec/Android.mk include $(EMUGL_PATH)/host/libs/Translator/GLcommon/Android.mk include $(EMUGL_PATH)/host/libs/Translator/GLES_CM/Android.mk include $(EMUGL_PATH)/host/libs/Translator/GLES_V2/Android.mk include $(EMUGL_PATH)/host/libs/Translator/EGL/Android.mk -# Required to declare SDL-related flags for some host tests. -include $(EMUGL_PATH)/sdl.mk - # Host shared libraries include $(EMUGL_PATH)/host/libs/libOpenglRender/Android.mk -# Host executables -include $(EMUGL_PATH)/host/renderer/Android.mk - -# Host unit-test for the renderer. - -include $(EMUGL_PATH)/tests/translator_tests/MacCommon/Android.mk -include $(EMUGL_PATH)/tests/translator_tests/GLES_CM/Android.mk -include $(EMUGL_PATH)/tests/translator_tests/GLES_V2/Android.mk - endif # BUILD_EMULATOR_HOST_OPENGL == true |