OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 import re | 5 import re |
6 import sys | 6 import sys |
7 | 7 |
8 import manual_bisect_files | 8 import manual_bisect_files |
9 from recipe_engine import recipe_api | 9 from recipe_engine import recipe_api |
10 | 10 |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 cp_branch, cp_number = self.m.commit_position.parse(commit_position) | 263 cp_branch, cp_number = self.m.commit_position.parse(commit_position) |
264 build_git_commit = self._get_git_commit(update_properties, primary_project) | 264 build_git_commit = self._get_git_commit(update_properties, primary_project) |
265 | 265 |
266 if fixed_staging_dir: | 266 if fixed_staging_dir: |
267 staging_dir = self.m.path['slave_build'].join('chrome_staging') | 267 staging_dir = self.m.path['slave_build'].join('chrome_staging') |
268 self.m.file.rmtree('purge staging dir', staging_dir) | 268 self.m.file.rmtree('purge staging dir', staging_dir) |
269 self.m.file.makedirs('create staging dir', staging_dir) | 269 self.m.file.makedirs('create staging dir', staging_dir) |
270 else: | 270 else: |
271 staging_dir = self.m.path.mkdtemp('chrome_staging') | 271 staging_dir = self.m.path.mkdtemp('chrome_staging') |
272 | 272 |
| 273 llvm_tools_to_copy = ['llvm-symbolizer', 'sancov'] |
| 274 llvm_bin_dir = self.m.path['checkout'].join('third_party', 'llvm-build', |
| 275 'Release+Asserts', 'bin') |
| 276 ext = '.exe' if self.m.platform.is_win else '' |
| 277 |
| 278 for tool in llvm_tools_to_copy: |
| 279 self.m.file.copy('Copy ' + tool, |
| 280 self.m.path.join(llvm_bin_dir, tool + ext), build_dir) |
| 281 |
273 # Build the list of files to archive. | 282 # Build the list of files to archive. |
274 zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir) | 283 zip_file_list = [f for f in self.m.file.listdir('build_dir', build_dir) |
275 if self._cf_should_package_file(f)] | 284 if self._cf_should_package_file(f)] |
276 | 285 |
277 # Use the legacy platform name as Clusterfuzz has some expectations on | 286 # Use the legacy platform name as Clusterfuzz has some expectations on |
278 # this (it only affects Windows, where it replace 'win' by 'win32'). | 287 # this (it only affects Windows, where it replace 'win' by 'win32'). |
279 pieces = [self.legacy_platform_name(), target.lower()] | 288 pieces = [self.legacy_platform_name(), target.lower()] |
280 if archive_subdir_suffix: | 289 if archive_subdir_suffix: |
281 pieces.append(archive_subdir_suffix) | 290 pieces.append(archive_subdir_suffix) |
282 subdir = '-'.join(pieces) | 291 subdir = '-'.join(pieces) |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 def legacy_download_url(self, gs_bucket_name, extra_url_components=None): | 445 def legacy_download_url(self, gs_bucket_name, extra_url_components=None): |
437 """Returns a url suitable for downloading a Chromium build from | 446 """Returns a url suitable for downloading a Chromium build from |
438 Google Storage. | 447 Google Storage. |
439 | 448 |
440 extra_url_components, if specified, should be a string without a | 449 extra_url_components, if specified, should be a string without a |
441 trailing '/' which is inserted in the middle of the URL. | 450 trailing '/' which is inserted in the middle of the URL. |
442 | 451 |
443 The builder_name, or parent_buildername, is always automatically | 452 The builder_name, or parent_buildername, is always automatically |
444 inserted into the URL.""" | 453 inserted into the URL.""" |
445 return self._legacy_url(True, gs_bucket_name, extra_url_components) | 454 return self._legacy_url(True, gs_bucket_name, extra_url_components) |
OLD | NEW |