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

Side by Side Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gn_rel.json

Issue 1917243002: Revert "build: roll infra_paths changes" (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 unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", 6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
7 "--master", 7 "--master",
8 "tryserver.webrtc", 8 "tryserver.webrtc",
9 "--builder", 9 "--builder",
10 "android_gn_rel", 10 "android_gn_rel",
11 "--slave", 11 "--slave",
12 "slavename", 12 "slavename",
13 "--spec", 13 "--spec",
14 "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.co m/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limi ted', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limite d'}]\ntarget_os = ['android']", 14 "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'}]\ntarget_os = [ 'android']",
15 "--root", 15 "--root",
16 "src", 16 "src",
17 "--revision_mapping_file", 17 "--revision_mapping_file",
18 "{\"src\": \"got_revision\"}", 18 "{\"src\": \"got_revision\"}",
19 "--git-cache-dir", 19 "--git-cache-dir",
20 "[ROOT]/b/build/slave/cache_dir", 20 "[GIT_CACHE]",
21 "--issue", 21 "--issue",
22 "666666", 22 "666666",
23 "--patchset", 23 "--patchset",
24 "1", 24 "1",
25 "--rietveld_server", 25 "--rietveld_server",
26 "https://fake.rietveld.url", 26 "https://fake.rietveld.url",
27 "--output_json", 27 "--output_json",
28 "/path/to/tmp/json", 28 "/path/to/tmp/json",
29 "--revision", 29 "--revision",
30 "src@12345", 30 "src@12345",
31 "--output_manifest" 31 "--output_manifest"
32 ], 32 ],
33 "cwd": "[SLAVE_BUILD]",
33 "env": { 34 "env": {
34 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 35 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
35 }, 36 },
36 "name": "bot_update", 37 "name": "bot_update",
37 "~followup_annotations": [ 38 "~followup_annotations": [
38 "@@@STEP_TEXT@Some step text@@@", 39 "@@@STEP_TEXT@Some step text@@@",
39 "@@@STEP_LOG_LINE@json.output@{@@@", 40 "@@@STEP_LOG_LINE@json.output@{@@@",
40 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", 41 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
41 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", 42 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
42 "@@@STEP_LOG_LINE@json.output@ \"src\": \"12345\"@@@", 43 "@@@STEP_LOG_LINE@json.output@ \"src\": \"12345\"@@@",
(...skipping 16 matching lines...) Expand all
59 "@@@STEP_LOG_END@json.output@@@", 60 "@@@STEP_LOG_END@json.output@@@",
60 "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5 8cb9\"@@@", 61 "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5 8cb9\"@@@",
61 "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" 62 "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
62 ] 63 ]
63 }, 64 },
64 { 65 {
65 "cmd": [ 66 "cmd": [
66 "python", 67 "python",
67 "-u", 68 "-u",
68 "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py", 69 "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
69 "[CWD]/src/out" 70 "[SLAVE_BUILD]/src/out"
70 ], 71 ],
72 "cwd": "[SLAVE_BUILD]",
71 "name": "clean test output files" 73 "name": "clean test output files"
72 }, 74 },
73 { 75 {
74 "cmd": [ 76 "cmd": [
75 "python", 77 "python",
76 "-u", 78 "-u",
77 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree (sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw ith('.pyc'):\n os.remove(os.path.join(base, f))\n", 79 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree (sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw ith('.pyc'):\n os.remove(os.path.join(base, f))\n",
78 "[CWD]/src/out/Release/debug_info_dumps", 80 "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
79 "[CWD]/src/out/Release/test_logs", 81 "[SLAVE_BUILD]/src/out/Release/test_logs",
80 "[CWD]/src/out/build_product.zip", 82 "[SLAVE_BUILD]/src/out/build_product.zip",
81 "[CWD]/src" 83 "[SLAVE_BUILD]/src"
82 ], 84 ],
85 "cwd": "[SLAVE_BUILD]",
83 "name": "clean local files", 86 "name": "clean local files",
84 "~followup_annotations": [ 87 "~followup_annotations": [
85 "@@@STEP_LOG_LINE@python.inline@@@@", 88 "@@@STEP_LOG_LINE@python.inline@@@@",
86 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", 89 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
87 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", 90 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
88 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", 91 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
89 "@@@STEP_LOG_LINE@python.inline@try:@@@", 92 "@@@STEP_LOG_LINE@python.inline@try:@@@",
90 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@", 93 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
91 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", 94 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
92 "@@@STEP_LOG_LINE@python.inline@ pass@@@", 95 "@@@STEP_LOG_LINE@python.inline@ pass@@@",
93 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv [4]):@@@", 96 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv [4]):@@@",
94 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", 97 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
95 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", 98 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
96 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" , 99 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@" ,
97 "@@@STEP_LOG_END@python.inline@@@" 100 "@@@STEP_LOG_END@python.inline@@@"
98 ] 101 ]
99 }, 102 },
100 { 103 {
101 "cmd": [ 104 "cmd": [
102 "python", 105 "python",
103 "-u", 106 "-u",
104 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 107 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
105 "runhooks" 108 "runhooks"
106 ], 109 ],
110 "cwd": "[SLAVE_BUILD]",
107 "env": { 111 "env": {
108 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 112 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
109 "GYP_CHROMIUM_NO_ACTION": "1", 113 "GYP_CHROMIUM_NO_ACTION": "1",
110 "GYP_CROSSCOMPILE": "1", 114 "GYP_CROSSCOMPILE": "1",
111 "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fas tbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1", 115 "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fas tbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
112 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/ build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 116 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
113 }, 117 },
114 "name": "gclient runhooks" 118 "name": "gclient runhooks"
115 }, 119 },
116 { 120 {
117 "cmd": [ 121 "cmd": [
118 "python", 122 "python",
119 "-u", 123 "-u",
120 "[ROOT]/b/depot_tools/gn.py", 124 "[DEPOT_TOOLS]/gn.py",
121 "--root=[CWD]/src", 125 "--root=[SLAVE_BUILD]/src",
122 "gen", 126 "gen",
123 "//out/Release", 127 "//out/Release",
124 "--args=is_debug=false target_os=\"android\" target_cpu=\"arm\" use_goma=t rue goma_dir=\"[ROOT]/b/build/goma\"" 128 "--args=is_debug=false target_os=\"android\" target_cpu=\"arm\" use_goma=t rue goma_dir=\"[BUILD]/goma\""
125 ], 129 ],
130 "cwd": "[SLAVE_BUILD]",
126 "name": "gn" 131 "name": "gn"
127 }, 132 },
128 { 133 {
129 "cmd": [ 134 "cmd": [
130 "python", 135 "python",
131 "-u", 136 "-u",
132 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", 137 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
133 "--show-path", 138 "--show-path",
134 "python", 139 "python",
135 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", 140 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
136 "--gsutil-py-path", 141 "--gsutil-py-path",
137 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", 142 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
138 "--ninja-path", 143 "--ninja-path",
139 "RECIPE_PACKAGE_REPO[depot_tools]/ninja", 144 "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
140 "--target", 145 "--target",
141 "Release", 146 "Release",
142 "--src-dir", 147 "--src-dir",
143 "[CWD]/src", 148 "[SLAVE_BUILD]/src",
144 "--goma-cache-dir", 149 "--goma-cache-dir",
145 "[ROOT]/b/build/slave/goma_cache", 150 "[GOMA_CACHE]",
146 "--build-tool", 151 "--build-tool",
147 "ninja", 152 "ninja",
148 "--compiler", 153 "--compiler",
149 "goma", 154 "goma",
150 "--goma-jsonstatus", 155 "--goma-jsonstatus",
151 "/path/to/tmp/json", 156 "/path/to/tmp/json",
152 "--goma-service-account-json-file", 157 "--goma-service-account-json-file",
153 "/creds/service_accounts/service-account-goma-client.json", 158 "/creds/service_accounts/service-account-goma-client.json",
154 "--goma-dir", 159 "--goma-dir",
155 "[ROOT]/b/build/goma", 160 "[BUILD]/goma",
156 "--goma-fail-fast", 161 "--goma-fail-fast",
157 "--goma-disable-local-fallback", 162 "--goma-disable-local-fallback",
158 "--", 163 "--",
159 "all" 164 "all"
160 ], 165 ],
166 "cwd": "[SLAVE_BUILD]",
161 "env": { 167 "env": {
162 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 168 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
163 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/ build/android:%(PATH)s" 169 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
164 }, 170 },
165 "name": "compile", 171 "name": "compile",
166 "~followup_annotations": [ 172 "~followup_annotations": [
167 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 173 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
168 "@@@STEP_LOG_END@json.output (invalid)@@@" 174 "@@@STEP_LOG_END@json.output (invalid)@@@"
169 ] 175 ]
170 }, 176 },
171 { 177 {
172 "name": "$result", 178 "name": "$result",
173 "recipe_result": null, 179 "recipe_result": null,
174 "status_code": 0 180 "status_code": 0
175 } 181 }
176 ] 182 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698