Merge "Revert^2 "Switch the loader to a noexcept version of libc++"" into main
This commit is contained in:
commit
d475ee45aa
1 changed files with 4 additions and 2 deletions
|
@ -367,7 +367,9 @@ cc_defaults {
|
|||
"liblinker_main",
|
||||
"liblinker_malloc",
|
||||
|
||||
"libc++_static",
|
||||
// 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_nomalloc",
|
||||
"libc_dynamic_dispatch",
|
||||
"libm",
|
||||
|
@ -434,7 +436,7 @@ cc_binary {
|
|||
"linker_debuggerd_android.cpp",
|
||||
],
|
||||
static_libs: [
|
||||
"libc++demangle",
|
||||
"libc++demangle_noexcept",
|
||||
"libdebuggerd_handler_fallback",
|
||||
],
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue