| Index: build/android/buildbot/bb_device_steps.py
|
| diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
|
| index 53646e366eebca9a0a7c4d6f382c09a02b4510ee..e18188cb674ec5dd9769540e34d98256a01fa2c3 100755
|
| --- a/build/android/buildbot/bb_device_steps.py
|
| +++ b/build/android/buildbot/bb_device_steps.py
|
| @@ -18,7 +18,6 @@ import bb_annotations
|
|
|
| sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
|
| import provision_devices
|
| -from pylib import android_commands
|
| from pylib import constants
|
| from pylib.device import device_utils
|
| from pylib.gtest import gtest_config
|
| @@ -214,9 +213,9 @@ def RunChromeProxyTests(options):
|
| """
|
| InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
|
| args = ['--browser', 'android-chrome-shell']
|
| - devices = android_commands.GetAttachedDevices()
|
| + devices = device_utils.DeviceUtils.HealthyDevices()
|
| if devices:
|
| - args = args + ['--device', devices[0]]
|
| + args = args + ['--device', devices[0].adb.GetDeviceSerial()]
|
| bb_annotations.PrintNamedStep('chrome_proxy')
|
| RunCmd(['tools/chrome_proxy/run_tests'] + args)
|
|
|
| @@ -233,7 +232,7 @@ def RunTelemetryTests(options, step_name, run_tests_path):
|
| """
|
| InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
|
| args = ['--browser', 'android-chrome-shell']
|
| - devices = android_commands.GetAttachedDevices()
|
| + devices = device_utils.DeviceUtils.HealthyDevices()
|
| if devices:
|
| args = args + ['--device', 'android']
|
| bb_annotations.PrintNamedStep(step_name)
|
|
|