commit 528b68d49dcf771231e0a8a70ee0fb6970d6fdba
author Elliott Hughes <enh@google.com> Thu Apr 19 09:57:32 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 19 09:57:32 2012 -0700
tree 7dfe5722589eef8ea4ff3a51cef4b362ec0ed545
parent fbe5b757cff040a455f93388d6eebdee0653a089
parent 2554cb916a1764218a1f11cc9741203b468310d0

Merge "Only wait for gdb to attach if debug_db_uid is in the environment." into ics-mr1-plus-art

src/runtime_linux.cc

diff --git a/src/runtime_linux.cc b/src/runtime_linux.cc
index c96b1e5..c4d4b3c 100644
--- a/src/runtime_linux.cc
+++ b/src/runtime_linux.cc
@@ -188,13 +188,15 @@
                       << (has_address ? StringPrintf(" fault addr %p", info->si_addr) : "");
   Backtrace();
 
-  // TODO: make this part optional, like it is on the device?
-  // Wait for debugger to attach.
-  LOG(INTERNAL_FATAL) << "********************************************************\n"
-                      << "* Process " << getpid() << " has been suspended while crashing. Attach gdb:\n"
-                      << "*     gdb -p " << getpid() << "\n"
-                      << "********************************************************\n";
-  while (true) {
+  // TODO: instead, get debuggerd running on the host, try to connect, and hang around on success.
+  if (getenv("debug_db_uid") != NULL) {
+    LOG(INTERNAL_FATAL) << "********************************************************\n"
+                        << "* Process " << getpid() << " has been suspended while crashing. Attach gdb:\n"
+                        << "*     gdb -p " << getpid() << "\n"
+                        << "********************************************************\n";
+    // Wait for debugger to attach.
+    while (true) {
+    }
   }
 }