commit 1d3b492bde061123087f73ebbe289a0037062d1f
author Dan Albert <danalbert@google.com> Tue Nov 11 21:41:14 2014 -0800
committer Dan Albert <danalbert@google.com> Tue Nov 11 21:42:27 2014 -0800
tree dadcd8f37f3906b349829e0266cd4920102d9ebe
parent 5c7e2e603079c611b99302e5898b443440f2d9d7

Revert "Move some tests to libc++."

The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.

This reverts commit e3cccbfd4776644c7cb705d52f51ca948df34f9a.

libcutils/tests/Android.mk

diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index afab3cc..76db5b1 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -42,10 +42,8 @@
     libcutils \
     liblog \
     libutils \
-    libc++abi \
-    libdl \
 
-LOCAL_CXX_STL := libc++_static
+LOCAL_CXX_STL := stlport_static
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64