android: Stop adding toolchain dir to PATH.

build/android/envsetup_functions.sh

 #!/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.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 50 matching lines @@
   export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
   export PATH=$PATH:${ANDROID_SDK_ROOT}/build-tools/\
 ${ANDROID_SDK_BUILD_TOOLS_VERSION}
 
   # This must be set before ANDROID_TOOLCHAIN, so that clang could find the
   # gold linker.
   # TODO(michaelbai): Remove this path once the gold linker become the default
   # linker.
   export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold
 
-  # Must have tools like arm-linux-androideabi-gcc on the path for ninja
-  export PATH=$PATH:${ANDROID_TOOLCHAIN}
-
   # Add Chromium Android development scripts to system path.
   # Must be after CHROME_SRC is set.
   export PATH=$PATH:${CHROME_SRC}/build/android
 
   # TODO(beverloo): Remove these once all consumers updated to --strip-binary.
   export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy)
   export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
 
   # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
   # to canonicalize them (remove double '/', remove trailing '/', etc).
@@ skipping 235 matching lines @@
   fi
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }