Remove obsolete workaround.
Bug: http://b/24465209 Test: manually ran the app. Change-Id: I1e2a498864c74ff3a9886b97f7dc60ad7f6dfa44
This commit is contained in:
parent
a238a9a328
commit
1b0f2b49d5
|
@ -1724,9 +1724,6 @@ cc_library {
|
|||
|
||||
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",
|
||||
|
||||
|
@ -1757,9 +1754,6 @@ cc_library {
|
|||
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",
|
||||
},
|
||||
|
@ -1785,10 +1779,8 @@ cc_library {
|
|||
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: {
|
||||
|
@ -1801,7 +1793,6 @@ cc_library {
|
|||
version_script: "libstdc++.mips64.map",
|
||||
},
|
||||
x86: {
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
version_script: "libstdc++.x86.map",
|
||||
},
|
||||
x86_64: {
|
||||
|
|
|
@ -4,7 +4,10 @@
|
|||
cc_library_static {
|
||||
name: "libdl_static",
|
||||
|
||||
srcs: ["libdl.cpp", "libdl_cfi.cpp"],
|
||||
srcs: [
|
||||
"libdl.cpp",
|
||||
"libdl_cfi.cpp",
|
||||
],
|
||||
|
||||
cflags: [
|
||||
"-Wall",
|
||||
|
@ -43,7 +46,6 @@ cc_library {
|
|||
arch: {
|
||||
arm: {
|
||||
version_script: "libdl.arm.map",
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
},
|
||||
arm64: {
|
||||
version_script: "libdl.arm64.map",
|
||||
|
@ -57,7 +59,6 @@ cc_library {
|
|||
x86: {
|
||||
ldflags: [
|
||||
"-Wl,--exclude-libs=libgcc_eh.a",
|
||||
"-Wl,--hash-style=both",
|
||||
],
|
||||
version_script: "libdl.x86.map",
|
||||
},
|
||||
|
@ -70,7 +71,7 @@ cc_library {
|
|||
whole_static_libs: ["libdl_static"],
|
||||
},
|
||||
static: {
|
||||
srcs: [ "libdl_static.c" ],
|
||||
srcs: ["libdl_static.c"],
|
||||
},
|
||||
cflags: [
|
||||
"-Wall",
|
||||
|
@ -90,7 +91,7 @@ cc_library {
|
|||
|
||||
// This is placeholder library the actual implementation is (currently)
|
||||
// provided by the linker.
|
||||
shared_libs: [ "ld-android" ],
|
||||
shared_libs: ["ld-android"],
|
||||
|
||||
sanitize: {
|
||||
never: true,
|
||||
|
|
|
@ -294,7 +294,6 @@ cc_library {
|
|||
],
|
||||
},
|
||||
instruction_set: "arm",
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
version_script: "libm.arm.map",
|
||||
},
|
||||
|
||||
|
@ -421,7 +420,6 @@ cc_library {
|
|||
],
|
||||
},
|
||||
local_include_dirs: ["i387"],
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
version_script: "libm.x86.map",
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in New Issue