diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-04-26 00:58:58 +0000 |
|---|---|---|
| committer | Ryan Prichard <rprichard@google.com> | 2024-04-26 01:00:13 +0000 |
| commit | 698ca39c9e6f2ed5987778cd50a556412a1acb97 (patch) | |
| tree | 33432f0f563f1c3b6d90c1221d6eefdf3a2154e9 | |
| parent | d162eb922ac9427083d41ef93891d007f2b904b6 (diff) | |
| download | bionic-698ca39c9e6f2ed5987778cd50a556412a1acb97.tar.gz | |
Revert "Switch the loader to a noexcept version of libc++"
Revert submission 2675705-use-prebuilt-libcxx
Reason for revert: breaks some Android tests (b/337120479, b/337121737, b/337122511)
Reverted changes: /q/submissionid:2675705-use-prebuilt-libcxx
Bug: 337120479
Bug: 337121737
Bug: 337122511
Change-Id: Ic5256fb1b4f09967ec29f36d8bdf96a16649ca05
| -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", ], }, |