Refactor and rename install-build-deps-android-sdk

build/android/buildbot_functions.sh

Index: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 0e3320cd5a17182d587afd5a0176ab0e0b800f30..3d58e257f9567a2ab085cded764bd426064713bb 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -43,20 +43,6 @@ function bb_setup_environment {
   export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
 }
 
-# Install the build deps by running
-# build/install-build-deps-android-sdk.sh.  This may update local tools.
-# $1: source root.
-function bb_install_build_deps {
-  echo "@@@BUILD_STEP install build deps android@@@"
-  local script="$1/build/install-build-deps-android-sdk.sh"
-  if [[ -f "$script" ]]; then
-    "$script"
-  else
-    echo "@@@STEP_WARNINGS@@@"
-    echo "Cannot find $script; why?"
-  fi
-}
-
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
@@ -105,10 +91,8 @@ function bb_baseline_setup {
     NEED_CLOBBER=1
   fi
 
-  # Setting up a new bot?  Must do this before envsetup.sh
-  if [ ! -d "${ANDROID_NDK_ROOT}" ] ; then
-    bb_install_build_deps $SRC_ROOT
-  fi
+  # Install sdk and ndk if necessary
+  "$SRC_ROOT/build/install_android_sdk_ndk.py" --versioned

[John Grabowski, 2012/07/17 18:38:15]

Don't like removal of directory check.
Prefer to avoid running script if possible.
Saves time.

[Isaac (away), 2012/07/18 09:45:05]

Script is a no-op for install NDK if directory exists.  So will not really cost
any time.  I would rather consolidate all the logic for installing sdk / ndk
into a single place (i.e. the script)

 
   echo "@@@BUILD_STEP Configure with envsetup.sh@@@"
   . build/android/envsetup.sh