summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Pilch <cpilch@google.com>2017-03-01 20:00:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-01 20:00:13 +0000
commit179f3947ded8c54cc23179a7bdbb467aaffb8355 (patch)
tree65be8e6b4622aa55db8411d052f371cf88b9db36
parent1137982aec1109c2a72a3c3139a4091be1c59b54 (diff)
parent0e14bebc9161232cdb330defd24337b3b58c752e (diff)
downloadadt-infra-179f3947ded8c54cc23179a7bdbb467aaffb8355.tar.gz
Merge "Revert "Fixes windows error introduced in CL 345105""
-rw-r--r--build/scripts/slave/recipes/adt/adb.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/scripts/slave/recipes/adt/adb.py b/build/scripts/slave/recipes/adt/adb.py
index 17c28312..9e94d77b 100644
--- a/build/scripts/slave/recipes/adt/adb.py
+++ b/build/scripts/slave/recipes/adt/adb.py
@@ -61,7 +61,7 @@ def RunSteps(api):
'--build-dir', build_dir,
'--skiplog']
if api.platform.is_win:
- upload_log_args.append('--iswindows')
+ upload_log_args['--iswindows'] = True
api.python("Zip and Upload Logs", log_util_path, upload_log_args)
def GenTests(api):