Index: build/android/tombstones.py |
diff --git a/build/android/tombstones.py b/build/android/tombstones.py |
index 3f3508631ada13a58cac2f83826cccef10fa6752..1a958ac28673c9d9a7ac83adc8c64fa6f75b9f5f 100755 |
--- a/build/android/tombstones.py |
+++ b/build/android/tombstones.py |
@@ -19,9 +19,8 @@ |
import sys |
import optparse |
-from pylib.device import adb_wrapper |
+from pylib import android_commands |
from pylib.device import device_errors |
-from pylib.device import device_filter |
from pylib.device import device_utils |
from pylib.utils import run_tests_helper |
@@ -236,15 +235,14 @@ |
if options.device: |
devices = [options.device] |
else: |
- devices = adb_wrapper.AdbWrapper.Devices( |
- filters=device_filter.DefaultFilters()) |
+ devices = android_commands.GetAttachedDevices() |
# This must be done serially because strptime can hit a race condition if |
# used for the first time in a multithreaded environment. |
# http://bugs.python.org/issue7980 |
tombstones = [] |
- for adb in devices: |
- device = device_utils.DeviceUtils(adb) |
+ for device_serial in devices: |
+ device = device_utils.DeviceUtils(device_serial) |
tombstones += _GetTombstonesForDevice(device, options) |
_ResolveTombstones(options.jobs, tombstones) |