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/shared | |
| 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/shared')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 2 | ||||
| -rw-r--r-- | emulator/opengl/shared/OpenglOsUtils/Android.mk | 2 | ||||
| -rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index b6a7e07..83090d8 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -32,7 +32,7 @@ $(call emugl-end-module) ### OpenglCodecCommon host, 64-bit ######################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64OpenglCodecCommon) + $(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) diff --git a/emulator/opengl/shared/OpenglOsUtils/Android.mk b/emulator/opengl/shared/OpenglOsUtils/Android.mk index a3dd3c2..f9673fc 100644 --- a/emulator/opengl/shared/OpenglOsUtils/Android.mk +++ b/emulator/opengl/shared/OpenglOsUtils/Android.mk @@ -38,7 +38,7 @@ $(call emugl-end-module) ### 64-bit host library #### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64OpenglOsUtils) + $(call emugl-begin-host64-static-library,lib64OpenglOsUtils) $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES)) LOCAL_SRC_FILES = $(host_common_SRC_FILES) $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) diff --git a/emulator/opengl/shared/emugl/common/Android.mk b/emulator/opengl/shared/emugl/common/Android.mk index fd7761e..58dd6da 100644 --- a/emulator/opengl/shared/emugl/common/Android.mk +++ b/emulator/opengl/shared/emugl/common/Android.mk @@ -22,7 +22,7 @@ $(call emugl-export,LDLIBS,-lstdc++) $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64emugl_common) + $(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) @@ -47,7 +47,7 @@ $(call emugl-import,libemugl_common libemugl_gtest) $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-executable,emugl64_common_host_unittests) + $(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) |