diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 20:50:24 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 20:50:24 +0000 |
| commit | 5f5e52d133f5c1f61c353a7737158c7b09cf2aa0 (patch) | |
| tree | b9677628644861043c46a63f9d4465bfcaede857 /build | |
| parent | 5378d79012fc21aad9df86c7502f0b8cf4daf8f3 (diff) | |
| download | chromium_src-5f5e52d133f5c1f61c353a7737158c7b09cf2aa0.zip chromium_src-5f5e52d133f5c1f61c353a7737158c7b09cf2aa0.tar.gz chromium_src-5f5e52d133f5c1f61c353a7737158c7b09cf2aa0.tar.bz2 | |
Delete ~/.android only on clobber.
We need ContentShell and ContentShellTest apks to be built with the same
keys.
BUG=crbug.com/145860
Review URL: https://chromiumcodereview.appspot.com/10912053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot_functions.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh index 064fa1c..dc64437 100755 --- a/build/android/buildbot_functions.sh +++ b/build/android/buildbot_functions.sh @@ -88,6 +88,9 @@ function bb_baseline_setup { 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." @@ -95,10 +98,6 @@ function bb_baseline_setup { fi fi - # Sdk key expires, delete android folder to be sure it is fresh - # crbug.com/145860 - rm -rf ~/.android - # Should be called only after envsetup is done. bb_run_gclient_hooks } |