diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-04-26 01:52:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 01:52:16 +0000 |
| commit | fc306b951b92911608d8234f499c42ffb106149a (patch) | |
| tree | 22c7f18113052c5af71277d17e578b685afb5da6 | |
| parent | 686803d2a996bc34206fc15e3d1b5b035f490201 (diff) | |
| parent | 698ca39c9e6f2ed5987778cd50a556412a1acb97 (diff) | |
| download | bionic-fc306b951b92911608d8234f499c42ffb106149a.tar.gz | |
Merge "Revert "Switch the loader to a noexcept version of libc++"" into main
| -rw-r--r-- | linker/Android.bp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linker/Android.bp b/linker/Android.bp index 1ede380de..e1a5a91c6 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -367,9 +367,7 @@ cc_defaults { "liblinker_main", "liblinker_malloc", - // Use a version of libc++ built without exceptions, because accessing EH globals uses - // ELF TLS, which is not supported in the loader. - "libc++_static_noexcept", + "libc++_static", "libc_nomalloc", "libc_dynamic_dispatch", "libm", @@ -436,7 +434,7 @@ cc_binary { "linker_debuggerd_android.cpp", ], static_libs: [ - "libc++demangle_noexcept", + "libc++demangle", "libdebuggerd_handler_fallback", ], }, |