aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/shared/emugl/common/Android.mk
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-06-11 14:57:38 +0200
committerDavid 'Digit' Turner <digit@google.com>2014-06-11 14:57:38 +0200
commitd430650793909f763de85847d234903606302b96 (patch)
tree2662edbc2849cb1461bdde7b19d1fbbc4b5b4c78 /emulator/opengl/shared/emugl/common/Android.mk
parent14338f93d7ab117bbc0f15e206622a99e1ff9d2f (diff)
downloadsdk-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/emugl/common/Android.mk')
-rw-r--r--emulator/opengl/shared/emugl/common/Android.mk4
1 files changed, 2 insertions, 2 deletions
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)