[Android] Introduces API 34 emulators for subset of tests

.ci.yaml

@@ -272,7 +272,7 @@ targets:
       # web_benchmarks needs Chrome.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"},
+          {"dependency": "android_virtual_device", "version": "34"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -289,7 +289,7 @@ targets:
       # See comments on 'master' version above.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"},
+          {"dependency": "android_virtual_device", "version": "34"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -324,17 +324,21 @@ targets:
           {"dependency": "open_jdk", "version": "version:11"}
         ]
 
+  # All of the Linux_android android_platform_tests shards have the same
+  # dependency list, despite some running on Android 33 AVDs versus 34.
+  # See https://github.com/flutter/flutter/issues/137082 for context.
   - name: Linux_android android_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_2 master
@@ -344,10 +348,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_3 master
@@ -357,10 +362,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_4 master
@@ -370,10 +376,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_5 master
@@ -383,10 +390,11 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_6 master
@@ -396,20 +404,21 @@ targets:
       target_file: android_platform_tests.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 34
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_api_33_shard_1 master
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 33
       package_sharding: "--shardIndex 0 --shardCount 2"
       dependencies: >-
         [
@@ -419,11 +428,11 @@ targets:
   - name: Linux_android android_platform_tests_api_33_shard_2 master
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_master.version
+      # set up for 33
       package_sharding: "--shardIndex 1 --shardCount 2"
       dependencies: >-
         [
@@ -441,7 +450,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_2 stable
@@ -455,7 +464,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_3 stable
@@ -469,7 +478,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_4 stable
@@ -483,7 +492,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_5 stable
@@ -497,7 +506,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_shard_6 stable
@@ -511,15 +520,14 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "34"}
         ]
 
   - name: Linux_android android_platform_tests_api_33_shard_1 stable
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 0 --shardCount 2"
@@ -531,9 +539,8 @@ targets:
   - name: Linux_android android_platform_tests_api_33_shard_2 stable
     recipe: packages/packages
     timeout: 60
-    bringup: true
     properties:
-      target_file: android_platform_tests_api_33.yaml
+      target_file: android_platform_tests_api_33_avd.yaml
       channel: master
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 1 --shardCount 2"

.ci/targets/android_platform_tests.yaml

@@ -5,23 +5,23 @@ tasks:
   - name: download Dart and Android deps
     script: script/tool_runner.sh
     infra_step: true
-    args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: build examples
     script: script/tool_runner.sh
-    args: ["build-examples", "--apk"]
+    args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: lint
     script: script/tool_runner.sh
-    args: ["lint-android"]
+    args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-unit"]
+    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
     script: script/tool_runner.sh
-    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]

.ci/targets/android_platform_tests_api_33_avd.yaml

@@ -20,11 +20,11 @@ tasks:
   # these steps.
   - name: native unit tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
     script: script/tool_runner.sh
     args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
     script: script/tool_runner.sh
-    args: ["drive-examples", "--android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
 

script/configs/still_requires_api_33_avd.yaml

@@ -2,3 +2,4 @@
 - file_selector
 - quick_actions
 - webview_flutter
+- path_provider