infra/bots/recipe_modules/flavor/gn_android_flavor.py - Issue 2334223003: Android GN: don't reboot before running

Unified Diff: infra/bots/recipe_modules/flavor/gn_android_flavor.py

Issue 2334223003: Android GN: don't reboot before running (Closed)

Patch Set: other way Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: infra/bots/recipe_modules/flavor/gn_android_flavor.py

diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py

index 85ab3732d54d7901c46f1208a14b0dcefd148355..b2b80a941d3ce1bc9c7818ed4d51191d9c574a7f 100644

--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py

+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py

@@ -61,18 +61,13 @@ 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')

borenet 2016/09/13 18:04:52 If we think we have to wait here, we might as well

mtklein 2016/09/13 18:20:54 Good point. Let's try no wait at all (PS 4), and

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 t

mtklein 2016/09/13 18:20:54 Right, seems to work okay. If it doesn't, I'll pu

borenet 2016/09/13 18:30:24 SGTM. I think it'll be fine, my only concern would

self._adb('kill adb server', 'kill-server')

def step(self, name, cmd, env=None, **kwargs):