diff options
| -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", ], }, |