commit 7a39094465bbd01a22565fce1f1155c762f8d145
author Dan Albert <danalbert@google.com> Mon May 19 23:46:51 2014 +0000
committer Dan Albert <danalbert@google.com> Mon May 19 23:46:51 2014 +0000
tree c3d23c62894a3dbabd5d0160166afe7ab5f4fcf3
parent 4d35da1df8b74c1965b2201f6089e7d7bb352def

Revert "Removes bionic's dependence on stlport"

This reverts commit 4d35da1df8b74c1965b2201f6089e7d7bb352def.

Change-Id: Ie9a2620441edb55dbc5949e13a4b913ea4e66797

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 699c93d..9a17c10 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -107,9 +107,6 @@
     unistd_test.cpp \
     wchar_test.cpp \
 
-libBionicStandardTests_c_includes := \
-    bionic/libc/private \
-
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
@@ -322,9 +319,10 @@
     libBionicTests \
 
 bionic-unit-tests-static_static_libraries := \
+    libstlport_static \
     libm \
     libc \
-    libc++ \
+    libstdc++ \
 
 bionic-unit-tests-static_force_static_executable := true