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:
209
209
properties :
210
210
release_build : " true"
211
211
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
+ }
212
219
# Do not remove(https://github.com/flutter/flutter/issues/144644)
213
220
# Scheduler will fail to get the platform
214
221
drone_dimensions :
@@ -304,6 +311,11 @@ targets:
304
311
add_recipes_cq : " true"
305
312
config_name : linux_license
306
313
clobber : " true"
314
+ # Ensure licenses in fuchsia deps can be correctly processed.
315
+ gclient_variables : >-
316
+ {
317
+ "download_fuchsia_deps": true
318
+ }
307
319
308
320
- name : Linux linux_web_engine
309
321
recipe : engine_v2/engine_v2
Original file line number Diff line number Diff line change @@ -110,9 +110,7 @@ vars = {
110
110
# Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which
111
111
# controls the behavior of all fuchsia related flags. I.e. any fuchsia related
112
112
# 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 ,
116
114
# Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable
117
115
# is currently only used for the Fuchsia LSC process and is not intended for
118
116
# local development.
@@ -1210,7 +1208,7 @@ hooks = [
1210
1208
{
1211
1209
'name' : 'Download Fuchsia system images' ,
1212
1210
'pattern' : '.' ,
1213
- 'condition' : 'run_fuchsia_emu' ,
1211
+ 'condition' : 'download_fuchsia_deps and run_fuchsia_emu' ,
1214
1212
'action' : [
1215
1213
'env' ,
1216
1214
'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}' ,
Original file line number Diff line number Diff line change 5
5
" device_type=none" ,
6
6
" os=Linux"
7
7
],
8
- "gclient_variables" : {
9
- "download_android_deps" : false
10
- },
11
8
"gn" : [
12
9
" --fuchsia" ,
13
10
" --fuchsia-cpu" ,
31
28
" os=Linux"
32
29
],
33
30
"gclient_variables" : {
34
- "download_android_deps" : false ,
35
31
"run_fuchsia_emu" : true
36
32
},
37
33
"gn" : [
68
64
" device_type=none" ,
69
65
" os=Linux"
70
66
],
71
- "gclient_variables" : {
72
- "download_android_deps" : false
73
- },
74
67
"gn" : [
75
68
" --fuchsia" ,
76
69
" --fuchsia-cpu" ,
94
87
" os=Linux"
95
88
],
96
89
"gclient_variables" : {
97
- "download_android_deps" : false ,
98
90
"run_fuchsia_emu" : true
99
91
},
100
92
"gn" : [
131
123
" device_type=none" ,
132
124
" os=Linux"
133
125
],
134
- "gclient_variables" : {
135
- "download_android_deps" : false
136
- },
137
126
"gn" : [
138
127
" --fuchsia" ,
139
128
" --fuchsia-cpu" ,
173
162
" os=Linux"
174
163
],
175
164
"gclient_variables" : {
176
- "download_android_deps" : false ,
177
165
"run_fuchsia_emu" : true
178
166
},
179
167
"gn" : [
210
198
" device_type=none" ,
211
199
" os=Linux"
212
200
],
213
- "gclient_variables" : {
214
- "download_android_deps" : false
215
- },
216
201
"gn" : [
217
202
" --fuchsia" ,
218
203
" --fuchsia-cpu" ,
236
221
" os=Linux"
237
222
],
238
223
"gclient_variables" : {
239
- "download_android_deps" : false ,
240
224
"run_fuchsia_emu" : true
241
225
},
242
226
"gn" : [
273
257
" device_type=none" ,
274
258
" os=Linux"
275
259
],
276
- "gclient_variables" : {
277
- "download_android_deps" : false ,
278
- "run_fuchsia_emu" : true
279
- },
280
260
"gn" : [
281
261
" --fuchsia" ,
282
262
" --fuchsia-cpu" ,
300
280
" os=Linux"
301
281
],
302
282
"gclient_variables" : {
303
- "download_android_deps" : false ,
304
283
"run_fuchsia_emu" : true
305
284
},
306
285
"gn" : [
337
316
" device_type=none" ,
338
317
" os=Linux"
339
318
],
340
- "gclient_variables" : {
341
- "download_android_deps" : false ,
342
- "run_fuchsia_emu" : true
343
- },
344
319
"gn" : [
345
320
" --fuchsia" ,
346
321
" --fuchsia-cpu" ,
380
355
" os=Linux"
381
356
],
382
357
"gclient_variables" : {
383
- "download_android_deps" : false ,
384
358
"run_fuchsia_emu" : true
385
359
},
386
360
"gn" : [
You can’t perform that action at this time.
0 commit comments