tests: clean up bionic-unit-tests-static linking
Adding libc++_static explicitly is not needed when it is specified
via stl:, and was the real reason we needed --allow-multiple-definition.
Bug: N/A
Test: ran static tests (32- and 64-bit)
Change-Id: I254a4b8c4f7955a17c970d31b427b05c1a2e0acf
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
diff --git a/tests/Android.bp b/tests/Android.bp
index d4027b3..8f1c11f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -527,7 +527,6 @@
static_libs: [
"libm",
"libc",
- "libc++_static",
"libdl",
"libtinyxml2",
"liblog",
@@ -537,12 +536,6 @@
static_executable: true,
stl: "libc++_static",
-
- // 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.
- ldflags: ["-Wl,--allow-multiple-definition"],
}
// -----------------------------------------------------------------------------