summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpilch <cpilch@google.com>2017-03-30 22:14:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-30 22:14:39 +0000
commit3108f3d59c0f624375be3c44195b904c701e4b99 (patch)
treeb6a9fd70a8c242956d555f71a0a2689e9cdea59d
parent757f81789d82e606493648467ef817f8abdb14d3 (diff)
parent0254b1cc2042be54915621fc50d5972aeb86e722 (diff)
downloadadt-infra-3108f3d59c0f624375be3c44195b904c701e4b99.tar.gz
am: 0254b1cc20 Change-Id: I0791e7d7e8c6ea03b1e4941fc3b99352899589ae
-rwxr-xr-xbuild/scripts/slave/annotated_run.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/scripts/slave/annotated_run.py b/build/scripts/slave/annotated_run.py
index b1ab163b..b51b2bb0 100755
--- a/build/scripts/slave/annotated_run.py
+++ b/build/scripts/slave/annotated_run.py
@@ -182,8 +182,9 @@ def update_scripts():
git_cmd = 'git.bat' if os.name == "nt" else 'git'
with stream.step('update_scripts') as s:
fetch_cmd = [git_cmd, 'fetch', '--all']
- reset_cmd = [git_cmd, 'reset', '--hard', 'origin/master']
- if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0:
+ reset_cmd = [git_cmd, 'reset', '--hard', 'origin/emu-master-dev']
+ checkout_cmd = [git_cmd, 'checkout', 'emu-master-dev']
+ if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0 or subprocess.call(checkout_cmd) != 0:
s.step_text('git update source failed!')
s.step_warnings()
s.step_text('git pull')