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 os | 8 import os |
9 import sys | 9 import sys |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... | |
23 parser = argparse.ArgumentParser(usage=USAGE) | 23 parser = argparse.ArgumentParser(usage=USAGE) |
24 | 24 |
25 debug_group = parser.add_mutually_exclusive_group() | 25 debug_group = parser.add_mutually_exclusive_group() |
26 debug_group.add_argument('--debug', help='Debug build (default)', | 26 debug_group.add_argument('--debug', help='Debug build (default)', |
27 default=True, action='store_true') | 27 default=True, action='store_true') |
28 debug_group.add_argument('--release', help='Release build', default=False, | 28 debug_group.add_argument('--release', help='Release build', default=False, |
29 dest='debug', action='store_false') | 29 dest='debug', action='store_false') |
30 parser.add_argument('--target-cpu', help='CPU architecture to run for.', | 30 parser.add_argument('--target-cpu', help='CPU architecture to run for.', |
31 choices=['x64', 'x86', 'arm'], default='arm') | 31 choices=['x64', 'x86', 'arm'], default='arm') |
32 parser.add_argument('--target-device', help='Device to run on.') | 32 parser.add_argument('--target-device', help='Device to run on.') |
33 parser.add_argument('--dont-install', | |
msw
2015/05/22 02:41:43
q: just curious, is this needed or just for effici
sky
2015/05/22 17:27:24
For efficiency. If you're doing a bunch of debuggi
msw
2015/05/22 17:52:52
This may not be needed after Jay's CL to install a
| |
34 help='Disables installing the apk', | |
35 default=False, action='store_true') | |
36 parser.add_argument('--gdb', help='Run gdb', | |
37 default=False, action='store_true') | |
33 launcher_args, args = parser.parse_known_args() | 38 launcher_args, args = parser.parse_known_args() |
34 | 39 |
35 config = Config(target_os=Config.OS_ANDROID, | 40 config = Config(target_os=Config.OS_ANDROID, |
36 target_cpu=launcher_args.target_cpu, | 41 target_cpu=launcher_args.target_cpu, |
37 is_debug=launcher_args.debug, | 42 is_debug=launcher_args.debug, |
38 apk_name="Mandoline.apk") | 43 apk_name="Mandoline.apk") |
39 paths = Paths(config) | 44 paths = Paths(config) |
40 shell = AndroidShell(paths.mojo_runner, paths.build_dir, paths.adb_path, | 45 shell = AndroidShell(paths.mojo_runner, paths.build_dir, paths.adb_path, |
41 launcher_args.target_device, | 46 launcher_args.target_device, |
42 target_package='org.chromium.mandoline') | 47 target_package='org.chromium.mandoline', |
48 src_root=paths.src_root) | |
43 | 49 |
44 extra_shell_args = shell.PrepareShellRun() | 50 if launcher_args.gdb: |
51 shell.PrepareGdb() | |
52 | |
53 extra_shell_args = shell.PrepareShellRun( | |
54 install=not launcher_args.dont_install) | |
45 args.extend(extra_shell_args) | 55 args.extend(extra_shell_args) |
46 | 56 |
47 shell.CleanLogs() | 57 shell.CleanLogs() |
48 p = shell.ShowLogs() | 58 p = shell.ShowLogs() |
49 shell.StartShell(args, sys.stdout, p.terminate) | 59 shell.StartShell(args, sys.stdout, p.terminate, gdb=launcher_args.gdb) |
msw
2015/05/22 02:41:43
nit: you don't actually need "gdb=" here
sky
2015/05/22 17:27:24
Done.
| |
50 return 0 | 60 return 0 |
51 | 61 |
52 | 62 |
53 if __name__ == "__main__": | 63 if __name__ == "__main__": |
54 sys.exit(main()) | 64 sys.exit(main()) |
OLD | NEW |