Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward build_overrides to flutter/build_overrides #832

Merged
merged 1 commit into from
Mar 7, 2024

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented 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

  • 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 the Flutter Style Guide recently, and have followed its advice.
  • 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.
  • 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.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

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
@cbracken cbracken merged commit ef514ca into flutter:master Mar 7, 2024
1 check passed
@cbracken cbracken deleted the build_overrides_redirect branch March 7, 2024 21:45
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
cbracken added a commit to flutter/engine 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants