Add Vulkan to BuildStats-Mini
Bug: skia:
Change-Id: I320b7945e5e2939404e039cb83831b2bb408aaac
Reviewed-on: https://skia-review.googlesource.com/c/161842
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 4f7eb55..d10b364 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -812,7 +812,7 @@
if strings.Contains(name, "Clang") {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("clang_linux"))
}
- if strings.Contains(name, "Vulkan") {
+ if strings.Contains(name, "Vulkan") || parts["extra_config"] == "Mini" {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("linux_vulkan_sdk"))
}
if parts["target_arch"] == "mips64el" || parts["target_arch"] == "loongson3a" {
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py
index a609de3..6e3700b 100644
--- a/infra/bots/recipe_modules/build/default.py
+++ b/infra/bots/recipe_modules/build/default.py
@@ -189,16 +189,20 @@
args['skia_enable_spirv_validation'] = 'false'
if 'Mini' in extra_tokens:
args.update({
- 'is_component_build': 'true', # Proves we can link a coherent .so.
- 'is_official_build': 'true', # No debug symbols, no tools.
- 'skia_enable_effects': 'false',
- 'skia_enable_gpu': 'true',
- 'skia_enable_pdf': 'false',
- 'skia_use_expat': 'false',
- 'skia_use_libjpeg_turbo': 'false',
- 'skia_use_libpng': 'false',
- 'skia_use_libwebp': 'false',
- 'skia_use_zlib': 'false',
+ # Proves we can link a coherent .so.
+ 'is_component_build': 'true',
+ # No debug symbols, no tools.
+ 'is_official_build': 'true',
+ 'skia_enable_effects': 'false',
+ 'skia_enable_gpu': 'true',
+ 'skia_enable_pdf': 'false',
+ 'skia_use_expat': 'false',
+ 'skia_use_libjpeg_turbo': 'false',
+ 'skia_use_libpng': 'false',
+ 'skia_use_libwebp': 'false',
+ 'skia_use_zlib': 'false',
+ 'skia_enable_vulkan_debug_layers': 'false',
+ 'skia_vulkan_sdk': '"%s"' % linux_vulkan_sdk
})
if 'NoDEPS' in extra_tokens:
args.update({
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json
index 6c7a36f..f2cba5b 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json
@@ -32,7 +32,7 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\""
+ "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_enable_vulkan_debug_layers=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\" target_cpu=\"x86_64\""
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 6949937..413e36a 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -8596,6 +8596,11 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:12"
+ },
+ {
+ "name": "skia/bots/linux_vulkan_sdk",
+ "path": "linux_vulkan_sdk",
+ "version": "version:1"
}
],
"command": [