Don't use prefix_symbols for host bionic linker wrapper
The only symbol that actually needs a prefix to avoid a collision is
_start, and that can be handled with a copy of begin.S that uses a
"#define" to rename _start to __dlwrap__start. Removing the prefixed
symbols will also allow simplifying the host bionic build process by
letting it directly reference the real _start.
Test: build and run host bionic binary
Change-Id: I50be786c16fe04b7f05c14ebfb74f710c7446ed9
diff --git a/linker/Android.bp b/linker/Android.bp
index 4a5bf44..5b06e3c 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -55,15 +55,13 @@
],
arch: {
arm64: {
- srcs: ["arch/arm64/begin.S"],
+ srcs: ["arch/arm64/linker_wrapper_begin.S"],
},
x86_64: {
- srcs: ["arch/x86_64/begin.S"],
+ srcs: ["arch/x86_64/linker_wrapper_begin.S"],
},
},
- prefix_symbols: "__dlwrap_",
-
header_libs: ["libc_headers"],
// We need to access Bionic private headers in the linker.