From ef1bd8bc71955a1512ded5e381490f0694f1e5dd Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 26 Jan 2016 13:35:01 -0800 Subject: Don't build libc++ twice. We can link libc++_static.a directly into libc++_shared.so instead of building the sources the same way twice. Change-Id: I559c534d81225d73525d2b89e8ad3cddf188fb6a --- sources/cxx-stl/llvm-libc++/Android.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sources/cxx-stl/llvm-libc++/Android.mk b/sources/cxx-stl/llvm-libc++/Android.mk index 8ebbb1324..c30fce5f4 100644 --- a/sources/cxx-stl/llvm-libc++/Android.mk +++ b/sources/cxx-stl/llvm-libc++/Android.mk @@ -145,16 +145,12 @@ LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags) LOCAL_CPP_FEATURES := rtti exceptions LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes) LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags) -LOCAL_STATIC_LIBRARIES := android_support +LOCAL_STATIC_LIBRARIES := android_support # Needed for export includes. include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared -LOCAL_SRC_FILES := $(llvm_libc++_sources) -LOCAL_C_INCLUDES := $(android_support_c_includes) $(llvm_libc++_includes) -LOCAL_CFLAGS := $(llvm_libc++_cflags) -LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags) -LOCAL_CPP_FEATURES := rtti exceptions +LOCAL_WHOLE_STATIC_LIBRARIES := c++_static LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes) LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags) LOCAL_STATIC_LIBRARIES := android_support -- cgit v1.2.3