Skip to content

Clean up include paths for Fuchsia in the flutter engine#182031

Merged
mbrase merged 1 commit into
flutter:masterfrom
mbrase:fuchsia_include_cleanup
Feb 11, 2026
Merged

Clean up include paths for Fuchsia in the flutter engine#182031
mbrase merged 1 commit into
flutter:masterfrom
mbrase:fuchsia_include_cleanup

Conversation

@mbrase

@mbrase mbrase commented Feb 6, 2026

Copy link
Copy Markdown
Contributor

This rewrites many of the include paths in Fuchsia engine code to use the full path of the file. For example:

-#include "runtime/dart/utils/inlines.h"
+#include "flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h"

I also cleaned up a few unused includes and convered the includes for the Fuchsia SDK to using angle backets.

Pre-launch Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I signed the [CLA].
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is [test-exempt].
  • I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
  • All existing and new tests are passing.

@github-actions github-actions Bot added a: text input Entering text in a text field or keyboard related problems engine flutter/engine related. See also e: labels. a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) platform-fuchsia Fuchsia code specifically f: focus Focus traversal, gaining or losing focus labels Feb 6, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors include paths for Fuchsia-specific code in the Flutter engine to use full paths from the source root. This is a great cleanup that improves maintainability by removing reliance on relative paths and include_dirs configurations in BUILD.gn files. The changes also include removing several unused headers and build configurations, which further cleans up the codebase.

I've found a couple of typos in the new include paths that would likely cause build failures. Please see my detailed comments.

// found in the LICENSE file.

#include "dart_runner/dart_test_component_controller.h"
#include "flutter/shell/platform/fuchsia/dart_runner/tets/dart_runner/dart_test_component_controller.h"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

There seems to be a typo in this include path. It should be tests instead of tets. Additionally, the path seems incorrect. The correct full path for dart_test_component_controller.h should be flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h.

Suggested change
#include "flutter/shell/platform/fuchsia/dart_runner/tets/dart_runner/dart_test_component_controller.h"
#include "flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h"

// found in the LICENSE file.

#include "fakes/scenic/fake_flatland.h"
#include "flutter/shell/platform/fuchsia/flutter/fakes/scenic/fake_flatland.h"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

This include path appears to be incorrect as it's missing the tests directory segment.

Suggested change
#include "flutter/shell/platform/fuchsia/flutter/fakes/scenic/fake_flatland.h"
#include "flutter/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.h"

This rewrites many of the include paths in Fuchsia engine code to use
the full path of the file. For example:

```diff
-#include "runtime/dart/utils/inlines.h"
+#include "flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h"
```

I also cleaned up a few unused includes and convered the includes for
the Fuchsia SDK to using angle backets.
@mbrase mbrase force-pushed the fuchsia_include_cleanup branch from b3701f3 to 83003dc Compare February 6, 2026 21:47
@jrwang

jrwang commented Feb 10, 2026

Copy link
Copy Markdown
Contributor

LGTM

@jrwang jrwang self-requested a review February 10, 2026 02:46
@mbrase mbrase added this pull request to the merge queue Feb 11, 2026
Merged via the queue into flutter:master with commit a1b62d3 Feb 11, 2026
181 checks passed
@mbrase mbrase deleted the fuchsia_include_cleanup branch February 11, 2026 21:06
rickhohler pushed a commit to rickhohler/flutter that referenced this pull request Feb 19, 2026
)

This rewrites many of the include paths in Fuchsia engine code to use
the full path of the file. For example:

```diff
-#include "runtime/dart/utils/inlines.h"
+#include "flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h"
```

I also cleaned up a few unused includes and convered the includes for
the Fuchsia SDK to using angle backets.

## 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], including [Features
we expect every widget to implement].
- [X] I signed the [CLA].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [X] I updated/added relevant documentation (doc comments with `///`).
- [X] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [X] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [ ] All existing and new tests are passing.
mboetger pushed a commit to mboetger/flutter that referenced this pull request Mar 26, 2026
)

This rewrites many of the include paths in Fuchsia engine code to use
the full path of the file. For example:

```diff
-#include "runtime/dart/utils/inlines.h"
+#include "flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h"
```

I also cleaned up a few unused includes and convered the includes for
the Fuchsia SDK to using angle backets.

## 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], including [Features
we expect every widget to implement].
- [X] I signed the [CLA].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [X] I updated/added relevant documentation (doc comments with `///`).
- [X] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [X] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [ ] All existing and new tests are passing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: text input Entering text in a text field or keyboard related problems engine flutter/engine related. See also e: labels. f: focus Focus traversal, gaining or losing focus platform-fuchsia Fuchsia code specifically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants