Reland "Move native assets to `isolated/` directory" #143055

dcharkes · 2024-02-07T08:28:07Z

Reland of #142709.

The revert of the revert is in the first commit, the fix in the commit on top.

The move of the fakes for packages/flutter_tools/test/general.shard/resident_runner_test.dart was erroneous before, as it was trying to use setters instead of a private field. This PR changes the private _devFS field in the fake to be a public fakeDevFS in line with other fakes.

Original PR description

Native assets in other build systems are not built with package:native_assets_builder invoking build.dart scripts. Instead all packages have their own blaze rules. Therefore we'd like to not depend on package:native_assets_builder from flutter tools in g3 at all.

This PR aims to move the imports of native_assets_builder and native_assets_cli into the isolated/ directory and into the files with a main function that are not used in with other build systems.

In order to be able to remove all imports in files used by other build systems, two new interfaces are added HotRunnerNativeAssetsBuilder and TestCompilerNativeAssetsBuilder. New parameters are then piped all the way through from the entry points:

bin/fuchsia_tester.dart
lib/executable.dart

The build_system/targets dir is already excluded in other build systems.

So, after this PR only the two above files and build_system/targets import from isolated/native_assets/ and only isolated/native_assets/ import package:native_assets_cli and package:native_assets_builder.

Context:

Sharing code between dartdev and flutter_tools #142041

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.
All existing and new tests are passing.

chingjun

LGTM

dcharkes · 2024-02-07T08:34:08Z

We might need to wait for the revert to land to be able to apply a g3 fix again.
Or roll the revert and the reland together.

FYI @XilaiZhang

patch cl: cl/604636592

vashworth

LGTM!

dcharkes · 2024-02-08T15:54:38Z

@XilaiZhang please hit submit on this PR once it's possible on your end.

XilaiZhang · 2024-02-08T17:51:14Z

cc @itsjustkevin (current oncall) I have pre attached a g3 fix for this reland and submitted this PR just now.

…er/flutter#143055)

Now that flutter/flutter#143055 has landed, we should be able to start doing breaking changes.

…er/flutter#143055)

Roll of dart-lang/native#964, which separates the `KernelAsset`s (the asset information embedded in the Dart kernel snapshot) from `Asset`s (the assets in the `build.dart` protocol). See the linked issue for why they ought to be different instead of shared. This PR does not change any functionality in Flutter. (Now that #143055 has landed, we can land breaking changes.) For reference, the same roll in the Dart SDK: https://dart-review.googlesource.com/c/sdk/+/352642

…er/flutter#143055)

dcharkes added 2 commits February 7, 2024 09:00

Reland "Move native assets to isolated/ directory"

284d599

Fix devFS test issues

02dc9d9

github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop labels Feb 7, 2024

dcharkes mentioned this pull request Feb 7, 2024

Move native assets to isolated/ directory #142709

Merged

8 tasks

dcharkes requested review from chingjun and vashworth February 7, 2024 08:30

chingjun approved these changes Feb 7, 2024

View reviewed changes

Fix layering violation

82607dc

vashworth approved these changes Feb 7, 2024

View reviewed changes

Merge branch 'master' into reland-native-assets-isolated

acb9328

XilaiZhang added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 8, 2024

auto-submit bot merged commit 4e70bfa into master Feb 8, 2024
124 checks passed

auto-submit bot deleted the reland-native-assets-isolated branch February 8, 2024 17:49

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 5f89a5034940 (25 revisions) flutter/packages#6080

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

df7ec82

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 03891a457809 (26 revisions) flutter/packages#6081

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

b6d5d6a

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 2174915cc37d (27 revisions) flutter/packages#6082

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

394e6d3

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 445b08685a1a (28 revisions) flutter/packages#6083

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

26d30bb

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 60f30a65b468 (29 revisions) flutter/packages#6084

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

570479b

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 2207a3077b9a (30 revisions) flutter/packages#6085

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 9, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

443a019

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 9, 2024

Roll Flutter from eb5d0a434ef1 to 2fc19619e8b3 (31 revisions) flutter/packages#6086

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 10, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

c2be538

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 10, 2024

Manual roll Flutter from eb5d0a434ef1 to d1d690276d84 (11 revisions) flutter/packages#6088

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 10, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

7d0043e

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 10, 2024

Roll Flutter from eb5d0a434ef1 to 581ec63df47f (44 revisions) flutter/packages#6089

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 10, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

428ba19

…er/flutter#143055)

engine-flutter-autoroll mentioned this pull request Feb 10, 2024

Roll Flutter from eb5d0a434ef1 to 581ec63df47f (44 revisions) flutter/packages#6090

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 10, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

5032543

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 11, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

bc9048f

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 11, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

448f2fc

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

86d0b56

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

3f27754

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

148069a

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

b85484f

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

a5d55d2

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

1d64211

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

3b1a733

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

a73ba80

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

0cdf1de

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

8cb8edc

…er/flutter#143055)

dcharkes mentioned this pull request Feb 13, 2024

[infra] Update workflow with native_ packages dart-lang/native#963

Merged

auto-submit bot pushed a commit to dart-lang/native that referenced this pull request Feb 13, 2024

[infra] Update workflow with native_ packages (#963)

b1a0c2a

Now that flutter/flutter#143055 has landed, we should be able to start doing breaking changes.

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

730b9c1

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

71aba7d

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 14, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

26409f8

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 14, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

c0d923f

…er/flutter#143055)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 14, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

6d3d613

…er/flutter#143055)

dcharkes mentioned this pull request Feb 14, 2024

Roll native_assets_builder to 0.5.0 #143472

Merged

8 tasks

dcharkes mentioned this pull request Apr 4, 2024

hook/link.dart support in flutter_tools #146263

Open

5 tasks

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024

4e70bfae2 Reland "Move native assets to isolated/ directory" (flutt…

e3fa2cc

…er/flutter#143055)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reland "Move native assets to `isolated/` directory" #143055

Reland "Move native assets to `isolated/` directory" #143055

dcharkes commented Feb 7, 2024 •

edited

Loading

chingjun left a comment

dcharkes commented Feb 7, 2024 •

edited

Loading

vashworth left a comment

dcharkes commented Feb 8, 2024

XilaiZhang commented Feb 8, 2024

Reland "Move native assets to isolated/ directory" #143055

Reland "Move native assets to isolated/ directory" #143055

Conversation

dcharkes commented Feb 7, 2024 • edited Loading

Original PR description

Pre-launch Checklist

chingjun left a comment

Choose a reason for hiding this comment

dcharkes commented Feb 7, 2024 • edited Loading

vashworth left a comment

Choose a reason for hiding this comment

dcharkes commented Feb 8, 2024

XilaiZhang commented Feb 8, 2024

Reland "Move native assets to `isolated/` directory" #143055

Reland "Move native assets to `isolated/` directory" #143055

dcharkes commented Feb 7, 2024 •

edited

Loading

dcharkes commented Feb 7, 2024 •

edited

Loading