Remove dependencies on fuchsia.sys.* FIDL protocols (flutter/engine#44614)

The fuchsia.sys FIDL library, used to implement v1 components, is deprecated in the Fuchsia platform and is being removed. Flutter now implements Components v2 but still imports the old library. Bug: https://fxbug.dev/109013
2026-02-20 02:29:02 +08:00 · 2023-08-11 17:41:38 -07:00 · 2023-08-11 17:41:38 -07:00 · 62b3a0cfa7
commit 62b3a0cfa7
parent 50688fbc3a
25 changed files with 42 additions and 86 deletions
--- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
@ -19,12 +19,13 @@ source_set("sdk_ext") {
  ]

  deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.sys",
    "$fuchsia_sdk_root/pkg:async-cpp",
    "../zircon",
    "//flutter/fml",
    "//flutter/third_party/tonic",
  ]

+  public_deps = [ "$fuchsia_sdk_root/pkg:zx" ]
+
  public_configs = [ ":sdk_ext_config" ]
 }
--- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
@ -100,8 +100,7 @@ void SetReturnCode(Dart_NativeArguments arguments) {

 }  // namespace

-void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-                zx::channel directory_request,
+void Initialize(zx::channel directory_request,
                std::optional<zx::eventpair> view_ref) {
  zircon::dart::Initialize();

@ -117,14 +116,6 @@ void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
  dart_state->class_library().add_provider("fuchsia",
                                           std::move(fuchsia_class_provider));

-  // V2 components do not use the environment.
-  if (environment) {
-    result = Dart_SetField(
-        library, ToDart("_environment"),
-        ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
-    FML_CHECK(!tonic::CheckAndHandleError(result));
-  }
-
  if (directory_request) {
    result = Dart_SetField(
        library, ToDart("_outgoingServices"),
--- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
+++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
@ -5,14 +5,16 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_FUCHSIA_SDK_EXT_FUCHSIA_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_FUCHSIA_SDK_EXT_FUCHSIA_H_

-#include <fuchsia/sys/cpp/fidl.h>
+#include <lib/zx/channel.h>
+#include <lib/zx/eventpair.h>
+
+#include <optional>

 namespace fuchsia {
 namespace dart {

 /// Initializes Dart bindings for the Fuchsia application model.
-void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-                zx::channel directory_request,
+void Initialize(zx::channel directory_request,
                std::optional<zx::eventpair> view_ref);

 }  // namespace dart
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
@ -96,19 +96,16 @@ void ScheduleMicrotask(Dart_NativeArguments args) {

 }  // namespace

-void InitBuiltinLibrariesForIsolate(
-    const std::string& script_uri,
-    fdio_ns_t* namespc,
-    int stdoutfd,
-    int stderrfd,
-    fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-    zx::channel directory_request,
-    bool service_isolate) {
+void InitBuiltinLibrariesForIsolate(const std::string& script_uri,
+                                    fdio_ns_t* namespc,
+                                    int stdoutfd,
+                                    int stderrfd,
+                                    zx::channel directory_request,
+                                    bool service_isolate) {
  // dart:fuchsia --------------------------------------------------------------
  // dart runner doesn't care about scenic view ref.
  if (!service_isolate) {
-    fuchsia::dart::Initialize(std::move(environment),
-                              std::move(directory_request), std::nullopt);
+    fuchsia::dart::Initialize(std::move(directory_request), std::nullopt);
  }

  // dart:fuchsia.builtin ------------------------------------------------------
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.h
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.h
@ -5,22 +5,20 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_

-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/fdio/namespace.h>
+#include <lib/zx/channel.h>

 #include <memory>
 #include <string>

 namespace dart_runner {

-void InitBuiltinLibrariesForIsolate(
-    const std::string& script_uri,
-    fdio_ns_t* namespc,
-    int stdoutfd,
-    int stderrfd,
-    fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-    zx::channel directory_request,
-    bool service_isolate);
+void InitBuiltinLibrariesForIsolate(const std::string& script_uri,
+                                    fdio_ns_t* namespc,
+                                    int stdoutfd,
+                                    int stderrfd,
+                                    zx::channel directory_request,
+                                    bool service_isolate);

 }  // namespace dart_runner

--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
@ -466,9 +466,9 @@ bool DartComponentController::RunDartMain() {
  stdout_fd_ = fileno(stdout);
  stderr_fd_ = fileno(stderr);

-  InitBuiltinLibrariesForIsolate(
-      url_, namespace_, stdout_fd_, stderr_fd_, nullptr /* environment */,
-      dart_outgoing_dir_request_.TakeChannel(), false /* service_isolate */);
+  InitBuiltinLibrariesForIsolate(url_, namespace_, stdout_fd_, stderr_fd_,
+                                 dart_outgoing_dir_request_.TakeChannel(),
+                                 false /* service_isolate */);

  Dart_ExitScope();
  Dart_ExitIsolate();
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h
@ -7,7 +7,6 @@

 #include <dart/test/cpp/fidl.h>
 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/cpp/wait.h>
 #include <lib/fdio/namespace.h>
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.h
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.h
@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_

 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
 #include <lib/sys/cpp/component_context.h>

--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
@ -523,9 +523,9 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {

  fidl::InterfaceRequest<fuchsia::io::Directory> outgoing_dir =
      std::move(*start_info_.mutable_outgoing_dir());
-  InitBuiltinLibrariesForIsolate(
-      url_, namespace_, stdout_fd_, stderr_fd_, nullptr /* environment */,
-      outgoing_dir.TakeChannel(), false /* service_isolate */);
+  InitBuiltinLibrariesForIsolate(url_, namespace_, stdout_fd_, stderr_fd_,
+                                 outgoing_dir.TakeChannel(),
+                                 false /* service_isolate */);

  Dart_ExitScope();
  Dart_ExitIsolate();
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
@ -8,7 +8,6 @@
 #include <memory>

 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/test/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/cpp/executor.h>
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/service_isolate.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/service_isolate.cc
@ -193,7 +193,7 @@ Dart_Isolate CreateServiceIsolate(
  SHUTDOWN_ON_ERROR(result);

  InitBuiltinLibrariesForIsolate(std::string(uri), nullptr, fileno(stdout),
-                                 fileno(stderr), nullptr, zx::channel(), true);
+                                 fileno(stderr), zx::channel(), true);

  // Make runnable.
  Dart_ExitScope();
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn
@ -155,7 +155,6 @@ template("runner_sources") {
             "$fuchsia_sdk_root/fidl:fuchsia.io",
             "$fuchsia_sdk_root/fidl:fuchsia.media",
             "$fuchsia_sdk_root/fidl:fuchsia.memorypressure",
-             "$fuchsia_sdk_root/fidl:fuchsia.sys",
             "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
             "$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
             "$fuchsia_sdk_root/fidl:fuchsia.ui.pointer",
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
@ -10,7 +10,6 @@
 #undef FALSE

 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/gfx/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
 #include <lib/sys/inspect/cpp/component.h>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc
@ -647,8 +647,7 @@ void ComponentV2::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
      std::move(fdio_ns_),                            // FDIO namespace
      std::move(directory_request_),                  // outgoing request
      product_config_,                                // product configuration
-      std::vector<std::string>(),                     // dart entrypoint args
-      false                                           // not a v1 component
+      std::vector<std::string>()                      // dart entrypoint args
      ));
 }

--- a/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.h
@ -11,7 +11,6 @@

 #include <fuchsia/component/runner/cpp/fidl.h>
 #include <fuchsia/io/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/default.h>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/engine.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/engine.cc
@ -207,8 +207,7 @@ Engine::Engine(Delegate& delegate,
               UniqueFDIONS fdio_ns,
               fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
               FlutterRunnerProductConfiguration product_config,
-               const std::vector<std::string>& dart_entrypoint_args,
-               bool for_v1_component)
+               const std::vector<std::string>& dart_entrypoint_args)
    : delegate_(delegate),
      thread_label_(std::move(thread_label)),
      thread_host_(CreateThreadHost(thread_label_, runner_services)),
@ -220,7 +219,7 @@ Engine::Engine(Delegate& delegate,
  Initialize(std::move(view_ref_pair), std::move(svc),
             std::move(runner_services), std::move(settings),
             std::move(fdio_ns), std::move(directory_request),
-             std::move(product_config), dart_entrypoint_args, for_v1_component);
+             std::move(product_config), dart_entrypoint_args);
 }

 void Engine::Initialize(
@ -231,8 +230,7 @@ void Engine::Initialize(
    UniqueFDIONS fdio_ns,
    fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
    FlutterRunnerProductConfiguration product_config,
-    const std::vector<std::string>& dart_entrypoint_args,
-    bool for_v1_component) {
+    const std::vector<std::string>& dart_entrypoint_args) {
  // Flatland uses |view_creation_token_| for linking.
  FML_CHECK(view_creation_token_.value.is_valid());

@ -584,18 +582,9 @@ void Engine::Initialize(

  // Shell has been created. Before we run the engine, set up the isolate
  // configurator.
-  {
-    fuchsia::sys::EnvironmentPtr environment;
-    if (for_v1_component) {
-      svc->Connect(environment.NewRequest());
-    }
-
-    isolate_configurator_ = std::make_unique<IsolateConfigurator>(
-        std::move(fdio_ns),
-        // v2 components do not use fuchsia.sys.Environment.
-        for_v1_component ? std::move(environment) : nullptr,
-        directory_request.TakeChannel(), std::move(isolate_view_ref.reference));
-  }
+  isolate_configurator_ = std::make_unique<IsolateConfigurator>(
+      std::move(fdio_ns), directory_request.TakeChannel(),
+      std::move(isolate_view_ref.reference));

  //  This platform does not get a separate surface platform view creation
  //  notification. Fire one eagerly.
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/engine.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/engine.h
@ -59,8 +59,7 @@ class Engine final : public fuchsia::memorypressure::Watcher {
         UniqueFDIONS fdio_ns,
         fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
         FlutterRunnerProductConfiguration product_config,
-         const std::vector<std::string>& dart_entrypoint_args,
-         bool for_v1_component);
+         const std::vector<std::string>& dart_entrypoint_args);

  ~Engine();

@ -81,8 +80,7 @@ class Engine final : public fuchsia::memorypressure::Watcher {
      UniqueFDIONS fdio_ns,
      fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
      FlutterRunnerProductConfiguration product_config,
-      const std::vector<std::string>& dart_entrypoint_args,
-      bool for_v1_component);
+      const std::vector<std::string>& dart_entrypoint_args);

  static void WarmupSkps(
      fml::BasicTaskRunner* concurrent_task_runner,
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/focus_delegate.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/focus_delegate.h
@ -5,7 +5,6 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FOCUS_DELEGATE_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_FOCUS_DELEGATE_H_

-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>

 #include <unordered_map>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc
@ -13,13 +13,10 @@

 namespace flutter_runner {

-IsolateConfigurator::IsolateConfigurator(
-    UniqueFDIONS fdio_ns,
-    fuchsia::sys::EnvironmentHandle environment,
-    zx::channel directory_request,
-    zx::eventpair view_ref)
+IsolateConfigurator::IsolateConfigurator(UniqueFDIONS fdio_ns,
+                                         zx::channel directory_request,
+                                         zx::eventpair view_ref)
    : fdio_ns_(std::move(fdio_ns)),
-      environment_(std::move(environment)),
      directory_request_(std::move(directory_request)),
      view_ref_(std::move(view_ref)) {}

@ -43,8 +40,7 @@ bool IsolateConfigurator::ConfigureCurrentIsolate() {
 }

 void IsolateConfigurator::BindFuchsia() {
-  fuchsia::dart::Initialize(std::move(environment_),
-                            std::move(directory_request_),
+  fuchsia::dart::Initialize(std::move(directory_request_),
                            std::move(view_ref_));
 }

--- a/engine/src/flutter/shell/platform/fuchsia/flutter/isolate_configurator.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/isolate_configurator.h
@ -5,7 +5,6 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_ISOLATE_CONFIGURATOR_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_ISOLATE_CONFIGURATOR_H_

-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/scenic/cpp/fidl.h>

 #include "flutter/fml/macros.h"
@ -19,7 +18,6 @@ namespace flutter_runner {
 class IsolateConfigurator final {
 public:
  IsolateConfigurator(UniqueFDIONS fdio_ns,
-                      fuchsia::sys::EnvironmentHandle environment,
                      zx::channel directory_request,
                      zx::eventpair view_ref);

@ -32,7 +30,6 @@ class IsolateConfigurator final {
 private:
  bool used_ = false;
  UniqueFDIONS fdio_ns_;
-  fuchsia::sys::EnvironmentHandle environment_;
  zx::channel directory_request_;
  zx::eventpair view_ref_;

--- a/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/platform_view.h
@ -5,7 +5,6 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_PLATFORM_VIEW_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_PLATFORM_VIEW_H_

-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
 #include <fuchsia/ui/input3/cpp/fidl.h>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/runner.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/runner.cc
@ -204,7 +204,6 @@ Runner::Runner(fml::RefPtr<fml::TaskRunner> task_runner,
 }

 Runner::~Runner() {
-  context_->outgoing()->RemovePublicService<fuchsia::sys::Runner>();
  context_->outgoing()
      ->RemovePublicService<fuchsia::component::runner::ComponentRunner>();

--- a/engine/src/flutter/shell/platform/fuchsia/flutter/runner.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/runner.h
@ -9,7 +9,6 @@
 #include <unordered_map>

 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/sys/cpp/component_context.h>
 #include <lib/trace-engine/instrumentation.h>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc
@ -12,7 +12,6 @@
 #include <fuchsia/memorypressure/cpp/fidl.h>
 #include <fuchsia/metrics/cpp/fidl.h>
 #include <fuchsia/net/interfaces/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
 #include <fuchsia/ui/display/singleton/cpp/fidl.h>
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc
@ -4,7 +4,6 @@

 #include <fuchsia/feedback/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>