Android GN: don't reboot before running

We're already rebooting after running, so we should already be ready to go when the task starts.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2334223003

Review-Url: https://codereview.chromium.org/2334223003

diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 2782bff..1f66e4c 100644 (file)
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -61,14 +61,12 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
     self._run('ninja', 'ninja', '-C', self.out_dir)
 
   def install(self):
-    self._adb('reboot', 'reboot')
-    self._adb('wait for device', 'wait-for-usb-device')
     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 reboot', 'reboot')
+      self._adb('reboot', 'reboot')
       self._adb('kill adb server', 'kill-server')
 
   def step(self, name, cmd, env=None, **kwargs):

diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
index 9571c97..6feaa7e 100644 (file)
--- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
@@ -2,22 +2,6 @@
   {
     "cmd": [
       "adb",
-      "reboot"
-    ],
-    "cwd": "[SLAVE_BUILD]/skia",
-    "name": "reboot"
-  },
-  {
-    "cmd": [
-      "adb",
-      "wait-for-usb-device"
-    ],
-    "cwd": "[SLAVE_BUILD]/skia",
-    "name": "wait for device"
-  },
-  {
-    "cmd": [
-      "adb",
       "shell",
       "mkdir",
       "-p",
@@ -595,7 +579,7 @@
       "reboot"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
-    "name": "TEMPORARY reboot"
+    "name": "reboot"
   },
   {
     "cmd": [