riscv64: enable the version scripts.
Test: treehugger
Change-Id: Idd7b3610bd3321d7e1a4e868cf5dbaf2980909ab
diff --git a/libc/Android.bp b/libc/Android.bp
index 1185b1e..c438ee0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1759,6 +1759,15 @@
keep_symbols: true,
},
},
+ riscv64: {
+ version_script: ":libc.riscv64.map",
+
+ // Leave the symbols in the shared library so that stack unwinders can produce
+ // meaningful name resolution.
+ strip: {
+ keep_symbols: true,
+ },
+ },
x86: {
// TODO: This is to work around b/24465209. Remove after root cause is fixed.
pack_relocations: false,
@@ -1834,6 +1843,14 @@
}
genrule {
+ name: "libc.riscv64.map",
+ out: ["libc.riscv64.map"],
+ srcs: ["libc.map.txt"],
+ tools: ["generate-version-script"],
+ cmd: "$(location generate-version-script) riscv64 $(in) $(out)",
+}
+
+genrule {
name: "libc.x86.map",
out: ["libc.x86.map"],
srcs: ["libc.map.txt"],
@@ -2032,6 +2049,9 @@
arm64: {
version_script: ":libstdc++.arm64.map",
},
+ riscv64: {
+ version_script: ":libstdc++.riscv64.map",
+ },
x86: {
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
@@ -2060,6 +2080,14 @@
}
genrule {
+ name: "libstdc++.riscv64.map",
+ out: ["libstdc++.riscv64.map"],
+ srcs: ["libstdc++.map.txt"],
+ tools: ["generate-version-script"],
+ cmd: "$(location generate-version-script) riscv64 $(in) $(out)",
+}
+
+genrule {
name: "libstdc++.x86.map",
out: ["libstdc++.x86.map"],
srcs: ["libstdc++.map.txt"],