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 6870400cb5896bc65af2249eefed32d2ef6d2b77..d0bb861c984ce6fd4469124d6738dc3bda03d815 100644 |
--- a/build/android/gyp/util/build_device.py |
+++ b/build/android/gyp/util/build_device.py |
@@ -11,14 +11,14 @@ 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 |
+GetAttachedDevices = android_commands.GetAttachedDevices |
class BuildDevice(object): |
@@ -52,8 +52,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 +69,7 @@ def GetConfigurationForDevice(id): |
cmd_output = adb.RunShellCommand(cmd) |
configuration = { |
- 'id': id, |
+ 'id': device_id, |
'description': cmd_output[-1], |
'install_metadata': cmd_output[:-1], |
} |