Use $ANDROID_TOOLCHAIN set by envsetup.sh in adb_gdb and gdb_apk

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, or adb_gdb_drt
@@ skipping 340 matching lines @@
 else
   # Nit: accept Chromium's 'ia32' as a valid target architecture. This
   # script prefers the NDK 'x86' name instead because it uses it to find
   # NDK-specific files (host gdb) with it.
   if [ "$TARGET_ARCH" = "ia32" ]; then
     TARGET_ARCH=x86
     log "Auto-config: --arch=$TARGET_ARCH  (equivalent to ia32)"
   fi
 fi
 
-# Detect the NDK system tag, i.e. the name used to identify the host.
-# out: NDK system tag (e.g. 'linux-x86_64').
-get_ndk_host_tag () {
-  if [ -z "$NDK_HOST_TAG" ]; then
-    case $(uname -s) in
-      Linux) NDK_HOST_TAG=linux-x86_64;;
-      Darwin) NDK_HOST_TAG=darwin-x86;;
-      *) panic "You can't run this script on this system: $uname -a";;
-    esac
-  fi
-  echo "$NDK_HOST_TAG"
-}
-
 # Convert an NDK architecture name into a GNU configure triplet.
 # $1: NDK architecture name (e.g. 'arm')
 # Out: Android GNU configure triplet (e.g. 'arm-linux-androideabi')
 get_arch_gnu_config () {
   case $1 in
     arm)
       echo "arm-linux-androideabi"
       ;;
     x86)
       echo "i686-linux-android"
@@ skipping 35 matching lines @@
   FILE=$NDK_DIR/toolchains/$NAME-4.6/prebuilt/$SUBPATH
   if [ ! -f "$FILE" ]; then
     FILE=$NDK_DIR/toolchains/$NAME-4.4.3/prebuilt/$SUBPATH
     if [ ! -f "$FILE" ]; then
       FILE=
     fi
   fi
   echo "$FILE"
 }
 
-# Find the path to an NDK's toolchain full prefix for a given architecture
-# $1: NDK install path
-# $2: NDK architecture name
-# Out: install path + binary prefix (e.g.
-#      ".../path/to/bin/arm-linux-androideabi-")
-get_ndk_toolchain_fullprefix () {
-  local NDK_DIR="$1"
-  local ARCH="$2"
-  local TARGET NAME HOST GCC CONFIG
-
-  # NOTE: This will need to be updated if the NDK changes the names or moves
-  #        the location of its prebuilt toolchains.
-  #
-  GCC=
-  HOST=$(get_ndk_host_tag)
-  CONFIG=$(get_arch_gnu_config $ARCH)
-  GCC=$(get_ndk_toolchain_prebuilt \
-        "$NDK_DIR" "$ARCH" "$HOST/bin/$CONFIG-gcc")
-  if [ ! -f "$GCC" -a "$ARCH" = "x86" ]; then
-    # Special case, the x86 toolchain used to be incorrectly
-    # named i686-android-linux-gcc!
-    GCC=$(get_ndk_toolchain_prebuilt \
-          "$NDK_DIR" "$ARCH" "$HOST/bin/i686-android-linux-gcc")
-  fi
-  if [ -z "$GCC" ]; then
-    panic "Cannot find Android NDK toolchain for '$ARCH' architecture. \
-Please verify your NDK installation!"
-  fi
-  echo "${GCC%%gcc}"
-}
-
 # $1: NDK install path
 # $2: target architecture.
 get_ndk_gdbserver () {
   local NDK_DIR="$1"
   local ARCH=$2
-  local HOST=$(get_ndk_host_tag)
   local BINARY
 
   # The location has moved after NDK r8
   BINARY=$NDK_DIR/prebuilt/android-$ARCH/gdbserver/gdbserver
   if [ ! -f "$BINARY" ]; then
     BINARY=$(get_ndk_toolchain_prebuilt "$NDK_DIR" "$ARCH" gdbserver)
   fi
   echo "$BINARY"
 }
 
 # Check/probe the path to the Android toolchain installation. Always
 # use the NDK versions of gdb and gdbserver. They must match to avoid
 # issues when both binaries do not speak the same wire protocol.
 #
 if [ -z "$TOOLCHAIN" ]; then
-  ANDROID_TOOLCHAIN=$(get_ndk_toolchain_fullprefix \
-                      "$ANDROID_NDK_ROOT" "$TARGET_ARCH")
-  ANDROID_TOOLCHAIN=$(dirname "$ANDROID_TOOLCHAIN")
   log "Auto-config: --toolchain=$ANDROID_TOOLCHAIN"
 else
   # Be flexible, allow one to specify either the install path or the bin
   # sub-directory in --toolchain:
   #
   if [ -d "$TOOLCHAIN/bin" ]; then
     TOOLCHAIN=$TOOLCHAIN/bin
   fi
   ANDROID_TOOLCHAIN=$TOOLCHAIN
 fi
@@ skipping 392 matching lines @@
   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"
 
 clean_exit $?