From 6252becd06d7bf9228c967d99cd596fc338b58aa Mon Sep 17 00:00:00 2001
From: Camille Simon <43054281+camsim99@users.noreply.github.com>
Date: Thu, 4 Jan 2024 13:33:10 -0800
Subject: [PATCH] [Android] Re-land "Re-land  'Add target to have
 linux_android_emulator_tests run on AVDs with Android 33 & 34'"
 (flutter/engine#49101)

Re-lands https://github.com/flutter/engine/pull/48936 that was reverted due to missing `DEPS` dependency (added).

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
---
 engine/src/flutter/.ci.yaml                   | 16 +++++
 .../linux_android_emulator_api_33.json        | 66 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 engine/src/flutter/ci/builders/linux_android_emulator_api_33.json

diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index 2f3b6d60dbe..88b40c41729 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -62,6 +62,22 @@ targets:
       - lib/ui/**
       - shell/platform/android/**
 
+# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
+# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
+  - name: Linux linux_android_emulator_tests_api_33
+    bringup: true
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_android_emulator_api_33
+    timeout: 60
+    runIf:
+      - .ci.yaml
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+
   - name: Linux builder_cache
     enabled_branches:
       - main
diff --git a/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json b/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json
new file mode 100644
index 00000000000..77139a2eb17
--- /dev/null
+++ b/engine/src/flutter/ci/builders/linux_android_emulator_api_33.json
@@ -0,0 +1,66 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gn": [
+                "--android",
+                "--android-cpu=x64",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "android_debug_x64",
+            "ninja": {
+                "config": "android_debug_x64",
+                "targets": [
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Android Unit Tests",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "33"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--android-variant",
+                        "android_debug_x64",
+                        "--type",
+                        "android"
+                    ]
+                },
+                {
+                    "language": "bash",
+                    "name": "Scenario App Integration Tests",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "33"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/run_android_tests.sh",
+                    "parameters": [
+                        "android_debug_x64"
+                    ]
+                }
+            ]
+        }
+    ]
+}