Deploy adb reconnect on disconnect daemon on WebKit (ContentShell) Android bot.
NOTRY=True
BUG=256353
Review URL: https://chromiumcodereview.appspot.com/18652008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211283 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 440c150..c8e7b358 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -14,6 +14,7 @@
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.gtest import gtest_config
@@ -251,7 +252,10 @@
bb_annotations.PrintNamedStep('provision_devices')
if options.reboot:
RebootDevices()
- RunCmd(['build/android/provision_devices.py', '-t', options.target])
+ provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
+ if options.auto_reconnect:
+ provision_cmd.append('--auto-reconnect')
+ RunCmd(provision_cmd)
def DeviceStatusCheck(_):
@@ -379,6 +383,7 @@
setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
MainTestWrapper(options)
+ provision_devices.KillHostHeartbeat()
if __name__ == '__main__':
