| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gyp_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gyp_.json
|
| similarity index 94%
|
| rename from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| rename to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gyp_.json
|
| index 9b2c2f491fd80831a5d675b9371de7f1ef731526..fdf540639fd1b3c4c272094c3da65ffdac8170eb 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gyp_.json
|
| @@ -129,26 +129,12 @@
|
| "env": {
|
| "FORCE_MAC_TOOLCHAIN": "1",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "clang=1 component=static_library 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/Release",
|
| - "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "gn"
|
| - },
|
| - {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| @@ -190,13 +176,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Mac64 Release (GN)",
|
| + "Mac64 Release (GYP)",
|
| "--buildbot-mastername",
|
| "client.libyuv",
|
| "--buildbot-slavename",
|
| "slavename",
|
| "--goma-deps-cache-file",
|
| - "Mac64_Release__GN_.gomadeps",
|
| + "Mac64_Release__GYP_.gomadeps",
|
| "--compiler",
|
| "goma-clang",
|
| "--goma-jsonstatus",
|
| @@ -205,8 +191,7 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "FORCE_MAC_TOOLCHAIN": "1",
|
|
|