From 92df34dfd57ee4614aa17c4c5b64211ed6c330b7 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 31 Mar 2025 13:07:29 -0700 Subject: [PATCH] [build] Remove Fuchsia sub-builds. The builders at https://ci.chromium.org/p/fuchsia/g/dart/console no longer exist. TEST=build Change-Id: I1b801d7892b3e6cba37d7b9549e3d08306cc9723 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/417907 Commit-Queue: Ryan Macnak Reviewed-by: Alexander Aprelev --- runtime/BUILD.gn | 7 ------ runtime/bin/BUILD.gn | 58 -------------------------------------------- runtime/configs.gni | 26 -------------------- 3 files changed, 91 deletions(-) diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index 1ede0151168..d3d06a78b55 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -121,13 +121,6 @@ config("dart_os_config") { } } -# We need to build gen_snapshot targeting Fuchsia during a build of the SDK -# targeting Mac and Linux. This configuration is used to unconditionally target -# Fuchsia. It should not be combined with dart_os_config. -config("dart_os_fuchsia_config") { - defines = [ "DART_TARGET_OS_FUCHSIA" ] -} - # We need to build gen_snapshot targeting Linux ARM64 during a build # of the SDK. This configuration is used to unconditionally target # Linux ARM64. It should not be combined with dart_os_config and dart_arch_config. diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index 6b53a0b5900..3c181b2daaf 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -85,20 +85,6 @@ build_libdart_builtin("libdart_builtin_product") { ] } -build_libdart_builtin("libdart_builtin_fuchsia") { - extra_configs = [ - "..:dart_maybe_product_config", - "..:dart_os_fuchsia_config", - ] -} - -build_libdart_builtin("libdart_builtin_product_fuchsia") { - extra_configs = [ - "..:dart_product_config", - "..:dart_os_fuchsia_config", - ] -} - build_libdart_builtin("libdart_builtin_host_targeting_host") { extra_configs = [ "..:dart_maybe_product_config" ] } @@ -316,34 +302,6 @@ build_gen_snapshot("gen_snapshot_product") { ] } -build_gen_snapshot("gen_snapshot_fuchsia") { - extra_configs = [ - "..:dart_maybe_product_config", - "..:dart_arch_config", - "..:dart_os_fuchsia_config", - ] - extra_deps = [ - ":gen_snapshot_dart_io_fuchsia", - ":libdart_builtin_fuchsia", - "..:libdart_precompiler_fuchsia", - "../platform:libdart_platform_precompiler_fuchsia", - ] -} - -build_gen_snapshot("gen_snapshot_product_fuchsia") { - extra_configs = [ - "..:dart_product_config", - "..:dart_arch_config", - "..:dart_os_fuchsia_config", - ] - extra_deps = [ - ":gen_snapshot_dart_io_product_fuchsia", - ":libdart_builtin_product_fuchsia", - "..:libdart_precompiler_product_fuchsia", - "../platform:libdart_platform_precompiler_product_fuchsia", - ] -} - build_gen_snapshot("gen_snapshot_product_linux_x64") { extra_configs = [ "..:dart_product_config", @@ -457,22 +415,6 @@ build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_host_targeting_host") { extra_configs = [ "..:dart_product_config" ] } -build_gen_snapshot_dart_io("gen_snapshot_dart_io_fuchsia") { - extra_configs = [ - "..:dart_maybe_product_config", - "..:dart_arch_config", - "..:dart_os_fuchsia_config", - ] -} - -build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_fuchsia") { - extra_configs = [ - "..:dart_product_config", - "..:dart_arch_config", - "..:dart_os_fuchsia_config", - ] -} - build_gen_snapshot_dart_io("gen_snapshot_dart_io_product_linux_x64") { extra_configs = [ "..:dart_product_config", diff --git a/runtime/configs.gni b/runtime/configs.gni index c4b1dd11881..ea79bcb264a 100644 --- a/runtime/configs.gni +++ b/runtime/configs.gni @@ -12,12 +12,6 @@ _base_config = [ "$_dart_runtime:dart_os_config", ] -_base_fuchsia_config = [ - "$_dart_runtime:dart_arch_config", - "$_dart_runtime:dart_config", - "$_dart_runtime:dart_os_fuchsia_config", -] - _base_host_targeting_host_config = [ "$_dart_runtime:dart_config" ] _maybe_product = [ "$_dart_runtime:dart_maybe_product_config" ] @@ -51,12 +45,6 @@ _precompiler_testing_config = _precompiler_product_config = _base_config + _precompiler_base + _product -_precompiler_fuchsia_config = - _base_fuchsia_config + _precompiler_base + _maybe_product - -_precompiler_product_fuchsia_config = - _base_fuchsia_config + _precompiler_base + _product - _precompiler_host_targeting_host_config = _base_host_targeting_host_config + _precompiler_base + _maybe_product @@ -125,20 +113,6 @@ _all_configs = [ compiler = true is_product = true }, - { - suffix = "_precompiler_fuchsia" - configs = _precompiler_fuchsia_config - snapshot = false - compiler = true - is_product = false - }, - { - suffix = "_precompiler_product_fuchsia" - configs = _precompiler_product_fuchsia_config - snapshot = false - compiler = true - is_product = true - }, { suffix = "_precompiler_host_targeting_host" configs = _precompiler_host_targeting_host_config