| Index: build/android/gyp/util/build_device.py
|
| diff --git a/build/android/gyp/util/build_device.py b/build/android/gyp/util/build_device.py
|
| index 11f6277453ba67dbf0dec15517f09c6a2721169b..03d5f2a275a86f2519f5161694453ca8131ac45c 100644
|
| --- a/build/android/gyp/util/build_device.py
|
| +++ b/build/android/gyp/util/build_device.py
|
| @@ -11,15 +11,13 @@ import os
|
| import re
|
| import sys
|
|
|
| -import build_utils
|
| +import build_utils # pylint: disable=F0401
|
|
|
| BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..')
|
| sys.path.append(BUILD_ANDROID_DIR)
|
|
|
| from pylib import android_commands
|
|
|
| -from pylib.android_commands import GetAttachedDevices
|
| -
|
|
|
| class BuildDevice(object):
|
| def __init__(self, configuration):
|
| @@ -52,8 +50,8 @@ class BuildDevice(object):
|
| return matches[0] if matches else None
|
|
|
|
|
| -def GetConfigurationForDevice(id):
|
| - adb = android_commands.AndroidCommands(id)
|
| +def GetConfigurationForDevice(device_id):
|
| + adb = android_commands.AndroidCommands(device_id)
|
| configuration = None
|
| has_root = False
|
| is_online = adb.IsOnline()
|
| @@ -69,7 +67,7 @@ def GetConfigurationForDevice(id):
|
| cmd_output = adb.RunShellCommand(cmd)
|
|
|
| configuration = {
|
| - 'id': id,
|
| + 'id': device_id,
|
| 'description': cmd_output[-1],
|
| 'install_metadata': cmd_output[:-1],
|
| }
|
|
|