diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-26 13:35:01 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-01-26 13:54:33 -0800 |
| commit | ef1bd8bc71955a1512ded5e381490f0694f1e5dd (patch) | |
| tree | 2a5bf072cbf24f9967f50f64943a8f2dd33fb331 /sources | |
| parent | e24ca048efad3c1e4d6e8af7b37576600e0c29c6 (diff) | |
| download | ndk-ef1bd8bc71955a1512ded5e381490f0694f1e5dd.tar.gz | |
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
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/Android.mk | 8 |
1 files 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 |