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

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

Issue 2030133002: WebRTC: Move ensure_goma step to before runhooks step. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 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_mac64_release__gn_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json
index 929b2410d023537008104eb0f509ceb443efda00..7700a81adf23e9bcba1b67a17ec14e0116ffd4a5 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_mac64_release__gn_.json
@@ -98,34 +98,6 @@
"name": "cleanup_temp"
},
{
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "clang=1 component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_h264=1 target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[DEPOT_TOOLS]/gn.py",
- "--root=[SLAVE_BUILD]/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\""
- ],
- "name": "gn"
- },
- {
"cmd": [],
"name": "ensure_goma"
},
@@ -180,6 +152,34 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "GYP_CHROMIUM_NO_ACTION": "1",
+ "GYP_DEFINES": "clang=1 component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 use_goma=1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient runhooks"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[DEPOT_TOOLS]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Release",
+ "--args=ffmpeg_branding=\"Chrome\" rtc_use_h264=true is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ ],
+ "name": "gn"
+ },
+ {
"allow_subannotations": true,
"cmd": [
"python",

Powered by Google App Engine
This is Rietveld 408576698