Add more debuggers. am: 30bc1b3b49 am: a29a89567e am: aff7d1c005 am: b729012837 am: 6b816667d4
Original change: https://android-review.googlesource.com/c/platform/system/testing/gtest_extras/+/2695208
Change-Id: I74ba80b027a8943dd08cd9a8c74ac7696dace16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/IsolateMain.cpp b/IsolateMain.cpp
index 77db51b..853d7e4 100644
--- a/IsolateMain.cpp
+++ b/IsolateMain.cpp
@@ -110,9 +110,17 @@
// just a QOL thing so it's fine if we are wrong.
if ((len = TEMP_FAILURE_RETRY(readlink(exe_path.c_str(), buf, sizeof(buf) - 1))) > 0) {
buf[len] = '\0';
- std::string_view file(basename(buf));
- return file != "gdb" && file != "gdbserver" && file != "gdbserver64" &&
- file != "gdbserver32" && file != "lldb" && file != "lldb-server";
+ static std::set<std::string_view> debuggers{"gdb",
+ "gdbserver",
+ "gdbserver64",
+ "lldb",
+ "lldb-server",
+ "arm-lldb-server",
+ "arm64-lldb-server",
+ "riscv64-lldb-server",
+ "x86-lldb-server",
+ "x86_64-lldb-server"};
+ return debuggers.find(basename(buf)) == debuggers.end();
}
// If we can't figure out what our parent was just assume we are fine to isolate.
}
