Index: build/android/tombstones.py |
diff --git a/build/android/tombstones.py b/build/android/tombstones.py |
index 1a958ac28673c9d9a7ac83adc8c64fa6f75b9f5f..c83a584800fc70042e4e1d7d8f7faf22e9cdeb86 100755 |
--- a/build/android/tombstones.py |
+++ b/build/android/tombstones.py |
@@ -19,7 +19,7 @@ import subprocess |
import sys |
import optparse |
-from pylib import android_commands |
+from pylib.device import adb_wrapper |
from pylib.device import device_errors |
from pylib.device import device_utils |
from pylib.utils import run_tests_helper |
@@ -233,19 +233,19 @@ def main(): |
options, _ = parser.parse_args() |
if options.device: |
- devices = [options.device] |
+ devices = [device_utils.DeviceUtils(options.device)] |
else: |
- devices = android_commands.GetAttachedDevices() |
+ devices = device_utils.DeviceUtils.HealthyDevices() |
# 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 device_serial in devices: |
- device = device_utils.DeviceUtils(device_serial) |
+ for device in devices: |
tombstones += _GetTombstonesForDevice(device, options) |
_ResolveTombstones(options.jobs, tombstones) |
+ |
if __name__ == '__main__': |
sys.exit(main()) |