diff options
| author | Ryan Prichard <rprichard@google.com> | 2021-01-20 00:10:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-20 00:10:58 +0000 |
| commit | fcd9c78534b865951eb70b02eb3a424f08ecd6a6 (patch) | |
| tree | 44f8e29a8b9cfa1c5163503e095c50ed1c3d42be /linker | |
| parent | ac78394a5a9398b16e1a8926242352a852c8318d (diff) | |
| parent | cdf7175fa5a5e684c3ba23082a313f394f61ef72 (diff) | |
| download | bionic-fcd9c78534b865951eb70b02eb3a424f08ecd6a6.tar.gz | |
Merge "Switch libc.so and linker to prebuilt LLVM libunwind"
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.bp | 5 |
1 files changed, 1 insertions, 4 deletions
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 |