Use the NDK that has been checked into android_tools.

BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@151080 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot_functions.sh

@@ -34,15 +34,6 @@ 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.@@@"
@@ -79,8 +70,6 @@ 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

android/envsetup_functions.sh

@@ -146,11 +146,10 @@ 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
-    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
+    export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
   fi
 
   # If ANDROID_SDK_ROOT is set when envsetup is run, use the sdk pointed to by