Add coverage related binaries to clang_linux asset

Add --depth 1 to the git clone commands to speed up the creation,
since we don't need all of the history ever to build.

Bug: skia:7080
Change-Id: Idcde5657e2097c2dbc259ab29b24d596b5623364
Reviewed-on: https://skia-review.googlesource.com/53481
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

3 files changed, 52 insertions, 44 deletions

diff --git a/infra/bots/assets/clang_linux/VERSION b/infra/bots/assets/clang_linux/VERSION
index f11c82a4cb..9a037142aa 100644
--- a/infra/bots/assets/clang_linux/VERSION
+++ b/infra/bots/assets/clang_linux/VERSION
@@ -1 +1 @@
-9
\ No newline at end of file
+10
\ No newline at end of file
diff --git a/infra/bots/assets/clang_linux/create.py b/infra/bots/assets/clang_linux/create.py
index b68117761d..7c75862bcb 100755
--- a/infra/bots/assets/clang_linux/create.py
+++ b/infra/bots/assets/clang_linux/create.py
@@ -23,14 +23,20 @@ def create_asset(target_dir):
 
   # Build Clang, lld, compiler-rt (sanitizer support) and libc++.
   os.chdir(tempfile.mkdtemp())
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "llvm"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "llvm"])
   os.chdir("llvm/tools")
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "clang"])
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "lld"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "clang"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "lld"])
   os.chdir("../projects")
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "compiler-rt"])
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "libcxx"])
-  subprocess.check_call(["git", "clone", "-b", BRANCH, REPO + "libcxxabi"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "compiler-rt"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "libcxx"])
+  subprocess.check_call(["git", "clone", "--depth", "1", "-b",
+                         BRANCH, REPO + "libcxxabi"])
   os.chdir("..")
   os.mkdir("out")
   os.chdir("out")
@@ -43,6 +49,8 @@ def create_asset(target_dir):
 
   # Copy a couple extra files we need.
   subprocess.check_call(["cp", "bin/llvm-symbolizer", target_dir + "/bin"])
+  subprocess.check_call(["cp", "bin/llvm-profdata", target_dir + "/bin"])
+  subprocess.check_call(["cp", "bin/llvm-cov", target_dir + "/bin"])
   libstdcpp = subprocess.check_output(["c++",
                                        "-print-file-name=libstdc++.so.6"])
   subprocess.check_call(["cp", libstdcpp.strip(), target_dir + "/lib"])
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 05f39c955d..4e51610fcb 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2742,7 +2742,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/armhf_sysroot",
@@ -2842,7 +2842,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/armhf_sysroot",
@@ -3302,7 +3302,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3332,7 +3332,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3362,7 +3362,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3392,7 +3392,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3422,7 +3422,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -3457,7 +3457,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3487,7 +3487,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3517,7 +3517,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3547,7 +3547,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3577,7 +3577,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3607,7 +3607,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3637,7 +3637,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3667,7 +3667,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3697,7 +3697,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dimensions": [
@@ -3727,7 +3727,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -7153,7 +7153,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -7206,7 +7206,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -7259,7 +7259,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -7360,7 +7360,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -7509,7 +7509,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -9116,7 +9116,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -9168,7 +9168,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -9267,7 +9267,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -9319,7 +9319,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -14614,7 +14614,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -14667,7 +14667,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -14720,7 +14720,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -14821,7 +14821,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -15066,7 +15066,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -15119,7 +15119,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -16892,7 +16892,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -16944,7 +16944,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -17043,7 +17043,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -17095,7 +17095,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [
@@ -17147,7 +17147,7 @@
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
-          "version": "version:9"
+          "version": "version:10"
         }
       ],
       "dependencies": [