From de9c34601a0be1c73d0e763174564fe0262817fb Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 5 Mar 2020 16:46:13 -0800 Subject: [PATCH] Switch to debugger_process_info in bionic. Bug: 135772972 Change-Id: I2b4eae107fc7f62a5ad7ead3a8cfa26e444532d4 --- linker/linker_debuggerd_android.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/linker/linker_debuggerd_android.cpp b/linker/linker_debuggerd_android.cpp index 42ea2b7ff..6a816736f 100644 --- a/linker/linker_debuggerd_android.cpp +++ b/linker/linker_debuggerd_android.cpp @@ -33,18 +33,25 @@ #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() { + // 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 = { - .get_abort_message = []() { - return __libc_shared_globals()->abort_msg; - }, - .post_dump = ¬ify_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; - }, +#if defined(__ANDROID_APEX__) + .get_process_info = get_process_info, +#endif + .post_dump = notify_gdb_of_libraries, }; debuggerd_init(&callbacks); }