summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpilch <cpilch@google.com>2017-03-27 19:04:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 19:04:57 +0000
commitdb546ad396cb6c4c2d2654e4e00c643cc04b8429 (patch)
tree9db69abc2ea133488bb63fb18eab2c3b2c9b3037
parent906732c3ec5f53e86e93b3874207f1cdcf773641 (diff)
parent22e3a123739e6132e662d36ff8dae7ee2abb4059 (diff)
downloadadt-infra-db546ad396cb6c4c2d2654e4e00c643cc04b8429.tar.gz
Pass --iswindows flag when on Windows for ADB am: 1eb513c544 am: a931634790
am: 22e3a12373 Change-Id: I59fa4f76737bb7108321d839f6114a240d5edb1f
-rw-r--r--build/scripts/slave/recipes/adt/adb.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/scripts/slave/recipes/adt/adb.py b/build/scripts/slave/recipes/adt/adb.py
index 807cb87a..17c28312 100644
--- a/build/scripts/slave/recipes/adt/adb.py
+++ b/build/scripts/slave/recipes/adt/adb.py
@@ -60,6 +60,8 @@ def RunSteps(api):
'--dst', '%s%s/' % (logs_dir, buildername),
'--build-dir', build_dir,
'--skiplog']
+ if api.platform.is_win:
+ upload_log_args.append('--iswindows')
api.python("Zip and Upload Logs", log_util_path, upload_log_args)
def GenTests(api):