Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug__gn_.json |
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug__gn_.json |
index 8a5cfaa2823a376e5f072aa1e75d5ccbadb7d729..4cc6c8483930d8436ced865883ea075dc99d7992 100644 |
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_debug__gn_.json |
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_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": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "component=shared_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "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", |
- "--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" |
}, |
{ |
@@ -88,9 +91,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -100,10 +103,11 @@ |
"--goma-service-account-json-file", |
"/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": "/creds/service_accounts/service-account-goma-client.json" |
}, |