From 6b4cbcfa1ac288393f02427202d2b4c44e2cccdd Mon Sep 17 00:00:00 2001 From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:26:48 +0000 Subject: [PATCH] Reverts "[Fuchsia] only download fuchsia deps when necessary (#51439)" (flutter/engine#51500) Reverts: flutter/engine#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 https://github.com/flutter/engine/pull/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 --- DEPS | 6 +++-- engine/src/flutter/.ci.yaml | 12 --------- .../flutter/ci/builders/linux_fuchsia.json | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index e7a54fed4a1..0e8fc657284 100644 --- a/DEPS +++ b/DEPS @@ -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. @@ -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}', diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index 11dbe1b6632..eac0999d9ea 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -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: @@ -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 diff --git a/engine/src/flutter/ci/builders/linux_fuchsia.json b/engine/src/flutter/ci/builders/linux_fuchsia.json index 0f9289732c6..249ba44090d 100644 --- a/engine/src/flutter/ci/builders/linux_fuchsia.json +++ b/engine/src/flutter/ci/builders/linux_fuchsia.json @@ -5,6 +5,9 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -28,6 +31,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -64,6 +68,9 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -87,6 +94,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -123,6 +131,9 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -162,6 +173,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -198,6 +210,9 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -221,6 +236,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -257,6 +273,10 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false, + "run_fuchsia_emu": true + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -280,6 +300,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [ @@ -316,6 +337,10 @@ "device_type=none", "os=Linux" ], + "gclient_variables": { + "download_android_deps": false, + "run_fuchsia_emu": true + }, "gn": [ "--fuchsia", "--fuchsia-cpu", @@ -355,6 +380,7 @@ "os=Linux" ], "gclient_variables": { + "download_android_deps": false, "run_fuchsia_emu": true }, "gn": [