Fixing app compat issue b/72143978
This is a squash revert of a4a4854 and 1b0f2b4
Revert "Remove a test for backwards compatibility we no longer support."
This reverts commit a4a485454a3a117eccdca1113681f770d765d865.
# This is the commit message #2:
Revert "Remove obsolete workaround."
This reverts commit 1b0f2b49d528c90842b4263269d9039d7e07415e.
Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
diff --git a/libc/Android.bp b/libc/Android.bp
index 3ff5c03..5f04e28 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1723,6 +1723,9 @@
arch: {
arm: {
+ //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",
@@ -1753,6 +1756,9 @@
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",
},
@@ -1778,8 +1784,10 @@
system_shared_libs: ["libc"],
static_libs: ["libasync_safe"],
+ //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
arch: {
arm: {
+ ldflags: ["-Wl,--hash-style=both"],
version_script: "libstdc++.arm.map",
},
arm64: {
@@ -1792,6 +1800,7 @@
version_script: "libstdc++.mips64.map",
},
x86: {
+ ldflags: ["-Wl,--hash-style=both"],
version_script: "libstdc++.x86.map",
},
x86_64: {