| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
|
| index d713e8094b98827e9da8fe68750b584eed85ccbe..c8ff104791a689186992885a1fb1f2840f10933c 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.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'}]",
|
| + "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'}]",
|
| "--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_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -67,13 +65,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| + "[ROOT]/b/depot_tools/gn.py",
|
| + "--root=[CWD]/src",
|
| "gen",
|
| "//out/Release",
|
| - "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]/goma\""
|
| + "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[ROOT]/b/build/goma\""
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gn"
|
| },
|
| {
|
| @@ -91,9 +88,9 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[CWD]/src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]/b/build/slave/goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -103,11 +100,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"
|
| },
|
|
|