Reland: Make clusterfuzz_archive include llvm-symbolizer and sancov.

scripts/slave/recipe_modules/archive/example.py

Index: scripts/slave/recipe_modules/archive/example.py
diff --git a/scripts/slave/recipe_modules/archive/example.py b/scripts/slave/recipe_modules/archive/example.py
index 599fe10ea9d32823ad0cf91a6a6f871e0f01612d..455549c4fdadea19b35176e6aa11f30a6971e8d0 100644
--- a/scripts/slave/recipe_modules/archive/example.py
+++ b/scripts/slave/recipe_modules/archive/example.py
@@ -23,8 +23,17 @@ def RunSteps(api):
         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')
+
   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', ''),
@@ -118,6 +127,21 @@ def GenTests(api):
         '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']))
+  )
+
   yield(
       api.test('zip_and_upload_custom_location') +
       api.platform('linux', 64) +