Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
index c0873c9a31bfe1f88e6ab104443416cfb112a05c..689994c7e19887ed4cf9bf71d314ba689dc617f3 100644 |
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json |
@@ -76,38 +76,6 @@ |
}, |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n" |
- ], |
- "env": { |
- "BUILDTYPE": "Debug", |
- "CHROME_HEADLESS": "1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", |
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" |
- }, |
- "name": "has ccache?", |
- "stdout": "/path/to/tmp/json", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"ccache\": \"/usr/bin/ccache\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@STEP_LOG_LINE@python.inline@import json@@@", |
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", |
- "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@ccache = None@@@", |
- "@@@STEP_LOG_LINE@python.inline@try:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ ccache = subprocess.check_output(['which', 'ccache']).rstrip()@@@", |
- "@@@STEP_LOG_LINE@python.inline@except:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ pass@@@", |
- "@@@STEP_LOG_LINE@python.inline@print json.dumps({'ccache': ccache})@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
"[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
@@ -121,7 +89,7 @@ |
"gn", |
"gen", |
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug", |
- "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" compiler_prefix=\"/usr/bin/ccache\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_cflags=\"-Qunused-arguments\" extra_ldflags=\"-fuse-ld=lld\" is_debug=true" |
+ "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_cflags=\"\" extra_ldflags=\"-fuse-ld=lld\" is_debug=true" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
"env": { |