Remove win_vulkan_sdk.
We only needed this for the Vulkan headers, which we now have in
src/third_party.
Change-Id: I453ed73c73b3304520b628527102607d848bcd37
Reviewed-on: https://skia-review.googlesource.com/c/180775
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 50f8db2..38d9ea2 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -30,16 +30,15 @@
)
const (
- BUNDLE_RECIPES_NAME = "Housekeeper-PerCommit-BundleRecipes"
- ISOLATE_GCLOUD_LINUX_NAME = "Housekeeper-PerCommit-IsolateGCloudLinux"
- ISOLATE_GO_DEPS_NAME = "Housekeeper-PerCommit-IsolateGoDeps"
- ISOLATE_SKIMAGE_NAME = "Housekeeper-PerCommit-IsolateSkImage"
- ISOLATE_SKP_NAME = "Housekeeper-PerCommit-IsolateSKP"
- ISOLATE_SVG_NAME = "Housekeeper-PerCommit-IsolateSVG"
- ISOLATE_NDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
- ISOLATE_SDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
- ISOLATE_WIN_TOOLCHAIN_NAME = "Housekeeper-PerCommit-IsolateWinToolchain"
- ISOLATE_WIN_VULKAN_SDK_NAME = "Housekeeper-PerCommit-IsolateWinVulkanSDK"
+ BUNDLE_RECIPES_NAME = "Housekeeper-PerCommit-BundleRecipes"
+ ISOLATE_GCLOUD_LINUX_NAME = "Housekeeper-PerCommit-IsolateGCloudLinux"
+ ISOLATE_GO_DEPS_NAME = "Housekeeper-PerCommit-IsolateGoDeps"
+ ISOLATE_SKIMAGE_NAME = "Housekeeper-PerCommit-IsolateSkImage"
+ ISOLATE_SKP_NAME = "Housekeeper-PerCommit-IsolateSKP"
+ ISOLATE_SVG_NAME = "Housekeeper-PerCommit-IsolateSVG"
+ ISOLATE_NDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
+ ISOLATE_SDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
+ ISOLATE_WIN_TOOLCHAIN_NAME = "Housekeeper-PerCommit-IsolateWinToolchain"
DEFAULT_OS_DEBIAN = "Debian-9.4"
DEFAULT_OS_LINUX_GCE = DEFAULT_OS_DEBIAN
@@ -731,10 +730,6 @@
cipdPkg: "win_toolchain",
path: "win_toolchain",
},
- ISOLATE_WIN_VULKAN_SDK_NAME: {
- cipdPkg: "win_vulkan_sdk",
- path: "win_vulkan_sdk",
- },
}
// isolateCIPDAsset generates a task to isolate the given CIPD asset.
@@ -883,9 +878,6 @@
if strings.Contains(name, "Clang") {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("clang_win"))
}
- if strings.Contains(name, "Vulkan") {
- task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_WIN_VULKAN_SDK_NAME))
- }
if strings.Contains(name, "OpenCL") {
task.CipdPackages = append(task.CipdPackages,
b.MustGetCipdPackageFromAsset("opencl_headers"),