repro for crbug.com/663886

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 554 matching lines @@
     *)
       echo "$ARCH-linux-android"
       ;;
   esac
 }
 
 # Convert an NDK architecture name into a toolchain name prefix
 # $1: NDK architecture name (e.g. 'arm')
 # Out: NDK toolchain name prefix (e.g. 'arm-linux-androideabi')
 get_arch_toolchain_prefix () {
-  # Return the configure triplet, except for x86!
-  if [ "$1" = "x86" ]; then
+  # Return the configure triplet, except for x86 and x86_64!
+  if [ "$1" = "x86" -o "$1" = "x86_64" ]; then
     echo "$1"
   else
     get_arch_gnu_config $1
   fi
 }
 
 # Find a NDK toolchain prebuilt file or sub-directory.
 # This will probe the various arch-specific toolchain directories
 # in the NDK for the needed file.
 # $1: NDK install path
@@ skipping 281 matching lines @@
   adb_shell $SU_PREFIX \"echo "foo"\" > $SU_PREFIX_TEST_LOG 2>&1
   if [ $? != 0 -o "$(cat $SU_PREFIX_TEST_LOG)" != "foo" ]; then
     echo "ERROR: Cannot use '$SU_PREFIX' as a valid su prefix:"
     echo "$ adb shell $SU_PREFIX \"echo foo\""
     cat $SU_PREFIX_TEST_LOG
     exit 1
   fi
   COMMAND_PREFIX="$SU_PREFIX \""
   COMMAND_SUFFIX="\""
 else
-  SHELL_UID=$(adb shell cat /proc/self/status | \
+  SHELL_UID=$("$ADB" shell cat /proc/self/status | \
               awk '$1 == "Uid:" { print $2; }')
   log "Shell UID: $SHELL_UID"
   if [ "$SHELL_UID" != 0 -o -n "$NO_ROOT" ]; then
     COMMAND_PREFIX="run-as $PACKAGE_NAME"
     COMMAND_SUFFIX=
   else
     COMMAND_PREFIX=
     COMMAND_SUFFIX=
   fi
 fi
@@ skipping 15 matching lines @@
     fi
   fi
   # Remove the fingerprint file in case pulling one of the libs fails.
   rm -f "$PULL_LIBS_DIR/build.fingerprint"
   SYSTEM_LIBS=$(echo "$MAPPINGS" | \
       awk '$6 ~ /\/system\/.*\.so$/ { print $6; }' | sort -u)
   for SYSLIB in /system/bin/linker $SYSTEM_LIBS; do
     echo "Pulling from device: $SYSLIB"
     DST_FILE=$PULL_LIBS_DIR$SYSLIB
     DST_DIR=$(dirname "$DST_FILE")
-    mkdir -p "$DST_DIR" && adb pull $SYSLIB "$DST_FILE" 2>/dev/null
+    mkdir -p "$DST_DIR" && "$ADB" pull $SYSLIB "$DST_FILE" 2>/dev/null
     fail_panic "Could not pull $SYSLIB from device !?"
   done
   echo "Writing the device fingerprint"
   echo "$DEVICE_FINGERPRINT" > "$PULL_LIBS_DIR/build.fingerprint"
 fi
 
 # Find all the sub-directories of $PULL_LIBS_DIR, up to depth 4
 # 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 $GDBSERVER to $TARGET_GDBSERVER"
-adb push $GDBSERVER $TMP_TARGET_GDBSERVER &>/dev/null
-adb shell $COMMAND_PREFIX cp $TMP_TARGET_GDBSERVER $TARGET_GDBSERVER $COMMAND_SUFFIX
-adb shell rm $TMP_TARGET_GDBSERVER
+"$ADB" push $GDBSERVER $TMP_TARGET_GDBSERVER &>/dev/null
+"$ADB" shell $COMMAND_PREFIX cp $TMP_TARGET_GDBSERVER $TARGET_GDBSERVER $COMMAND_SUFFIX
+"$ADB" shell rm $TMP_TARGET_GDBSERVER
 fail_panic "Could not copy gdbserver to the device!"
 
 if [ -z "$PORT" ]; then
     PORT=5039
 fi
 HOST_PORT=$PORT
 TARGET_PORT=$PORT
 
 # Select correct app_process for architecture.
 case $TARGET_ARCH in
@@ skipping 11 matching lines @@
 # Detect AddressSanitizer setup on the device. In that case app_process is a
 # script, and the real executable is app_process.real.
 GDBEXEC_ASAN=app_process.real
 adb_shell ls /system/bin/$GDBEXEC_ASAN
 if [ $? == 0 ]; then
     GDBEXEC=$GDBEXEC_ASAN
 fi
 
 # Pull the app_process binary from the device.
 log "Pulling $GDBEXEC from device"
-adb pull /system/bin/$GDBEXEC "$TMPDIR"/$GDBEXEC &>/dev/null
+"$ADB" pull /system/bin/$GDBEXEC "$TMPDIR"/$GDBEXEC &>/dev/null
 fail_panic "Could not retrieve $GDBEXEC from the device!"
 
 # Setup network redirection
 log "Setting network redirection (host:$HOST_PORT -> device:$TARGET_PORT)"
-adb forward tcp:$HOST_PORT tcp:$TARGET_PORT
+"$ADB" forward tcp:$HOST_PORT tcp:$TARGET_PORT
 fail_panic "Could not setup network redirection from \
 host:localhost:$HOST_PORT to device:localhost:$TARGET_PORT!"
 
 # Start gdbserver in the background
 # Note that using run-as requires the package to be debuggable.
 #
 # If not, this will fail horribly. The alternative is to run the
 # program as root, which requires of course root privileges.
 # Maybe we should add a --root option to enable this?
 #
@@ skipping 59 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"