| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gyp_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gn_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gyp_.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gn_.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gyp_.json
|
| index 01a39325b84fc9264c1d78e5cd553a9aeddf534d..00ce7f87f60011261c268f36c3deb0441981f732 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gn_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_win64_debug__gyp_.json
|
| @@ -4,7 +4,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]\\Win64_Debug__GN_",
|
| + "[BUILDER_CACHE]\\Win64_Debug__GYP_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -29,7 +29,7 @@
|
| "--master",
|
| "client.webrtc",
|
| "--builder",
|
| - "Win64 Debug (GN)",
|
| + "Win64 Debug (GYP)",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -46,7 +46,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win64_Debug__GN_",
|
| + "cwd": "[BUILDER_CACHE]\\Win64_Debug__GYP_",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -83,7 +83,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]\\resources\\cleanup_files.py",
|
| - "[BUILDER_CACHE]\\Win64_Debug__GN_\\src\\out"
|
| + "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src\\out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -163,7 +163,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win64_Debug__GN_\\src",
|
| + "cwd": "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -176,20 +176,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win64_Debug__GN_\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "client.webrtc",
|
| "-b",
|
| - "Win64 Debug (GN)",
|
| + "Win64 Debug (GYP)",
|
| "--config-file",
|
| - "[BUILDER_CACHE]\\Win64_Debug__GN_\\src\\webrtc\\build\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src\\webrtc\\build\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| - "--gyp-script=[BUILDER_CACHE]\\Win64_Debug__GN_\\src\\webrtc\\build\\gyp_webrtc.py",
|
| + "--gyp-script=[BUILDER_CACHE]\\Win64_Debug__GYP_\\src\\webrtc\\build\\gyp_webrtc.py",
|
| "//out/Debug_x64"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win64_Debug__GN_\\src",
|
| + "cwd": "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -210,7 +210,7 @@
|
| "--target",
|
| "Debug_x64",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Win64_Debug__GN_\\src",
|
| + "[BUILDER_CACHE]\\Win64_Debug__GYP_\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -223,8 +223,7 @@
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
|
|