aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/shared/emugl
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-02-27 19:45:42 +0100
committerDavid 'Digit' Turner <digit@google.com>2014-03-06 00:32:11 +0100
commit32851ad05bd779ed04d5992ec241d54238c12fbc (patch)
tree4e5d810cfb9605cde4a158adbe129dbe739d9543 /emulator/opengl/shared/emugl
parent7693d297d269b2d294ce4ce1c854991668eeb8eb (diff)
downloadsdk-32851ad05bd779ed04d5992ec241d54238c12fbc.zip
sdk-32851ad05bd779ed04d5992ec241d54238c12fbc.tar.gz
sdk-32851ad05bd779ed04d5992ec241d54238c12fbc.tar.bz2
emulator/opengl: Build 64-bit unit tests.
This is done by building a special version of GoogleTest specially for the GPU emulation libraries. Change-Id: Ie27c75d9a85836f392375e110a5152031af586bc
Diffstat (limited to 'emulator/opengl/shared/emugl')
-rw-r--r--emulator/opengl/shared/emugl/common/Android.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/emulator/opengl/shared/emugl/common/Android.mk b/emulator/opengl/shared/emugl/common/Android.mk
index d0b9d4e..5c444fd 100644
--- a/emulator/opengl/shared/emugl/common/Android.mk
+++ b/emulator/opengl/shared/emugl/common/Android.mk
@@ -27,9 +27,10 @@ host_commonSources := \
$(call emugl-begin-host-executable,emugl_common_host_unittests)
LOCAL_SRC_FILES := $(host_commonSources)
-LOCAL_C_INCLUDES += external/gtest/include
-LOCAL_LDFLAGS += -lpthread
-$(call emugl-export,STATIC_LIBRARIES, libemugl_common libgtest_host libgtest_main_host)
+$(call emugl-import,libemugl_common libemugl_gtest)
$(call emugl-end-module)
-# TODO(digit): 64-bit version, once we have 64-bit gtest.
+$(call emugl-begin-host-executable,emugl64_common_host_unittests)
+LOCAL_SRC_FILES := $(host_commonSources)
+$(call emugl-import,lib64emugl_common lib64emugl_gtest)
+$(call emugl-end-module)