diff options
| -rw-r--r-- | libc/Android.bp | 15 | ||||
| -rw-r--r-- | linker/Android.bp | 5 |
2 files changed, 2 insertions, 18 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 10f431159..cdd5473d7 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1631,6 +1631,7 @@ cc_library { "gwp_asan", "libc_init_dynamic", "libc_common_shared", + "libunwind-exported", ], }, @@ -1672,8 +1673,6 @@ 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 @@ -1692,10 +1691,6 @@ cc_library { strip: { keep_symbols: true, }, - - shared: { - whole_static_libs: [ "libgcc_stripped" ], - }, }, x86: { // TODO: This is to work around b/24465209. Remove after root cause is fixed. @@ -1709,10 +1704,6 @@ cc_library { strip: { keep_symbols: true, }, - - shared: { - whole_static_libs: [ "libgcc_stripped" ], - }, }, x86_64: { version_script: ":libc.x86_64.map", @@ -1722,10 +1713,6 @@ cc_library { strip: { keep_symbols: true, }, - - shared: { - whole_static_libs: [ "libgcc_stripped" ], - }, }, }, diff --git a/linker/Android.bp b/linker/Android.bp index 3ebae59d9..efda312e7 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -232,19 +232,15 @@ cc_defaults { arch: { arm: { srcs: [":linker_sources_arm"], - static_libs: ["libunwind_llvm"], }, arm64: { srcs: [":linker_sources_arm64"], - static_libs: ["libgcc_stripped"], }, x86: { srcs: [":linker_sources_x86"], - static_libs: ["libgcc_stripped"], }, x86_64: { srcs: [":linker_sources_x86_64"], - static_libs: ["libgcc_stripped"], }, }, @@ -292,6 +288,7 @@ cc_defaults { "libc_nomalloc", "libc_dynamic_dispatch", "libm", + "libunwind", ], // Ensure that if the linker needs __gnu_Unwind_Find_exidx, then the linker will have a |