| 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 # Avoid initializing the adb path [worker count]+1 times by storing it as a
static member. | 405 # Avoid initializing the adb path [worker count]+1 times by storing it as a
static member. |
| 406 _adb_path = None | 406 _adb_path = None |
| 407 | 407 |
| 408 SUPPORTED_VERSIONS = ('android') | 408 SUPPORTED_VERSIONS = ('android') |
| 409 | 409 |
| 410 FALLBACK_PATHS = {'icecreamsandwich': ['android'] + linux.LinuxPort.latest_p
latform_fallback_path()} | 410 FALLBACK_PATHS = {'icecreamsandwich': ['android'] + linux.LinuxPort.latest_p
latform_fallback_path()} |
| 411 | 411 |
| 412 # Android has aac and mp3 codecs built in. | 412 # Android has aac and mp3 codecs built in. |
| 413 PORT_HAS_AUDIO_CODECS_BUILT_IN = True | 413 PORT_HAS_AUDIO_CODECS_BUILT_IN = True |
| 414 | 414 |
| 415 BUILD_REQUIREMENTS_URL = 'https://code.google.com/p/chromium/wiki/AndroidBui
ldInstructions' |
| 416 |
| 415 def __init__(self, host, port_name, **kwargs): | 417 def __init__(self, host, port_name, **kwargs): |
| 416 super(AndroidPort, self).__init__(host, port_name, **kwargs) | 418 super(AndroidPort, self).__init__(host, port_name, **kwargs) |
| 417 | 419 |
| 418 self._operating_system = 'android' | 420 self._operating_system = 'android' |
| 419 self._version = 'icecreamsandwich' | 421 self._version = 'icecreamsandwich' |
| 420 | 422 |
| 421 self._host_port = factory.PortFactory(host).get('chromium', **kwargs) | 423 self._host_port = factory.PortFactory(host).get('chromium', **kwargs) |
| 422 self._server_process_constructor = self._android_server_process_construc
tor | 424 self._server_process_constructor = self._android_server_process_construc
tor |
| 423 | 425 |
| 424 if not self.get_option('disable_breakpad'): | 426 if not self.get_option('disable_breakpad'): |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 return command | 1277 return command |
| 1276 | 1278 |
| 1277 def _read_prompt(self, deadline): | 1279 def _read_prompt(self, deadline): |
| 1278 last_char = '' | 1280 last_char = '' |
| 1279 while True: | 1281 while True: |
| 1280 current_char = self._server_process.read_stdout(deadline, 1) | 1282 current_char = self._server_process.read_stdout(deadline, 1) |
| 1281 if current_char == ' ': | 1283 if current_char == ' ': |
| 1282 if last_char in ('#', '$'): | 1284 if last_char in ('#', '$'): |
| 1283 return | 1285 return |
| 1284 last_char = current_char | 1286 last_char = current_char |
| OLD | NEW |