From 8c4474b9eaca88cc2dd3aced013587d95e1d4b58 Mon Sep 17 00:00:00 2001
From: "ilevy@chromium.org"
<ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 25 Sep 2012 20:18:02 +0000
Subject: Cleanup android builder clobber step
- on clobbers, the clobber step title was overriding much of envsetup
- removed unneeded NEED_CLOBBER var.
TBR=yaron
BUG=
Review URL: https://codereview.chromium.org/10981027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158638 0039d316-1c4b-4281-b951-d872f2087c98
---
build/android/buildbot/buildbot_functions.sh | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
(limited to 'build')
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index cc145cf..d261e7f 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -10,10 +10,6 @@
# 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 {
@@ -50,25 +46,12 @@ function bb_run_gclient_hooks {
# $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
-
-
- local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
- if [[ $BUILDTOOL = ninja ]]; then
- export GYP_GENERATORS=ninja
- fi
- if [ "$NEED_CLOBBER" -eq 1 ]; then
+ if [[ $BUILDBOT_CLOBBER ]]; then
echo "@@@BUILD_STEP Clobber@@@"
# Sdk key expires, delete android folder.
# crbug.com/145860
@@ -80,6 +63,13 @@ function bb_baseline_setup {
fi
fi
+ echo "@@@BUILD_STEP Environment setup@@@"
+ bb_parse_args "$@"
+
+ local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
+ if [[ $BUILDTOOL = ninja ]]; then
+ export GYP_GENERATORS=ninja
+ fi
bb_setup_goma_internal
. build/android/envsetup.sh
export GYP_DEFINES+=" fastbuild=1"
--
cgit v1.1