diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-26 23:21:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-26 23:21:22 +0000 |
| commit | 3782950fd288037e4f80856356185134771f2020 (patch) | |
| tree | 9fd66afa744bc58de42369aa6f74ea201de1e280 | |
| parent | 9d68b3d2c4375909e42de85a6dad58e57703f211 (diff) | |
| parent | 12f3d3a26023214642b18d396dbce8aa10fa7671 (diff) | |
| download | ndk-3782950fd288037e4f80856356185134771f2020.tar.gz | |
Merge "Don\'t build libc++ twice."
am: 12f3d3a260
* commit '12f3d3a26023214642b18d396dbce8aa10fa7671':
Don't build libc++ twice.
| -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 7c9f45880..03bf84c58 100644 --- a/sources/cxx-stl/llvm-libc++/Android.mk +++ b/sources/cxx-stl/llvm-libc++/Android.mk @@ -144,16 +144,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 |