Revert "Use ccache for linux default builds."
This reverts commit 9f3eef796f631977c08fb1771f6507e0a8e55d99.
Reason for revert: breaking https://chromium-swarm.appspot.com/tasklist?f=sk_name%3AHousekeeper-PerCommit-CheckGeneratedFiles
Original change's description:
> Use ccache for linux default builds.
>
> Change-Id: I6bd2439c59f165d56f093185aba818d186b62761
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268903
> Commit-Queue: Weston Tracey <westont@google.com>
> Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
TBR=benjaminwagner@google.com,westont@google.com
Change-Id: I3c5a8f456d03c880a24294e61ae116bd5a1e3db8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269481
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index d48df0b..eb9a570 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -92,12 +92,6 @@
Path: "cache/work",
},
}
- CACHES_CCACHE = []*specs.Cache{
- &specs.Cache{
- Name: "ccache",
- Path: "cache/ccache",
- },
- }
CACHES_DOCKER = []*specs.Cache{
&specs.Cache{
Name: "docker",
@@ -1082,11 +1076,6 @@
return deps
}
-// usesCCache adds attributes to tasks which use ccache.
-func (b *builder) usesCCache(t *specs.TaskSpec, name string) {
- t.Caches = append(t.Caches, CACHES_CCACHE...)
-}
-
// usesGit adds attributes to tasks which use git.
func (b *builder) usesGit(t *specs.TaskSpec, name string) {
t.Caches = append(t.Caches, CACHES_GIT...)
@@ -1199,8 +1188,6 @@
b.MustGetCipdPackageFromAsset("opencl_ocl_icd_linux"),
)
}
- task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("ccache_linux"))
- b.usesCCache(task, name)
} else if strings.Contains(name, "Win") {
task.Dependencies = append(task.Dependencies, b.isolateCIPDAsset(ISOLATE_WIN_TOOLCHAIN_NAME))
if strings.Contains(name, "Clang") {
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py
index d59ebb4..f455583 100644
--- a/infra/bots/recipe_modules/build/default.py
+++ b/infra/bots/recipe_modules/build/default.py
@@ -135,19 +135,6 @@
args['skia_compile_processors'] = 'true'
args['skia_generate_workarounds'] = 'true'
- # ccache + clang-tidy.sh chokes on the argument list.
- if api.vars.is_linux and 'Tidy' not in extra_tokens:
- args['cc_wrapper'] = '"%s"' % api.vars.slave_dir.join('ccache_linux', 'bin', 'ccache')
- env['CCACHE_DIR'] = api.vars.cache_dir.join('ccache')
- # Compilers are unpacked from cipd with bogus timestamps, only contribute
- # compiler content to hashes. If Ninja ever uses absolute paths to changing
- # directories we'll also need to set a CCACHE_BASEDIR.
- env['CCACHE_COMPILERCHECK'] = 'content'
- # As of 2020-02-07, the sum of each Debian9-Clang-x86
- # non-flutter/android/chromebook build takes less than 75G cache space.
- env['CCACHE_MAXSIZE'] = '75G'
- env['CCACHE_MAXFILES'] = '0'
-
if compiler == 'Clang' and api.vars.is_linux:
cc = clang_linux + '/bin/clang'
cxx = clang_linux + '/bin/clang++'
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json
index 03a4315..f8cc013 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-fprofile-instr-generate\", \"-fcoverage-mapping\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json
index e67fdba..04564da 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-OpenCL.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-OpenCL.json
index 3979dd9..316c2a0 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-OpenCL.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-OpenCL.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-OpenCL/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\", \"-isystem[START_DIR]/opencl_headers\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\", \"-L[START_DIR]/opencl_ocl_icd_linux\"] skia_use_opencl=true target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\", \"-isystem[START_DIR]/opencl_headers\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\", \"-L[START_DIR]/opencl_ocl_icd_linux\"] skia_use_opencl=true target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json
index 912cdac..e9df3a4 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\", \"-DSK_CPU_LIMIT_SSE41\", \"-DSKCMS_PORTABLE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\", \"-DSK_CPU_LIMIT_SSE41\", \"-DSKCMS_PORTABLE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json
index c164310..b6c3703 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SafeStack/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] sanitize=\"safe-stack\" target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] sanitize=\"safe-stack\" target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM.json
index f35b899..10d28b0 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SkVM/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\", \"-DSK_USE_SKVM_BLITTER\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\", \"-DSK_USE_SKVM_BLITTER\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM_ASAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM_ASAN.json
index 77e6446..3e3eb45 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM_ASAN.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SkVM_ASAN.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SkVM_ASAN/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\", \"-DSK_USE_SKVM_BLITTER\", \"-DSK_ENABLE_SCOPED_LSAN_SUPPRESSIONS\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\", \"-DSK_USE_SKVM_BLITTER\", \"-DSK_ENABLE_SCOPED_LSAN_SUPPRESSIONS\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN.json
index fbb77c4..67a5bfe 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN.json
@@ -88,14 +88,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out\"] sanitize=\"MSAN\" skia_use_egl=true skia_use_fontconfig=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out\"] sanitize=\"MSAN\" skia_use_egl=true skia_use_fontconfig=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -109,10 +105,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Wuffs.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Wuffs.json
index 157b901..b5a3b80 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Wuffs.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Wuffs.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Wuffs/Debug",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] skia_use_wuffs=true target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] skia_use_wuffs=true target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ANGLE.json
index b5bb8ee..0a37cde 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ANGLE.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ANGLE/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_use_angle=true target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_use_angle=true target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json
index 992d869..410b2e6 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ASAN/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-DSK_ENABLE_SCOPED_LSAN_SUPPRESSIONS\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-DSK_ENABLE_SCOPED_LSAN_SUPPRESSIONS\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json
index fcd0fb8..2d1e5f7 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-march=native\", \"-fomit-frame-pointer\", \"-O3\", \"-ffp-contract=off\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-march=native\", \"-fomit-frame-pointer\", \"-O3\", \"-ffp-contract=off\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json
index 31be48f..9d8e045 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false is_official_build=true skia_enable_fontmgr_empty=true skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_freetype=false skia_use_harfbuzz=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_vulkan=false skia_use_zlib=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false is_official_build=true skia_enable_fontmgr_empty=true skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_freetype=false skia_use_harfbuzz=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_vulkan=false skia_use_zlib=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Static.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Static.json
index 40a8e22..35e81cc 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Static.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Static.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Static/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-static-libstdc++\", \"-static-libgcc\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-static-libstdc++\", \"-static-libgcc\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
index c33dab9..3a00732 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
@@ -85,14 +85,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -106,10 +102,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json
index 23dac9e..f3712da 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json
@@ -36,14 +36,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_enable_vulkan_debug_layers=true skia_use_vulkan=true target_cpu=\"x86_64\" werror=true"
+ "--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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_enable_vulkan_debug_layers=true skia_use_vulkan=true target_cpu=\"x86_64\" werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -57,10 +53,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
index 127184f..eba848a 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
@@ -50,14 +50,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Housekeeper-PerCommit-CheckGeneratedFiles/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_compile_processors=true skia_generate_workarounds=true werror=true"
+ "--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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_compile_processors=true skia_generate_workarounds=true werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -71,10 +67,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
index 28c1886..31b062e 100644
--- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
+++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
@@ -306,14 +306,10 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/build/out/Release",
- "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" 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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_compile_processors=true skia_generate_workarounds=true werror=true"
+ "--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\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_compile_processors=true skia_generate_workarounds=true werror=true"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_REPO[depot_tools]"
},
@@ -327,10 +323,6 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
- "CCACHE_COMPILERCHECK": "content",
- "CCACHE_DIR": "[START_DIR]/cache/ccache",
- "CCACHE_MAXFILES": "0",
- "CCACHE_MAXSIZE": "75G",
"CHROME_HEADLESS": "1",
"PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_REPO[depot_tools]"
},
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 577aa1b..5c42910 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -3055,10 +3055,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3076,11 +3072,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3134,10 +3125,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3155,11 +3142,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3213,10 +3195,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3234,11 +3212,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3292,10 +3265,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3313,11 +3282,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3371,10 +3335,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3392,11 +3352,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3450,10 +3405,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3471,11 +3422,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3529,10 +3475,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3550,11 +3492,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3608,10 +3545,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3629,11 +3562,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3687,10 +3615,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3708,11 +3632,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3766,10 +3685,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3787,11 +3702,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -3845,10 +3755,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -3866,11 +3772,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -5710,10 +5611,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -5736,11 +5633,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6164,10 +6056,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6190,11 +6078,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6243,10 +6126,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6269,11 +6148,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6322,10 +6196,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6348,11 +6218,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6476,10 +6341,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6502,11 +6363,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6555,10 +6411,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6591,11 +6443,6 @@
"name": "skia/bots/opencl_ocl_icd_linux",
"path": "opencl_ocl_icd_linux",
"version": "version:0"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6644,10 +6491,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6670,11 +6513,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6723,10 +6561,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6749,11 +6583,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6802,10 +6631,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6828,11 +6653,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6881,10 +6701,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6907,11 +6723,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -6960,10 +6771,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -6986,11 +6793,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7039,10 +6841,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7065,11 +6863,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7118,10 +6911,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7149,11 +6938,6 @@
"name": "skia/bots/cmake_linux",
"path": "cmake_linux",
"version": "version:0"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7202,10 +6986,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7233,11 +7013,6 @@
"name": "skia/bots/cmake_linux",
"path": "cmake_linux",
"version": "version:0"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7286,10 +7061,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7312,11 +7083,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7365,10 +7131,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7391,11 +7153,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7444,10 +7201,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7470,11 +7223,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7523,10 +7271,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7549,11 +7293,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7602,10 +7341,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7628,11 +7363,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7681,10 +7411,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7707,11 +7433,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7776,10 +7497,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7817,11 +7534,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -7945,10 +7657,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -7971,11 +7679,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8032,10 +7735,6 @@
{
"name": "git_cache",
"path": "cache/git_cache"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8073,11 +7772,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8125,10 +7819,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8151,11 +7841,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8204,10 +7889,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8230,11 +7911,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8283,10 +7959,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8309,11 +7981,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8362,10 +8029,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8388,11 +8051,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8441,10 +8099,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8467,11 +8121,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8520,10 +8169,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8546,11 +8191,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8599,10 +8239,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8630,11 +8266,6 @@
"name": "skia/bots/cmake_linux",
"path": "cmake_linux",
"version": "version:0"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8683,10 +8314,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8709,11 +8336,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8762,10 +8384,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8788,11 +8406,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8841,10 +8454,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8867,11 +8476,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -8920,10 +8524,6 @@
{
"name": "vpython",
"path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -8946,11 +8546,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:16"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9003,10 +8598,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9024,11 +8615,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9082,10 +8668,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9103,11 +8685,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9161,10 +8738,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9182,11 +8755,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9240,10 +8808,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9261,11 +8825,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9319,10 +8878,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9340,11 +8895,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9398,10 +8948,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9419,11 +8965,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9477,10 +9018,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9498,11 +9035,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
@@ -9556,10 +9088,6 @@
{
"name": "docker",
"path": "cache/docker"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
}
],
"cipd_packages": [
@@ -9577,11 +9105,6 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:18e4e91040bcaae33d51a0179a9ada9319cde14d"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
}
],
"command": [
