commit 9b0c6ff69c7f80fd1fd0346c7840a0ca3e640a75
author Dan Albert <danalbert@google.com> Wed May 14 14:16:47 2014 -0700
committer Dan Albert <danalbert@google.com> Fri May 16 14:55:50 2014 -0700
tree 88553f75f85785aac1d5a6d37a85fbda49dd167a
parent a82b32a7a7855cb93e11e060120803e91cc81c2d

Use libc++ versions of gtest libs when needed

Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 60a7c9e..49ea518 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -6,7 +6,7 @@
 
 LOCAL_C_INCLUDES += external/gtest/include
 ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
-LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx
+LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
 else
 LOCAL_STATIC_LIBRARIES += libgtest libgtest_main