| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug__gn_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug__gn_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug__gn_.json
|
| index 4762fa7f20db34c793a2ecc309a92b3599f6ed65..e309d64c76f7a225ac78233a270467dcd49afad9 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug__gn_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_debug__gn_.json
|
| @@ -98,34 +98,6 @@
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_h264=1 target_arch=x64 use_goma=1",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| - "gen",
|
| - "//out/Debug",
|
| - "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]/goma\""
|
| - ],
|
| - "name": "gn"
|
| - },
|
| - {
|
| "cmd": [],
|
| "name": "ensure_goma"
|
| },
|
| @@ -180,6 +152,34 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| + "runhooks"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "GYP_CHROMIUM_NO_ACTION": "1",
|
| + "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 use_goma=1",
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "name": "gclient runhooks"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[DEPOT_TOOLS]/gn.py",
|
| + "--root=[SLAVE_BUILD]/src",
|
| + "gen",
|
| + "//out/Debug",
|
| + "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
|
| + ],
|
| + "name": "gn"
|
| + },
|
| + {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
|
|