Index: build/android/adb_install_apk.py |
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py |
index b6da19ef2691bb8185080a42e5c59905a418cab1..5d0fd171494090e70247d0552a4cf3d4f2bb6c33 100755 |
--- a/build/android/adb_install_apk.py |
+++ b/build/android/adb_install_apk.py |
@@ -10,9 +10,8 @@ |
import os |
import sys |
+from pylib import android_commands |
from pylib import constants |
-from pylib.device import adb_wrapper |
-from pylib.device import device_filter |
from pylib.device import device_utils |
@@ -72,11 +71,10 @@ |
constants.SetBuildType(options.build_type) |
ValidateInstallAPKOption(parser, options, args) |
- devices = adb_wrapper.AdbWrapper.Devices( |
- filters=device_filter.DefaultFilters()) |
+ devices = android_commands.GetAttachedDevices() |
if options.device: |
- if options.device not in [d.GetDeviceSerial() for d in devices]: |
+ if options.device not in devices: |
raise Exception('Error: %s not in attached devices %s' % (options.device, |
','.join(devices))) |
devices = [options.device] |