commit f63cfd97f362429af738ecb43583a646754c1f66
author Alex Light <allight@google.com> Thu Oct 15 20:50:57 2020 +0000
committer Christopher Ferris <cferris@google.com> Thu Oct 15 14:16:01 2020 -0700
tree b9fd19839c2d613ca0935aad6bdecf2b1ab850b1
parent c4c7b899026becd29735f49c5ad771581251877f

IsolateMain should default off under lldb too

We are moving away from gdb to lldb for our default debugger.
We should make sure IsolateMain disables itself for lldb.

Test: Manual

Change-Id: I816992e7d21dc1e77460480fb567d50311bdfaaf

IsolateMain.cpp

diff --git a/IsolateMain.cpp b/IsolateMain.cpp
index 898fb52..5b34ef5 100644
--- a/IsolateMain.cpp
+++ b/IsolateMain.cpp
@@ -97,7 +97,8 @@
     }
   }
   if (!isolation_forced) {
-    // Check if we are running gdb/gdbserver. No need to be sneaky we are assuming no one is hiding.
+    // Check if we are running gdb/gdbserver/lldb/lldb-server. No need to be sneaky we are assuming
+    // no one is hiding.
     pid_t ppid = getppid();
     std::string exe_path = std::string("/proc/") + std::to_string(ppid) + "/exe";
     char buf[PATH_MAX + 1];
@@ -110,7 +111,8 @@
     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";
+      return file != "gdb" && file != "gdbserver" && file != "gdbserver64" &&
+             file != "gdbserver32" && file != "lldb" && file != "lldb-server";
     }
     // If we can't figure out what our parent was just assume we are fine to isolate.
   }