From d4d761b74c78be3d6030edbf4337520fcc5df87d Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Mon, 17 Jul 2023 19:12:57 -0400
Subject: [PATCH] [pigeon] Enable Android emulator tests in CI (#4484)

Enables the new emulator support for the Linux custom package test targets, and enables the emulator-based Android integration tests for Pigeon.

Drops the cores from the high-core config (32) to the default (8) since the emulator requires KVM, and there are currently no 32-core KVM machines in the pool. In practice, it appears that this doesn't have much affect on the runtime.

Fixes https://github.com/flutter/flutter/issues/111505
---
 .ci.yaml                            | 10 ++++++++--
 packages/pigeon/tool/run_tests.dart | 10 ++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index c56c48ed34ee0..449a075cfb08b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -239,15 +239,18 @@ 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
-      # 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.
       dependencies: >-
         [
+          {"dependency": "android_virtual_device", "version": "33"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -256,12 +259,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
       # 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"}
         ]
diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart
index 42ee818380804..e593e15e9a3d8 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,