Skia Android bots: use adb_wait_for_device script

scripts/slave/recipe_modules/skia/android_flavor.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import android_devices
 import config
 import copy
 import default_flavor
 
@@ skipping 28 matching lines @@
       'No device found for builder: %s' % str(builder_dict))  # pragma: no cover
 
 
 class _ADBWrapper(object):
   """Wrapper for the ADB recipe module.
 
   The ADB recipe module looks for the ADB binary at a path we don't have checked
   out on our bots. This wrapper ensures that we set a custom ADB path before
   attempting to use the module.
   """
-  def __init__(self, adb_api, path_to_adb, serial):
+  def __init__(self, adb_api, path_to_adb, serial, android_flavor):
     self._adb = adb_api
     self._adb.set_adb_path(path_to_adb)
     self._serial = serial
     self._wait_count = 0
+    self._android_flavor = android_flavor
 
   def wait_for_device(self):
     """Run 'adb wait-for-device'."""
     self._wait_count += 1
-    self._adb(name='wait for device (%d)' % self._wait_count,
-              serial=self._serial,
-              cmd=['wait-for-device'],
-              infra_step=True)
+    cmd = [
+        self._android_flavor.android_bin.join('adb_wait_for_device'),
+        '-s', self._serial,
+    ]
+    self._android_flavor._skia_api.m.step(
+        name='wait for device (%d)' % self._wait_count,
+        cmd=cmd,
+        infra_step=True)
 
   def maybe_wait_for_device(self):
     """Run 'adb wait-for-device' if it hasn't already been run."""
     if self._wait_count == 0:
       self.wait_for_device()
 
   def __call__(self, *args, **kwargs):
     self.maybe_wait_for_device()
     return self._adb(*args, **kwargs)
 
 
 class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(AndroidFlavorUtils, self).__init__(skia_api)
     self.device = device_from_builder_dict(self._skia_api.c.builder_cfg)
     slave_info = android_devices.SLAVE_INFO.get(
         self._skia_api.c.SLAVE_NAME,
         android_devices.SLAVE_INFO['default'])
     self.serial = slave_info.serial
     self.android_bin = self._skia_api.m.path['slave_build'].join(
         'skia', 'platform_tools', 'android', 'bin')
     self._android_sdk_root = slave_info.android_sdk_root
     self._adb = _ADBWrapper(
         self._skia_api.m.adb,
         self._skia_api.m.path.join(self._android_sdk_root,
                                    'platform-tools', 'adb'),
-        self.serial)
+        self.serial,
+        self)
     self._has_root = slave_info.has_root
     self._default_env = {'ANDROID_SDK_ROOT': self._android_sdk_root,
                          'SKIA_ANDROID_VERBOSE_SETUP': 1}
 
   def step(self, name, cmd, **kwargs):
     self._adb.maybe_wait_for_device()
     args = [self.android_bin.join('android_run_skia'),
             '--verbose',
             '--logcat',
             '-d', self.device,
@@ skipping 153 matching lines @@
     prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dirs=default_flavor.SKPDirs(
             prefix + 'skp', self._skia_api.c.BUILDER_NAME, '/'),
         tmp_dir=prefix + 'tmp_dir')