Revert "Use checked in android_tools Android NDK."

This reverts commit 7c03095b.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10824228

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150715 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -522,7 +522,7 @@ deps_os = {
 
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
-      "@c02185bf0f9ce4638896ad707e588183f4fd2dde",
+      "@201b7ff1c6c435c55303baf9391a4dec8f4c628c",
   },
 }
 

build/android/buildbot_functions.sh

@@ -34,6 +34,15 @@ function bb_parse_args {
   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.@@@"
@@ -70,6 +79,8 @@ function bb_baseline_setup {
     return 1
   fi
 
+  bb_setup_environment
+
   for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \
     $(dirname "${ANDROID_NDK_ROOT}") ; do
     if [[ ! -d "${mandatory_directory}" ]]; then

build/android/envsetup_functions.sh

@@ -146,10 +146,11 @@ common_gyp_vars() {
 #  > make
 ################################################################################
 sdk_build_init() {
-  # If ANDROID_NDK_ROOT is set when envsetup is run, use the ndk pointed to by
-  # the environment variable.  Otherwise, use the default ndk from the tree.
   if [ ! -d "${ANDROID_NDK_ROOT}" ]; then
-    export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
+    echo "ANDROID_NDK_ROOT must be set to the path of Android NDK." >& 2
+    echo "which could be installed by" >& 2
+    echo "<chromium_tree>/src/build/install-build-deps-android-sdk.sh" >& 2
+    return 1
   fi
 
   # If ANDROID_SDK_ROOT is set when envsetup is run, use the sdk pointed to by