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

Reverts "[Fuchsia] only download fuchsia deps when necessary (#51439)" #51500

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,6 @@ targets:
properties:
release_build: "true"
config_name: linux_fuchsia
# pm in fuchsia-sdk is required when uploading artifacts, so we have to
# download the fuchsia-deps in root builder.
gclient_variables: >-
{
"download_android_deps": false,
"download_fuchsia_deps": true
}
# Do not remove(https://github.com/flutter/flutter/issues/144644)
# Scheduler will fail to get the platform
drone_dimensions:
Expand Down Expand Up @@ -311,11 +304,6 @@ targets:
add_recipes_cq: "true"
config_name: linux_license
clobber: "true"
# Ensure licenses in fuchsia deps can be correctly processed.
gclient_variables: >-
{
"download_fuchsia_deps": true
}

- name: Linux linux_web_engine
recipe: engine_v2/engine_v2
Expand Down
6 changes: 4 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ vars = {
# Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which
# controls the behavior of all fuchsia related flags. I.e. any fuchsia related
# logic or condition may not work if this flag is False.
'download_fuchsia_deps': False,
# TODO(zijiehe): Make this condition more strict to only download fuchsia
# dependencies when necessary: b/40935282
'download_fuchsia_deps': 'host_os == "linux"',
# Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable
# is currently only used for the Fuchsia LSC process and is not intended for
# local development.
Expand Down Expand Up @@ -1208,7 +1210,7 @@ hooks = [
{
'name': 'Download Fuchsia system images',
'pattern': '.',
'condition': 'download_fuchsia_deps and run_fuchsia_emu',
'condition': 'run_fuchsia_emu',
'action': [
'env',
'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',
Expand Down
26 changes: 26 additions & 0 deletions ci/builders/linux_fuchsia.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand All @@ -28,6 +31,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down Expand Up @@ -64,6 +68,9 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand All @@ -87,6 +94,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down Expand Up @@ -123,6 +131,9 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand Down Expand Up @@ -162,6 +173,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down Expand Up @@ -198,6 +210,9 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand All @@ -221,6 +236,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down Expand Up @@ -257,6 +273,10 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand All @@ -280,6 +300,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down Expand Up @@ -316,6 +337,10 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
"--fuchsia",
"--fuchsia-cpu",
Expand Down Expand Up @@ -355,6 +380,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"run_fuchsia_emu": true
},
"gn": [
Expand Down