Merge "Stop exporting unwinder from arm32 libc.a"
This commit is contained in:
commit
a924442816
|
@ -1639,6 +1639,8 @@ cc_library {
|
|||
srcs: [":libc_sources_shared_arm"],
|
||||
// special for arm
|
||||
cflags: ["-DCRT_LEGACY_WORKAROUND"],
|
||||
|
||||
whole_static_libs: [ "libunwind_llvm" ],
|
||||
},
|
||||
|
||||
// Arm 32 bit does not produce complete exidx unwind information
|
||||
|
@ -1648,8 +1650,6 @@ cc_library {
|
|||
strip: {
|
||||
keep_symbols_and_debug_frame: true,
|
||||
},
|
||||
|
||||
whole_static_libs: [ "libunwind_llvm" ],
|
||||
},
|
||||
arm64: {
|
||||
version_script: ":libc.arm64.map",
|
||||
|
@ -1660,7 +1660,9 @@ cc_library {
|
|||
keep_symbols: true,
|
||||
},
|
||||
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
shared: {
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
},
|
||||
},
|
||||
x86: {
|
||||
// TODO: This is to work around b/24465209. Remove after root cause is fixed.
|
||||
|
@ -1675,7 +1677,9 @@ cc_library {
|
|||
keep_symbols: true,
|
||||
},
|
||||
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
shared: {
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
},
|
||||
},
|
||||
x86_64: {
|
||||
version_script: ":libc.x86_64.map",
|
||||
|
@ -1686,7 +1690,9 @@ cc_library {
|
|||
keep_symbols: true,
|
||||
},
|
||||
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
shared: {
|
||||
whole_static_libs: [ "libgcc_stripped" ],
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in New Issue