Switch to debugger_process_info in bionic.

Bug: 135772972
Change-Id: I2b4eae107fc7f62a5ad7ead3a8cfa26e444532d4
This commit is contained in:
Peter Collingbourne 2020-03-05 16:46:13 -08:00
parent c84d295f7c
commit de9c34601a

View file

@ -33,18 +33,25 @@
#include "linker_gdb_support.h" #include "linker_gdb_support.h"
#if defined(__ANDROID_APEX__)
static debugger_process_info get_process_info() {
return {
.abort_msg = __libc_shared_globals()->abort_msg,
.fdsan_table = &__libc_shared_globals()->fd_table,
.gwp_asan_state = __libc_shared_globals()->gwp_asan_state,
.gwp_asan_metadata = __libc_shared_globals()->gwp_asan_metadata,
};
}
#endif
void linker_debuggerd_init() { void linker_debuggerd_init() {
// There may be a version mismatch between the bootstrap linker and the crash_dump in the APEX,
// so don't pass in any process info from the bootstrap linker.
debuggerd_callbacks_t callbacks = { debuggerd_callbacks_t callbacks = {
.get_abort_message = []() { #if defined(__ANDROID_APEX__)
return __libc_shared_globals()->abort_msg; .get_process_info = get_process_info,
}, #endif
.post_dump = &notify_gdb_of_libraries, .post_dump = notify_gdb_of_libraries,
.get_gwp_asan_state = []() {
return __libc_shared_globals()->gwp_asan_state;
},
.get_gwp_asan_metadata = []() {
return __libc_shared_globals()->gwp_asan_metadata;
},
}; };
debuggerd_init(&callbacks); debuggerd_init(&callbacks);
} }