Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json |
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json |
index a6950ba52f32f6bad148e9e1755f7dcdf29dee6d..e3cfd022af62794b6e4375e1288af7e08e18d46b 100644 |
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json |
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"slavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]\ntarget_os = ['ios', 'mac']", |
+ "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'}]\ntarget_os = ['ios', 'mac']", |
"--root", |
"src", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,7 +25,6 @@ |
"--force", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -54,11 +53,10 @@ |
"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_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=ios clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=arm64 target_subarch=arm64 use_goma=1", |
+ "GYP_DEFINES": "OS=ios clang=1 component=static_library gomadir='[ROOT]/b/build/goma' target_arch=arm64 target_subarch=arm64 use_goma=1", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -71,11 +69,10 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[CWD]/src", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -102,9 +99,9 @@ |
"--target", |
"Release-iphoneos", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[CWD]/src", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]/b/build/slave/goma_cache", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -114,11 +111,10 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--", |
"All" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |