This repository was archived by the owner on Feb 25, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +14
-30
lines changed
Expand file tree Collapse file tree 3 files changed +14
-30
lines changed Original file line number Diff line number Diff line change @@ -209,6 +209,13 @@ targets:
209209 properties :
210210 release_build : " true"
211211 config_name : linux_fuchsia
212+ # pm in fuchsia-sdk is required when uploading artifacts, so we have to
213+ # download the fuchsia-deps in root builder.
214+ gclient_variables : >-
215+ {
216+ "download_android_deps": false,
217+ "download_fuchsia_deps": true
218+ }
212219 # Do not remove(https://github.com/flutter/flutter/issues/144644)
213220 # Scheduler will fail to get the platform
214221 drone_dimensions :
@@ -304,6 +311,11 @@ targets:
304311 add_recipes_cq : " true"
305312 config_name : linux_license
306313 clobber : " true"
314+ # Ensure licenses in fuchsia deps can be correctly processed.
315+ gclient_variables : >-
316+ {
317+ "download_fuchsia_deps": true
318+ }
307319
308320 - name : Linux linux_web_engine
309321 recipe : engine_v2/engine_v2
Original file line number Diff line number Diff line change @@ -110,9 +110,7 @@ vars = {
110110 # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which
111111 # controls the behavior of all fuchsia related flags. I.e. any fuchsia related
112112 # logic or condition may not work if this flag is False.
113- # TODO(zijiehe): Make this condition more strict to only download fuchsia
114- # dependencies when necessary: b/40935282
115- 'download_fuchsia_deps' : 'host_os == "linux"' ,
113+ 'download_fuchsia_deps' : False ,
116114 # Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable
117115 # is currently only used for the Fuchsia LSC process and is not intended for
118116 # local development.
@@ -1210,7 +1208,7 @@ hooks = [
12101208 {
12111209 'name' : 'Download Fuchsia system images' ,
12121210 'pattern' : '.' ,
1213- 'condition' : 'run_fuchsia_emu' ,
1211+ 'condition' : 'download_fuchsia_deps and run_fuchsia_emu' ,
12141212 'action' : [
12151213 'env' ,
12161214 'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}' ,
Original file line number Diff line number Diff line change 55 " device_type=none" ,
66 " os=Linux"
77 ],
8- "gclient_variables" : {
9- "download_android_deps" : false
10- },
118 "gn" : [
129 " --fuchsia" ,
1310 " --fuchsia-cpu" ,
3128 " os=Linux"
3229 ],
3330 "gclient_variables" : {
34- "download_android_deps" : false ,
3531 "run_fuchsia_emu" : true
3632 },
3733 "gn" : [
6864 " device_type=none" ,
6965 " os=Linux"
7066 ],
71- "gclient_variables" : {
72- "download_android_deps" : false
73- },
7467 "gn" : [
7568 " --fuchsia" ,
7669 " --fuchsia-cpu" ,
9487 " os=Linux"
9588 ],
9689 "gclient_variables" : {
97- "download_android_deps" : false ,
9890 "run_fuchsia_emu" : true
9991 },
10092 "gn" : [
131123 " device_type=none" ,
132124 " os=Linux"
133125 ],
134- "gclient_variables" : {
135- "download_android_deps" : false
136- },
137126 "gn" : [
138127 " --fuchsia" ,
139128 " --fuchsia-cpu" ,
173162 " os=Linux"
174163 ],
175164 "gclient_variables" : {
176- "download_android_deps" : false ,
177165 "run_fuchsia_emu" : true
178166 },
179167 "gn" : [
210198 " device_type=none" ,
211199 " os=Linux"
212200 ],
213- "gclient_variables" : {
214- "download_android_deps" : false
215- },
216201 "gn" : [
217202 " --fuchsia" ,
218203 " --fuchsia-cpu" ,
236221 " os=Linux"
237222 ],
238223 "gclient_variables" : {
239- "download_android_deps" : false ,
240224 "run_fuchsia_emu" : true
241225 },
242226 "gn" : [
273257 " device_type=none" ,
274258 " os=Linux"
275259 ],
276- "gclient_variables" : {
277- "download_android_deps" : false ,
278- "run_fuchsia_emu" : true
279- },
280260 "gn" : [
281261 " --fuchsia" ,
282262 " --fuchsia-cpu" ,
300280 " os=Linux"
301281 ],
302282 "gclient_variables" : {
303- "download_android_deps" : false ,
304283 "run_fuchsia_emu" : true
305284 },
306285 "gn" : [
337316 " device_type=none" ,
338317 " os=Linux"
339318 ],
340- "gclient_variables" : {
341- "download_android_deps" : false ,
342- "run_fuchsia_emu" : true
343- },
344319 "gn" : [
345320 " --fuchsia" ,
346321 " --fuchsia-cpu" ,
380355 " os=Linux"
381356 ],
382357 "gclient_variables" : {
383- "download_android_deps" : false ,
384358 "run_fuchsia_emu" : true
385359 },
386360 "gn" : [
You can’t perform that action at this time.
0 commit comments