Reland: Make clusterfuzz_archive include llvm-symbolizer and sancov.

scripts/slave/recipe_modules/archive/example.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'archive',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
 ]
 
 TEST_HASH_MAIN='5e3250aadda2b170692f8e762d43b7e8deadbeef'
 TEST_COMMIT_POSITON_MAIN='refs/heads/B1@{#123456}'
 
 TEST_HASH_COMPONENT='deadbeefdda2b170692f8e762d43b7e8e7a96686'
 TEST_COMMIT_POSITON_COMPONENT='refs/heads/master@{#234}'
 
 
 def RunSteps(api):
   if 'build_archive_url' in api.properties:
     api.archive.zip_and_upload_build(
         step_name='zip build',
         target=api.path['checkout'].join('/Release/out'))
     return
+
+  if 'no_llvm' not in api.properties:
+    llvm_bin_dir = api.path['checkout'].join('third_party', 'llvm-build',
+                                             'Release+Asserts', 'bin')
+    api.path.mock_add_paths(api.path.join(llvm_bin_dir, 'llvm-symbolizer'))
+    api.path.mock_add_paths(api.path.join(llvm_bin_dir, 'sancov'))
+
+  build_dir = api.path['slave_build'].join('src', 'out', 'Release')
+
+  if 'llvm_tools_in_build_dir' in api.properties:
+    api.path.mock_add_paths(api.path.join(build_dir, 'llvm-symbolizer'))
+    api.path.mock_add_paths(api.path.join(build_dir, 'sancov'))
+
   api.archive.clusterfuzz_archive(
-      build_dir=api.path['slave_build'].join('src', 'out', 'Release'),
+      build_dir=build_dir,
       update_properties=api.properties.get('update_properties'),
       gs_bucket='chromium',
       gs_acl=api.properties.get('gs_acl', ''),
       archive_prefix='chrome-asan',
       archive_subdir_suffix=api.properties.get('archive_subdir_suffix', ''),
       revision_dir=api.properties.get('revision_dir'),
       primary_project=api.properties.get('primary_project'),
   )
 
 
@@ skipping 73 matching lines @@
     api.platform('linux', 64) +
     api.properties(
         update_properties=update_properties,
         revision_dir='x10',
         primary_project='x10',
     ) +
     api.override_step_data(
         'listdir build_dir', api.json.output(['chrome']))
   )
 
+  update_properties = {
+    'got_revision': TEST_HASH_MAIN,
+    'got_revision_cp': TEST_COMMIT_POSITON_MAIN,
+  }
+  yield (
+    api.test('cf_archiving_no_llvm') +
+    api.platform('linux', 64) +
+    api.properties(
+      update_properties=update_properties,
+      no_llvm=True,
+    ) +
+    api.override_step_data(
+      'listdir build_dir', api.json.output(['chrome']))
+  )
+
+  update_properties = {
+    'got_revision': TEST_HASH_MAIN,
+    'got_revision_cp': TEST_COMMIT_POSITON_MAIN,
+  }
+  yield (
+    api.test('cf_archiving_llvm_tools_in_build_dir') +
+    api.platform('linux', 64) +
+    api.properties(
+      update_properties=update_properties,
+      llvm_tools_in_build_dir=True,
+    ) +
+    api.override_step_data(
+      'listdir build_dir', api.json.output(['chrome']))
+  )
+
   yield(
       api.test('zip_and_upload_custom_location') +
       api.platform('linux', 64) +
       api.properties(
           build_archive_url='gs://dummy-bucket/Linux Release/full-build.zip')
   )