Android: uses taskset when starting adb.
Workaround for some adb issues.
While at it, print the step name before doing any action.
BUG=268450
Review URL: https://chromiumcodereview.appspot.com/22857005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217959 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 1d83a96e..f020281 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -237,12 +237,14 @@
RunCmd(['sleep', '5'])
def ProvisionDevices(options):
- # Restart adb to work around bugs, sleep to wait for usb discovery.
- RunCmd(['adb', 'kill-server'])
- RunCmd(['adb', 'start-server'])
- RunCmd(['sleep', '1'])
-
bb_annotations.PrintNamedStep('provision_devices')
+
+ if not bb_utils.TESTING:
+ # Restart adb to work around bugs, sleep to wait for usb discovery.
+ adb = android_commands.AndroidCommands()
+ adb.RestartAdbServer()
+ RunCmd(['sleep', '1'])
+
if options.reboot:
RebootDevices()
provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
