Migrate build_overrides from buildroot to engine #51258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
fyi @loic-sharma for ANGLE |
0d9a63a
to
02747e1
Compare
cbracken
added a commit
to cbracken/buildroot
that referenced
this pull request
Mar 7, 2024
In flutter/engine#51258, all existing build_overrides from the buildroot were copied into the engine. This replaces each existing file under build_overrides in the buildroot with a shim that just imports the files landed in that patch. This allows the third-party dependencies to continue hardcoding the //build_overrides/foo.gni path, but provides a seamless path forward when we drop the buildroot. Issue: flutter/flutter#144790 Part of: flutter/flutter#67373
9 tasks
|
auto label is removed for flutter/engine/51258, due to - The status or check suite Linux linux_host_engine has failed. Please fix the issues identified (or deflake) before re-applying this label. |
02747e1
to
4d7a57b
Compare
Files under the build_overrides directory in the buildroot are typically hardcoded imports in third-party dependencies used for project-specific configuration. For example, ANGLE hardcodes an import of `//build_overrides/angle.gni` so that consumers of ANGLE can configure the build to their needs. This adds a copy all existing src/build_overrides files at the equivalent `src/flutter/build_overrides` path in the engine. A followup patch will replace each existing file under `src/build_overrides` in the buildroot with a shim that just imports the files landed in this patch. This allows the upstream project to continue hardcoding the `//build_overrides/foo.gni` path, but provides a seamless path forward when we drop the buildroot. Adds flutter/build_overrides as an excluded path for the licence script. Issue: flutter/flutter#144790 Part of: flutter/flutter#67373
696c799
to
bbf840d
Compare
cbracken
added a commit
to flutter/buildroot
that referenced
this pull request
Mar 7, 2024
In flutter/engine#51258, all existing build_overrides from the buildroot were copied into the engine. This replaces each existing file under build_overrides in the buildroot with a shim that just imports the files landed in that patch. This allows the third-party dependencies to continue hardcoding the `//build_overrides/foo.gni` path, but provides a seamless path forward when we drop the buildroot. Issue: flutter/flutter#144790 Part of: flutter/flutter#67373 ## 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 the [Flutter Style Guide] _recently_, and have followed its advice. - [X] I signed the [CLA]. - [X] I listed at least one issue that this PR fixes in the description above. - [X] 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]. - [X] Do not start, operate, or service Flutter CI infra until you read and understand the operator's manual. Failure to do so could result in serious injury or death. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [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 [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
cbracken
added a commit
to cbracken/flutter_engine
that referenced
this pull request
Mar 7, 2024
In flutter#51258, all existing build_overrides from the buildroot were copied into the engine. In flutter/buildroot#832, all buildroot build_overrides were converted into simple forwarding files that point to the ones in the engine such that we have a seamless path to eliminating the buildroot, while allowing third-party dependencies to continue to hardcode `//build_overrides/foo.gni`. This rolls the buildroot to the engine and switches everthing over to the new engine-based build_overrides. Issue: flutter/flutter#144790 Part of: flutter/flutter#67373
9 tasks
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 7, 2024
cbracken
added a commit
that referenced
this pull request
Mar 7, 2024
In #51258, all existing build_overrides from the buildroot were copied into the engine. In flutter/buildroot#832, all buildroot build_overrides were converted into simple forwarding files that point to the ones in the engine such that we have a seamless path to eliminating the buildroot, while allowing third-party dependencies to continue to hardcode `//build_overrides/foo.gni`. This rolls the buildroot to the engine and switches everthing over to the new engine-based build_overrides. Fixes: flutter/flutter#144790 Part of: flutter/flutter#67373 ## 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'm pretty sure that despite no real changes that should affect the licence script, that it'll probably fail for some reason anyway and I'll spend 2 hours fixing it. - [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]. <!-- Links --> [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
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Mar 7, 2024
…144799) flutter/engine@ec4f9af...1750693 2024-03-07 chris@bracken.jp Migrate build_overrides from buildroot to engine (flutter/engine#51258) 2024-03-07 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from y67DIBX84h7pAekIp... to 5Ra_AjCji-uR1GaX7... (flutter/engine#51261) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from y67DIBX84h7p to 5Ra_AjCji-uR If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Files under the build_overrides directory in the buildroot are typically hardcoded imports in third-party dependencies used for project-specific configuration. For example, ANGLE hardcodes an import of
//build_overrides/angle.gniso that consumers of ANGLE can configure the build to their needs.This adds a copy all existing src/build_overrides files at the equivalent
src/flutter/build_overridespath in the engine. A followup patch will replace each existing file undersrc/build_overridesin the buildroot with a shim that just imports the files landed in this patch. This allows third-party dependencies to continue hardcoding the//build_overrides/foo.gnipath, but provides a seamless path forward when we drop the buildroot.Issue: flutter/flutter#144790
Part of: flutter/flutter#67373
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.