Revert "Removes bionic's dependence on stlport"
This reverts commit 4d35da1df8b74c1965b2201f6089e7d7bb352def.
Change-Id: Ie9a2620441edb55dbc5949e13a4b913ea4e66797
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 4019a29..c1a0f16 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -77,7 +77,7 @@
$($(module)_ldlibs_$(build_type)) \
ifeq ($(build_type),target)
- include external/libcxx/libcxx.mk
+ include external/stlport/libstlport.mk
include $(BUILD_$(build_target))
endif
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
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index a089c3a..58cb374 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -27,7 +27,7 @@
#include "ScopedSignalHandler.h"
#if defined(__BIONIC__) // mktime_tz is a bionic extension.
-#include <bionic_time.h>
+#include <libc/private/bionic_time.h>
#endif // __BIONIC__
TEST(time, mktime_tz) {