| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| index faf60d7bb124766bf17ebfbfbb8b60f0f6291789..b08fcd6746a69fb41d8fc1a084bf73a1c211ca9a 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| @@ -141,7 +141,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=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -217,28 +217,6 @@
|
| ]
|
| },
|
| {
|
| - "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",
|
| @@ -259,7 +237,7 @@
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| - "goma-clang",
|
| + "goma",
|
| "--goma-jsonstatus",
|
| "/path/to/tmp/json",
|
| "--goma-service-account-json-file",
|
| @@ -366,7 +344,7 @@
|
| "builder_name": "V8 Linux64",
|
| "properties": {
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "clang=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| @@ -391,7 +369,7 @@
|
| "builder_name": "V8 Linux64 - avx2",
|
| "properties": {
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "clang=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| @@ -433,7 +411,7 @@
|
| "properties": {
|
| "archive": "gs://chromium-v8/v8-linux64-rel",
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "clang=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
|
|