commit ba0c51fd282c4f47b95230c5444e76f342900cfa
author Ian Rogers <irogers@google.com> Fri May 16 12:26:00 2014 -0700
committer Dan Albert <danalbert@google.com> Mon May 19 11:26:10 2014 -0700
tree 19fc240937854b35e4dd93cb1e6d4c7a2168e87c
parent 84e524207b23d58a1b1e5f4443000ccac97c4184

Switch ART to libc++.

TODO: remove all vestiges of stlport.

Change-Id: I95a3cb0b53d0898f0a5d388b606e79522f4d85e0

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 1cd528b..8973aab 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -187,7 +187,7 @@
     LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
     LOCAL_CFLAGS_x86 := $(ART_TARGET_CFLAGS_x86)
     LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils libvixl
-    LOCAL_STATIC_LIBRARIES += libgtest
+    LOCAL_STATIC_LIBRARIES += libgtest_libc++
     LOCAL_MODULE_PATH_32 := $(ART_NATIVETEST_OUT)/$(ART_TARGET_ARCH_32)
     LOCAL_MODULE_PATH_64 := $(ART_NATIVETEST_OUT)/$(ART_TARGET_ARCH_64)
     LOCAL_MULTILIB := both