From 3900ec6e47e403f54f8660148abdf9ead438ae21 Mon Sep 17 00:00:00 2001
From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:09:26 +0000
Subject: [PATCH] Reverts "[Android] Add target to have
 linux_android_emulator_tests run on AVDs with Android 33 & 34"
 (flutter/engine#48895)

Reverts flutter/engine#48811
Initiated by: camsim99
This change reverts the following previous change:
Original Description:
Adds target (`Linux linux_android_emulator_tests_api_33`)  to have Android emulator testst run on AVDs with Android 33 so that the differences between those tests runs and those running on AVDs with Android 34 (`Linux linux_android_emulator_tests`) may be observed.

Related to https://github.com/flutter/flutter/issues/137947.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
---
 engine/src/flutter/.ci.yaml                   |  15 ---
 .../builders/linux_android_emulator_33.json   | 110 ------------------
 2 files changed, 125 deletions(-)
 delete mode 100644 engine/src/flutter/ci/builders/linux_android_emulator_33.json

diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index 96c36662be..f4480ea050 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -65,21 +65,6 @@ 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
-      - lib/ui/**
-      - shell/platform/android/**
-
   - name: Linux builder_cache
     enabled_branches:
       - main
diff --git a/engine/src/flutter/ci/builders/linux_android_emulator_33.json b/engine/src/flutter/ci/builders/linux_android_emulator_33.json
deleted file mode 100644
index a62a6e28db..0000000000
--- a/engine/src/flutter/ci/builders/linux_android_emulator_33.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "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"
-                    ]
-                }
-            ]
-        },
-        {
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux",
-                "kvm=1",
-                "cores=8"
-            ],
-            "gn": [
-                "--android",
-                "--android-cpu=x86",
-                "--no-lto",
-                "--rbe",
-                "--no-goma"
-            ],
-            "name": "android_debug_x86",
-            "ninja": {
-                "config": "android_debug_x86",
-                "targets": [
-                    "flutter/shell/platform/android:flutter_shell_native_unittests"
-                ]
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Android Unit Tests (API 28)",
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "28"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--android-variant",
-                        "android_debug_x86",
-                        "--type",
-                        "android"
-                    ]
-                }
-            ]
-        }
-    ]
-}