From 506aea031699d564db07d435cbcd076de4c0ca64 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Tue, 28 Mar 2017 14:22:03 -0700
Subject: [PATCH] enable windows tests with workaround (#9058)

---
 dev/devicelab/manifest.yaml                       | 11 +++++------
 examples/flutter_gallery/android/app/build.gradle |  8 ++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index 5bcaa747df9..2a8960aab92 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -211,9 +211,8 @@ tasks:
     stage: devicelab_win
     required_agent_capabilities: ["windows"]
 
-  # TODO(goderbauer): disabled until https://github.com/flutter/flutter/issues/8986 is resolved
-  # hot_mode_dev_cycle_win__benchmark:
-  #   description: >
-  #     Measures the performance of Dart VM hot patching feature on Windows.
-  #   stage: devicelab_win
-  #   required_agent_capabilities: ["windows"]
+  hot_mode_dev_cycle_win__benchmark:
+    description: >
+      Measures the performance of Dart VM hot patching feature on Windows.
+    stage: devicelab_win
+    required_agent_capabilities: ["windows"]
diff --git a/examples/flutter_gallery/android/app/build.gradle b/examples/flutter_gallery/android/app/build.gradle
index 4e2e46b56c2..90352570439 100644
--- a/examples/flutter_gallery/android/app/build.gradle
+++ b/examples/flutter_gallery/android/app/build.gradle
@@ -33,6 +33,14 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    aaptOptions {
+        // TODO(goderbauer): remove when https://github.com/flutter/flutter/issues/8986 is resolved.
+        if(System.getenv("FLUTTER_CI_WIN")) {
+            println "AAPT cruncher disabled when running on Win CI."
+            cruncherEnabled false
+        }
+    }
 }
 
 flutter {