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

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 25 matching lines @@
 
 
 # Setup environment for Android build.
 # Called from bb_baseline_setup.
 # Moved to top of file so it is easier to find.
 function bb_setup_environment {
   export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
   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.@@@"
   exit 0
 }
 
 # Basic setup for all bots to run after a source tree checkout.
 # Args:
 #   $1: source root.
 #   $2 and beyond: key value pairs which are parsed by bb_parse_args.
@@ skipping 28 matching lines @@
       echo "Build cannot continue."
       echo "@@@STEP_FAILURE@@@"
       return 1
     fi
   done
 
   if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
     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
 
   if [ "$NEED_CLOBBER" -eq 1 ]; then
     echo "@@@BUILD_STEP Clobber@@@"
     rm -rf "${SRC_ROOT}"/out
     if [ -e "${SRC_ROOT}"/out ] ; then
       echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
       echo "@@@STEP_WARNINGS@@@"
@@ skipping 159 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
   )
 }