Revert "Use checked in android_tools Android NDK."

build/android/buildbot_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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 16 matching lines @@
         ;;
       *)
         echo "@@@STEP_WARNINGS@@@"
         echo "Warning, unparsed input argument: '$1'"
         ;;
     esac
     shift
   done
 }
 
+
+# Setup environment for Android build.  Do not set ANDROID_SDK_ROOT so that
+# default version from $ROOT/src/third_party/android_tools/
+# Called from bb_baseline_setup.
+# Moved to top of file so it is easier to find.
+function bb_setup_environment {
+  export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
+}
+
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
   exit 0
 }
 
 function bb_run_gclient_hooks {
   echo "@@@BUILD_STEP runhooks android@@@"
   gclient runhooks
 }
@@ skipping 16 matching lines @@
     return 1
   fi
   cd $SRC_ROOT
 
   if [ ! -f build/android/envsetup.sh ] ; then
     echo "No envsetup.sh"
     echo "@@@STEP_FAILURE@@@"
     return 1
   fi
 
+  bb_setup_environment
+
   for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \
     $(dirname "${ANDROID_NDK_ROOT}") ; do
     if [[ ! -d "${mandatory_directory}" ]]; then
       echo "Directory ${mandatory_directory} does not exist."
       echo "Build cannot continue."
       echo "@@@STEP_FAILURE@@@"
       return 1
     fi
   done
 
@@ skipping 200 matching lines @@
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
   extract_exitcode=$?
   if (( $extract_exitcode > 1 )); then
     echo "@@@STEP_WARNINGS@@@"
     return
   fi
   return $extract_exitcode
   )
 }