| Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gyp.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gyp.json
|
| similarity index 94%
|
| rename from scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| rename to scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gyp.json
|
| index 89d2a35fbb24ab7b801aaee6ad18ac6504239f1e..e5f1193468db8dd9d5074ba70d332518fabadb53 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gyp.json
|
| @@ -134,26 +134,12 @@
|
| "cwd": "[SLAVE_BUILD]\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| - "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]\\gn.py",
|
| - "--root=[SLAVE_BUILD]\\src",
|
| - "gen",
|
| - "//out/Debug_x64",
|
| - "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]\\cipd\\goma\""
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]\\src",
|
| - "name": "gn"
|
| - },
|
| - {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| @@ -194,13 +180,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "win_x64_gn",
|
| + "win_x64_gyp",
|
| "--buildbot-mastername",
|
| "tryserver.libyuv",
|
| "--buildbot-slavename",
|
| "slavename",
|
| "--goma-deps-cache-file",
|
| - "win_x64_gn.gomadeps",
|
| + "win_x64_gyp.gomadeps",
|
| "--compiler",
|
| "goma-clang",
|
| "--goma-jsonstatus",
|
| @@ -211,8 +197,7 @@
|
| "[CACHE]\\cipd\\goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
|
|