diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 19:49:52 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 19:49:52 +0000 |
| commit | ade004feb642b1bb3772e03366a0ad28d8f7ff8c (patch) | |
| tree | 427c43f6e9db687f54733b2f8a28801bcd9b4105 /build | |
| parent | 9e04bd820c1924f9958d541290f66cd222764f8b (diff) | |
| download | chromium_src-ade004feb642b1bb3772e03366a0ad28d8f7ff8c.zip chromium_src-ade004feb642b1bb3772e03366a0ad28d8f7ff8c.tar.gz chromium_src-ade004feb642b1bb3772e03366a0ad28d8f7ff8c.tar.bz2 | |
Fix get_device_configuration.py/device_utils.py
- Fix get_device_configuration.py to use build_device.GetAttachedDevices
without the () as it is now a list not a method since () was added at
build_device.GetAttachedDevices
- Fix device_utils.py to check for unicode as well as str since the config
push_libraries was loading had unicode for the device id
NOTRY=true
BUG=267773
Review URL: https://codereview.chromium.org/233203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/gyp/util/build_device.py | 2 | ||||
| -rw-r--r-- | build/android/pylib/device/device_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/android/gyp/util/build_device.py b/build/android/gyp/util/build_device.py index b847b82..928bd02 100644 --- a/build/android/gyp/util/build_device.py +++ b/build/android/gyp/util/build_device.py @@ -19,7 +19,7 @@ sys.path.append(BUILD_ANDROID_DIR) from pylib import android_commands from pylib.device import device_utils -GetAttachedDevices = android_commands.GetAttachedDevices() +GetAttachedDevices = android_commands.GetAttachedDevices class BuildDevice(object): diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py index aa42aff..c8a5c3a 100644 --- a/build/android/pylib/device/device_utils.py +++ b/build/android/pylib/device/device_utils.py @@ -20,7 +20,7 @@ class DeviceUtils(object): def __init__(self, device): self.old_interface = None - if isinstance(device, str): + if isinstance(device, basestring): self.old_interface = pylib.android_commands.AndroidCommands(device) elif isinstance(device, adb_wrapper.AdbWrapper): self.old_interface = pylib.android_commands.AndroidCommands(str(device)) |