Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1145)

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json
index 178dd42d0d99189d696ab20066f63d7fcfee8e44..9ebb745bdc27cfde6a822f1e1d728446b40c6788 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux64_release__gn_.json
@@ -11,20 +11,19 @@
"--slave",
"slavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@12345",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -61,9 +60,8 @@
"python",
"-u",
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[SLAVE_BUILD]/src/out"
+ "[CWD]/src/out"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean test output files"
},
{
@@ -75,7 +73,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -85,11 +82,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 dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -98,13 +94,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=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]/goma\""
+ "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[ROOT]/b/build/goma\""
],
- "cwd": "[SLAVE_BUILD]",
"name": "gn"
},
{
@@ -122,9 +117,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",
@@ -134,11 +129,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"
},

Powered by Google App Engine
This is Rietveld 408576698