Allow using cgdb with adb_gdb script.

build/android/adb_gdb

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 # A generic script used to attach to a running Chromium process and
 # debug it. Most users should not use this directly, but one of the
 # wrapper scripts like adb_gdb_content_shell
@@ skipping 69 matching lines @@
 DEFAULT_ACTIVITY=${ADB_GDB_ACTIVITY:-".Main"}
 
 # Allow wrapper scripts to set the program name through ADB_GDB_PROGNAME
 PROGNAME=${ADB_GDB_PROGNAME:-$(basename "$0")}
 
 ACTIVITY=$DEFAULT_ACTIVITY
 ADB=
 ANNOTATE=
 FORCE=
 GDBEXEPOSTFIX=gdb
+CGDB=
 GDBINIT=
 GDBSERVER=
 HELP=
 NDK_DIR=
 NO_PULL_LIBS=
 PACKAGE_NAME=
 PID=
 PORT=
 PRIVILEGED=
 PRIVILEGED_INDEX=
@@ skipping 99 matching lines @@
       ;;
     --target-arch=*)
       TARGET_ARCH=$optarg
       ;;
     --toolchain=*)
       TOOLCHAIN=$optarg
       ;;
     --ui)
       GDBEXEPOSTFIX=gdbtui
       ;;
+    --cgdb)
+      CGDB=cgdb
+      ;;
+    --cgdb*)

[jbudorick, 2017/06/19 13:11:39]

nit: should this be --cgdb=* ?

[sakal-chromium, 2017/06/19 14:50:12]

Done.

+      CGDB=$optarg
+      ;;
     --verbose)
       VERBOSE=$(( $VERBOSE + 1 ))
       ;;
     -*)
       panic "Unknown option $opt, see --help." >&2
       ;;
     *)
       if [ "$PACKAGE_NAME" ]; then
         panic "You can only provide a single package name as argument!\
  See --help."
@@ skipping 80 matching lines @@
 
 Any local .gdbinit script will be ignored, but it is possible to pass a
 gdb command script with the --script=<file> option. Note that its commands
 will be passed to gdb after the remote connection and library symbol
 loading have completed.
 
 Valid options:
   --help|-h|-?          Print this message.
   --verbose             Increase verbosity.
 
+  --cgdb[=<file>]       Use cgdb (an interface for gdb that shows the code).
   --sandboxed           Debug first sandboxed process we find.
   --sandboxed=<num>     Debug specific sandboxed process.
   --symbol-dir=<path>   Specify directory with symbol shared libraries.
   --output-directory=<path> Specify the output directory (e.g. "out/Debug").
   --package-name=<name> Specify package name (alternative to 1st argument).
   --privileged          Debug first privileged process we find.
   --privileged=<num>    Debug specific privileged process.
   --program-name=<name> Specify program name (cosmetic only).
   --pid=<pid>           Specify application process pid.
   --force               Kill any previous debugging session, if any.
@@ skipping 721 matching lines @@
   cat "$GDBINIT" >> $COMMANDS
 fi
 
 if [ "$VERBOSE" -gt 0 ]; then
   echo "### START $COMMANDS"
   cat $COMMANDS
   echo "### END $COMMANDS"
 fi
 
 log "Launching gdb client: $GDB $GDB_ARGS -x $COMMANDS"
-$GDB $GDB_ARGS -x $COMMANDS &&
+if [ "$CGDB" ]; then
+  $CGDB -d $GDB -- $GDB_ARGS -x $COMMANDS
+else
+  $GDB $GDB_ARGS -x $COMMANDS
+fi
 rm -f "$GDBSERVER_PIDFILE"