| 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 from skypy.skyserver import SkyServer | 6 from skypy.skyserver import SkyServer |
| 7 import argparse | 7 import argparse |
| 8 import json | 8 import json |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 if is_android: | 124 if is_android: |
| 125 shell_args += ['--origin=%s' % build_dir_url] | 125 shell_args += ['--origin=%s' % build_dir_url] |
| 126 | 126 |
| 127 # Desktop-only work-around for mojo crashing under chromoting. | 127 # Desktop-only work-around for mojo crashing under chromoting. |
| 128 if not is_android and args.use_osmesa: | 128 if not is_android and args.use_osmesa: |
| 129 shell_args.append( | 129 shell_args.append( |
| 130 '--args-for=mojo:native_viewport_service --use-osmesa') | 130 '--args-for=mojo:native_viewport_service --use-osmesa') |
| 131 | 131 |
| 132 if is_android and args.gdb: | 132 if is_android and args.gdb: |
| 133 shell_args.append('--wait-for-debugger') | 133 shell_args.append('--wait-for-debugger') |
| 134 shell_args.append('--predictable-app-filenames') |
| 134 | 135 |
| 135 if 'remote_sky_server_port' in self.pids: | 136 if 'remote_sky_server_port' in self.pids: |
| 136 shell_command = self._wrap_for_android(shell_args) | 137 shell_command = self._wrap_for_android(shell_args) |
| 137 else: | 138 else: |
| 138 shell_command = [self.paths.mojo_shell_path] + shell_args | 139 shell_command = [self.paths.mojo_shell_path] + shell_args |
| 139 | 140 |
| 140 return shell_command | 141 return shell_command |
| 141 | 142 |
| 142 def sky_server_for_args(self, args, packages_root): | 143 def sky_server_for_args(self, args, packages_root): |
| 143 # FIXME: This is a hack. sky_server should just take a build_dir | 144 # FIXME: This is a hack. sky_server should just take a build_dir |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 load_parser.set_defaults(func=self.load_command) | 610 load_parser.set_defaults(func=self.load_command) |
| 610 | 611 |
| 611 args = parser.parse_args() | 612 args = parser.parse_args() |
| 612 args.func(args) | 613 args.func(args) |
| 613 | 614 |
| 614 self._write_pid_file(PID_FILE_PATH, self.pids) | 615 self._write_pid_file(PID_FILE_PATH, self.pids) |
| 615 | 616 |
| 616 | 617 |
| 617 if __name__ == '__main__': | 618 if __name__ == '__main__': |
| 618 SkyDebugger().main() | 619 SkyDebugger().main() |
| OLD | NEW |