Move buildbot files to a separate buildbot dir

- Adding placeholder scripts in old locations until new locations can be
  updated in buildbot master
- Removed buildbot.sh, unused.

TBR=bulach

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

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

22 files changed, 63 insertions, 492 deletions

diff --git a/build/android/buildbot.sh b/build/android/buildbot.sh
deleted file mode 100755
index 43d7853..0000000
--- a/build/android/buildbot.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -ex
-# 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.
-#
-# Currently used as the entry point by both trybot and FYI bot.
-# TODO(jrg): redirect those bots to buildbot_try_compile.sh and
-# buildbot_fyi.sh, then delete this file.
-
-
-ROOT=$(cd "$(dirname $0)"; pwd)
-if [ "${TRYBOT:-0}" = 1 ] ; then
-  exec $ROOT/buildbot_try_compile.sh
-else
-  exec $ROOT/buildbot_fyi.sh
-fi
diff --git a/build/android/buildbot/bb_fyi_builder.sh b/build/android/buildbot/bb_fyi_builder.sh
index 3fa3c7f..3acc3b0 100755
--- a/build/android/buildbot/bb_fyi_builder.sh
+++ b/build/android/buildbot/bb_fyi_builder.sh
@@ -9,9 +9,9 @@
 # SHERIFF: there should be no need to disable this bot.
 # The FYI waterfall does not close the tree.
 
-
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 bb_baseline_setup "$BB_SRC_ROOT" "$@"
 bb_check_webview_licenses
diff --git a/build/android/buildbot/bb_fyi_tester.sh b/build/android/buildbot/bb_fyi_tester.sh
index 9d123af..c96721a 100755
--- a/build/android/buildbot/bb_fyi_tester.sh
+++ b/build/android/buildbot/bb_fyi_tester.sh
@@ -9,8 +9,9 @@
 # SHERIFF: there should be no need to disable this bot.
 # The FYI waterfall does not close the tree.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 bb_baseline_setup "$BB_SRC_ROOT" "$@"
 bb_extract_build
diff --git a/build/android/buildbot/bb_main_builder.sh b/build/android/buildbot/bb_main_builder.sh
index 5df5b24..092122f 100755
--- a/build/android/buildbot/bb_main_builder.sh
+++ b/build/android/buildbot/bb_main_builder.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for the main waterfall.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn the main waterfall android bots
 # green (preventing tree closures), uncomment the next line (and send
diff --git a/build/android/buildbot/bb_main_tester.sh b/build/android/buildbot/bb_main_tester.sh
index 0593b15..e51168b 100755
--- a/build/android/buildbot/bb_main_tester.sh
+++ b/build/android/buildbot/bb_main_tester.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for the main waterfall.  Tester only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn the main waterfall android bots
 # green (preventing tree closures), uncomment the next line (and send
diff --git a/build/android/buildbot/bb_try_builder.sh b/build/android/buildbot/bb_try_builder.sh
index c68c456..1891992 100755
--- a/build/android/buildbot/bb_try_builder.sh
+++ b/build/android/buildbot/bb_try_builder.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for trybots.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn "android" trybots green,
 # uncomment the next line (and send appropriate email out):
diff --git a/build/android/buildbot/bb_try_compile.sh b/build/android/buildbot/bb_try_compile.sh
index 0e78beb..4595413 100755
--- a/build/android/buildbot/bb_try_compile.sh
+++ b/build/android/buildbot/bb_try_compile.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for trybots.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn "android" trybots green,
 # uncomment the next line (and send appropriate email out):
diff --git a/build/android/buildbot/bb_try_compile_test.sh b/build/android/buildbot/bb_try_compile_test.sh
index 1247d92..c6b28e8 100755
--- a/build/android/buildbot/bb_try_compile_test.sh
+++ b/build/android/buildbot/bb_try_compile_test.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for trybots.  Compile and test.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn "android_test" trybots green,
 # uncomment the next line (and send appropriate email out):
diff --git a/build/android/buildbot/bb_try_tester.sh b/build/android/buildbot/bb_try_tester.sh
index da476dd..caba32d 100755
--- a/build/android/buildbot/bb_try_tester.sh
+++ b/build/android/buildbot/bb_try_tester.sh
@@ -4,8 +4,10 @@
 # found in the LICENSE file.
 #
 # Buildbot annotator script for tester half of android trybots
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn "android" trybots green,
 # uncomment the next line (and send appropriate email out):
diff --git a/build/android/buildbot/bb_webkit_latest_builder.sh b/build/android/buildbot/bb_webkit_latest_builder.sh
index cfd7ed5..982f857 100755
--- a/build/android/buildbot/bb_webkit_latest_builder.sh
+++ b/build/android/buildbot/bb_webkit_latest_builder.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for the WebKit builder on the Canary waterfall.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn the main waterfall android bots
 # green (preventing tree closures), uncomment the next line (and send
diff --git a/build/android/buildbot/bb_webkit_latest_tester.sh b/build/android/buildbot/bb_webkit_latest_tester.sh
index 07f688e..46f965e 100755
--- a/build/android/buildbot/bb_webkit_latest_tester.sh
+++ b/build/android/buildbot/bb_webkit_latest_tester.sh
@@ -5,8 +5,9 @@
 #
 # Buildbot annotator script for the WebKit tester on the Canary waterfall.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+BB_DIR="$(dirname $0)"
+BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)"
+. "$BB_DIR/buildbot_functions.sh"
 
 # SHERIFF: if you need to quickly turn the main waterfall android bots
 # green (preventing tree closures), uncomment the next line (and send
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
deleted file mode 100755
index 1cf31db..0000000
--- a/build/android/buildbot_functions.sh
+++ /dev/null
@@ -1,307 +0,0 @@
-#!/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}"
-JOBS="${JOBS:-4}"
-
-# Clobber build?  Overridden by bots with BUILDBOT_CLOBBER.
-NEED_CLOBBER="${NEED_CLOBBER:-0}"
-
-
-# Parse named arguments passed into the annotator script
-# and assign them global variable names.
-function bb_parse_args {
-  while [[ $1 ]]; do
-    case "$1" in
-      --factory-properties=*)
-        FACTORY_PROPERTIES="$(echo "$1" | sed 's/^[^=]*=//')"
-        BUILDTYPE=$(bb_get_json_prop "$FACTORY_PROPERTIES" target)
-        ;;
-      --build-properties=*)
-        BUILD_PROPERTIES="$(echo "$1" | sed 's/^[^=]*=//')"
-        ;;
-      *)
-        echo "@@@STEP_WARNINGS@@@"
-        echo "Warning, unparsed input argument: '$1'"
-        ;;
-    esac
-    shift
-  done
-}
-
-# 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 {
-  gclient runhooks
-}
-
-# 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.
-function bb_baseline_setup {
-  echo "@@@BUILD_STEP Environment setup@@@"
-  SRC_ROOT="$1"
-  # Remove SRC_ROOT param
-  shift
-
-  bb_parse_args "$@"
-
-  cd $SRC_ROOT
-  if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
-    NEED_CLOBBER=1
-  fi
-
-  export GOMA_DIR=/b/build/goma
-
-  local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
-  if [ $BUILDTOOL = "ninja" ]; then
-    export GYP_GENERATORS=ninja
-  fi
-
-  . build/android/envsetup.sh
-
-  if [ "$NEED_CLOBBER" -eq 1 ]; then
-    echo "@@@BUILD_STEP Clobber@@@"
-    # Sdk key expires, delete android folder.
-    # crbug.com/145860
-    rm -rf ~/.android
-    rm -rf "${SRC_ROOT}"/out
-    if [ -e "${SRC_ROOT}"/out ] ; then
-      echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
-      echo "@@@STEP_WARNINGS@@@"
-    fi
-  fi
-
-  # Should be called only after envsetup is done.
-  bb_run_gclient_hooks
-}
-
-
-# Setup goma.  Used internally to buildbot_functions.sh.
-function bb_setup_goma_internal {
-  export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
-  export GOMA_COMPILER_PROXY_DAEMON_MODE=true
-  export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
-
-  echo "Starting goma"
-  ${GOMA_DIR}/goma_ctl.sh ensure_start
-  trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM
-}
-
-# Stop goma.
-function bb_stop_goma_internal {
-  echo "Stopping goma"
-  ${GOMA_DIR}/goma_ctl.sh stop
-}
-
-# $@: make args.
-# Use goma if possible; degrades to non-Goma if needed.
-function bb_goma_make {
-  if [ "${GOMA_DIR}" = "" ]; then
-    make -j${JOBS} "$@"
-    return
-  fi
-
-  HOST_CC=$GOMA_DIR/gcc
-  HOST_CXX=$GOMA_DIR/g++
-  TARGET_CC=$(/bin/ls $ANDROID_TOOLCHAIN/*-gcc | head -n1)
-  TARGET_CXX=$(/bin/ls $ANDROID_TOOLCHAIN/*-g++ | head -n1)
-  TARGET_CC="$GOMA_DIR/gomacc $TARGET_CC"
-  TARGET_CXX="$GOMA_DIR/gomacc $TARGET_CXX"
-  COMMON_JAVAC="$GOMA_DIR/gomacc /usr/bin/javac -J-Xmx512M \
-    -target 1.5 -Xmaxerrs 9999999"
-
-  command make \
-    -j100 \
-    -l20 \
-    HOST_CC="$HOST_CC" \
-    HOST_CXX="$HOST_CXX" \
-    TARGET_CC="$TARGET_CC" \
-    TARGET_CXX="$TARGET_CXX" \
-    CC.host="$HOST_CC" \
-    CXX.host="$HOST_CXX" \
-    CC.target="$TARGET_CC" \
-    CXX.target="$TARGET_CXX" \
-    LINK.target="$TARGET_CXX" \
-    COMMON_JAVAC="$COMMON_JAVAC" \
-    BUILDTYPE="$BUILDTYPE" \
-    "$@"
-
-  local make_exit_code=$?
-  return $make_exit_code
-}
-
-# Build using ninja.
-function bb_goma_ninja {
-  echo "Using ninja to build."
-  local TARGET=$1
-  ninja -C out/$BUILDTYPE -j120 -l20 $TARGET
-}
-
-# Compile step
-function bb_compile {
-  # This must be named 'compile', not 'Compile', for CQ interaction.
-  # Talk to maruel for details.
-  echo "@@@BUILD_STEP compile@@@"
-
-  bb_setup_goma_internal
-
-  BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
-  if [ $BUILDTOOL = "ninja" ]; then
-    bb_goma_ninja All
-  else
-    bb_goma_make
-  fi
-
-  bb_stop_goma_internal
-}
-
-# Experimental compile step; does not turn the tree red if it fails.
-function bb_compile_experimental {
-  # Linking DumpRenderTree appears to hang forever?
-  EXPERIMENTAL_TARGETS="android_experimental"
-  for target in ${EXPERIMENTAL_TARGETS} ; do
-    echo "@@@BUILD_STEP Experimental Compile $target @@@"
-    set +e
-    if [ $BUILDTOOL = "ninja" ]; then
-      bb_goma_ninja "${target}"
-    else
-      bb_goma_make -k "${target}"
-    fi
-    if [ $? -ne 0 ] ; then
-      echo "@@@STEP_WARNINGS@@@"
-    fi
-    set -e
-  done
-}
-
-# Run tests on an emulator.
-function bb_run_tests_emulator {
-  echo "@@@BUILD_STEP Run Tests on an Emulator@@@"
-  build/android/run_tests.py -e --xvfb --verbose
-}
-
-# Run tests on an actual device.  (Better have one plugged in!)
-function bb_run_unit_tests {
-  python build/android/device_status_check.py
-  local LOGCAT_DUMP_DIR="$CHROME_SRC/out/logcat"
-  rm -rf "$LOGCAT_DUMP_DIR"
-  python build/android/adb_logcat_monitor.py "$LOGCAT_DUMP_DIR" &
-
-  build/android/run_tests.py --xvfb --verbose
-
-  echo "@@@BUILD_STEP Logcat dump@@@"
-  python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR"
-}
-
-# Run instrumentation test.
-# Args:
-#   $1: TEST_APK.
-#   $2: EXTRA_FLAGS to be passed to run_instrumentation_tests.py.
-function bb_run_instrumentation_test {
-  local TEST_APK=${1}
-  local EXTRA_FLAGS=${2}
-  local INSTRUMENTATION_FLAGS="-vvv"
-  INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}"
-  INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}"
-  build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS}
-}
-
-# Run content shell instrumentation test on device.
-function bb_run_instrumentation_tests {
-  build/android/adb_install_content_shell
-  local TEST_APK="content_shell_test/ContentShellTest-debug"
-  # Use -I to install the test apk only on the first run.
-  # TODO(bulach): remove the second once we have a Smoke test.
-  bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke"
-  bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest"
-  bb_run_instrumentation_test ${TEST_APK} "-A MediumTest"
-  bb_run_instrumentation_test ${TEST_APK} "-A LargeTest"
-}
-
-# Zip and archive a build.
-function bb_zip_build {
-  echo "@@@BUILD_STEP Zip build@@@"
-  python ../../../../scripts/slave/zip_build.py \
-    --src-dir "$SRC_ROOT" \
-    --exclude-files "lib.target" \
-    --factory-properties "$FACTORY_PROPERTIES" \
-    --build-properties "$BUILD_PROPERTIES"
-}
-
-# Download and extract a build.
-function bb_extract_build {
-  echo "@@@BUILD_STEP Download and extract build@@@"
-  if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then
-    return 1
-  fi
-
-  # When extract_build.py downloads an unversioned build it
-  # issues a warning by exiting with large numbered return code
-  # When it fails to download it build, it exits with return
-  # code 1.  We disable halt on error mode and return normally
-  # unless the python tool returns 1.
-  (
-  set +e
-  python ../../../../scripts/slave/extract_build.py \
-    --build-dir "$SRC_ROOT" \
-    --build-output-dir "out" \
-    --factory-properties "$FACTORY_PROPERTIES" \
-    --build-properties "$BUILD_PROPERTIES"
-  local extract_exit_code=$?
-  if (( $extract_exit_code > 1 )); then
-    echo "@@@STEP_WARNINGS@@@"
-    return
-  fi
-  return $extract_exit_code
-  )
-}
-
-# Reboot all phones and wait for them to start back up
-# Does not break build if a phone fails to restart
-function bb_reboot_phones {
-  echo "@@@BUILD_STEP Rebooting phones@@@"
-  (
-  set +e
-  cd $CHROME_SRC/build/android/pylib;
-  for DEVICE in $(adb_get_devices); do
-    python -c "import android_commands;\
-        android_commands.AndroidCommands(device='$DEVICE').Reboot(True)" &
-  done
-  wait
-  )
-}
-
-# Runs the license checker for the WebView build.
-function bb_check_webview_licenses {
-  echo "@@@BUILD_STEP Check licenses for WebView@@@"
-  (
-  set +e
-  cd "${SRC_ROOT}"
-  python android_webview/tools/webview_licenses.py scan
-  local license_exit_code=$?
-  if [[ license_exit_code -ne 0 ]]; then
-    echo "@@@STEP_FAILURE@@@"
-  fi
-  return $license_exit_code
-  )
-}
-
-# Retrieve a packed json property using python
-function bb_get_json_prop {
-  local JSON="$1"
-  local PROP="$2"
-
-  python -c "import json; print json.loads('$JSON').get('$PROP')"
-}
diff --git a/build/android/buildbot_fyi_builder.sh b/build/android/buildbot_fyi_builder.sh
index 3fa3c7f..627d417 100755
--- a/build/android/buildbot_fyi_builder.sh
+++ b/build/android/buildbot_fyi_builder.sh
@@ -1,20 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for the FYI waterfall builder.
-# Compiler and zip the build.
 
-# SHERIFF: there should be no need to disable this bot.
-# The FYI waterfall does not close the tree.
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_check_webview_licenses
-bb_compile
-bb_compile_experimental
-bb_zip_build
+exec $(dirname $0)/buildbot/bb_fyi_builder.sh "$@"
diff --git a/build/android/buildbot_fyi_tester.sh b/build/android/buildbot_fyi_tester.sh
index 9d123af..476e7f5 100755
--- a/build/android/buildbot_fyi_tester.sh
+++ b/build/android/buildbot_fyi_tester.sh
@@ -1,19 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for a FYI waterfall tester.
-# Downloads and extracts a build from the builder and runs tests.
 
-# SHERIFF: there should be no need to disable this bot.
-# The FYI waterfall does not close the tree.
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_extract_build
-bb_reboot_phones
-bb_run_unit_tests
-bb_run_instrumentation_tests
+exec $(dirname $0)/buildbot/bb_fyi_tester.sh "$@"
diff --git a/build/android/buildbot_main.sh b/build/android/buildbot_main.sh
index 5df5b24..7d76c22 100755
--- a/build/android/buildbot_main.sh
+++ b/build/android/buildbot_main.sh
@@ -1,19 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for the main waterfall.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-# SHERIFF: if you need to quickly turn the main waterfall android bots
-# green (preventing tree closures), uncomment the next line (and send
-# appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_compile
-bb_zip_build
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
+exec $(dirname $0)/buildbot/bb_main_builder.sh "$@"
diff --git a/build/android/buildbot_main_tester.sh b/build/android/buildbot_main_tester.sh
deleted file mode 100755
index 0593b15..0000000
--- a/build/android/buildbot_main_tester.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -ex
-# 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.
-#
-# Buildbot annotator script for the main waterfall.  Tester only.
-
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-# SHERIFF: if you need to quickly turn the main waterfall android bots
-# green (preventing tree closures), uncomment the next line (and send
-# appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_extract_build
-bb_reboot_phones
-bb_run_unit_tests
diff --git a/build/android/buildbot_try_builder.sh b/build/android/buildbot_try_builder.sh
index c68c456..170a423 100755
--- a/build/android/buildbot_try_builder.sh
+++ b/build/android/buildbot_try_builder.sh
@@ -1,19 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for trybots.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-# SHERIFF: if you need to quickly turn "android" trybots green,
-# uncomment the next line (and send appropriate email out):
-## bb_force_bot_green_and_exit
-# You will also need to change buildbot_try_tester.sh
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_check_webview_licenses
-bb_compile
-bb_zip_build
+exec $(dirname $0)/buildbot/bb_try_builder.sh "$@"
diff --git a/build/android/buildbot_try_compile.sh b/build/android/buildbot_try_compile.sh
index 0e78beb..b3b6067 100755
--- a/build/android/buildbot_try_compile.sh
+++ b/build/android/buildbot_try_compile.sh
@@ -1,17 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for trybots.  Compile only.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-# SHERIFF: if you need to quickly turn "android" trybots green,
-# uncomment the next line (and send appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_check_webview_licenses
-bb_compile
+exec $(dirname $0)/buildbot/bb_try_compile.sh "$@"
diff --git a/build/android/buildbot_try_compile_test.sh b/build/android/buildbot_try_compile_test.sh
index 1247d92..4bb7615 100755
--- a/build/android/buildbot_try_compile_test.sh
+++ b/build/android/buildbot_try_compile_test.sh
@@ -1,19 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for trybots.  Compile and test.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-# SHERIFF: if you need to quickly turn "android_test" trybots green,
-# uncomment the next line (and send appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_compile
-bb_reboot_phones
-bb_run_unit_tests
-bb_run_instrumentation_tests
+exec $(dirname $0)/buildbot/bb_try_compile_test.sh "$@"
diff --git a/build/android/buildbot_try_tester.sh b/build/android/buildbot_try_tester.sh
index da476dd..1be48c4 100755
--- a/build/android/buildbot_try_tester.sh
+++ b/build/android/buildbot_try_tester.sh
@@ -1,19 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for tester half of android trybots
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
 
-# SHERIFF: if you need to quickly turn "android" trybots green,
-# uncomment the next line (and send appropriate email out):
-## bb_force_bot_green_and_exit
-# You will also need to change buildbot_try_builder.sh
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_extract_build
-bb_reboot_phones
-bb_run_unit_tests
-bb_run_instrumentation_tests
+exec $(dirname $0)/buildbot/bb_try_tester.sh "$@"
diff --git a/build/android/buildbot_webkit_main.sh b/build/android/buildbot_webkit_main.sh
index cfd7ed5..50761d0 100755
--- a/build/android/buildbot_webkit_main.sh
+++ b/build/android/buildbot_webkit_main.sh
@@ -1,18 +1,9 @@
-#!/bin/bash -ex
+#!/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.
-#
-# Buildbot annotator script for the WebKit builder on the Canary waterfall.
 
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
+# Temporary placeholders to call new buildbot script locations until
+# buildbot master config can be pointed to new location.
 
-# SHERIFF: if you need to quickly turn the main waterfall android bots
-# green (preventing tree closures), uncomment the next line (and send
-# appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_compile
-bb_zip_build
+exec $(dirname $0)/buildbot/bb_webkit_latest_builder.sh "$@"
diff --git a/build/android/buildbot_webkit_tester.sh b/build/android/buildbot_webkit_tester.sh
deleted file mode 100755
index 07f688e..0000000
--- a/build/android/buildbot_webkit_tester.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -ex
-# 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.
-#
-# Buildbot annotator script for the WebKit tester on the Canary waterfall.
-
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-# SHERIFF: if you need to quickly turn the main waterfall android bots
-# green (preventing tree closures), uncomment the next line (and send
-# appropriate email out):
-## bb_force_bot_green_and_exit
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_extract_build
-bb_reboot_phones
-bb_run_unit_tests