Commit c086201e authored by boliu@chromium.org's avatar boliu@chromium.org

Fix android adb version match

With M SDK, the output of "adb version" has changed, from:
"""Android Debug Bridge version 1.0.32"""

to:
"""Android Debug Bridge version 1.0.32
Revision 57224c5cff69-android"""

Update script regex to match both.

Review URL: https://codereview.chromium.org/1313773002

git-svn-id: svn://svn.chromium.org/blink/trunk@201081 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 07a4a181
......@@ -308,7 +308,7 @@ class AndroidCommands(object):
@staticmethod
def _determine_adb_version(adb_command_path, executive, debug_logging):
re_version = re.compile('^.*version ([\d\.]+)$')
re_version = re.compile('^.*version ([\d\.]+)')
try:
output = executive.run_command([adb_command_path, 'version'], error_handler=executive.ignore_error,
debug_logging=debug_logging)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment