| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """ A simple device interface for build steps. | 5 """ A simple device interface for build steps. |
| 6 | 6 |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| 11 import re | 11 import re |
| 12 import sys | 12 import sys |
| 13 | 13 |
| 14 from util import build_utils | 14 from util import build_utils |
| 15 | 15 |
| 16 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..') | 16 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..') |
| 17 sys.path.append(BUILD_ANDROID_DIR) | 17 sys.path.append(BUILD_ANDROID_DIR) |
| 18 | 18 |
| 19 from pylib.device import adb_wrapper | 19 from devil.android import device_errors |
| 20 from pylib.device import device_errors | 20 from devil.android import device_utils |
| 21 from pylib.device import device_utils | 21 from devil.android.sdk import adb_wrapper |
| 22 | 22 |
| 23 | 23 |
| 24 def GetAttachedDevices(): | 24 def GetAttachedDevices(): |
| 25 return [a.GetDeviceSerial() | 25 return [a.GetDeviceSerial() |
| 26 for a in adb_wrapper.AdbWrapper.Devices()] | 26 for a in adb_wrapper.AdbWrapper.Devices()] |
| 27 | 27 |
| 28 | 28 |
| 29 class BuildDevice(object): | 29 class BuildDevice(object): |
| 30 def __init__(self, configuration): | 30 def __init__(self, configuration): |
| 31 self.id = configuration['id'] | 31 self.id = configuration['id'] |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 assert len(configurations) == 1 | 102 assert len(configurations) == 1 |
| 103 return BuildDevice(configurations[0]) | 103 return BuildDevice(configurations[0]) |
| 104 | 104 |
| 105 | 105 |
| 106 def GetBuildDeviceFromPath(path): | 106 def GetBuildDeviceFromPath(path): |
| 107 configurations = ReadConfigurations(path) | 107 configurations = ReadConfigurations(path) |
| 108 if len(configurations) > 0: | 108 if len(configurations) > 0: |
| 109 return GetBuildDevice(ReadConfigurations(path)) | 109 return GetBuildDevice(ReadConfigurations(path)) |
| 110 return None | 110 return None |
| 111 | 111 |
| OLD | NEW |