Update Android.bp with arch-specific version scripts
Change-Id: I59b34f21b54e8a2084bb318a08c4092064f48083
diff --git a/libc/Android.bp b/libc/Android.bp
index 93854b7..ab934b9 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1952,9 +1952,6 @@
stl: "none",
system_shared_libs: [],
- // Don't re-export new/delete and friends, even if the compiler really wants to.
- version_script: "libc.map",
-
// We'd really like to do this for all architectures, but since this wasn't done
// before, these symbols must continue to be exported on LP32 for binary
// compatibility.
@@ -1972,6 +1969,9 @@
//TODO: This is to work around b/24465209. Remove after root cause is fixed
ldflags: ["-Wl,--hash-style=both"],
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.arm.map",
+
shared: {
srcs: ["arch-arm/bionic/exidx_dynamic.c"],
},
@@ -1983,12 +1983,30 @@
"arch-arm/bionic/atexit_legacy.c",
],
},
+ arm64: {
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.arm64.map",
+ },
+ mips: {
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.mips.map",
+ },
+ mips64: {
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.mips64.map",
+ },
x86: {
//TODO: This is to work around b/24465209. Remove after root cause is fixed
ldflags: ["-Wl,--hash-style=both"],
+
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.x86.map",
},
x86_64: {
clang: use_clang_x86_64,
+
+ // Don't re-export new/delete and friends, even if the compiler really wants to.
+ version_script: "libc.x86_64.map",
},
},
sanitize: ["never"],