generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Revert "Removes bionic's dependence on stlport""

Browse Source
This commit is contained in:
Dan Albert 2014-05-19 23:48:06 +00:00 committed by Gerrit Code Review
commit 05b37cfc18
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
benchmarks/Android.mk
View File

@ -49,7 +49,8 @@ LOCAL_MODULE_STEM_64 := bionic-benchmarks64
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_CFLAGS += $(benchmark_c_flags)
include external/libcxx/libcxx.mk LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
LOCAL_SHARED_LIBRARIES += libstlport
LOCAL_SRC_FILES := $(benchmark_src_files) LOCAL_SRC_FILES := $(benchmark_src_files)
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
tests/Android.build.mk
View File

@ -77,7 +77,7 @@ LOCAL_LDLIBS := \
$($(module)_ldlibs_$(build_type)) \ $($(module)_ldlibs_$(build_type)) \
ifeq ($(build_type),target) ifeq ($(build_type),target)
include external/libcxx/libcxx.mk include external/stlport/libstlport.mk
include $(BUILD_$(build_target)) include $(BUILD_$(build_target))
endif endif

6
tests/Android.mk
View File

@ -107,9 +107,6 @@ libBionicStandardTests_src_files := \
unistd_test.cpp \ unistd_test.cpp \
wchar_test.cpp \ wchar_test.cpp \
libBionicStandardTests_c_includes := \
bionic/libc/private \
libBionicStandardTests_cflags := \ libBionicStandardTests_cflags := \
$(test_cflags) \ $(test_cflags) \
@ -322,9 +319,10 @@ bionic-unit-tests-static_whole_static_libraries := \
libBionicTests \ libBionicTests \
bionic-unit-tests-static_static_libraries := \ bionic-unit-tests-static_static_libraries := \
libstlport_static \
libm \ libm \
libc \ libc \
libc++ \ libstdc++ \
bionic-unit-tests-static_force_static_executable := true bionic-unit-tests-static_force_static_executable := true

2
tests/time_test.cpp
View File

@ -27,7 +27,7 @@
#include "ScopedSignalHandler.h" #include "ScopedSignalHandler.h"
#if defined(__BIONIC__) // mktime_tz is a bionic extension. #if defined(__BIONIC__) // mktime_tz is a bionic extension.
#include <bionic_time.h> #include <libc/private/bionic_time.h>
#endif // __BIONIC__ #endif // __BIONIC__
TEST(time, mktime_tz) { TEST(time, mktime_tz) {