Index: scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_arm___sim___beta_branch___debug.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_arm___sim___beta_branch___debug.json b/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_arm___sim___beta_branch___debug.json |
index 90f656187b9003c51f09b3cdd100fe5ca3081ec2..1667c94e0fee4e10eda1184f3bee42d414beeae4 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_arm___sim___beta_branch___debug.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_arm___sim___beta_branch___debug.json |
@@ -121,7 +121,7 @@ |
"cwd": "[SLAVE_BUILD]/v8", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=arm", |
+ "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=arm", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -139,28 +139,6 @@ |
"name": "cleanup_temp" |
}, |
{ |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
- "--src-dir", |
- "[SLAVE_BUILD]/v8", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
- }, |
- "name": "clang_revision", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -181,7 +159,7 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma-clang", |
+ "goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-service-account-json-file", |