Skip to content

Conversation

@dcharkes
Copy link
Contributor

Roll of a bunch of breaking changes from the native_assets_builder and native_assets_cli upstream. Most notably:

This PR also updates the template in flutter create --template=package_ffi to use the rewritten API.

This PR does not change any functionality in Flutter.

For reference, the same roll in the Dart SDK:

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.

@github-actions github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop labels Mar 22, 2024
KernelAsset _targetLocationAndroid(Asset asset) {
final AssetPath path = asset.path;
KernelAsset _targetLocationAndroid(AssetImpl asset) {
final LinkModeImpl linkMode = (asset as NativeCodeAssetImpl).linkMode;
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of curiosity, why is the tool now using *Impl types? I suppose since we're already importing an *internal library it doesn't matter also using internal implementation interfaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The interfaces don't expose the APIs needed. (JSON serialization for example.) That's why we use the implementations.

The API is meant for hook/built.dart writers. The *Impl classes are meant for hook/build.dart invokers (dartdev and flutter_tools).

return KernelAsset(
id: asset.id,
target: asset.target,
target: Target.fromArchitectureAndOS(asset.architecture!, asset.os),
Copy link
Contributor

Choose a reason for hiding this comment

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

why was this change necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Target is removed from the hook/build.dart API using Assets, but still used in KernelAsset. Target is a VM concept, hook/build.dart writers will only talk about OS and Architecture. dartdev and flutter_tools have to do the conversion.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks

Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

A few questions, mostly out of curiosity, but this LGTM once CI passes.

@dcharkes
Copy link
Contributor Author

A few questions, mostly out of curiosity, but this LGTM once CI passes.

Thanks @christopherfujino!

@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 25, 2024
@dcharkes dcharkes merged commit baa54fd into master Mar 25, 2024
@dcharkes dcharkes deleted the bump-native-assets branch March 25, 2024 14:02
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 25, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Mar 26, 2024
Roll Flutter from 14774b9 to dbdcead (38 revisions)

flutter/flutter@14774b9...dbdcead

2024-03-25 [email protected] Roll Flutter Engine from ef896e942f44 to 04191a122e9a (1 revision) (flutter/flutter#145709)
2024-03-25 [email protected] Update semantics.dart (flutter/flutter#145683)
2024-03-25 [email protected] TwoDimensionalChildDelegate should dispatch creation and disposal events (flutter/flutter#145684)
2024-03-25 [email protected] Memory leaks clean up 1 (flutter/flutter#145691)
2024-03-25 [email protected] Roll Flutter Engine from 2e8d77dbb0f0 to ef896e942f44 (1 revision) (flutter/flutter#145705)
2024-03-25 [email protected] [Fix]: Searchbar doesn't lose focus when tapped outside (flutter/flutter#145232)
2024-03-25 [email protected] Fix typo in hitTest docs (flutter/flutter#145677)
2024-03-25 [email protected] Roll Packages from 611aea1 to 28d126c (1 revision) (flutter/flutter#145690)
2024-03-25 [email protected] [deps] Bump native assets dependencies (flutter/flutter#145612)
2024-03-25 [email protected] Roll Flutter Engine from 857584c458ff to 2e8d77dbb0f0 (1 revision) (flutter/flutter#145678)
2024-03-25 [email protected] Add `AnimationStyle` to `showBottomSheet` and `showModalBottomSheet` (flutter/flutter#145536)
2024-03-25 [email protected] Roll Flutter Engine from ae758d54630d to 857584c458ff (2 revisions) (flutter/flutter#145673)
2024-03-25 [email protected] Roll Flutter Engine from efdde39a2a57 to ae758d54630d (1 revision) (flutter/flutter#145669)
2024-03-25 [email protected] make hot reload reflect changes to asset transformer configurations (flutter/flutter#144660)
2024-03-25 [email protected] Roll Flutter Engine from 0734f47f2a3d to efdde39a2a57 (2 revisions) (flutter/flutter#145668)
2024-03-24 [email protected] Roll Flutter Engine from 7c139e0a4897 to 0734f47f2a3d (1 revision) (flutter/flutter#145662)
2024-03-24 [email protected] Leak clean up. (flutter/flutter#144803)
2024-03-24 [email protected] Turn off randomization for leak detection bots. (flutter/flutter#145624)
2024-03-24 [email protected] Roll Flutter Engine from 2f5afdf62365 to 7c139e0a4897 (1 revision) (flutter/flutter#145655)
2024-03-24 [email protected] Roll Flutter Engine from 7aa8521e640e to 2f5afdf62365 (2 revisions) (flutter/flutter#145651)
2024-03-23 [email protected] Roll Flutter Engine from 689ea4b10b17 to 7aa8521e640e (1 revision) (flutter/flutter#145643)
2024-03-23 [email protected] Roll Flutter Engine from 42d4262b4b20 to 689ea4b10b17 (1 revision) (flutter/flutter#145636)
2024-03-23 [email protected] Reland #128236 "Improve build output for all platforms" (flutter/flutter#145495)
2024-03-23 [email protected] Roll Flutter Engine from 7690eb12ded5 to 42d4262b4b20 (1 revision) (flutter/flutter#145635)
2024-03-23 [email protected] Roll Flutter Engine from 8a51e124fbf1 to 7690eb12ded5 (1 revision) (flutter/flutter#145634)
2024-03-23 [email protected] Roll Flutter Engine from bc4fa4367edb to 8a51e124fbf1 (4 revisions) (flutter/flutter#145630)
2024-03-23 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.8 to 3.24.9 (flutter/flutter#145627)
2024-03-23 [email protected] Add workaround for bug adding unicode strings to test reports. (flutter/flutter#145607)
2024-03-23 [email protected] Roll Flutter Engine from 52142e428760 to bc4fa4367edb (1 revision) (flutter/flutter#145626)
2024-03-23 [email protected] [web][docs] Improve HtmlElementView widget docs. (flutter/flutter#145192)
2024-03-23 [email protected] Disable flaky text_editing_integration tests temporarily. (flutter/flutter#145629)
2024-03-22 [email protected] Roll Flutter Engine from cc8f752b81e5 to 52142e428760 (4 revisions) (flutter/flutter#145625)
2024-03-22 [email protected] Fix skipping golden comparator for CI environments (flutter/flutter#145619)
2024-03-22 [email protected] Roll Flutter Engine from 68301f268278 to cc8f752b81e5 (1 revision) (flutter/flutter#145621)
2024-03-22 [email protected] Roll Packages from b7fbe68 to 611aea1 (4 revisions) (flutter/flutter#145615)
2024-03-22 [email protected] Roll Flutter Engine from 63ff0dedd8e6 to 68301f268278 (2 revisions) (flutter/flutter#145613)
2024-03-22 [email protected] Roll Flutter Engine from 09dadce76828 to 63ff0dedd8e6 (2 revisions) (flutter/flutter#145611)
2024-03-22 [email protected] 2DScrollView - Fix drag when one axis does not have enough content (flutter/flutter#145566)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose
...
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: desktop Running on desktop autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants