Removes bionic's dependence on stlport
Only affects tests/benchmarks. Confirmed passing on arm.
Change-Id: If158e23e8cd06e7597ef6f3c9376f6799b467e62
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index cf3d692..d8e0d27 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -49,8 +49,7 @@
LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags)
-LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
-LOCAL_SHARED_LIBRARIES += libstlport
+include external/libcxx/libcxx.mk
LOCAL_SRC_FILES := $(benchmark_src_files)
include $(BUILD_EXECUTABLE)
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index c1a0f16..4019a29 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/stlport/libstlport.mk
+ include external/libcxx/libcxx.mk
include $(BUILD_$(build_target))
endif
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
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 58cb374..a089c3a 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 <libc/private/bionic_time.h>
+#include <bionic_time.h>
#endif // __BIONIC__
TEST(time, mktime_tz) {
