🚕 adb_gdb: Add --device flag

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 97 matching lines @@
 TARGET_ARCH=
 TOOLCHAIN=
 VERBOSE=0
 
 for opt; do
   optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
   case $opt in
     --adb=*)
       ADB=$optarg
       ;;
+    --device=*)
+      export ANDROID_SERIAL=$optarg
+      ;;
     --activity=*)
       ACTIVITY=$optarg
       ;;
     --annotate=3)
       ANNOTATE=$optarg
       ;;
     --force)
       FORCE=true
       ;;
     --gdbserver=*)
@@ skipping 139 matching lines @@
 its value.
 
 Otherwise, the script will complain, but you can use the --gdbserver,
 --gdb and --symbol-lib options to specify everything manually.
 
 An alternative to --gdb=<file> is to use --toollchain=<path> to specify
 the path to the host target-specific cross-toolchain.
 
 You will also need the 'adb' tool in your path. Otherwise, use the --adb
 option. The script will complain if there is more than one device connected
-and ANDROID_SERIAL is not defined.
+and a device is not specified with either --device or ANDROID_SERIAL).
 
 The first time you use it on a device, the script will pull many system
 libraries required by the process into a temporary directory. This
 is done to strongly improve the debugging experience, like allowing
 readable thread stacks and more. The libraries are copied to the following
 directory by default:
 
   $DEFAULT_PULL_LIBS_DIR/
 
 But you can use the --pull-libs-dir=<path> option to specify an
@@ skipping 26 matching lines @@
                         <num> may be a float if your sleep(1) supports it.
   --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 target gdbserver binary.
   --gdb=<file>          Specify host gdb client binary.
   --target-arch=<name>  Specify NDK target arch.
   --adb=<file>          Specify host ADB binary.
+  --device=<file>       ADB device serial to use (-s flag).
   --port=<port>         Specify the tcp port to use.
 
   --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.
                         e.g. --su-prefix="su -c"
 
   --pull-libs           Force system libraries extraction.
   --no-pull-libs        Do not extract any system library.
   --libs-dir=<path>     Specify system libraries extraction directory.
@@ skipping 49 matching lines @@
 ADB_VERSION=$($ADB version 2>/dev/null)
 echo "$ADB_VERSION" | fgrep -q -e "Android Debug Bridge"
 if [ $? != 0 ]; then
   panic "Your 'adb' tool seems invalid, use --adb=<file> to specify a \
 different one: $ADB"
 fi
 
 # If there are more than one device connected, and ANDROID_SERIAL is not
 # defined, print an error message.
 NUM_DEVICES_PLUS2=$($ADB devices 2>/dev/null | wc -l)
-if [ "$NUM_DEVICES_PLUS2" -lt 3 -a -z "$ANDROID_SERIAL" ]; then
+if [ "$NUM_DEVICES_PLUS2" -gt 3 -a -z "$ANDROID_SERIAL" ]; then
   echo "ERROR: There is more than one Android device connected to ADB."
   echo "Please define ANDROID_SERIAL to specify which one to use."
   exit 1
 fi
 
 # Run a command through adb shell, strip the extra \r from the output
 # and return the correct status code to detect failures. This assumes
 # that the adb shell command prints a final \n to stdout.
 # $1+: command to run
 # Out: command's stdout
@@ skipping 614 matching lines @@
 
 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 &&
 rm -f "$GDBSERVER_PIDFILE"