| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import argparse | 6 import argparse |
| 7 import logging | 7 import logging |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 from mopy.android import AndroidShell | 10 import devtools |
| 11 devtools.add_pylib_to_path() |
| 12 from pylib.android import AndroidShell |
| 13 |
| 11 from mopy.config import Config | 14 from mopy.config import Config |
| 12 from mopy.paths import Paths | 15 from mopy.paths import Paths |
| 13 | 16 |
| 14 USAGE = ("android_mojo_shell.py " | 17 USAGE = ("android_mojo_shell.py " |
| 15 "[--args-for=<mojo-app>] " | 18 "[--args-for=<mojo-app>] " |
| 16 "[--content-handlers=<handlers>] " | 19 "[--content-handlers=<handlers>] " |
| 17 "[--enable-external-applications] " | 20 "[--enable-external-applications] " |
| 18 "[--disable-cache] " | 21 "[--disable-cache] " |
| 19 "[--enable-multiprocess] " | 22 "[--enable-multiprocess] " |
| 20 "[--url-mappings=from1=to1,from2=to2] " | 23 "[--url-mappings=from1=to1,from2=to2] " |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 args.extend(extra_shell_args) | 58 args.extend(extra_shell_args) |
| 56 | 59 |
| 57 shell.CleanLogs() | 60 shell.CleanLogs() |
| 58 p = shell.ShowLogs() | 61 p = shell.ShowLogs() |
| 59 shell.StartShell(args, sys.stdout, p.terminate) | 62 shell.StartShell(args, sys.stdout, p.terminate) |
| 60 return 0 | 63 return 0 |
| 61 | 64 |
| 62 | 65 |
| 63 if __name__ == "__main__": | 66 if __name__ == "__main__": |
| 64 sys.exit(main()) | 67 sys.exit(main()) |
| OLD | NEW |