| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 | 285 |
| 286 | 286 |
| 287 class AndroidPort(base.Port): | 287 class AndroidPort(base.Port): |
| 288 port_name = 'android' | 288 port_name = 'android' |
| 289 | 289 |
| 290 # Avoid initializing the adb path [worker count]+1 times by storing it as a
static member. | 290 # Avoid initializing the adb path [worker count]+1 times by storing it as a
static member. |
| 291 _adb_path = None | 291 _adb_path = None |
| 292 | 292 |
| 293 SUPPORTED_VERSIONS = ('android') | 293 SUPPORTED_VERSIONS = ('android') |
| 294 | 294 |
| 295 FALLBACK_PATHS = {'icecreamsandwich': ['android'] + linux.LinuxPort.latest_p
latform_fallback_path()} | 295 FALLBACK_PATHS = {'kitkat': ['android'] + linux.LinuxPort.latest_platform_fa
llback_path()} |
| 296 | 296 |
| 297 BUILD_REQUIREMENTS_URL = 'https://www.chromium.org/developers/how-tos/androi
d-build-instructions' | 297 BUILD_REQUIREMENTS_URL = 'https://www.chromium.org/developers/how-tos/androi
d-build-instructions' |
| 298 | 298 |
| 299 def __init__(self, host, port_name, **kwargs): | 299 def __init__(self, host, port_name, **kwargs): |
| 300 _import_android_packages_if_necessary() | 300 _import_android_packages_if_necessary() |
| 301 super(AndroidPort, self).__init__(host, port_name, **kwargs) | 301 super(AndroidPort, self).__init__(host, port_name, **kwargs) |
| 302 | 302 |
| 303 self._operating_system = 'android' | 303 self._operating_system = 'android' |
| 304 self._version = 'icecreamsandwich' | 304 self._version = 'kitkat' |
| 305 | 305 |
| 306 self._host_port = factory.PortFactory(host).get(**kwargs) | 306 self._host_port = factory.PortFactory(host).get(**kwargs) |
| 307 self.server_process_constructor = self._android_server_process_construct
or | 307 self.server_process_constructor = self._android_server_process_construct
or |
| 308 | 308 |
| 309 if not self.get_option('disable_breakpad'): | 309 if not self.get_option('disable_breakpad'): |
| 310 self._dump_reader = DumpReaderAndroid(host, self._build_path()) | 310 self._dump_reader = DumpReaderAndroid(host, self._build_path()) |
| 311 | 311 |
| 312 if self.driver_name() != self.CONTENT_SHELL_NAME: | 312 if self.driver_name() != self.CONTENT_SHELL_NAME: |
| 313 raise AssertionError('Layout tests on Android only support content_s
hell as the driver.') | 313 raise AssertionError('Layout tests on Android only support content_s
hell as the driver.') |
| 314 | 314 |
| (...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 return command | 1125 return command |
| 1126 | 1126 |
| 1127 def _read_prompt(self, deadline): | 1127 def _read_prompt(self, deadline): |
| 1128 last_char = '' | 1128 last_char = '' |
| 1129 while True: | 1129 while True: |
| 1130 current_char = self._server_process.read_stdout(deadline, 1) | 1130 current_char = self._server_process.read_stdout(deadline, 1) |
| 1131 if current_char == ' ': | 1131 if current_char == ' ': |
| 1132 if last_char in ('#', '$'): | 1132 if last_char in ('#', '$'): |
| 1133 return | 1133 return |
| 1134 last_char = current_char | 1134 last_char = current_char |
| OLD | NEW |