diff options
| author | Stephen Hines <srhines@google.com> | 2014-12-04 02:51:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-04 02:51:31 +0000 |
| commit | 5ebcac32772426a8bc0cb0cd15502207f1476011 (patch) | |
| tree | 51d7a25957893941be1e8470ed566cd66ea78f96 | |
| parent | f511e6a2fa049753f64bd737a4d74ff0f88cc611 (diff) | |
| parent | 56cd394d2b7681ebe88091d8d64e183827fa8b05 (diff) | |
| download | extras-5ebcac32772426a8bc0cb0cd15502207f1476011.tar.gz | |
Merge "Use "-z muldefs" to work around duplicate symbol issues."
| -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) |