diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-21 00:01:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 00:01:15 +0000 |
| commit | 66b3e31936b99436e01c473dca492126eea3e336 (patch) | |
| tree | 61ca33e697920ad7919d6f8026d62d6c796590c3 /core/host_test_internal.mk | |
| parent | 96983cba421434b2bee1230bbc809bb52d45e52d (diff) | |
| parent | 318217a84a05880f5e10ba2086f87eb0320772c7 (diff) | |
| download | build-66b3e31936b99436e01c473dca492126eea3e336.zip build-66b3e31936b99436e01c473dca492126eea3e336.tar.gz build-66b3e31936b99436e01c473dca492126eea3e336.tar.bz2 | |
am 318217a8: Enable building of gtest for Windows
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
Diffstat (limited to 'core/host_test_internal.mk')
| -rw-r--r-- | core/host_test_internal.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk index 5f0a1f3..8611c4b 100644 --- a/core/host_test_internal.mk +++ b/core/host_test_internal.mk @@ -2,7 +2,14 @@ ## Shared definitions for all host test compilations. ##################################################### -LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g +ifeq ($(HOST_OS),windows) +LOCAL_CFLAGS += -DGTEST_OS_WINDOWS +else +LOCAL_CFLAGS += -DGTEST_OS_LINUX +LOCAL_LDLIBS += -lpthread +endif + +LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g LOCAL_C_INCLUDES += external/gtest/include my_test_libcxx := false @@ -19,4 +26,3 @@ LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host LOCAL_SHARED_LIBRARIES += endif -LOCAL_LDLIBS += -lpthread |