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 from mopy.android import AndroidShell |
(...skipping 22 matching lines...) Expand all Loading... |
33 logger = logging.getLogger() | 33 logger = logging.getLogger() |
34 logging.basicConfig(stream=sys.stdout, format="%(levelname)s:%(message)s") | 34 logging.basicConfig(stream=sys.stdout, format="%(levelname)s:%(message)s") |
35 logger.setLevel(logging.DEBUG if runner_args.verbose else logging.WARNING) | 35 logger.setLevel(logging.DEBUG if runner_args.verbose else logging.WARNING) |
36 logger.debug("Initialized logging: level=%s" % logger.level) | 36 logger.debug("Initialized logging: level=%s" % logger.level) |
37 | 37 |
38 config = Config(target_os=Config.OS_ANDROID, | 38 config = Config(target_os=Config.OS_ANDROID, |
39 target_cpu=runner_args.target_cpu, | 39 target_cpu=runner_args.target_cpu, |
40 is_debug=runner_args.debug, | 40 is_debug=runner_args.debug, |
41 apk_name="MojoRunner.apk") | 41 apk_name="MojoRunner.apk") |
42 shell = AndroidShell(config) | 42 shell = AndroidShell(config) |
43 args.extend(shell.PrepareShellRun(runner_args.origin, runner_args.device)) | 43 shell.InitShell(runner_args.origin, runner_args.device) |
44 | |
45 shell.CleanLogs() | |
46 p = shell.ShowLogs() | 44 p = shell.ShowLogs() |
47 shell.StartShell(args, sys.stdout, p.terminate) | 45 shell.StartShell(args, sys.stdout, p.terminate) |
48 return 0 | 46 return 0 |
49 | 47 |
50 | 48 |
51 if __name__ == "__main__": | 49 if __name__ == "__main__": |
52 sys.exit(main()) | 50 sys.exit(main()) |
OLD | NEW |