Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 3afc7b1

Browse files
Reverts "[Fuchsia] only download fuchsia deps when necessary (#51439)" (#51500)
Reverts: #51439 Initiated by: zijiehe-google-com Reason for reverting: broke dart->flutter roller due to the expected licenses not being included without `download_fuchsia_deps` in `.gclient`. Original PR Author: zijiehe-google-com Reviewed By: {zanderso} This change reverts the following previous change: This is a quick follow up of #51072 to only download fuchsia deps (via download_fuchsia_deps gclient arg) when necessary. Considering the pr/51072 is very huge, keeping these condition changes in a separate change would be cleaner. The wiki has been updated already since setting the download_fuchsia_deps gclient arg explicitly won't break the existing workflow. I also mentioned in the wiki that building and running fuchsia needed a linux box (an explicit assertion in the with_envs.py). Bug: http://b/40935282 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent fda5c69 commit 3afc7b1

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

.ci.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,6 @@ 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-
}
219212
# Do not remove(https://github.com/flutter/flutter/issues/144644)
220213
# Scheduler will fail to get the platform
221214
drone_dimensions:
@@ -311,11 +304,6 @@ targets:
311304
add_recipes_cq: "true"
312305
config_name: linux_license
313306
clobber: "true"
314-
# Ensure licenses in fuchsia deps can be correctly processed.
315-
gclient_variables: >-
316-
{
317-
"download_fuchsia_deps": true
318-
}
319307

320308
- name: Linux linux_web_engine
321309
recipe: engine_v2/engine_v2

DEPS

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ 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-
'download_fuchsia_deps': 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"',
114116
# Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable
115117
# is currently only used for the Fuchsia LSC process and is not intended for
116118
# local development.
@@ -1208,7 +1210,7 @@ hooks = [
12081210
{
12091211
'name': 'Download Fuchsia system images',
12101212
'pattern': '.',
1211-
'condition': 'download_fuchsia_deps and run_fuchsia_emu',
1213+
'condition': 'run_fuchsia_emu',
12121214
'action': [
12131215
'env',
12141216
'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',

ci/builders/linux_fuchsia.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"device_type=none",
66
"os=Linux"
77
],
8+
"gclient_variables": {
9+
"download_android_deps": false
10+
},
811
"gn": [
912
"--fuchsia",
1013
"--fuchsia-cpu",
@@ -28,6 +31,7 @@
2831
"os=Linux"
2932
],
3033
"gclient_variables": {
34+
"download_android_deps": false,
3135
"run_fuchsia_emu": true
3236
},
3337
"gn": [
@@ -64,6 +68,9 @@
6468
"device_type=none",
6569
"os=Linux"
6670
],
71+
"gclient_variables": {
72+
"download_android_deps": false
73+
},
6774
"gn": [
6875
"--fuchsia",
6976
"--fuchsia-cpu",
@@ -87,6 +94,7 @@
8794
"os=Linux"
8895
],
8996
"gclient_variables": {
97+
"download_android_deps": false,
9098
"run_fuchsia_emu": true
9199
},
92100
"gn": [
@@ -123,6 +131,9 @@
123131
"device_type=none",
124132
"os=Linux"
125133
],
134+
"gclient_variables": {
135+
"download_android_deps": false
136+
},
126137
"gn": [
127138
"--fuchsia",
128139
"--fuchsia-cpu",
@@ -162,6 +173,7 @@
162173
"os=Linux"
163174
],
164175
"gclient_variables": {
176+
"download_android_deps": false,
165177
"run_fuchsia_emu": true
166178
},
167179
"gn": [
@@ -198,6 +210,9 @@
198210
"device_type=none",
199211
"os=Linux"
200212
],
213+
"gclient_variables": {
214+
"download_android_deps": false
215+
},
201216
"gn": [
202217
"--fuchsia",
203218
"--fuchsia-cpu",
@@ -221,6 +236,7 @@
221236
"os=Linux"
222237
],
223238
"gclient_variables": {
239+
"download_android_deps": false,
224240
"run_fuchsia_emu": true
225241
},
226242
"gn": [
@@ -257,6 +273,10 @@
257273
"device_type=none",
258274
"os=Linux"
259275
],
276+
"gclient_variables": {
277+
"download_android_deps": false,
278+
"run_fuchsia_emu": true
279+
},
260280
"gn": [
261281
"--fuchsia",
262282
"--fuchsia-cpu",
@@ -280,6 +300,7 @@
280300
"os=Linux"
281301
],
282302
"gclient_variables": {
303+
"download_android_deps": false,
283304
"run_fuchsia_emu": true
284305
},
285306
"gn": [
@@ -316,6 +337,10 @@
316337
"device_type=none",
317338
"os=Linux"
318339
],
340+
"gclient_variables": {
341+
"download_android_deps": false,
342+
"run_fuchsia_emu": true
343+
},
319344
"gn": [
320345
"--fuchsia",
321346
"--fuchsia-cpu",
@@ -355,6 +380,7 @@
355380
"os=Linux"
356381
],
357382
"gclient_variables": {
383+
"download_android_deps": false,
358384
"run_fuchsia_emu": true
359385
},
360386
"gn": [

0 commit comments

Comments
 (0)