diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-11-09 16:31:42 -0500 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2016-11-09 22:44:46 +0000 |
| commit | 27dcee1643b3b783ca0b2312e21f40f3766bd213 (patch) | |
| tree | 6cfc3d8bd4ea15cd165da708008bacaadbd3f15b | |
| parent | cb36f3cacf1d044b9cb28639f0e0fca2b86d157f (diff) | |
Android builders do not need host toolchains.
This trims a few packages. We do the same in buildbot.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4634
Change-Id: I4c76d744917cb244ca3390d55d9ea602cda2dd58
Reviewed-on: https://skia-review.googlesource.com/4634
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | infra/bots/gen_tasks.go | 10 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 15 |
2 files changed, 2 insertions, 23 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 5796e0483e..fe69f35312 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -206,15 +206,9 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str } else { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("android_ndk_linux")) } - } - - // Clang on Linux. - if strings.Contains(name, "Ubuntu") && strings.Contains(name, "Clang") { + } else if strings.Contains(name, "Ubuntu") && strings.Contains(name, "Clang") { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("clang_linux")) - } - - // Windows toolchain. - if strings.Contains(name, "Win") { + } else if strings.Contains(name, "Win") { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("win_toolchain")) if strings.Contains(name, "Vulkan") { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("win_vulkan_sdk")) diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index f0140cb1d2..f8d9db0177 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -215,11 +215,6 @@ "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", "version": "version:5" - }, - { - "name": "skia/bots/clang_linux", - "path": "clang_linux", - "version": "version:4" } ], "dimensions": [ @@ -252,11 +247,6 @@ "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", "version": "version:5" - }, - { - "name": "skia/bots/clang_linux", - "path": "clang_linux", - "version": "version:4" } ], "dimensions": [ @@ -314,11 +304,6 @@ "name": "skia/bots/android_ndk_windows", "path": "n", "version": "version:2" - }, - { - "name": "skia/bots/win_toolchain", - "path": "t", - "version": "version:5" } ], "dimensions": [ |