From 77b2c6da79d932721d82e4e01709a4119fbdf6cc Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Sun, 16 Jul 2023 08:18:37 -0400
Subject: [PATCH 1/3] Add emulator to Linux custom tests

---
 .ci.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 8702a4769748..97cd1d3d9611 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -247,16 +247,19 @@ targets:
   - name: Linux_android custom_package_tests master
     recipe: packages/packages
     timeout: 30
+    dimensions:
+      kvm: "1"
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: linux_custom_package_tests.yaml
-      cores: "32"
-      # Pigeon tests need Andoid deps (thus the Linux_android base) and
-      # clang-format.
+      # Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
+      # and clang-format.
       # web_benchmarks needs Chrome.
+    properties:
       dependencies: >-
         [
+          {"dependency": "android_virtual_device", "version": "33"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -265,13 +268,15 @@ targets:
   - name: Linux_android custom_package_tests stable
     recipe: packages/packages
     timeout: 30
+    dimensions:
+      kvm: "1"
     properties:
       version_file: flutter_stable.version
       target_file: linux_custom_package_tests.yaml
-      cores: "32"
       # See comments on 'master' version above.
       dependencies: >-
         [
+          {"dependency": "android_virtual_device", "version": "33"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]

From 0bb77093a6ec1ec276a1d9657a2c5443cb2de368 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Sun, 16 Jul 2023 08:20:02 -0400
Subject: [PATCH 2/3] copypasta

---
 .ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index 97cd1d3d9611..fafd0a236e50 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -256,7 +256,6 @@ targets:
       # Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
       # and clang-format.
       # web_benchmarks needs Chrome.
-    properties:
       dependencies: >-
         [
           {"dependency": "android_virtual_device", "version": "33"},

From 0e9bf24226538040ef545ad4b52bfc7f159a57ce Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Sun, 16 Jul 2023 08:21:24 -0400
Subject: [PATCH 3/3] Enable tests

---
 packages/pigeon/tool/run_tests.dart | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart
index 42ee81838080..e593e15e9a3d 100644
--- a/packages/pigeon/tool/run_tests.dart
+++ b/packages/pigeon/tool/run_tests.dart
@@ -167,11 +167,8 @@ Future<void> main(List<String> args) async {
     androidJavaUnitTests,
     androidJavaLint,
     androidKotlinUnitTests,
-    // TODO(stuartmorgan): Include these once CI supports running simulator
-    // tests. Currently these tests aren't run in CI.
-    // See https://github.com/flutter/flutter/issues/111505.
-    // androidJavaIntegrationTests,
-    // androidKotlinIntegrationTests,
+    androidJavaIntegrationTests,
+    androidKotlinIntegrationTests,
   ];
   const List<String> macOSHostTests = <String>[
     iOSObjCUnitTests,
@@ -198,9 +195,6 @@ Future<void> main(List<String> args) async {
     windowsHostTests,
     // Tests that are deliberately not included in CI:
     <String>[
-      // See comment in linuxHostTests:
-      androidJavaIntegrationTests,
-      androidKotlinIntegrationTests,
       // See comments in macOSHostTests:
       iOSObjCIntegrationTests,
       iOSSwiftIntegrationTests,