From d9898c5b8292b9eecc40a7819bfedb4e1a4fe041 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 29 Sep 2014 15:16:46 -0700 Subject: [PATCH] Ignore multiple symbol definition errors. 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. Change-Id: Idbf19fefda47298c39360e3f5b6242b0b1a52fcc --- tests/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Android.mk b/tests/Android.mk index 59fe57dc6..448a8dc83 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