Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Conversation

stuartmorgan-g
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g commented Jan 21, 2020

Updates the ANGLE checkout to the latest master. Among other things, picks up fixes for errors when building under Visual Studio 2019.

Part of fix for flutter/flutter#48831

@stuartmorgan-g
Copy link
Contributor Author

This will be updated to include flutter/buildroot#339 once that lands. I was hoping to be able to separate them, but there didn't seem to be a good way to avoid a lockstep change.

@stuartmorgan-g
Copy link
Contributor Author

The failing bot is still using VS 2017 despite the buildroot update. How is our Windows CI getting VS? Apparently not gclient the way the actual bots do?

Checking to see if the image has VS 2019
@stuartmorgan-g
Copy link
Contributor Author

Sigh, looks like both Cirrus and goma are running into issues with VS 2019. I'll need to revert the buildroot change until I can get those resolved.

@stuartmorgan-g
Copy link
Contributor Author

Looks like now that we're on clang we can roll ANGLE separately from switching to VS 2019, which is good news. I'll need to do some more license script work though, it seems.

(@clarkezone FYI)

@stuartmorgan-g
Copy link
Contributor Author

@chinmaygarde Please re-review, since it now has all the necessary license changes (including license script changes).

I will of course fix the buildroot line pointing at my fork to point at flutter/buildroot#373 before landing.

stuartmorgan-g added a commit to flutter/buildroot that referenced this pull request Jun 10, 2020
This is necessary for flutter/engine#15868

Changes:
- Adds third_party/zlib/google/ from Chromium, which is used by newer versions of ANGLE when building in Chromium-buildroot mode (which we do, since it's the closest match for us), and build rules for it.
- Fixes the third_party/.gitignore to not ignore all subdirectories by default, only top-level directories (where we map in dependencies).
- Adds `angle_has_build` to our GN rules, to match recent Chromium changes.

Note: this requires some of the license script changes from the PR above in order to roll into the engine.
@fluttergithubbot
Copy link
Contributor

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@stuartmorgan-g stuartmorgan-g merged commit 5c69b8b into flutter:master Jun 10, 2020
@stuartmorgan-g stuartmorgan-g deleted the angle-roll branch June 10, 2020 15:53
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 10, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 11, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 11, 2020
chinmaygarde pushed a commit to chinmaygarde/flutter_buildroot that referenced this pull request May 4, 2021
This is necessary for flutter/engine#15868

Changes:
- Adds third_party/zlib/google/ from Chromium, which is used by newer versions of ANGLE when building in Chromium-buildroot mode (which we do, since it's the closest match for us), and build rules for it.
- Fixes the third_party/.gitignore to not ignore all subdirectories by default, only top-level directories (where we map in dependencies).
- Adds `angle_has_build` to our GN rules, to match recent Chromium changes.

Note: this requires some of the license script changes from the PR above in order to roll into the engine.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants