| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64___xcode.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64___xcode.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64___xcode.json
|
| index 5fa1b29c3984150a6a829c1d4ff9261293dde64b..4f44472f989b8080e99b9c93b0945df4c0f63c5b 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64___xcode.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64___xcode.json
|
| @@ -65,7 +65,8 @@
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "clang=1 target_arch=x64 v8_target_arch=x64",
|
| + "GYP_DEFINES": "clang=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1 v8_target_arch=x64",
|
| + "GYP_GENERATORS": "ninja,xcode-ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -122,15 +123,25 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--build-tool",
|
| - "xcode",
|
| + "ninja",
|
| "--compiler",
|
| - "clang",
|
| + "goma-clang",
|
| + "--goma-jsonstatus",
|
| + "/path/to/tmp/json",
|
| + "--goma-service-account-json-file",
|
| + "/creds/service_accounts/service-account-goma-client.json",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| - "name": "compile"
|
| + "name": "compile",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| + "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|