diff options
| author | Dan Albert <danalbert@google.com> | 2018-08-09 11:53:20 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-08-09 21:01:16 +0000 |
| commit | d273b7c1d6aecae2d2e80fbe92ee0eb8f13b2cd4 (patch) | |
| tree | b0622ab397197be69c6225a8cc42cb5748e34302 | |
| parent | 7c8e44219bada108a2b6fba226f3f8edd221e52d (diff) | |
| download | external_libcxx-d273b7c1d6aecae2d2e80fbe92ee0eb8f13b2cd4.tar.gz external_libcxx-d273b7c1d6aecae2d2e80fbe92ee0eb8f13b2cd4.tar.bz2 external_libcxx-d273b7c1d6aecae2d2e80fbe92ee0eb8f13b2cd4.zip | |
Build c++_shared without function/data sections, static with.ndk-r18bndk-r18-beta2
Test: ndk/checkbuild.py && ndk/run_tests.py
Bug: https://github.com/android-ndk/ndk/issues/748
Change-Id: I8b8d26be75fc8ccdf86006a8347e6ce3648e8f9d
(cherry picked from commit c229a18610eac7489c4a9f440cbd6c5b443fd50c)
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 3806bfe40..93f4b991c 100644 --- a/Android.mk +++ b/Android.mk @@ -152,7 +152,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := c++_static LOCAL_SRC_FILES := $(libcxx_sources) LOCAL_C_INCLUDES := $(libcxx_includes) -LOCAL_CPPFLAGS := $(libcxx_cxxflags) +LOCAL_CPPFLAGS := $(libcxx_cxxflags) -ffunction-sections -fdata-sections LOCAL_CPP_FEATURES := rtti exceptions LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes) LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags) @@ -174,7 +174,11 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared LOCAL_STRIP_MODE := none -LOCAL_WHOLE_STATIC_LIBRARIES := c++_static libc++abi +LOCAL_SRC_FILES := $(libcxx_sources) +LOCAL_C_INCLUDES := $(libcxx_includes) +LOCAL_CPPFLAGS := $(libcxx_cxxflags) -fno-function-sections -fno-data-sections +LOCAL_CPP_FEATURES := rtti exceptions +LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes) LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags) LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags) |