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

Side by Side Diff: mojo/devtools/common/mojo_run

Issue 1259253002: Fix adb path being used in `mojo_run`. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 4 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/devtools/common/devtoolslib/shell_arguments.py ('k') | no next file » | 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 devtoolslib import paths 10 from devtoolslib import paths
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if mojo_paths: 85 if mojo_paths:
86 if script_args.android and not script_args.adb_path: 86 if script_args.android and not script_args.adb_path:
87 script_args.adb_path = mojo_paths['adb'] 87 script_args.adb_path = mojo_paths['adb']
88 if script_args.android and not script_args.origin_path: 88 if script_args.android and not script_args.origin_path:
89 script_args.origin_path = mojo_paths['build'] 89 script_args.origin_path = mojo_paths['build']
90 if not script_args.shell_path: 90 if not script_args.shell_path:
91 script_args.shell_path = mojo_paths['shell'] 91 script_args.shell_path = mojo_paths['shell']
92 92
93 if script_args.verbose: 93 if script_args.verbose:
94 print 'Running within a Chromium-style checkout.' 94 print 'Running within a Chromium-style checkout.'
95 print 'Using the locally built shell at ' + script_args.shell_path 95 print ' - using the locally built shell at ' + script_args.shell_path
96 if script_args.origin_path: 96 if script_args.origin_path:
97 print 'Using the local origin of ' + script_args.origin_path 97 print ' - using the local origin of ' + script_args.origin_path
98 if script_args.android:
99 print ' - using adb path of ' + script_args.adb_path
98 elif script_args.verbose: 100 elif script_args.verbose:
99 print 'Running outside a Chromium-style checkout.' 101 print 'Running outside a Chromium-style checkout.'
100 102
101 try: 103 try:
102 shell, shell_args = shell_arguments.ConfigureShell(script_args, shell_args) 104 shell, shell_args = shell_arguments.ConfigureShell(script_args, shell_args)
103 except shell_arguments.ShellConfigurationException as e: 105 except shell_arguments.ShellConfigurationException as e:
104 print e 106 print e
105 return 1 107 return 1
106 108
107 if not script_args.no_debugger: 109 if not script_args.no_debugger:
(...skipping 18 matching lines...) Expand all
126 128
127 if script_args.verbose: 129 if script_args.verbose:
128 print "Shell arguments: " + str(shell_args) 130 print "Shell arguments: " + str(shell_args)
129 131
130 shell.Run(shell_args) 132 shell.Run(shell_args)
131 return 0 133 return 0
132 134
133 135
134 if __name__ == "__main__": 136 if __name__ == "__main__":
135 sys.exit(main()) 137 sys.exit(main())
OLDNEW
« no previous file with comments | « mojo/devtools/common/devtoolslib/shell_arguments.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698