| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gyp_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gyp_.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gyp_.json
|
| index ad086c2954311708c42b301821bd0cba6d40174a..d404d1a50c7f78a2cccbba7130a2ccd38702f997 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gyp_.json
|
| @@ -26,7 +26,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_",
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -51,7 +51,7 @@
|
| "--master",
|
| "client.webrtc",
|
| "--builder",
|
| - "Mac64 Release (GN)",
|
| + "Mac64 Release (GYP)",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -68,7 +68,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac64_Release__GN_",
|
| + "cwd": "[BUILDER_CACHE]/Mac64_Release__GYP_",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -105,7 +105,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_/src/out"
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_/src/out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -185,7 +185,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac64_Release__GN_/src",
|
| + "cwd": "[BUILDER_CACHE]/Mac64_Release__GYP_/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -198,20 +198,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "client.webrtc",
|
| "-b",
|
| - "Mac64 Release (GN)",
|
| + "Mac64 Release (GYP)",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_/src/webrtc/build/mb_config.pyl",
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_/src/webrtc/build/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--gyp-script=[BUILDER_CACHE]/Mac64_Release__GN_/src/webrtc/build/gyp_webrtc.py",
|
| + "--gyp-script=[BUILDER_CACHE]/Mac64_Release__GYP_/src/webrtc/build/gyp_webrtc.py",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac64_Release__GN_/src",
|
| + "cwd": "[BUILDER_CACHE]/Mac64_Release__GYP_/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -224,7 +224,7 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_/src",
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_/src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -254,7 +254,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Mac64_Release__GN_/src",
|
| + "[BUILDER_CACHE]/Mac64_Release__GYP_/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -267,8 +267,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"
|
|
|