From f9e62f9bd98449a1cce954769a4bb7d0c0769e6a Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 6 May 2021 14:53:11 -0700
Subject: [PATCH 1/4] Roll buildroot to pick change to cppwinrt invocation

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 4b78227a760bb..16ba7779a647e 100644
--- a/DEPS
+++ b/DEPS
@@ -96,7 +96,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '45ce223bc8d8ca88e2eb2f38eb0cf799e39edd06',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7137efc8964bd91fa13e69af2cd3d1e13007d065',
 
    # Fuchsia compatibility
    #

From b0473092a79991869ed1eb5a97b68f84dc033774 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 6 May 2021 16:14:36 -0700
Subject: [PATCH 2/4] Ensure to use python3 for the script

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 16ba7779a647e..9f1dd29e4f1ad 100644
--- a/DEPS
+++ b/DEPS
@@ -662,7 +662,7 @@ hooks = [
     'pattern': '.',
     'condition': 'download_windows_deps',
     'action': [
-      'python',
+      'python3',
       'src/build/win/generate_winrt_headers.py',
     ]
   }

From 8164a8dd1360dfb78ba8db70a26aa3005112674d Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 6 May 2021 18:11:42 -0700
Subject: [PATCH 3/4] disable uwp builders

---
 ci/dev/prod_builders.json | 3 ++-
 ci/dev/try_builders.json  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/dev/prod_builders.json b/ci/dev/prod_builders.json
index f9d4d074d59af..4ff3669ddb30f 100644
--- a/ci/dev/prod_builders.json
+++ b/ci/dev/prod_builders.json
@@ -70,7 +70,8 @@
       },
       {
          "name":"Windows UWP Engine",
-         "repo":"engine"
+         "repo":"engine",
+         "enabled": false
       },
       {
          "name":"Windows Web Engine",
diff --git a/ci/dev/try_builders.json b/ci/dev/try_builders.json
index f40e61da384eb..3c65e9475f924 100644
--- a/ci/dev/try_builders.json
+++ b/ci/dev/try_builders.json
@@ -110,7 +110,7 @@
       {
          "name":"Windows UWP Engine",
          "repo":"engine",
-         "enabled": true
+         "enabled": false
       },
       {
          "name":"Windows Web Engine",

From 36a88b4eb3ed7f87e5ae4c91df97a0faa854c4db Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 6 May 2021 18:15:10 -0700
Subject: [PATCH 4/4] Prod builders don't support 'enabled' option

---
 ci/dev/prod_builders.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ci/dev/prod_builders.json b/ci/dev/prod_builders.json
index 4ff3669ddb30f..50f098abbdddf 100644
--- a/ci/dev/prod_builders.json
+++ b/ci/dev/prod_builders.json
@@ -68,11 +68,6 @@
          "name":"Windows Host Engine",
          "repo":"engine"
       },
-      {
-         "name":"Windows UWP Engine",
-         "repo":"engine",
-         "enabled": false
-      },
       {
          "name":"Windows Web Engine",
          "repo":"engine"