| 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 """Default flavor utils class, used for desktop builders.""" | 6 """Default flavor utils class, used for desktop builders.""" |
| 7 | 7 |
| 8 | 8 |
| 9 import json | 9 import json |
| 10 | 10 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 '%(PATH)s']) | 203 '%(PATH)s']) |
| 204 env['GYP_MSVS_VERSION'] = '2015' | 204 env['GYP_MSVS_VERSION'] = '2015' |
| 205 else: | 205 else: |
| 206 make_cmd = ['make'] | 206 make_cmd = ['make'] |
| 207 cmd = make_cmd + [target] | 207 cmd = make_cmd + [target] |
| 208 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, | 208 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, |
| 209 env=env, cwd=self._skia_api.m.path['checkout']) | 209 env=env, cwd=self._skia_api.m.path['checkout']) |
| 210 if 'CommandBuffer' in self._skia_api.builder_name: | 210 if 'CommandBuffer' in self._skia_api.builder_name: |
| 211 self._skia_api._run_once(self.build_command_buffer) | 211 self._skia_api._run_once(self.build_command_buffer) |
| 212 | 212 |
| 213 def copy_extra_build_products(self, swarming_out_dir): |
| 214 """Copy extra build products to specified directory. |
| 215 |
| 216 Copy flavor-specific build products to swarming_out_dir for use in test and |
| 217 perf steps. Only called if running_in_swarming.""" |
| 218 pass |
| 219 |
| 213 @property | 220 @property |
| 214 def out_dir(self): | 221 def out_dir(self): |
| 215 """Flavor-specific out directory.""" | 222 """Flavor-specific out directory.""" |
| 216 return self._skia_api.skia_out.join(self._skia_api.configuration) | 223 return self._skia_api.skia_out.join(self._skia_api.configuration) |
| 217 | 224 |
| 218 def device_path_join(self, *args): | 225 def device_path_join(self, *args): |
| 219 """Like os.path.join(), but for paths on a connected device.""" | 226 """Like os.path.join(), but for paths on a connected device.""" |
| 220 return self._skia_api.m.path.join(*args) | 227 return self._skia_api.m.path.join(*args) |
| 221 | 228 |
| 222 def device_path_exists(self, path): | 229 def device_path_exists(self, path): |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 return DeviceDirs( | 290 return DeviceDirs( |
| 284 dm_dir=self._skia_api.dm_dir, | 291 dm_dir=self._skia_api.dm_dir, |
| 285 perf_data_dir=self._skia_api.perf_data_dir, | 292 perf_data_dir=self._skia_api.perf_data_dir, |
| 286 resource_dir=self._skia_api.resource_dir, | 293 resource_dir=self._skia_api.resource_dir, |
| 287 images_dir=join('images'), | 294 images_dir=join('images'), |
| 288 skp_dir=self._skia_api.local_skp_dir, | 295 skp_dir=self._skia_api.local_skp_dir, |
| 289 tmp_dir=join('tmp')) | 296 tmp_dir=join('tmp')) |
| 290 | 297 |
| 291 def __repr__(self): | 298 def __repr__(self): |
| 292 return '<%s object>' % self.__class__.__name__ # pragma: no cover | 299 return '<%s object>' % self.__class__.__name__ # pragma: no cover |
| OLD | NEW |