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/libdl/Android.bp b/libdl/Android.bp
index 041ee26..3889bdb 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -4,10 +4,7 @@
cc_library_static {
name: "libdl_static",
- srcs: [
- "libdl.cpp",
- "libdl_cfi.cpp",
- ],
+ srcs: ["libdl.cpp", "libdl_cfi.cpp"],
cflags: [
"-Wall",
@@ -46,6 +43,7 @@
arch: {
arm: {
version_script: "libdl.arm.map",
+ ldflags: ["-Wl,--hash-style=both"],
},
arm64: {
version_script: "libdl.arm64.map",
@@ -59,6 +57,7 @@
x86: {
ldflags: [
"-Wl,--exclude-libs=libgcc_eh.a",
+ "-Wl,--hash-style=both",
],
version_script: "libdl.x86.map",
},
@@ -71,7 +70,7 @@
whole_static_libs: ["libdl_static"],
},
static: {
- srcs: ["libdl_static.c"],
+ srcs: [ "libdl_static.c" ],
},
cflags: [
"-Wall",
@@ -91,7 +90,7 @@
// This is placeholder library the actual implementation is (currently)
// provided by the linker.
- shared_libs: ["ld-android"],
+ shared_libs: [ "ld-android" ],
sanitize: {
never: true,