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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, | 145 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, |
146 env=env, cwd=self._skia_api.m.path['checkout']) | 146 env=env, cwd=self._skia_api.m.path['checkout']) |
147 if 'CommandBuffer' in self._skia_api.builder_name: | 147 if 'CommandBuffer' in self._skia_api.builder_name: |
148 self._skia_api._run_once(self.build_command_buffer) | 148 self._skia_api._run_once(self.build_command_buffer) |
149 | 149 |
150 def copy_extra_build_products(self, swarming_out_dir): | 150 def copy_extra_build_products(self, swarming_out_dir): |
151 """Copy extra build products to specified directory. | 151 """Copy extra build products to specified directory. |
152 | 152 |
153 Copy flavor-specific build products to swarming_out_dir for use in test and | 153 Copy flavor-specific build products to swarming_out_dir for use in test and |
154 perf steps.""" | 154 perf steps.""" |
155 pass | 155 if ("Win" in self._skia_api.builder_name and |
| 156 "Vulkan" in self._skia_api.builder_name): |
| 157 # This copies vulkan-1.dll that has been bundled into win_vulkan_sdk |
| 158 # since version 2 See skia/api BUILD_PRODUCTS_ISOLATE_WHITELIST |
| 159 self._skia_api.copy_build_products( |
| 160 self._skia_api.m.path['slave_build'].join('win_vulkan_sdk'), |
| 161 swarming_out_dir) |
156 | 162 |
157 @property | 163 @property |
158 def out_dir(self): | 164 def out_dir(self): |
159 """Flavor-specific out directory.""" | 165 """Flavor-specific out directory.""" |
160 return self._skia_api.skia_out.join(self._skia_api.configuration) | 166 return self._skia_api.skia_out.join(self._skia_api.configuration) |
161 | 167 |
162 def device_path_join(self, *args): | 168 def device_path_join(self, *args): |
163 """Like os.path.join(), but for paths on a connected device.""" | 169 """Like os.path.join(), but for paths on a connected device.""" |
164 return self._skia_api.m.path.join(*args) | 170 return self._skia_api.m.path.join(*args) |
165 | 171 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 return DeviceDirs( | 231 return DeviceDirs( |
226 dm_dir=self._skia_api.dm_dir, | 232 dm_dir=self._skia_api.dm_dir, |
227 perf_data_dir=self._skia_api.perf_data_dir, | 233 perf_data_dir=self._skia_api.perf_data_dir, |
228 resource_dir=self._skia_api.resource_dir, | 234 resource_dir=self._skia_api.resource_dir, |
229 images_dir=self._skia_api.images_dir, | 235 images_dir=self._skia_api.images_dir, |
230 skp_dir=self._skia_api.local_skp_dir, | 236 skp_dir=self._skia_api.local_skp_dir, |
231 tmp_dir=self._skia_api.tmp_dir) | 237 tmp_dir=self._skia_api.tmp_dir) |
232 | 238 |
233 def __repr__(self): | 239 def __repr__(self): |
234 return '<%s object>' % self.__class__.__name__ # pragma: no cover | 240 return '<%s object>' % self.__class__.__name__ # pragma: no cover |
OLD | NEW |