| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gyp_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gyp_.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
|
| rename to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gyp_.json
|
| index 79caffc671c2ce3ba5f3ded0938177d4e3e8f81b..7e5398399ff491cf2284313b8b42e62d3a330b8d 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gyp_.json
|
| @@ -128,7 +128,6 @@
|
| "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": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -138,19 +137,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| - "gen",
|
| - "//out/Release",
|
| - "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "gn"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| @@ -166,13 +152,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Linux64 Release (GN)",
|
| + "Linux64 Release (GYP)",
|
| "--buildbot-mastername",
|
| "client.libyuv",
|
| "--buildbot-slavename",
|
| "slavename",
|
| "--goma-deps-cache-file",
|
| - "Linux64_Release__GN_.gomadeps",
|
| + "Linux64_Release__GYP_.gomadeps",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -181,8 +167,7 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
|
|