Fix the adb_gdb script to honor the --gdb flag for a user specified gdb binary according to the exi…

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 103 matching lines @@
       ;;
     --annotate=3)
       ANNOTATE=$optarg
       ;;
     --force)
       FORCE=true
       ;;
     --gdbserver=*)
       GDBSERVER=$optarg
       ;;
+    --gdb=*)
+      GDB=$optarg
+      ;;
     --help|-h|-?)
       HELP=true
       ;;
     --ndk-dir=*)
       NDK_DIR=$optarg
       ;;
     --no-pull-libs)
       NO_PULL_LIBS=true
       ;;
     --package-name=*)
@@ skipping 161 matching lines @@
   --package-name=<name> Specify package name (alternative to 1st argument).
   --program-name=<name> Specify program name (cosmetic only).
   --pid=<pid>           Specify application process pid.
   --force               Kill any previous debugging session, if any.
   --start               Start package's activity on device.
   --ui                  Use gdbtui instead of gdb
   --activity=<name>     Activity name for --start [$DEFAULT_ACTIVITY].
   --annotate=<num>      Enable gdb annotation.
   --script=<file>       Specify extra GDB init script.
 
-  --gdbserver=<file>    Specify targer gdbserver binary.
-  --gdb=<program>       Specify host gdb client binary.
+  --gdbserver=<file>    Specify target gdbserver binary.
+  --gdb=<file>          Specify host gdb client binary.
   --target-arch=<name>  Specify NDK target arch.
-  --adb=<program>       Specify host ADB binary.
+  --adb=<file>          Specify host ADB binary.
 
   --su-prefix=<prefix>  Prepend <prefix> to 'adb shell' commands that are
                         run by this script. This can be useful to use
                         the 'su' program on rooted production devices.
 
   --pull-libs           Force system libraries extraction.
   --no-pull-libs        Do not extract any system library.
   --libs-dir=<path>     Specify system libraries extraction directory.
 
   --debug               Use libraries under out/Debug.
@@ skipping 216 matching lines @@
   if [ -d "$TOOLCHAIN/bin" ]; then
     TOOLCHAIN=$TOOLCHAIN/bin
   fi
   ANDROID_TOOLCHAIN=$TOOLCHAIN
 fi
 
 # Cosmetic: Remove trailing directory separator.
 ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN%/}
 
 # Find host GDB client binary
-GDB=$(which $ANDROID_TOOLCHAIN/*-$GDBEXEPOSTFIX 2>/dev/null | head -1)
 if [ -z "$GDB" ]; then
-  panic "Can't find Android gdb client in your path, check your \
---toolchain path."
+  GDB=$(which $ANDROID_TOOLCHAIN/*-$GDBEXEPOSTFIX 2>/dev/null | head -1)
+  if [ -z "$GDBSERVER" ]; then
+    panic "Can't find Android gdb client in your path, check your \
+--toolchain or --gdb path."
+  fi
+  log "Host gdb client: $GDB"
 fi
-log "Host gdb client: $GDB"
 
 # Find gdbserver binary, we will later push it to /data/local/tmp
 # This ensures that both gdbserver and $GDB talk the same binary protocol,
 # otherwise weird problems will appear.
 #
 if [ -z "$GDBSERVER" ]; then
   GDBSERVER=$(get_ndk_gdbserver "$ANDROID_NDK_ROOT" "$TARGET_ARCH")
   if [ -z "$GDBSERVER" ]; then
     panic "Can't find NDK gdbserver binary. use --gdbserver to specify \
 valid one!"
@@ skipping 318 matching lines @@
 # so we can add them to solib-search-path later.
 SOLIB_DIRS=$(find $PULL_LIBS_DIR -mindepth 1 -maxdepth 4 -type d | \
              grep -v "^$" | tr '\n' ':')
 
 # This is a re-implementation of gdbclient, where we use compatible
 # versions of gdbserver and $GDBNAME to ensure that everything works
 # properly.
 #
 
 # Push gdbserver to the device
-log "Pushing gdbserver to $TARGET_GDBSERVER"
+log "Pushing gdbserver $GDBSERVER to $TARGET_GDBSERVER"
 adb push $GDBSERVER $TARGET_GDBSERVER &>/dev/null
 fail_panic "Could not copy gdbserver to the device!"
 
 PORT=5039
 HOST_PORT=$PORT
 TARGET_PORT=$PORT
 
 # Pull the app_process binary from the device
 GDBEXEC=app_process
 log "Pulling $GDBEXEC from device"
@@ skipping 54 matching lines @@
 
 if [ "$VERBOSE" -gt 0 ]; then
   echo "### START $COMMANDS"
   cat $COMMANDS
   echo "### END $COMMANDS"
 fi
 
 log "Launching gdb client: $GDB $GDBARGS -x $COMMANDS"
 $GDB $GDBARGS -x $COMMANDS &&
 rm -f "$GDBSERVER_PIDFILE"