diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-19 10:50:15 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-19 11:33:14 -0700 |
| commit | 4d35da1df8b74c1965b2201f6089e7d7bb352def (patch) | |
| tree | 21c58c7fa8fa2d34d777eeae25a79d5bf05b087a | |
| parent | 48ee47ce25fa9c99df49855ebf77ae1758d58d47 (diff) | |
| download | bionic-4d35da1df8b74c1965b2201f6089e7d7bb352def.zip bionic-4d35da1df8b74c1965b2201f6089e7d7bb352def.tar.gz bionic-4d35da1df8b74c1965b2201f6089e7d7bb352def.tar.bz2 | |
Removes bionic's dependence on stlport
Only affects tests/benchmarks. Confirmed passing on arm.
Change-Id: If158e23e8cd06e7597ef6f3c9376f6799b467e62
| -rw-r--r-- | benchmarks/Android.mk | 3 | ||||
| -rw-r--r-- | tests/Android.build.mk | 2 | ||||
| -rw-r--r-- | tests/Android.mk | 6 | ||||
| -rw-r--r-- | tests/time_test.cpp | 2 |
4 files changed, 7 insertions, 6 deletions
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_MODULE_STEM_64 := bionic-benchmarks64 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 @@ LOCAL_LDLIBS := \ $($(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 @@ libBionicStandardTests_src_files := \ unistd_test.cpp \ wchar_test.cpp \ +libBionicStandardTests_c_includes := \ + bionic/libc/private \ + libBionicStandardTests_cflags := \ $(test_cflags) \ @@ -319,10 +322,9 @@ bionic-unit-tests-static_whole_static_libraries := \ 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) { |