Skip to content

Commit

Permalink
Add dependency on Windows SDK CIPD package
Browse files Browse the repository at this point in the history
We now build against a specific Windows SDK rather than whatever happens
to be installed on the host machine.

This also rolls the buildroot to include change
flutter/buildroot#448, which generates the WinRT
headers from the CIPD Windows SDK.

This also rolls an updated version of cppwinrt that includes supports
for long paths.

This also re-enables the UWP builder.
  • Loading branch information
cbracken committed May 7, 2021
1 parent f631f5b commit e36ca65
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
15 changes: 13 additions & 2 deletions DEPS
Expand Up @@ -96,7 +96,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '7137efc8964bd91fa13e69af2cd3d1e13007d065',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3a3422d5f3b2c3ff237d855a6906d6d7533e4af4',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -554,12 +554,23 @@ deps = {
'dep_type': 'cipd',
},

# Windows SDK
'src/third_party/windows_sdk': {
'packages': [
{
'package': 'flutter/windows/windows-sdk',
'version': 'build:10.0.19041.0'
}
],
'condition': 'download_windows_deps',
'dep_type': 'cipd',
},
# CppWinRT tooling for UWP builds
'src/third_party/cppwinrt': {
'packages': [
{
'package': 'flutter/cppwinrt/win-amd64',
'version': 'build:2.0.210304.5'
'version': 'build:2.0.210505.3'
}
],
'condition': 'download_windows_deps',
Expand Down
4 changes: 4 additions & 0 deletions ci/dev/prod_builders.json
Expand Up @@ -68,6 +68,10 @@
"name":"Windows Host Engine",
"repo":"engine"
},
{
"name":"Windows UWP Engine",
"repo":"engine"
},
{
"name":"Windows Web Engine",
"repo":"engine"
Expand Down
2 changes: 1 addition & 1 deletion ci/dev/try_builders.json
Expand Up @@ -110,7 +110,7 @@
{
"name":"Windows UWP Engine",
"repo":"engine",
"enabled": false
"enabled": true
},
{
"name":"Windows Web Engine",
Expand Down

0 comments on commit e36ca65

Please sign in to comment.