diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-06-11 14:57:38 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-06-11 14:57:38 +0200 |
| commit | d430650793909f763de85847d234903606302b96 (patch) | |
| tree | 2662edbc2849cb1461bdde7b19d1fbbc4b5b4c78 /emulator/opengl/host/libs | |
| parent | 14338f93d7ab117bbc0f15e206622a99e1ff9d2f (diff) | |
| download | sdk-d430650793909f763de85847d234903606302b96.zip sdk-d430650793909f763de85847d234903606302b96.tar.gz sdk-d430650793909f763de85847d234903606302b96.tar.bz2 | |
emulator/opengl: Prepare for 64-bit build changes.
This patch slightly modifies the build files for the GPU emulation
libraries to prepare for future changes in the emulator-specific
build system that will be necessary to support Win64 binaries.
The main difference is the introduction of 64-bit versions of the
emugl-begin-host-<type> macros, named emugl-begin-host64-<type>.
Change-Id: Ib40c030fa407b0ed951755dd9b007fda85778e03
Diffstat (limited to 'emulator/opengl/host/libs')
8 files changed, 8 insertions, 8 deletions
diff --git a/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/emulator/opengl/host/libs/GLESv1_dec/Android.mk index 811a2bb..7ab3f0a 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv1_dec/Android.mk @@ -25,7 +25,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLESv1_dec) + $(call emugl-begin-host64-static-library,lib64GLESv1_dec) $(call emugl-import, lib64OpenglCodecCommon lib64OpenglOsUtils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) diff --git a/emulator/opengl/host/libs/GLESv2_dec/Android.mk b/emulator/opengl/host/libs/GLESv2_dec/Android.mk index 03692ee..bc04c25 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv2_dec/Android.mk @@ -23,7 +23,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLESv2_dec) + $(call emugl-begin-host64-static-library,lib64GLESv2_dec) $(call emugl-import, lib64OpenglCodecCommon lib64OpenglOsUtils) $(call emugl-gen-decoder,$(LOCAL_PATH),gl2) diff --git a/emulator/opengl/host/libs/Translator/EGL/Android.mk b/emulator/opengl/host/libs/Translator/EGL/Android.mk index 40f165a..5d1c9b2 100644 --- a/emulator/opengl/host/libs/Translator/EGL/Android.mk +++ b/emulator/opengl/host/libs/Translator/EGL/Android.mk @@ -48,7 +48,7 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ######################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64EGL_translator) + $(call emugl-begin-host64-shared-library,lib64EGL_translator) $(call emugl-import,lib64GLcommon) LOCAL_LDLIBS += $(host_common_LDLIBS) -m64 diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk index b126902..c5e7e6d 100644 --- a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk @@ -19,7 +19,7 @@ $(call emugl-end-module) ### GLES_CM host implementation, 64-bit ######################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64GLES_CM_translator) + $(call emugl-begin-host64-shared-library,lib64GLES_CM_translator) $(call emugl-import,lib64GLcommon) diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk index 9175ab5..438334a 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk @@ -19,7 +19,7 @@ $(call emugl-end-module) ### GLES_V2 host implementation, 64-bit ############################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64GLES_V2_translator) + $(call emugl-begin-host64-shared-library,lib64GLES_V2_translator) $(call emugl-import, lib64GLcommon) LOCAL_LDLIBS += -m64 diff --git a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk index 375da8b..b215329 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk @@ -48,7 +48,7 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ################ ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLcommon) + $(call emugl-begin-host64-static-library,lib64GLcommon) $(call emugl-import,lib64OpenglOsUtils) translator_path := $(LOCAL_PATH)/.. diff --git a/emulator/opengl/host/libs/libOpenglRender/Android.mk b/emulator/opengl/host/libs/libOpenglRender/Android.mk index 3cfbef0..787ae83 100644 --- a/emulator/opengl/host/libs/libOpenglRender/Android.mk +++ b/emulator/opengl/host/libs/libOpenglRender/Android.mk @@ -63,7 +63,7 @@ $(call emugl-end-module) ### host libOpenglRender, 64-bit ######################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64OpenglRender) + $(call emugl-begin-host64-shared-library,lib64OpenglRender) $(call emugl-import,lib64GLESv1_dec lib64GLESv2_dec lib64_renderControl_dec lib64OpenglCodecCommon lib64OpenglOsUtils) diff --git a/emulator/opengl/host/libs/renderControl_dec/Android.mk b/emulator/opengl/host/libs/renderControl_dec/Android.mk index 3bc5c3e..4a97a93 100644 --- a/emulator/opengl/host/libs/renderControl_dec/Android.mk +++ b/emulator/opengl/host/libs/renderControl_dec/Android.mk @@ -11,7 +11,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64_renderControl_dec) + $(call emugl-begin-host64-static-library,lib64_renderControl_dec) $(call emugl-import,lib64OpenglCodecCommon) $(call emugl-gen-decoder,$(LOCAL_PATH),renderControl) # For renderControl_types.h |