OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 | 5 |
6 # pylint: disable=W0201 | 6 # pylint: disable=W0201 |
7 | 7 |
8 | 8 |
9 import copy | 9 import copy |
10 import default_flavor | 10 import default_flavor |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 stdout=self.m.raw_io.output(), | 260 stdout=self.m.raw_io.output(), |
261 infra_step=True, | 261 infra_step=True, |
262 ).stdout.rstrip() | 262 ).stdout.rstrip() |
263 prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_') | 263 prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_') |
264 self.device_dirs = default_flavor.DeviceDirs( | 264 self.device_dirs = default_flavor.DeviceDirs( |
265 dm_dir=prefix + 'dm', | 265 dm_dir=prefix + 'dm', |
266 perf_data_dir=prefix + 'perf', | 266 perf_data_dir=prefix + 'perf', |
267 resource_dir=prefix + 'resources', | 267 resource_dir=prefix + 'resources', |
268 images_dir=prefix + 'images', | 268 images_dir=prefix + 'images', |
269 skp_dir=prefix + 'skp/skps', | 269 skp_dir=prefix + 'skp/skps', |
| 270 svg_dir=prefix + 'svg/svgs', |
270 tmp_dir=prefix + 'tmp_dir') | 271 tmp_dir=prefix + 'tmp_dir') |
271 | 272 |
272 self._has_root = self.has_root() | 273 self._has_root = self.has_root() |
273 self.m.run(self.m.step, | 274 self.m.run(self.m.step, |
274 name='kill skia', | 275 name='kill skia', |
275 cmd=[ | 276 cmd=[ |
276 self.android_bin.join('android_kill_skia'), | 277 self.android_bin.join('android_kill_skia'), |
277 '--verbose', | 278 '--verbose', |
278 ] + self.serial_args, | 279 ] + self.serial_args, |
279 env=self._default_env, | 280 env=self._default_env, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 infra_step=True).stdout.rstrip() | 338 infra_step=True).stdout.rstrip() |
338 | 339 |
339 def remove_file_on_device(self, path, *args, **kwargs): | 340 def remove_file_on_device(self, path, *args, **kwargs): |
340 """Delete the given file.""" | 341 """Delete the given file.""" |
341 return self._adb(name='rm %s' % self.m.path.basename(path), | 342 return self._adb(name='rm %s' % self.m.path.basename(path), |
342 serial=self.serial, | 343 serial=self.serial, |
343 cmd=['shell', 'rm', '-f', path], | 344 cmd=['shell', 'rm', '-f', path], |
344 infra_step=True, | 345 infra_step=True, |
345 *args, | 346 *args, |
346 **kwargs) | 347 **kwargs) |
OLD | NEW |