Skip to content

Fix hooks inputs outputs rebuilt#186701

Merged
auto-submit[bot] merged 15 commits into
flutter:masterfrom
dcharkes:fix-hooks-inputs-outputs-rebuilt
May 22, 2026
Merged

Fix hooks inputs outputs rebuilt#186701
auto-submit[bot] merged 15 commits into
flutter:masterfrom
dcharkes:fix-hooks-inputs-outputs-rebuilt

Conversation

@dcharkes
Copy link
Copy Markdown
Contributor

@dcharkes dcharkes commented May 18, 2026 •
edited
Loading

Closes:

Fix:

  • Updated packages/flutter_tools/lib/src/build_system/targets/native_assets.dart and packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart to cleanly support the tracking of build hook output files, ensuring they are properly bundled as part of the asset bundling phase and correctly rebuild when modified.

Test:

  • Added isolated integration tests (packages/flutter_tools/test/integration.shard/isolated/dart_data_asset_flutter_build_test.dart) specifically verifying that Flutter builds rebuild correctly on macOS and Web when hook-generated data asset files are deleted or changed.

Dependency updates:

  • Upgrades the build hook and native asset package ecosystem to the latest versions to apply the same fix in hooks_runner.
  • The hooks_runner fix required a breaking change to package:hooks. (We did the breaking change in a way so that further additions to ProtocolExtension do not cause bring changes in the future.)

Refactors how the LinkHooks Target tracks dependencies:

  • Only outputs its own DEPS as opposed to [hooks] Fix pass-through dependencies #185739
    • Adding the BuildHooks inputs and outputs leads to extra link hook target runs.
  • To achieve that, runFlutterSpecificLinkHooks no longer combines the assets and dependencies from both build and link, the combining is done in combineBuildAndLinkResults.
  • The LinkHooks still outputs the combined asset list so that downstream targets don't have to combine the BuildHooks and LinkHooks outputs manually.

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label May 18, 2026
dcharkes
dcharkes commented May 18, 2026
View reviewed changes
Comment thread pubspec.yaml Outdated
@github-actions github-actions Bot added the tool Affects the "flutter" command-line tool. See also t: labels. label May 18, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label May 19, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@fluttergithubbot
Copy link
Copy Markdown
Contributor

fluttergithubbot commented May 19, 2026

An existing Git SHA, 2f51a4345c9c35896f6292e2bdf7f2b23703def8, was detected, and no actions were taken.

To re-trigger presubmits after closing or re-opeing a PR, or pushing a HEAD commit (i.e. with --force) that already was pushed before, push a blank commit (git commit --allow-empty -m "Trigger Build") or rebase to continue.

@github-actions github-actions Bot removed the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 19, 2026
@dcharkes dcharkes mentioned this pull request May 20, 2026
Merged
@github-actions github-actions Bot removed the CICD Run CI/CD label May 22, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 22, 2026
bkonyi
bkonyi reviewed May 22, 2026
View reviewed changes
Comment thread packages/flutter_tools/lib/src/build_system/targets/hook_runner_native.dart Outdated
final DartHooksResult dartHooksResult = await runFlutterSpecificHooks(
final (
results: _,
buildResult: DartHooksResult buildResult,
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Nit: I think this can just be the following:

final (:DartHookResult buildResult) = await runFlutterSpecificBuildHooks(...);`

Comment thread packages/flutter_tools/lib/src/build_system/targets/native_assets.dart Outdated
final (
results: SerializedBuildResults results,
dependencies: List<Uri> dependencies,
buildResult: DartHooksResult buildResult,
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Nit: We can use the shorthand here:

final(:SerializedBuildResults results, :DartHooksResult buildResult) = ...

Comment thread packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart Outdated
final (
results: SerializedBuildResults results,
dependencies: List<Uri> dependencies,
buildResult: DartHooksResult _,
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

This isn't needed.

Comment thread packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart Outdated
final dataAssets = <DataAsset>[...linkResult.dataAssets];
final dependencies = <Uri>{...linkResult.dependencies};

for (var i = 0; i < targets.length; i++) {
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Nit: do we need the index? If not, we should just iterate over targets.

Comment thread packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart Outdated
}
if (duplicateDataAssetIds.isNotEmpty) {
throwToolExit(
'Found duplicates in the data assets: ${duplicateDataAssetIds.toList()} while compiling for ${targets.map((AssetBuildTarget e) => e.targetString).toList()}.',
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Nit: I'd pull the map out into a variable to make this error string shorter.

Comment thread packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart Outdated
}
if (duplicateCodeAssetIds.isNotEmpty) {
throwToolExit(
'Found duplicates in the code assets: ${duplicateCodeAssetIds.toList()} while compiling for ${targets.map((AssetBuildTarget e) => e.targetString).toList()}.',
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Same here.

@github-actions github-actions Bot removed the CICD Run CI/CD label May 22, 2026
@dcharkes dcharkes added the CICD Run CI/CD label May 22, 2026
@dcharkes dcharkes requested a review from bkonyi May 22, 2026 18:10
bkonyi
bkonyi reviewed May 22, 2026
View reviewed changes
Comment thread packages/flutter_tools/lib/src/build_system/targets/hook_runner_native.dart
results: _,
buildResult: DartHooksResult buildResult,
) = await runFlutterSpecificBuildHooks(
final (:DartHooksResult buildResult, results: _) = await runFlutterSpecificBuildHooks(
Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

I don't think you need to bind results at all here.

Copy link
Copy Markdown
Contributor Author

@dcharkes dcharkes May 22, 2026

Choose a reason for hiding this comment

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

I don't think records destructuring has a ... rest syntax. I tried a bunch of different syntaxes but the analyzer stays unhappy. Would you enlighten me what the right syntax is?

Copy link
Copy Markdown
Contributor

@bkonyi bkonyi May 22, 2026

Choose a reason for hiding this comment

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

Ah, disregard. Gemini lied to me when I asked if final (:DartHooksResult buildResult) = await runFlutterSpecificBuildHooks(...) was valid 🤦

Comment thread packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
@dcharkes dcharkes requested a review from bkonyi May 22, 2026 20:22
@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label May 22, 2026
@auto-submit auto-submit Bot added this pull request to the merge queue May 22, 2026
Merged via the queue into flutter:master with commit 340101a May 22, 2026
175 of 176 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 22, 2026
This was referenced May 23, 2026
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Merged
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request May 26, 2026
@engine-flutter-autoroll
Roll Flutter from e03b91f1fe34 to f3a4b9897834 (63 revisions) (#11789)
fc795e5 
Roll Flutter from e03b91f1fe34 to f3a4b9897834 (63 revisions)

flutter/flutter@e03b91f...f3a4b98

2026-05-26 47866232+chunhtai@users.noreply.github.com Update batch release doc to reflect latest workflow (flutter/flutter#186979)
2026-05-26 engine-flutter-autoroll@skia.org Roll Skia from 0442274cc696 to 27a819894f7c (5 revisions) (flutter/flutter#187094)
2026-05-26 bkonyi@google.com [Tool Robustness] Gracefully handle asynchronous subprocess crashes and connection timeouts (flutter/flutter#186964)
2026-05-26 bkonyi@google.com [pubspec] Bump Dart SDK constraint to ^3.13.0 (flutter/flutter#186957)
2026-05-26 engine-flutter-autoroll@skia.org Roll Dart SDK from 7eb54169841d to 00e625453c43 (1 revision) (flutter/flutter#187086)
2026-05-26 bdero@google.com [Impeller] Retire Y-coord-scale plumbing by flipping GLES at the vertex stage (flutter/flutter#186556)
2026-05-26 engine-flutter-autoroll@skia.org Roll Skia from f4f294bdf98d to 0442274cc696 (2 revisions) (flutter/flutter#187079)
2026-05-26 kevmoo@users.noreply.github.com [flutter_tools] Fix version cache poisoning from git environment variables (flutter/flutter#186595)
2026-05-26 bkonyi@google.com [Tool] Handle DTD connection failures gracefully in widget-preview (flutter/flutter#186952)
2026-05-25 engine-flutter-autoroll@skia.org Roll Skia from 9d1adb5f2427 to f4f294bdf98d (1 revision) (flutter/flutter#187056)
2026-05-25 engine-flutter-autoroll@skia.org Roll Skia from 4dd78179e6ec to 9d1adb5f2427 (1 revision) (flutter/flutter#187048)
2026-05-25 engine-flutter-autoroll@skia.org Roll Skia from 1f26101197bf to 4dd78179e6ec (4 revisions) (flutter/flutter#187044)
2026-05-24 engine-flutter-autoroll@skia.org Roll Skia from bbe9ccc2bdbf to 1f26101197bf (1 revision) (flutter/flutter#187016)
2026-05-24 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from nsgcNDlZOuweOvy3Q... to Itd2Jq_ZIABH2rW7B... (flutter/flutter#187032)
2026-05-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 7e0f28eb5315 to 7eb54169841d (1 revision) (flutter/flutter#187005)
2026-05-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 90e55fa88456 to 7e0f28eb5315 (1 revision) (flutter/flutter#186990)
2026-05-23 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 6T6BY9PTftoG3vP_1... to nsgcNDlZOuweOvy3Q... (flutter/flutter#186984)
2026-05-23 chris@bracken.jp iOS] Migrate VSyncClient to a pure Obj-C implementation (#186166) (flutter/flutter#186935)
2026-05-23 30870216+gaaclarke@users.noreply.github.com Disables embedder_tests.cm for fuchsia (flutter/flutter#186969)
2026-05-23 engine-flutter-autoroll@skia.org Roll Dart SDK from b8414c46f6c7 to 90e55fa88456 (2 revisions) (flutter/flutter#186977)
2026-05-22 engine-flutter-autoroll@skia.org Roll Skia from 6fdb013d1953 to bbe9ccc2bdbf (1 revision) (flutter/flutter#186980)
2026-05-22 mdebbar@google.com [web] Fix cutoff text in WebParagraph (flutter/flutter#186819)
2026-05-22 1961493+harryterkelsen@users.noreply.github.com fix(web): Removes the iterative downscaling hack (flutter/flutter#186914)
2026-05-22 30870216+gaaclarke@users.noreply.github.com opts the linux embedder into sdf rendering (flutter/flutter#186909)
2026-05-22 engine-flutter-autoroll@skia.org Roll Skia from dae8778ca40d to 6fdb013d1953 (5 revisions) (flutter/flutter#186970)
2026-05-22 dacoharkes@google.com Fix hooks inputs outputs rebuilt (flutter/flutter#186701)
2026-05-22 30870216+gaaclarke@users.noreply.github.com adds linux impeller integration test for external textures (flutter/flutter#186759)
2026-05-22 kevmoo@users.noreply.github.com fix(flutter_tools): defensively catch DWDS unregistered service extension errors (flutter/flutter#186896)
2026-05-22 bdero@google.com [Impeller] Add golden harness support to the renderer test layer (flutter/flutter#186735)
2026-05-22 mdebbar@google.com [web] Remove image codecs from canvaskit_chromium (flutter/flutter#178133)
2026-05-22 30870216+gaaclarke@users.noreply.github.com opts all macos into wide gamut (flutter/flutter#186277)
2026-05-22 engine-flutter-autoroll@skia.org Roll Skia from 356185490a75 to dae8778ca40d (9 revisions) (flutter/flutter#186949)
2026-05-22 1598289+lukemmtt@users.noreply.github.com Filter out SwiftPM schemes when fetching schemes (flutter/flutter#186006)
2026-05-22 engine-flutter-autoroll@skia.org Roll Packages from 3754d04 to 69cf959 (1 revision) (flutter/flutter#186950)
2026-05-22 engine-flutter-autoroll@skia.org Roll Dart SDK from eca46bec956d to b8414c46f6c7 (2 revisions) (flutter/flutter#186944)
2026-05-22 30870216+gaaclarke@users.noreply.github.com Saves a DeviceHolderVK with the CommandPoolVK (flutter/flutter#186749)
2026-05-22 engine-flutter-autoroll@skia.org Roll Dart SDK from e0d509fd676e to eca46bec956d (1 revision) (flutter/flutter#186922)
2026-05-22 bkonyi@google.com [ Tool ] Stop generating widget preview scaffold under $TMP (flutter/flutter#186476)
2026-05-21 737941+loic-sharma@users.noreply.github.com Fix typo in StretchingOverscrollIndicator docs (flutter/flutter#186897)
2026-05-21 engine-flutter-autoroll@skia.org Roll Dart SDK from 28c7cb5a8e8d to e0d509fd676e (1 revision) (flutter/flutter#186903)
2026-05-21 jason-simmons@users.noreply.github.com Fix some issues in the integration between EmbedderExternalViewEmbedder and Impeller (flutter/flutter#184905)
2026-05-21 jason-simmons@users.noreply.github.com Fix a potential buffer overflow in the animated PNG decoder when parsing malformed fdAT chunks (flutter/flutter#186700)
2026-05-21 engine-flutter-autoroll@skia.org Roll Skia from 2ff20950975d to 356185490a75 (5 revisions) (flutter/flutter#186892)
2026-05-21 flar@google.com Add primitive shadows to rendering benchmark (flutter/flutter#186779)
2026-05-21 15619084+vashworth@users.noreply.github.com Move prefetchSwiftPackages to be per platform (flutter/flutter#186468)
2026-05-21 okorohelijah@google.com Upgrade iOS version (flutter/flutter#186889)
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@liamappelbe liamappelbe liamappelbe left review comments

@bkonyi bkonyi bkonyi approved these changes

@gmackall gmackall Awaiting requested review from gmackall gmackall is a code owner automatically assigned from flutter/android-reviewers

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: desktop Running on desktop CICD Run CI/CD team-windows Owned by the Windows platform team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dcharkes @fluttergithubbot @liamappelbe @bkonyi @alpesh76