summaryrefslogtreecommitdiffstats
path: root/mandoline/tools
diff options
context:
space:
mode:
authorsadrul <sadrul@chromium.org>2015-07-30 09:54:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 16:55:33 +0000
commit9d2da8ce22f724f17b6e2125eb99e704a53d8f17 (patch)
tree15f01dab8b7579b8ada90dcdce5c8129b2a54e2f /mandoline/tools
parent632247ab88b66a6fe424a0a38d22b7623775468c (diff)
downloadchromium_src-9d2da8ce22f724f17b6e2125eb99e704a53d8f17.zip
chromium_src-9d2da8ce22f724f17b6e2125eb99e704a53d8f17.tar.gz
chromium_src-9d2da8ce22f724f17b6e2125eb99e704a53d8f17.tar.bz2
mandoline: Fix install/run scripts for android after r341065.
http://crrev.com/341065 removed the origin parameter from AndroidShell.InitShell, but the mandoline scripts were not updated for this. Fix that here. BUG=498020 Review URL: https://codereview.chromium.org/1270563002 Cr-Commit-Position: refs/heads/master@{#341136}
Diffstat (limited to 'mandoline/tools')
-rwxr-xr-xmandoline/tools/android/install_mandoline.py2
-rwxr-xr-xmandoline/tools/android/run_mandoline.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mandoline/tools/android/install_mandoline.py b/mandoline/tools/android/install_mandoline.py
index 0f9387e..e8da2af 100755
--- a/mandoline/tools/android/install_mandoline.py
+++ b/mandoline/tools/android/install_mandoline.py
@@ -39,7 +39,7 @@ def main():
is_debug=runner_args.debug,
apk_name='Mandoline.apk')
shell = AndroidShell(config)
- shell.InitShell(None, runner_args.device)
+ shell.InitShell(runner_args.device)
return 0
diff --git a/mandoline/tools/android/run_mandoline.py b/mandoline/tools/android/run_mandoline.py
index cf9139d..9e5255f 100755
--- a/mandoline/tools/android/run_mandoline.py
+++ b/mandoline/tools/android/run_mandoline.py
@@ -69,7 +69,7 @@ def main():
is_debug=runner_args.debug,
apk_name='Mandoline.apk')
shell = AndroidShell(config)
- shell.InitShell(None, runner_args.device)
+ shell.InitShell(runner_args.device)
p = shell.ShowLogs()
temp_gdb_dir = None