diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-30 17:30:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-30 17:30:52 +0000 |
| commit | e49491ada4c8e7827329b56a93e5377433aa9084 (patch) | |
| tree | 65d1a66d5cd4f6d7a41b1bed735c89d6013a7688 | |
| parent | 9997daa0ff8f630bee5d3b8eb0ab15a0ba1e5cf6 (diff) | |
| parent | d9898c5b8292b9eecc40a7819bfedb4e1a4fe041 (diff) | |
| download | bionic-e49491ada4c8e7827329b56a93e5377433aa9084.zip bionic-e49491ada4c8e7827329b56a93e5377433aa9084.tar.gz bionic-e49491ada4c8e7827329b56a93e5377433aa9084.tar.bz2 | |
Merge "Ignore multiple symbol definition errors."
| -rw-r--r-- | tests/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 59fe57d..448a8dc 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -280,6 +280,12 @@ bionic-unit-tests-static_static_libraries := \ bionic-unit-tests-static_force_static_executable := true +# libc and libc++ both define std::nothrow. libc's is a private symbol, but this +# still causes issues when linking libc.a and libc++.a, since private isn't +# effective until it has been linked. To fix this, just allow multiple symbol +# definitions for the static tests. +bionic-unit-tests-static_ldflags := -Wl,--allow-multiple-definition + module := bionic-unit-tests-static module_tag := optional build_type := target |