Android GN: don't reboot before running

infra/bots/recipe_modules/flavor/gn_android_flavor.py

 # Copyright 2016 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 default_flavor
 import subprocess
 
 """GN Android flavor utils, used for building Skia for Android with GN."""
 class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, m):
@@ skipping 43 matching lines @@
         'ndk': quote(self.m.vars.slave_dir.join(ndk_asset)),
         'target_cpu': quote(target_arch),
     }.iteritems()))
 
     self._run('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'),
               infra_step=True)
     self._run('gn gen', 'gn', 'gen', self.out_dir, '--args=' + gn_args)
     self._run('ninja', 'ninja', '-C', self.out_dir)
 
   def install(self):
-    self._adb('reboot', 'reboot')
     self._adb('wait for device', 'wait-for-usb-device')

[borenet, 2016/09/13 18:04:52]

If we think we have to wait here, we might as well wait for boot-completed, just
in case.

[mtklein, 2016/09/13 18:20:54]

Good point.  Let's try no wait at all (PS 4), and then if that's no good I'll
restore a full _wait_for_device():

  sleep 10
  wait-for-usb-device
  wait for sys.boot_completed

[mtklein, 2016/09/13 18:23:26]

err, PS 5, which is PS 4 rebased.

[borenet, 2016/09/13 18:30:24]

SGTM

-    self._adb('TEMPORARY clear /data/local/tmp',
-              'shell', 'rm', '-rf', '/data/local/tmp/*')
     self._adb('mkdir /data/local/tmp/resources',
               'shell', 'mkdir', '-p', '/data/local/tmp/resources')
 
   def cleanup_steps(self):
     if self._ever_ran_adb:
-      self._adb('TEMPORARY clear /data/local/tmp',
-                'shell', 'rm', '-rf', '/data/local/tmp/*')
-      self._adb('TEMPORARY reboot', 'reboot')
+      self._adb('reboot', 'reboot')

[borenet, 2016/09/13 18:04:52]

To be clear, we're rebooting and not waiting for the device to come back?

[mtklein, 2016/09/13 18:20:54]

Right, seems to work okay.  If it doesn't, I'll put self._wait_for_device() here
too.

[borenet, 2016/09/13 18:30:24]

SGTM. I think it'll be fine, my only concern would be bots getting quarantined
because the device hasn't finished rebooting yet, and that would only be an
issue if we were getting alerts about it.

       self._adb('kill adb server', 'kill-server')
 
   def step(self, name, cmd, env=None, **kwargs):
     app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
     self._adb('push %s' % cmd[0],
               'push', app, '/data/local/tmp')
 
     sh = '%s.sh' % cmd[0]
     self.m.run.writefile(self.m.vars.tmp_dir.join(sh),
         'set -x; /data/local/tmp/%s; echo $? >/data/local/tmp/rc' %
@@ skipping 40 matching lines @@
   def read_file_on_device(self, path):
     return self._adb('read %s' % path,
                      'shell', 'cat', path, stdout=self.m.raw_io.output()).stdout
 
   def remove_file_on_device(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-f', path)
 
   def create_clean_device_dir(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-rf', path)
     self._adb('mkdir %s' % path, 'shell', 'mkdir', '-p', path)