diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-29 09:39:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-29 09:39:56 +0000 |
| commit | 972e1c6d399e81b59fc07d7b7bdc77069ebac1c7 (patch) | |
| tree | dd49d80843e153f72f8003561c893015478d67a1 /emulator/opengl/host/libs/Translator | |
| parent | 956b01fd91a6a576e8c8e35b2d608408e866c5da (diff) | |
| parent | 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced (diff) | |
| download | sdk-972e1c6d399e81b59fc07d7b7bdc77069ebac1c7.zip sdk-972e1c6d399e81b59fc07d7b7bdc77069ebac1c7.tar.gz sdk-972e1c6d399e81b59fc07d7b7bdc77069ebac1c7.tar.bz2 | |
Merge "emulator/opengl: Cleanup build files + remove obsolete tests."
Diffstat (limited to 'emulator/opengl/host/libs/Translator')
4 files changed, 23 insertions, 41 deletions
diff --git a/emulator/opengl/host/libs/Translator/EGL/Android.mk b/emulator/opengl/host/libs/Translator/EGL/Android.mk index 5d1c9b2..298c502 100644 --- a/emulator/opengl/host/libs/Translator/EGL/Android.mk +++ b/emulator/opengl/host/libs/Translator/EGL/Android.mk @@ -47,12 +47,10 @@ LOCAL_SRC_FILES := $(host_common_SRC_FILES) $(call emugl-end-module) ### EGL host implementation, 64-bit ######################## -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64EGL_translator) - $(call emugl-import,lib64GLcommon) +$(call emugl-begin-host64-shared-library,lib64EGL_translator) +$(call emugl-import,lib64GLcommon) - LOCAL_LDLIBS += $(host_common_LDLIBS) -m64 - LOCAL_SRC_FILES := $(host_common_SRC_FILES) +LOCAL_LDLIBS += $(host_common_LDLIBS) +LOCAL_SRC_FILES := $(host_common_SRC_FILES) - $(call emugl-end-module) -endif +$(call emugl-end-module) diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk index c5e7e6d..48cb5c4 100644 --- a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk @@ -9,23 +9,13 @@ host_common_SRC_FILES := \ ### GLES_CM host implementation (On top of OpenGL) ######################## $(call emugl-begin-host-shared-library,libGLES_CM_translator) - $(call emugl-import,libGLcommon) - LOCAL_SRC_FILES := $(host_common_SRC_FILES) - $(call emugl-end-module) ### GLES_CM host implementation, 64-bit ######################## -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64GLES_CM_translator) - - $(call emugl-import,lib64GLcommon) - - LOCAL_CFLAGS += -fPIC - LOCAL_LDLIBS += -m64 - LOCAL_SRC_FILES := $(host_common_SRC_FILES) - - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-begin-host64-shared-library,lib64GLES_CM_translator) +$(call emugl-import,lib64GLcommon) +LOCAL_SRC_FILES := $(host_common_SRC_FILES) +$(call emugl-end-module) diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk index 438334a..c96965b 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk @@ -18,12 +18,9 @@ $(call emugl-end-module) ### GLES_V2 host implementation, 64-bit ############################## -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64GLES_V2_translator) - $(call emugl-import, lib64GLcommon) +$(call emugl-begin-host64-shared-library,lib64GLES_V2_translator) +$(call emugl-import, lib64GLcommon) - LOCAL_LDLIBS += -m64 - LOCAL_SRC_FILES := $(host_common_SRC_FILES) +LOCAL_SRC_FILES := $(host_common_SRC_FILES) - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-end-module) diff --git a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk index fdbedad..d1a462d 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk @@ -46,16 +46,13 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ################ -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64GLcommon) - - translator_path := $(LOCAL_PATH)/.. - LOCAL_SRC_FILES := $(host_common_SRC_FILES) - LOCAL_CFLAGS += -fPIC - $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) - $(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) - $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) - $(call emugl-export,STATIC_LIBRARIES, lib64emugl_common) - - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-begin-host64-static-library,lib64GLcommon) + +translator_path := $(LOCAL_PATH)/.. +LOCAL_SRC_FILES := $(host_common_SRC_FILES) +$(call emugl-export,LDLIBS,$(host_common_LDLIBS)) +$(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) +$(call emugl-export,STATIC_LIBRARIES, lib64emugl_common) + +$(call emugl-end-module) |