This repository was archived by the owner on Apr 21, 2025. It is now read-only.
Changes to support RBE in Windows builds#820
Merged
zanderso merged 2 commits intoflutter:masterfrom Feb 9, 2024
Merged
Conversation
Contributor
|
This is still work in progress. |
cbracken
reviewed
Feb 8, 2024
|
|
||
| script_dir = os.path.dirname(os.path.realpath(__file__)) | ||
| json_data_file = os.path.join(script_dir, 'win_toolchain.json') | ||
| json_data_file = os.path.join(script_dir, 'new_win_toolchain.json') |
Member
There was a problem hiding this comment.
It doesn't look like this file is checked in -- is it meant to be?
Member
Author
There was a problem hiding this comment.
No, this file is generated by gclient sync via this script. It holds info about the location of the toolchain and the version so that the same version of the toolchain isn't downloaded again.
cbracken
reviewed
Feb 8, 2024
Member
cbracken
left a comment
cbracken
left a comment
There was a problem hiding this comment.
Overall lgtm - I'm assuming setup_toolchain.py and win_toolchain_data.gni are updated from the chromium tree?
Member
Author
Correct. |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This PR does a few things:
depot_tools, which typically exists outside of the engine source root both locally and in CI. That setup makes the Windows SDK inaccessible to RBE builds. Instead, this PR checks outdepot_toolsunderflutter/third_party/depot_toolsby listing it in theDEPSfile. This location is under the engine source root, and is therefore accessible to RBE builds. This change has the downside of breaking how CI does caching of thedepot_toolsWindows toolchain and SDK, which will add some time to builds.build/find_depot_tools.py,build/toolchain/win/BUILD.gn, andbuild/toolchain/win/setup_toolchain.pyare copied from there and adapted to the Flutter engine repo.