From 1b88c55bc7dc270eb5d719077443ebfbc91c797f Mon Sep 17 00:00:00 2001 From: Miguel <1889916+miguelfrde@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:03:50 -0800 Subject: [PATCH] [fuchsia] Remove now unnecessary diagnostics directory (flutter/engine#51180) Inspect is now published using InspectSink and we can get rid of this directory. I'm unsure what "debug" and "ctrl" are for so I left them untouched. Bug: https://g-issues.fuchsia.dev/issues/320785253 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat --- .../platform/fuchsia/dart_runner/dart_component_controller.cc | 2 +- .../src/flutter/shell/platform/fuchsia/flutter/component_v2.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git 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 index a2dbb35ea4a..c86ff1208cd 100644 --- 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 @@ -231,7 +231,7 @@ bool DartComponentController::CreateAndBindNamespace() { dart_outgoing_dir_ptr_to_check_on_open_.NewRequest()); // Collect our standard set of directories. - std::vector other_dirs = {"debug", "ctrl", "diagnostics"}; + std::vector other_dirs = {"debug", "ctrl"}; dart_outgoing_dir_ptr_to_check_on_open_.events().OnOpen = [this, other_dirs](zx_status_t status, auto unused) { diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc index ef616bbf4bf..98f1f57abfc 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc @@ -274,7 +274,7 @@ ComponentV2::ComponentV2( // Collect our standard set of directories along with directories that are // included in the cml file to expose. - std::vector other_dirs = {"debug", "ctrl", "diagnostics"}; + std::vector other_dirs = {"debug", "ctrl"}; for (auto dir : metadata.expose_dirs) { other_dirs.push_back(dir); }