diff options
| author | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 20:18:02 +0000 |
|---|---|---|
| committer | ilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 20:18:02 +0000 |
| commit | 8c4474b9eaca88cc2dd3aced013587d95e1d4b58 (patch) | |
| tree | 5184a0ecaf71fe87bc7299819c4bc0e743f45f1e /build | |
| parent | fcc0158bf1b9df2a9ad07b222ff75f26d4b6fa06 (diff) | |
| download | chromium_src-8c4474b9eaca88cc2dd3aced013587d95e1d4b58.zip chromium_src-8c4474b9eaca88cc2dd3aced013587d95e1d4b58.tar.gz chromium_src-8c4474b9eaca88cc2dd3aced013587d95e1d4b58.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/buildbot_functions.sh | 26 |
1 files changed, 8 insertions, 18 deletions
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" |