diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-06 16:57:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-06 16:57:29 +0000 |
| commit | fd8752eb6a438832e0ba9a19db896614403f8945 (patch) | |
| tree | 4e5d810cfb9605cde4a158adbe129dbe739d9543 /emulator/opengl/shared/emugl | |
| parent | 33dbfca01d61ae2c839bc9a55f20e3c2eaf5757a (diff) | |
| parent | 32851ad05bd779ed04d5992ec241d54238c12fbc (diff) | |
| download | sdk-fd8752eb6a438832e0ba9a19db896614403f8945.zip sdk-fd8752eb6a438832e0ba9a19db896614403f8945.tar.gz sdk-fd8752eb6a438832e0ba9a19db896614403f8945.tar.bz2 | |
Merge "emulator/opengl: Build 64-bit unit tests." into idea133
Diffstat (limited to 'emulator/opengl/shared/emugl')
| -rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 9 |
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) |