| Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json
|
| diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json
|
| index 12eeefdfefc4a51b454b6b23d7a2490d717a7599..ae867681ba246e5b23a1871f7ec7208f28a2ac35 100644
|
| --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json
|
| +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.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": "Release",
|
| - "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-arm64-Release-GN_Android"
|
| - },
|
| - "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-arm64-Release-GN_Android/Release",
|
| - "--args=compiler_prefix=\"/usr/bin/ccache\" extra_cflags=\"-Qunused-arguments\" is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\""
|
| + "--args=is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\""
|
| ],
|
| "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| "env": {
|
|
|