commit 965bfefb6b5f7a89d10fa5c03d06591e99314c4d
author Dan Albert <danalbert@google.com> Wed May 14 14:16:47 2014 -0700
committer Dan Albert <danalbert@google.com> Fri May 16 11:22:44 2014 -0700
tree de95cc5fb6c26e7097aea1dfc573853c5bc19e9e
parent c0f10644bf877fae44e8aa5ebfff41f0e27af197

Use libc++ versions of gtest libs when needed

Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4

core/host_test_internal.mk

diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk
index 650b9c6..c2c3186 100644
--- a/core/host_test_internal.mk
+++ b/core/host_test_internal.mk
@@ -5,7 +5,11 @@
 LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g
 LOCAL_C_INCLUDES +=  external/gtest/include
 
+ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
+LOCAL_STATIC_LIBRARIES += libgtest_libcxx_host libgtest_main_libcxx_host
+else
 LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
 LOCAL_SHARED_LIBRARIES +=
+endif
 
 LOCAL_LDLIBS += -lpthread

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 7b99678..60a7c9e 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -5,6 +5,9 @@
 LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
 
 LOCAL_C_INCLUDES += external/gtest/include
+ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
+LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx
+else
 LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
 
 ifndef LOCAL_SDK_VERSION
@@ -14,6 +17,7 @@
 LOCAL_SHARED_LIBRARIES += libstlport
 LOCAL_STATIC_LIBRARIES += libstdc++
 endif
+endif
 
 ifndef LOCAL_MODULE_PATH
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)