Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: mojo/tools/android_mojo_shell.py

Issue 1057603003: Simplify mojo_shell since it's now only used for Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update scripts Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/shell/url_resolver_unittest.cc ('k') | mojo/tools/apptest_runner.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.config import Config 10 from mopy.config import Config
11 from mopy import android 11 from mopy import android
12 12
13 USAGE = ("android_mojo_shell.py "
14 "[--args-for=<mojo-app>] "
15 "[--content-handlers=<handlers>] "
16 "[--enable-external-applications] "
17 "[--disable-cache] "
18 "[--enable-multiprocess] "
19 "[--url-mappings=from1=to1,from2=to2] "
20 "[<mojo-app>] "
21 """
22
23 A <mojo-app> is a Mojo URL or a Mojo URL and arguments within quotes.
24 Example: mojo_shell "mojo:js_standalone test.js".
25 <url-lib-path> is searched for shared libraries named by mojo URLs.
26 The value of <handlers> is a comma separated list like:
27 text/html,mojo:html_viewer,application/javascript,mojo:js_content_handler
28 """)
29
30
31 def main(): 13 def main():
32 logging.basicConfig() 14 logging.basicConfig()
33 15
34 parser = argparse.ArgumentParser(usage=USAGE) 16 parser = argparse.ArgumentParser("Helper for running mojo_shell")
35 17
36 debug_group = parser.add_mutually_exclusive_group() 18 debug_group = parser.add_mutually_exclusive_group()
37 debug_group.add_argument('--debug', help='Debug build (default)', 19 debug_group.add_argument('--debug', help='Debug build (default)',
38 default=True, action='store_true') 20 default=True, action='store_true')
39 debug_group.add_argument('--release', help='Release build', default=False, 21 debug_group.add_argument('--release', help='Release build', default=False,
40 dest='debug', action='store_false') 22 dest='debug', action='store_false')
41 parser.add_argument('--target-cpu', help='CPU architecture to run for.', 23 parser.add_argument('--target-cpu', help='CPU architecture to run for.',
42 choices=['x64', 'x86', 'arm']) 24 choices=['x64', 'x86', 'arm'])
43 parser.add_argument('--origin', help='Origin for mojo: URLs.') 25 parser.add_argument('--origin', help='Origin for mojo: URLs.')
44 launcher_args, args = parser.parse_known_args() 26 launcher_args, args = parser.parse_known_args()
45 27
46 config = Config(target_os=Config.OS_ANDROID, 28 config = Config(target_os=Config.OS_ANDROID,
47 target_cpu=launcher_args.target_cpu, 29 target_cpu=launcher_args.target_cpu,
48 is_debug=launcher_args.debug) 30 is_debug=launcher_args.debug)
49 31
50 extra_shell_args = android.PrepareShellRun(config, launcher_args.origin) 32 extra_shell_args = android.PrepareShellRun(config, launcher_args.origin)
51 args.extend(extra_shell_args) 33 args.extend(extra_shell_args)
52 34
53 android.CleanLogs() 35 android.CleanLogs()
54 p = android.ShowLogs() 36 p = android.ShowLogs()
55 android.StartShell(args, sys.stdout, p.terminate) 37 android.StartShell(args, sys.stdout, p.terminate)
56 return 0 38 return 0
57 39
58 40
59 if __name__ == "__main__": 41 if __name__ == "__main__":
60 sys.exit(main()) 42 sys.exit(main())
OLDNEW
« no previous file with comments | « mojo/shell/url_resolver_unittest.cc ('k') | mojo/tools/apptest_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698