Index: mandoline/tools/android_run_mandoline.py |
diff --git a/mandoline/tools/android_run_mandoline.py b/mandoline/tools/android_run_mandoline.py |
index d5540a4854fd9cf7ad414d0c27bb1634a7e2e76b..71ac9ad3a4529b993abfaa77981261b5d78ba03f 100755 |
--- a/mandoline/tools/android_run_mandoline.py |
+++ b/mandoline/tools/android_run_mandoline.py |
@@ -9,7 +9,7 @@ import os |
import sys |
sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname(__file__)), |
- '../../mojo/tools')) |
+ os.pardir, os.pardir, 'mojo', 'tools')) |
from mopy.android import AndroidShell |
from mopy.config import Config |
@@ -38,9 +38,7 @@ def main(): |
is_debug=runner_args.debug, |
apk_name="Mandoline.apk") |
shell = AndroidShell(config) |
- args.extend(shell.PrepareShellRun(None, runner_args.device, runner_args.gdb)) |
- |
- shell.CleanLogs() |
+ shell.InitShell(None, runner_args.device) |
p = shell.ShowLogs() |
shell.StartShell(args, sys.stdout, p.terminate, runner_args.gdb) |
return 0 |