commit 4d35da1df8b74c1965b2201f6089e7d7bb352def
author Dan Albert <danalbert@google.com> Mon May 19 10:50:15 2014 -0700
committer Dan Albert <danalbert@google.com> Mon May 19 11:33:14 2014 -0700
tree 21c58c7fa8fa2d34d777eeae25a79d5bf05b087a
parent 48ee47ce25fa9c99df49855ebf77ae1758d58d47

Removes bionic's dependence on stlport

Only affects tests/benchmarks. Confirmed passing on arm.

Change-Id: If158e23e8cd06e7597ef6f3c9376f6799b467e62

tests/Android.mk

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