commit 66b3e31936b99436e01c473dca492126eea3e336
author Adam Lesinski <adamlesinski@google.com> Tue Oct 21 00:01:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 21 00:01:15 2014 +0000
tree 61ca33e697920ad7919d6f8026d62d6c796590c3
parent 96983cba421434b2bee1230bbc809bb52d45e52d
parent 318217a84a05880f5e10ba2086f87eb0320772c7

am 318217a8: Enable building of gtest for Windows

* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
  Enable building of gtest for Windows

core/host_test_internal.mk

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_SHARED_LIBRARIES +=
 endif
 
-LOCAL_LDLIBS += -lpthread