scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json - Issue 2030133002: WebRTC: Move ensure_goma step to before runhooks step.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.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

« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder__dbg_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json

diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json

index 35a0a4d0e54c4942ed6b483730fcf09cf72d772a..caa87e57ef2932bbcb6c7be29c464ea436d6e0f6 100644

--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json

+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder_x64__dbg_.json

@@ -92,22 +92,6 @@

]

{

- "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_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

- },

- "name": "gclient runhooks"

- },

- {

"cmd": [],

"name": "ensure_goma"

@@ -165,6 +149,22 @@

"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_CROSSCOMPILE": "1",

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

+ },

+ "name": "gclient runhooks"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

"--show-path",

"python",