Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json |
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json |
index b185532376550b1837c0039684d38843b89e331a..23235d662f12e94ff1adfa9daefe284ac1200725 100644 |
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json |
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"slavename", |
"--spec", |
- "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[ROOT]\\b\\build\\slave\\cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,6 +25,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -53,10 +54,11 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"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 gomadir='[ROOT]\\b\\build\\goma' target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -65,12 +67,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]\\b\\depot_tools\\gn.py", |
- "--root=[CWD]\\src", |
+ "[DEPOT_TOOLS]\\gn.py", |
+ "--root=[SLAVE_BUILD]\\src", |
"gen", |
"//out/Debug_x64", |
- "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[ROOT]\\b\\build\\goma\"" |
+ "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]\\goma\"" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gn" |
}, |
{ |
@@ -80,10 +83,11 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -110,9 +114,9 @@ |
"--target", |
"Debug_x64", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -122,10 +126,11 @@ |
"--goma-service-account-json-file", |
"C:\\creds\\service_accounts\\service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]\\b\\build\\goma", |
+ "[BUILD]\\goma", |
"--", |
"all" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |