diff options
| author | Stephen Hines <srhines@google.com> | 2014-12-02 10:41:37 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-12-02 10:41:37 -0800 |
| commit | 56cd394d2b7681ebe88091d8d64e183827fa8b05 (patch) | |
| tree | 51d7a25957893941be1e8470ed566cd66ea78f96 /memtrack | |
| parent | f511e6a2fa049753f64bd737a4d74ff0f88cc611 (diff) | |
| download | extras-56cd394d2b7681ebe88091d8d64e183827fa8b05.tar.gz | |
Use "-z muldefs" to work around duplicate symbol issues.
Bug: 18389563
The duplicate symbols arise as part of a compiler-rt update, which impacts
libc++_static.a (and causes conflicts with the symbols in libgcc.a).
Change-Id: I67d25c5ffcf6bbf199593a07917b1dc739301a57
Diffstat (limited to 'memtrack')
| -rw-r--r-- | memtrack/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/memtrack/Android.mk b/memtrack/Android.mk index f05d6c48..5fa9f157 100644 --- a/memtrack/Android.mk +++ b/memtrack/Android.mk @@ -46,4 +46,11 @@ LOCAL_STATIC_LIBRARIES := \ libdl \ LOCAL_CXX_STL := libc++_static + +# Bug: 18389563 - Today, libc++_static and libgcc have duplicate sybols for +# __aeabi_uidiv(). Allowing multiple definitions lets the build proceed, but +# updating compiler-rt to be a superset of libgcc will allow this WAR to be +# removed. +LOCAL_LDFLAGS := -Wl,-z,muldefs + include $(BUILD_EXECUTABLE) |