diff options
Diffstat (limited to 'infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py index 9ab77eaf35..bd65e01516 100644 --- a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py @@ -15,22 +15,21 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): super(GNChromecastFlavorUtils, self).__init__(m) self._ever_ran_adb = False self._user_ip = '' - self.m.vars.android_bin_dir = self.m.path.join(self.m.vars.android_bin_dir, - 'bin') # Disk space is extremely tight on the Chromecasts (~100M) There is not # enough space on the android_data_dir (/cache/skia) to fit the images, # resources, executable and output the dm images. So, we have dm_out be # on the tempfs (i.e. RAM) /dev/shm. (which is about 140M) - + data_dir = '/cache/skia/' self.device_dirs = default_flavor.DeviceDirs( + bin_dir = '/cache/skia/bin', dm_dir = '/dev/shm/skia/dm_out', - perf_data_dir = self.m.vars.android_data_dir + 'perf', - resource_dir = self.m.vars.android_data_dir + 'resources', - images_dir = self.m.vars.android_data_dir + 'images', - skp_dir = self.m.vars.android_data_dir + 'skps', - svg_dir = self.m.vars.android_data_dir + 'svgs', - tmp_dir = self.m.vars.android_data_dir) + perf_data_dir = data_dir + 'perf', + resource_dir = data_dir + 'resources', + images_dir = data_dir + 'images', + skp_dir = data_dir + 'skps', + svg_dir = data_dir + 'svgs', + tmp_dir = data_dir) @property def user_ip_host(self): @@ -53,8 +52,8 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): def install(self): super(GNChromecastFlavorUtils, self).install() - self._adb('mkdir ' + self.m.vars.android_bin_dir, - 'shell', 'mkdir', '-p', self.m.vars.android_bin_dir) + self._adb('mkdir ' + self.device_dirs.bin_dir, + 'shell', 'mkdir', '-p', self.device_dirs.bin_dir) def _adb(self, title, *cmd, **kwargs): if not self._ever_ran_adb: @@ -104,7 +103,7 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): def cleanup_steps(self): if self._ever_ran_adb: # To clean up disk space for next time - self._ssh('Delete executables', 'rm', '-r', self.m.vars.android_bin_dir, + self._ssh('Delete executables', 'rm', '-r', self.device_dirs.bin_dir, abort_on_failure=False, infra_step=True) # Reconnect if was disconnected self._adb('disconnect', 'disconnect') @@ -125,7 +124,7 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): line = line.replace(addr, addr + ' ' + sym.strip()) print line """, - args=[self.m.vars.skia_out.join(self.m.vars.configuration)], + args=[self.m.vars.skia_out], infra_step=True, abort_on_failure=False) @@ -145,10 +144,10 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): return self.m.run(self.m.step, title, cmd=ssh_cmd, **kwargs) def step(self, name, cmd, **kwargs): - app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) + app = self.m.vars.skia_out.join(cmd[0]) self._adb('push %s' % cmd[0], - 'push', app, self.m.vars.android_bin_dir) + 'push', app, self.device_dirs.bin_dir) - cmd[0] = '%s/%s' % (self.m.vars.android_bin_dir, cmd[0]) + cmd[0] = '%s/%s' % (self.device_dirs.bin_dir, cmd[0]) self._ssh(str(name), *cmd, infra_step=False) |