diff --git a/.agents/skills/run-devicelab-with-led/SKILL.md b/.agents/skills/run-devicelab-with-led/SKILL.md
new file mode 100644
index 0000000000000..c64af2abaa4d9
--- /dev/null
+++ b/.agents/skills/run-devicelab-with-led/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: run-devicelab-with-led
+description: Run DeviceLab tests for Flutter PRs using LUCI's `led` CLI tool. Use when asked to run, launch, try, or deflake a post-submit or devicelab test against a PR using `led`.
+---
+
+<!--
+Host assumptions:
+    Installed and on path:
+        * led (from depot_tools)
+        * git
+        * gh
+    Had authentication setup:
+        * led
+        * gh
+        * gcert / glogin (SSO auth required for recipes repository git operations)
+-->
+
+# Running DeviceLab Tests with `led`
+
+This skill guides running post-submit and DeviceLab tests for pull requests (PRs) using LUCI's `led` CLI tool. For additional context, see [docs/infra/Running-Devicelab-Tests-For-PR.md](../../../docs/infra/Running-Devicelab-Tests-For-PR.md).
+
+## Prerequisites
+
+1. **`led` tool**: Must be installed (via `depot_tools`) and available in your `PATH`. Verify via `led auth-info`.
+2. **SSO authentication**: Verify valid SSO / LOAS credentials via `gcertstatus` or `glogin status`. If expired, instruct the user to run `glogin` or `gcert`.
+3. **`recipes` repository** (when including `led edit-recipe-bundle`): If testing local recipe changes or recipe-only PRs, commands containing `led edit-recipe-bundle` must be executed from the root of a local checkout of the Flutter [`recipes`](https://flutter.googlesource.com/recipes) repository (`git clone https://flutter.googlesource.com/recipes`).
+
+## Workflow
+
+### 1. Gather Inputs based on PR Type
+
+Collect the following required arguments:
+* **`PR_NUMBER`**: The pull request number (e.g., `123456`).
+* **`PRESUBMIT_TEST`**: The exact name of the LUCI staging builder to run (e.g., `Windows_mokey hot_mode_dev_cycle_win__benchmark` or `Mac_ios microbenchmarks_ios`).
+
+### 2. Execute `led` Pipeline
+
+If you are using `led edit-recipe-bundle` to test local recipe modifications, navigate to the root of your local `recipes` repository checkout (`$CWD` is packaged by `led edit-recipe-bundle`). If only testing without recipe edits, `led edit-recipe-bundle` can either be run from a `recipes` checkout or omitted.
+
+Run the command pipeline corresponding to the PR type:
+
+#### Command
+
+```bash
+led get-builder 'luci.flutter.staging:PRESUBMIT_TEST' \
+  | led edit -pa git_ref='refs/pull/PR_NUMBER/head' \
+  | led edit -pa git_url='https://github.com/flutter/flutter' \
+  | led edit-recipe-bundle \
+  | led launch
+```
+
+### 3. Report Launched Task Details
+
+`led launch` outputs details about the launched build, including Swarming / LUCI task links. Provide the resulting URL to the user so they can track execution progress and examine logs.
+
+## Example
+
+- **User Prompt**: "Run the devicelab test `Windows_mokey hot_mode_dev_cycle_win__benchmark` for framework PR 12345 with led."
+- **Action**: Run the `led` command (navigate to local `recipes/` directory if using `led edit-recipe-bundle` for local recipe edits):
+  ```bash
+  led get-builder 'luci.flutter.staging:Windows_mokey hot_mode_dev_cycle_win__benchmark' \
+    | led edit -pa git_ref='refs/pull/12345/head' \
+    | led edit -pa git_url='https://github.com/flutter/flutter' \
+    | led edit-recipe-bundle \
+    | led launch
+  ```
diff --git a/.ci.yaml b/.ci.yaml
index d8f3a738f017c..deb6e0a7779fe 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -59,7 +59,8 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Ubuntu
       cores: "8"
@@ -82,7 +83,8 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Ubuntu
       cores: "8"
@@ -106,7 +108,8 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Ubuntu
       cores: "8"
@@ -119,7 +122,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:8.20.0"}
+          {"dependency": "curl", "version": "version:8.20.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Ubuntu
       cores: "8"
@@ -131,7 +135,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:8.20.0"}
+          {"dependency": "curl", "version": "version:8.20.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Linux
       device_type: "Pixel 7 Pro"
@@ -142,7 +147,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:8.20.0"}
+          {"dependency": "curl", "version": "version:8.20.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Linux
       device_type: "mokey"
@@ -153,7 +159,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:8.20.0"}
+          {"dependency": "curl", "version": "version:8.20.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Linux
       device_type: "SM-S921U1"
@@ -256,7 +263,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Mac-15.7
       cpu: x86
@@ -267,7 +275,8 @@ platform_properties:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Mac-15.7
       cpu: arm64
@@ -346,7 +355,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       os: Windows-10
       device_type: "mokey"
@@ -379,7 +389,8 @@ targets:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:8.20.0"}
+          {"dependency": "curl", "version": "version:8.20.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "android", "linux", "mokey"]
@@ -413,7 +424,8 @@ targets:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "gh_cli", "version": "version:2.8.0-2-g32256d38"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
 
   - name: Linux_android_emu android views
@@ -436,7 +448,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab","hostonly"]
@@ -460,7 +473,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "1_5"
@@ -478,7 +492,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "2_5"
@@ -496,7 +511,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "3_5"
@@ -514,7 +530,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "4_5"
@@ -532,7 +549,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "5_5"
@@ -680,6 +698,21 @@ targets:
       - DEPS
       - dartdoc_options.yaml
 
+  - name: Linux snippets
+    recipe: flutter/flutter_drone
+    bringup: true
+    timeout: 30
+    properties:
+      tags: >
+        ["framework", "hostonly", "shard", "linux"]
+      shard: snippets
+    runIf:
+      - dev/snippets/**
+      - dev/bots/**
+      - .ci.yaml
+      - engine/**
+      - DEPS
+
   - name: Linux engine_dependency_proxy_test
     recipe: devicelab/devicelab_drone
     timeout: 60
@@ -687,7 +720,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -732,7 +766,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["firebaselab"]
@@ -821,7 +856,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: slow
@@ -853,7 +889,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "ninja", "version": "version:1.9.0"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: misc
@@ -861,7 +898,7 @@ targets:
         ["framework", "hostonly", "shard", "linux"]
     runIf:
       - dev/**
-      - examples/api/**
+      - examples/**
       - packages/flutter/**
       - packages/flutter_driver/**
       - packages/integration_test/**
@@ -928,7 +965,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -950,7 +988,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -972,7 +1011,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -994,7 +1034,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1017,7 +1058,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1040,7 +1082,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1063,7 +1106,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1086,7 +1130,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1110,7 +1155,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1134,7 +1180,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1157,7 +1204,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       # TODO(fujino): delete once propagation from
       # https://github.com/flutter/flutter/issues/158521 completes.
@@ -1184,7 +1232,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -1321,7 +1370,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1383,7 +1433,8 @@ targets:
     properties:
       dependencies: >-
         [
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "linux"]
@@ -1402,7 +1453,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "1_7"
@@ -1430,7 +1482,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "2_7"
@@ -1458,7 +1511,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "3_7"
@@ -1486,7 +1540,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "4_7"
@@ -1514,7 +1569,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "5_7"
@@ -1542,7 +1598,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "6_7"
@@ -1570,7 +1627,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "7_7"
@@ -1601,7 +1659,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: android_preview_tool_integration_tests
       tags: >
@@ -1627,7 +1686,8 @@ targets:
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ninja", "version": "version:1.9.0"},
-          {"dependency": "open_jdk", "version": "version:17"}
+          {"dependency": "open_jdk", "version": "version:17"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: android_java17_tool_integration_tests
       tags: >
@@ -1649,7 +1709,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk", "version": "version:11"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       task_name: android_java11_dependency_smoke_tests
       tags: >
@@ -1675,7 +1736,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       task_name: android_java17_dependency_smoke_tests
       tags: >
@@ -1701,7 +1763,8 @@ targets:
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
-          {"dependency": "ninja", "version": "version:1.9.0"}
+          {"dependency": "ninja", "version": "version:1.9.0"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests_commands
       subshard: 1_1
@@ -1723,7 +1786,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests
       subshard: general
@@ -1745,7 +1809,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests
       subshard: widget_preview_scaffold
@@ -1781,7 +1846,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
 
   - name: Linux_android_emu_vulkan_stable android_hardware_smoke_vulkan_tests
@@ -1806,7 +1872,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
 
   - name: Linux_android_emu_vulkan_stable android_hardware_smoke_vulkan_instrumented_tests
@@ -1833,7 +1900,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
 
   - name: Linux web_benchmarks_canvaskit
@@ -2240,143 +2308,6 @@ targets:
       - engine/**
       - DEPS
 
-  - name: Linux web_skwasm_tests_2
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "2"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
-
-  - name: Linux web_skwasm_tests_3
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "3"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
-
-  - name: Linux web_skwasm_tests_4
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "4"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
-
-  - name: Linux web_skwasm_tests_5
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "5"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
-
-  - name: Linux web_skwasm_tests_6
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "6"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
-
-  - name: Linux web_skwasm_tests_7_last
-    recipe: flutter/flutter_drone
-    bringup: true
-    timeout: 45
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
-          {"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
-        ]
-      shard: web_skwasm_tests
-      subshard: "7_last"
-      tags: >
-        ["framework", "hostonly", "shard", "linux"]
-      test_timeout_secs: "2700"
-    runIf:
-      - dev/**
-      - packages/**
-      - bin/**
-      - .ci.yaml
-      - engine/**
-      - DEPS
 
   - name: Linux web_tool_tests
     recipe: flutter/flutter_drone
@@ -3938,7 +3869,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "1_5"
@@ -3960,7 +3892,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "2_5"
@@ -3982,7 +3915,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "3_5"
@@ -4004,7 +3938,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "4_5"
@@ -4026,7 +3961,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "5_5"
@@ -4043,7 +3979,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "1_5"
@@ -4060,7 +3997,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "2_5"
@@ -4077,7 +4015,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "3_5"
@@ -4094,7 +4033,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "4_5"
@@ -4111,7 +4051,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "5_5"
@@ -4322,7 +4263,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: misc
@@ -4330,7 +4272,7 @@ targets:
         ["framework", "hostonly", "shard", "mac"]
     runIf:
       - dev/**
-      - examples/api/**
+      - examples/**
       - packages/flutter/**
       - packages/flutter_driver/**
       - packages/integration_test/**
@@ -4353,7 +4295,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: misc
@@ -4361,7 +4304,7 @@ targets:
         ["framework", "hostonly", "shard", "mac"]
     runIf:
       - dev/**
-      - examples/api/**
+      - examples/**
       - packages/flutter/**
       - packages/flutter_driver/**
       - packages/integration_test/**
@@ -4410,7 +4353,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4458,7 +4402,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4478,7 +4423,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4498,7 +4444,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4519,7 +4466,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4602,7 +4550,8 @@ targets:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4666,7 +4615,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "mac"]
@@ -4686,7 +4636,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -4814,7 +4765,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "1_10"
@@ -4840,7 +4792,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "2_10"
@@ -4866,7 +4819,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "3_10"
@@ -4892,7 +4846,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "4_10"
@@ -4918,7 +4873,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "5_10"
@@ -4944,7 +4900,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "6_10"
@@ -4970,7 +4927,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "7_10"
@@ -4996,7 +4954,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "8_10"
@@ -5022,7 +4981,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "9_10"
@@ -5048,7 +5008,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
-          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "10_10"
@@ -5073,7 +5034,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests_commands
       subshard: 1_1
@@ -5088,7 +5050,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests_commands
       subshard: 1_1
@@ -5103,7 +5066,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests
       subshard: general
@@ -5463,13 +5427,17 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: route_test_ios
 
-  - name: Mac_ios flavors_test_ios
+  - name: Mac flavors_test_ios
     recipe: devicelab/devicelab_drone
     presubmit: false
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
       tags: >
-        ["devicelab", "ios", "mac"]
+        ["devicelab", "hostonly", "mac"]
       task_name: flavors_test_ios
 
   - name: Mac_arm64_ios flutter_gallery_ios__compile
@@ -5585,40 +5553,60 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: integration_test_test_ios
 
-  - name: Mac_ios integration_ui_ios_driver
+  - name: Mac integration_ui_ios_driver
     recipe: devicelab/devicelab_drone
+    bringup: true
     presubmit: false
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
       tags: >
-        ["devicelab", "ios", "mac"]
+        ["devicelab", "hostonly", "mac"]
       task_name: integration_ui_ios_driver
 
-  - name: Mac_ios integration_ui_ios_frame_number
+  - name: Mac integration_ui_ios_frame_number
     recipe: devicelab/devicelab_drone
+    bringup: true
     presubmit: false
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
       tags: >
-        ["devicelab", "ios", "mac"]
+        ["devicelab", "hostonly", "mac"]
       task_name: integration_ui_ios_frame_number
 
-  - name: Mac_ios integration_ui_ios_keyboard_resize
+  - name: Mac integration_ui_ios_keyboard_resize
     recipe: devicelab/devicelab_drone
+    bringup: true
     presubmit: false
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
       tags: >
-        ["devicelab", "ios", "mac"]
+        ["devicelab", "hostonly", "mac"]
       task_name: integration_ui_ios_keyboard_resize
 
-  - name: Mac_ios integration_ui_ios_textfield
+  - name: Mac integration_ui_ios_textfield
     recipe: devicelab/devicelab_drone
+    bringup: true
     presubmit: false
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
+        ]
       tags: >
-        ["devicelab", "ios", "mac"]
+        ["devicelab", "hostonly", "mac"]
       task_name: integration_ui_ios_textfield
 
   - name: Mac_x64 ios_app_with_extensions_test
@@ -6166,7 +6154,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "1_9"
@@ -6183,7 +6172,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "2_9"
@@ -6200,7 +6190,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "3_9"
@@ -6217,7 +6208,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "4_9"
@@ -6234,7 +6226,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "5_9"
@@ -6251,7 +6244,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "6_9"
@@ -6268,7 +6262,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "7_9"
@@ -6285,7 +6280,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "8_9"
@@ -6302,7 +6298,8 @@ targets:
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: build_tests
       subshard: "9_9"
@@ -6387,7 +6384,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "vs_build", "version": "version:vs2019"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: misc
@@ -6395,7 +6393,7 @@ targets:
         ["framework", "hostonly", "shard", "windows"]
     runIf:
       - dev/**
-      - examples/api/**
+      - examples/**
       - packages/flutter/**
       - packages/flutter_driver/**
       - packages/integration_test/**
@@ -6419,7 +6417,8 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
           {"dependency": "vs_build", "version": "version:vs2019"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "android_sdk", "version": "version:37v2"}
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: framework_tests
       subshard: misc
@@ -6506,7 +6505,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6551,7 +6551,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6571,7 +6572,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6591,7 +6593,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6613,7 +6616,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6660,7 +6664,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6680,7 +6685,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6700,7 +6706,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       tags: >
         ["devicelab", "hostonly", "windows"]
@@ -6865,7 +6872,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "1_10"
@@ -6891,7 +6899,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "2_10"
@@ -6917,7 +6926,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "3_10"
@@ -6943,7 +6953,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "4_10"
@@ -6969,7 +6980,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "5_10"
@@ -6995,7 +7007,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "6_10"
@@ -7021,7 +7034,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "7_10"
@@ -7047,7 +7061,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "8_10"
@@ -7073,7 +7088,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "9_10"
@@ -7099,7 +7115,8 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
           {"dependency": "open_jdk", "version": "version:21"},
           {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_integration_tests
       subshard: "10_10"
@@ -7123,7 +7140,8 @@ targets:
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests_commands
       subshard: 1_2
@@ -7147,7 +7165,8 @@ targets:
         [
           {"dependency": "android_sdk", "version": "version:36v4"},
           {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "vs_build", "version": "version:vs2019"}
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests_commands
       subshard: 2_2
@@ -7169,7 +7188,8 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:37v2"},
-          {"dependency": "open_jdk", "version": "version:21"}
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
         ]
       shard: tool_tests
       subshard: general
@@ -7240,6 +7260,20 @@ targets:
         ]
       task_name: windows_home_scroll_perf__timeline_summary
 
+  - name: Windows windows_text_shadow_perf__timeline_summary
+    recipe: devicelab/devicelab_drone
+    presubmit: false
+    bringup: true
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab", "hostonly", "windows"]
+      dependencies: >-
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+      task_name: windows_text_shadow_perf__timeline_summary
+
   - name: Windows_arm64 windows_home_scroll_perf__timeline_summary
     recipe: devicelab/devicelab_drone
     presubmit: false
@@ -7280,6 +7314,21 @@ targets:
         ]
       task_name: windows_desktop_impeller
 
+  - name: Windows windows_engine_integration_golden_test
+    recipe: devicelab/devicelab_drone
+    presubmit: false
+    bringup: true
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab", "hostonly", "windows"]
+      dependencies: >-
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"},
+          {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+        ]
+      task_name: windows_engine_integration_golden_test
+
   - name: Windows texture_impeller_windows
     recipe: devicelab/devicelab_drone
     presubmit: false
@@ -7596,6 +7645,12 @@ targets:
     bringup: true
     timeout: 60
     properties:
+      dependencies: >-
+        [
+          {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
+          {"dependency": "cmake", "version": "build_id:8787856497187628321"},
+          {"dependency": "ninja", "version": "version:1.9.0"}
+        ]
       tags: >
         ["devicelab", "hostonly", "linux"]
       task_name: windowing_test_linux
diff --git a/.gemini/styleguide.md b/.gemini/styleguide.md
index b8a71a120e923..b095a5f134b68 100644
--- a/.gemini/styleguide.md
+++ b/.gemini/styleguide.md
@@ -29,6 +29,10 @@ flutter/flutter repository. It is based on the more comprehensive official
 - **Search for counter-examples**: Identify scenarios or edge cases that the proposed code does not handle. If a counter-example is found, propose a test case to demonstrate the gap.
 - **Suggest simplification and refactoring**: Assess whether the code can be made simpler or refactored to enhance readability and maintainability.
 
+### What Not to Report
+
+- **Do not report syntax errors**: Leave the detection of syntax errors to the analyzer. The review agent should focus on higher-level concerns such as logic, design, and maintainability rather than issues that automated tooling already catches.
+
 ## General Philosophy
 
 - **Optimize for readability**: Code is read more often than it is written.
diff --git a/.github/ISSUE_TEMPLATE/09_feature.yml b/.github/ISSUE_TEMPLATE/09_feature.yml
deleted file mode 100644
index ccce3f7890a3d..0000000000000
--- a/.github/ISSUE_TEMPLATE/09_feature.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Create an umbrella issue
-description: As a contributor, I would like to create an umbrella issue for a
-feature to be added to the feature tracker.
-title: '☂️ <Feature Title>'
-projects: ["flutter/82"]
-body:
-  - type: input
-    id: design_doc
-    attributes:
-      label: Design Doc
-      description: Add a design doc if there is one for this feature.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Please describe the feature you are adding.
-    validations:
-      required: true
-  - type: textarea
-    id: tracking_issues
-    attributes:
-      label: Tracking Issues
-      description: List of issues associated with this feature.
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/09_wasm.yml b/.github/ISSUE_TEMPLATE/09_wasm.yml
new file mode 100644
index 0000000000000..b0c2e35e218e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/09_wasm.yml
@@ -0,0 +1,60 @@
+name: Report a Flutter WebAssembly (Wasm) issue
+description: |
+  You hit a compilation, packaging, or runtime blocker while targeting WebAssembly (Wasm) in Flutter Web.
+labels: ['platform-web', 'e: wasm', 'c: tfw4']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for testing Flutter Web with WebAssembly! 🚀
+        Please provide relevant build logs, browser details, and package dependencies so engineering leads can rapidly triage your issue.
+  - type: textarea
+    id: build_command_output
+    attributes:
+      label: Build Command & Compile Logs
+      description: |
+        Paste the exact build command (e.g., `flutter build web --wasm`) and any resulting terminal errors or stack traces. **Note: If reporting a runtime bug where compilation succeeded cleanly, simply list your build command without full terminal output.**
+      placeholder: |
+        $ flutter build web --wasm
+        Target wasm_module failed: ...
+      render: shell
+    validations:
+      required: true
+  - type: input
+    id: browser_version
+    attributes:
+      label: Target Browser & Version
+      description: Specify the browser and version where the Wasm runtime or visual bug occurred (e.g., Chrome 145.0.0.0, Safari 18.2). **Optional if reporting a compilation or build failure.**
+      placeholder: Chrome 145.0
+    validations:
+      required: false
+  - type: textarea
+    id: blocking_packages
+    attributes:
+      label: Blocking Packages / Dependencies
+      description: |
+        List any third-party packages from your `pubspec.yaml` causing Wasm compilation failures or missing FFI bindings. Leave blank if standard SDK code.
+      placeholder: |
+        package:sqlite3_web 2.1.0
+        package:js_bindings 1.4.2
+    validations:
+      required: false
+  - type: textarea
+    id: reproduction_steps
+    attributes:
+      label: Steps to reproduce & Actual Behavior
+      description: Provide specific code snippets or minimal reproduction steps describing what went wrong versus expected results. If reporting a runtime exception, include console DevTools stack traces here.
+      placeholder: |
+        1. Create default demo app with `--wasm` flag.
+        2. Import package X and call `init()`.
+        3. Observe console exception in browser DevTools.
+    validations:
+      required: true
+  - type: textarea
+    id: flutter_doctor
+    attributes:
+      label: Flutter Doctor Output
+      description: Paste the complete output of `flutter doctor -v` from your local terminal.
+      render: shell
+    validations:
+      required: true
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0353541bf2961..ba01674f4c24a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -50,7 +50,7 @@
 'd: api docs':
   - changed-files:
     - any-glob-to-any-file:
-      - examples/api/**/*
+      - packages/flutter/examples/api/**/*
 
 'd: docs/':
   - changed-files:
@@ -61,6 +61,7 @@
   - changed-files:
     - any-glob-to-any-file:
       - examples/**/*
+      - packages/flutter/examples/**/*
 
 'e: embedder':
   - changed-files:
@@ -138,7 +139,6 @@ framework:
       - packages/flutter_localizations/**/*
       - packages/flutter_test/**/*
       - packages/integration_test/**/*
-      - examples/api/**/*
       - docs/about/**/*
       - docs/contributing/**/*
       - docs/libraries/**/*
diff --git a/.github/workflows/freeze.yml b/.github/workflows/freeze.yml
index 7927f4d07e500..f69b46b250d11 100644
--- a/.github/workflows/freeze.yml
+++ b/.github/workflows/freeze.yml
@@ -22,6 +22,9 @@ jobs:
     name: Check Code Freeze
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'flutter/flutter' }}
+    permissions:
+      contents: read
+      pull-requests: write
 
     steps:
       - name: Check for changes in frozen folders
@@ -32,23 +35,50 @@ jobs:
           token: ${{ github.token }}
           filters: |
             frozen:
+              - 'packages/flutter/examples/api/lib/material/**'
+              - 'packages/flutter/examples/api/lib/cupertino/**'
+              - 'packages/flutter/examples/api/test/material/**'
+              - 'packages/flutter/examples/api/test/cupertino/**'
               - 'packages/flutter/lib/src/material/**'
               - 'packages/flutter/lib/src/cupertino/**'
               - 'packages/flutter/test/material/**'
               - 'packages/flutter/test/cupertino/**'
-              - 'examples/api/lib/material/**'
-              - 'examples/api/lib/cupertino/**'
-              - 'examples/api/test/material/**'
-              - 'examples/api/test/cupertino/**'
               - 'packages/flutter/lib/fix_data/fix_cupertino.yaml'
               - 'packages/flutter/lib/fix_data/fix_material/**'
               - 'packages/flutter/test_fixes/material/**'
               - 'packages/flutter/test_fixes/cupertino/**'
 
+      - name: Comment on frozen changes
+        if: github.event_name != 'merge_group' && steps.filter.outputs.frozen == 'true' && !contains(github.event.pull_request.labels.*.name, 'override code freeze')
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          github-token: ${{ github.token }}
+          script: |
+            const issueNumber = context.issue.number;
+            const comments = await github.paginate(github.rest.issues.listComments, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issueNumber,
+            });
+            const issueUrl = 'https://github.com/flutter/flutter/issues/188444';
+            const alreadyCommented = comments.some(comment =>
+              comment.body && comment.body.includes(issueUrl)
+            );
+            if (!alreadyCommented) {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issueNumber,
+                body: 'This pull request contains changes to Material or Cupertino, which are currently frozen in this repository.\n\n' +
+                  'Changes should be made in `material_ui` and/or `cupertino_ui` in the [flutter/packages](https://github.com/flutter/packages) repository.\n\n' +
+                  'Please refer to https://github.com/flutter/flutter/issues/188444 for instructions.',
+              });
+            }
+
       - name: Fail on frozen changes
         if: github.event_name != 'merge_group' && steps.filter.outputs.frozen == 'true' && !contains(github.event.pull_request.labels.*.name, 'override code freeze')
         run: |
           echo "Error: Code changes detected during the current code freeze."
-          echo "If this is a critical fix that must land, please file an issue for team-design."
-          echo "Info: https://github.com/flutter/flutter/issues/184093"
+          echo "Changes to Material and Cupertino should be made in material_ui and/or cupertino_ui in the flutter/packages repository."
+          echo "Info: https://github.com/flutter/flutter/issues/188444"
           exit 1
diff --git a/.github/workflows/tree-analyze.yml b/.github/workflows/tree-analyze.yml
index 3f1ac02ccc92d..93f8fbc83eef6 100644
--- a/.github/workflows/tree-analyze.yml
+++ b/.github/workflows/tree-analyze.yml
@@ -33,6 +33,7 @@ jobs:
         uses: ./.github/actions/wait-for-engine-build
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          check-name: 'Linux linux_host_engine,Linux linux_android_debug_engine'
 
       - uses: ./.github/actions/composite-flutter-setup
 
diff --git a/DEPS b/DEPS
index 1666d37147f40..7deaee1ad3888 100644
--- a/DEPS
+++ b/DEPS
@@ -10,13 +10,12 @@
 vars = {
   'android_git': 'https://android.googlesource.com',
   'chromium_git': 'https://chromium.googlesource.com',
-  'swiftshader_git': 'https://swiftshader.googlesource.com',
   'dart_git': 'https://dart.googlesource.com',
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
   'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
-  'skia_revision': 'f73c4510d12da77512253d3a00d72275b45427c7',
+  'skia_revision': 'd07795eebb11219c638399981a60e9a6ff6052b3',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -56,24 +55,24 @@ vars = {
   # updated revision list of existing dependencies. You will need to
   # gclient sync before and after update deps to ensure all deps are updated.
   # updated revision list of existing dependencies.
-  'dart_revision': 'c3acfc2479f6eae42f7cbafe5e5518a2dd757b81',
+  'dart_revision': 'ad45e1b3210985c57bdb99960c77659050f4eebb',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '9926156a583cec3d22d521232b31c70fa9a87dc1',
-  'dart_boringssl_rev': '22a0079b189c391b95689813a41982ce11876f0a',
-  'dart_core_rev': 'fe516ee1b38cc60e7a8c6e082c337037a043d782',
+  'dart_boringssl_rev': '7017746ef9f887c9005f035d9bd88974d53fd48f',
+  'dart_core_rev': '4a5ae2bc9db1f39fac071f1a6fade64bd155f734',
   'dart_devtools_rev': '21f1838f3a9b138ac377efb953ca5a53c8832e75',
-  'dart_ecosystem_rev': 'edfdb3b4063b9034b708144633a700204f865f43',
-  'dart_http_rev': '5d94ef52582867e077bf41c3fa20fb8b1d1d834e',
+  'dart_ecosystem_rev': 'ed9c592c1d35106c0a8a52044426515017a60646',
+  'dart_http_rev': 'a9176ac97402a42e1b275a26eb20a9deaec92184',
   'dart_i18n_rev': 'e1b5a798f8922bb27bbc6d858748ece6f9a19f02',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_rev': '91efb90f437bb6a30e6726c3369a2fcb9bba06e7',
-  'dart_pub_rev': 'ec276d10a7fa0f6c6ec005340fb9ad29f3b012d0',
+  'dart_pub_rev': '7654d523a42e764fad77c9e7b63a9686b88c9323',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': 'b827a6e38b934232c7f7b8728a5aef6165e7df2d',
+  'dart_tools_rev': 'd644cdabe20233a344fc0eb1f5cbd1cc3388ad9d',
   'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
-  'dart_web_rev': '12a9ca2ebc08f5a6f2d69aebc7daa1f5a2e6a431',
+  'dart_web_rev': '6b84f811cd67a5fd05f4dac24cb56542bcfc92e4',
   'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
   'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',
 
@@ -186,7 +185,6 @@ vars = {
   "upstream_shelf": "https://github.com/dart-lang/shelf.git",
   "upstream_skia": "https://skia.googlesource.com/skia.git",
   "upstream_sqlite": "https://github.com/sqlite/sqlite.git",
-  "upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
   "upstream_tar": "https://github.com/simolus3/tar.git",
   "upstream_test": "https://github.com/dart-lang/test.git",
   "upstream_usage": "https://github.com/dart-lang/usage.git",
@@ -201,7 +199,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': '1frGe_KltAJKkeyPgy4cDJqScCYVYSpC9sJfjflcvl4C',
+  'fuchsia_test_scripts_version': 'KaOq3EE4qJ9fnaaaKznmHAZs9wyn-LdK_h52KEQv2KgC',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -224,7 +222,6 @@ allowed_hosts = [
   'flutter.googlesource.com',
   'llvm.googlesource.com',
   'skia.googlesource.com',
-  'swiftshader.googlesource.com',
 ]
 
 deps = {
@@ -342,7 +339,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@dfdf6420c7ea923d28edef3f11e89b4ff23d03bf',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@ac96918074974dcd4ea20f764f17090f58c1e428',
+   Var('dart_git') + '/dartdoc.git@8be851e2bfc5e4cfc0c7ec6f64b1a89699bf6456',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
    Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -357,7 +354,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@046f63d1d89cd9954623bfa2df9c69d1a395375e',
+   Var('dart_git') + '/native.git@ae2fa39d12465cb415fb57e1aa03f8f4c0dc682f',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -366,7 +363,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@6918a7690946044b4098e9f6735439044c676e13',
+   Var('dart_git') + '/shelf.git@fb3f931d2c158d794e83c1b76b7be4b625db3c28',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
    Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -375,7 +372,7 @@ deps = {
    Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@bd92e633e7f05edc3301865bdc00d1ae181cb1f1',
+   Var('dart_git') + '/test.git@55b186ddcad50fe4808226e0b681875dda6dd123',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -544,7 +541,7 @@ deps = {
    Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '03c67afd452cdff45b41bfe65e19a2fb5b80a0e8',
 
   'engine/src/flutter/third_party/swiftshader':
-  Var('swiftshader_git') + '/SwiftShader.git' + '@' + '794b0cfce1d828d187637e6d932bae484fbe0976',
+  Var('flutter_git') + '/third_party/swiftshader.git' + '@' + '1be9f83618f8ba258431c0c13d7a083eb193df11',
 
   'engine/src/flutter/third_party/angle':
   Var('flutter_git') + '/third_party/angle' + '@' + 'cc08479fbcc181697fa837069ce1103c58c15528',
@@ -833,7 +830,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '_J8wM3kyQpLN9wvRD5upBr9L1g5TCYF3Oc8P0m3QeZMC'
+        'version': 'G3M0_OC-NACckIiVgFyftqUoCFlVblBmLtYUlWlkFFoC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
diff --git a/TESTOWNERS b/TESTOWNERS
index f84904777efe9..c631152cc7b95 100644
--- a/TESTOWNERS
+++ b/TESTOWNERS
@@ -156,7 +156,6 @@
 /dev/devicelab/bin/tasks/integration_ui_driver.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_frame_number.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/integration_ui_screenshot.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_textfield.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/microbenchmarks.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/native_assets_android.dart @dcharkes @flutter/android
@@ -210,7 +209,6 @@
 /dev/devicelab/bin/tasks/integration_ui_ios_driver.dart LongCatIsLooong @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart @LongCatIsLooong @flutter/engine
-/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart @LongCatIsLooong @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @LongCatIsLooong @flutter/tool
 /dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @hellohuanlin @flutter/tool
 /dev/devicelab/bin/tasks/ios_defines_test.dart @vashworth @flutter/tool
@@ -331,7 +329,9 @@
 /dev/devicelab/bin/tasks/windowing_test_macos.dart @knopp @flutter/desktop
 /dev/devicelab/bin/tasks/windowing_test_windows.dart @mattkae @flutter/desktop
 /dev/devicelab/bin/tasks/windows_desktop_impeller.dart @jonahwilliams @flutter/engine
+/dev/devicelab/bin/tasks/windows_engine_integration_golden_test.dart @b-luk @flutter/engine
 /dev/devicelab/bin/tasks/windows_home_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
+/dev/devicelab/bin/tasks/windows_text_shadow_perf__timeline_summary.dart @gaaclarke @flutter/engine
 /dev/devicelab/bin/tasks/windows_startup_test.dart @loic-sharma @flutter/desktop
 
 ## Host only framework tests
@@ -339,6 +339,8 @@
 # Linux docs_generate_release
 # Linux docs_publish
 /dev/bots/docs.sh @Piinks @flutter/framework
+# Linux snippets
+/dev/snippets @dkwingsmt @flutter/framework
 # Linux packages_autoroller
 /dev/conductor/core @christopherfujino @flutter/tool
 # Linux web_e2e_test
@@ -373,6 +375,7 @@
 # coverage @christopherfujino @flutter/infra
 # customer_testing @Piinks @flutter/framework
 # docs @Piinks @flutter/framework
+# snippets @Piinks @flutter/framework
 # flutter_packaging @christopherfujino @flutter/infra
 # flutter_plugins @stuartmorgan-g @flutter/plugin
 # framework_tests @Piinks @flutter/framework
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 74a5e1e3b0eeb..74bb48dbae333 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,6 +1,16 @@
 include: analysis_options_common.yaml
 
+# Note: Analyzer plugins (such as flutter_analyzer_plugin) must be configured
+# directly in each subpackage's analysis_options.yaml (with the appropriate
+# relative depth) rather than at the repository root. The Dart analyzer resolves
+# plugin paths relative to the subpackage directory evaluating the options, so
+# relative plugin paths cannot be inherited from root options.
+
 analyzer:
+  errors:
+    # This error code will no longer be reported here. Until dart rolls in, we need to just ignore the issue.
+    # ignore: unrecognized_error_code
+    plugins_in_inner_options: ignore
   exclude:
     - "bin/cache/**"
       # Ignore protoc generated files
diff --git a/bin/internal/flutter_packages.version b/bin/internal/flutter_packages.version
index a6ebf2a65b6f0..277daccf98d0d 100644
--- a/bin/internal/flutter_packages.version
+++ b/bin/internal/flutter_packages.version
@@ -1 +1 @@
-5351d8c0f8df210f09d79aea5960a5d48ceb44af
+a3e763e60321146e9f79571ca917c824b25e62ce
diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1
index 318ef62add853..111a34e92210a 100644
--- a/bin/internal/update_dart_sdk.ps1
+++ b/bin/internal/update_dart_sdk.ps1
@@ -49,10 +49,16 @@ if ($engineRealm) {
 
 # It's important to use the native Dart SDK as the default target architecture
 # for Flutter Windows builds depend on the Dart executable's architecture.
+# FLUTTER_HOST_ARCH can be set as an override to force download for the specified architecture.
+# PROCESSOR_ARCHITECTURE is a standard Windows env var indicating host CPU architecture.
 $dartZipNameX64 = "dart-sdk-windows-x64.zip"
 $dartZipNameArm64 = "dart-sdk-windows-arm64.zip"
 $dartZipName = $dartZipNameX64
-if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
+if ($env:FLUTTER_HOST_ARCH -eq "arm64") {
+    $dartZipName = $dartZipNameArm64
+} elseif ($env:FLUTTER_HOST_ARCH -eq "x64") {
+    $dartZipName = $dartZipNameX64
+} elseif ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
     $dartSdkArm64Url = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipNameArm64"
     Try {
         Invoke-WebRequest -Uri $dartSdkArm64Url -UseBasicParsing -Method Head | Out-Null
diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh
index 41f419112e1f4..cf306f0c1cd11 100755
--- a/bin/internal/update_dart_sdk.sh
+++ b/bin/internal/update_dart_sdk.sh
@@ -61,8 +61,11 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != "$(< "$ENGINE_STAMP")" ];
     exit 1
   }
 
-  # `uname -m` may be running in Rosetta mode, instead query sysctl
-  if [ "$OS" = 'Darwin' ]; then
+  if [ -n "$FLUTTER_HOST_ARCH" ]; then
+    # FLUTTER_HOST_ARCH can be set to override the host architecture detection.
+    ARCH="$FLUTTER_HOST_ARCH"
+  elif [ "$OS" = 'Darwin' ]; then
+    # `uname -m` may be running in Rosetta mode, instead query sysctl
     # Allow non-zero exit so we can do control flow
     set +e
     # -n means only print value, not key
diff --git a/dev/a11y_assessments/lib/main.dart b/dev/a11y_assessments/lib/main.dart
index 2c03117319764..2f47a8530b3f5 100644
--- a/dev/a11y_assessments/lib/main.dart
+++ b/dev/a11y_assessments/lib/main.dart
@@ -42,7 +42,7 @@ final ThemeData _highContrastDarkTheme = _buildTheme(
 );
 
 class App extends StatelessWidget {
-  const App({super.key, this.initialTags = const <Tag>{Tag.batch2}});
+  const App({super.key, this.initialTags = const <Tag>{Tag.batch3}});
 
   final Set<Tag> initialTags;
 
diff --git a/dev/a11y_assessments/lib/use_cases/bottom_app_bar.dart b/dev/a11y_assessments/lib/use_cases/bottom_app_bar.dart
new file mode 100644
index 0000000000000..3aaf4b79a571e
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/bottom_app_bar.dart
@@ -0,0 +1,73 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+import '../utils.dart';
+import 'use_cases.dart';
+
+class BottomAppBarUseCase extends UseCase {
+  BottomAppBarUseCase();
+
+  @override
+  String get name => 'BottomAppBar';
+
+  @override
+  String get route => '/bottom-app-bar';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => const MainWidget();
+}
+
+class MainWidget extends StatefulWidget {
+  const MainWidget({super.key});
+
+  @override
+  State<MainWidget> createState() => MainWidgetState();
+}
+
+class MainWidgetState extends State<MainWidget> {
+  final String pageTitle = getUseCaseName(BottomAppBarUseCase());
+  String _selectedAction = 'None';
+
+  void _onItemTapped(String action) {
+    setState(() {
+      _selectedAction = action;
+    });
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
+    ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Tapped: $action')));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      bottomNavigationBar: BottomAppBar(
+        child: Row(
+          children: <Widget>[
+            IconButton(
+              tooltip: 'Open menu',
+              icon: const Icon(Icons.menu),
+              onPressed: () => _onItemTapped('Menu'),
+            ),
+            IconButton(
+              tooltip: 'Search',
+              icon: const Icon(Icons.search),
+              onPressed: () => _onItemTapped('Search'),
+            ),
+            IconButton(
+              tooltip: 'Favorite',
+              icon: const Icon(Icons.favorite),
+              onPressed: () => _onItemTapped('Favorite'),
+            ),
+          ],
+        ),
+      ),
+      body: Center(child: Text('Selected: $_selectedAction')),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/check_box.dart b/dev/a11y_assessments/lib/use_cases/check_box.dart
new file mode 100644
index 0000000000000..1864e8b77e0e9
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/check_box.dart
@@ -0,0 +1,55 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class CheckBoxUseCase extends UseCase {
+  CheckBoxUseCase();
+
+  @override
+  String get name => 'CheckBox';
+
+  @override
+  String get route => '/check-box';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  bool _checked = false;
+
+  String pageTitle = getUseCaseName(CheckBoxUseCase());
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        children: <Widget>[
+          Checkbox(
+            value: _checked,
+            semanticLabel: 'Enabled checkbox',
+            onChanged: (bool? value) {
+              setState(() {
+                _checked = value!;
+              });
+            },
+          ),
+          const Checkbox(value: false, semanticLabel: 'Disabled checkbox', onChanged: null),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/dropdown_menu.dart b/dev/a11y_assessments/lib/use_cases/dropdown_menu.dart
new file mode 100644
index 0000000000000..2de0c02f8eb7a
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/dropdown_menu.dart
@@ -0,0 +1,69 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class DropdownMenuUseCase extends UseCase {
+  DropdownMenuUseCase();
+
+  @override
+  String get name => 'DropdownMenu';
+
+  @override
+  String get route => '/dropdown-menu';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => const _MainWidget();
+}
+
+class _MainWidget extends StatelessWidget {
+  const _MainWidget();
+
+  static const List<String> _kOptions = <String>['apple', 'banana', 'lemon'];
+  static final List<DropdownMenuEntry<String>> _kMenuEntries = _kOptions
+      .map<DropdownMenuEntry<String>>(
+        (String name) => DropdownMenuEntry<String>(value: name, label: name),
+      )
+      .toList();
+
+  @override
+  Widget build(BuildContext context) {
+    final String pageTitle = getUseCaseName(DropdownMenuUseCase());
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        padding: const EdgeInsets.all(24.0),
+        children: <Widget>[
+          Semantics(
+            label: 'Enabled dropdown menu',
+            child: DropdownMenu<String>(
+              key: const Key('enabled dropdown menu'),
+              label: const Text('Fruit'),
+              expandedInsets: EdgeInsets.zero,
+              initialSelection: _kOptions.first,
+              dropdownMenuEntries: _kMenuEntries,
+            ),
+          ),
+          const SizedBox(height: 24.0),
+          Semantics(
+            label: 'Disabled dropdown menu',
+            child: DropdownMenu<String>(
+              key: const Key('disabled dropdown menu'),
+              label: const Text('Fruit'),
+              expandedInsets: EdgeInsets.zero,
+              enabled: false,
+              initialSelection: _kOptions.first,
+              dropdownMenuEntries: _kMenuEntries,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/menu_anchor.dart b/dev/a11y_assessments/lib/use_cases/menu_anchor.dart
new file mode 100644
index 0000000000000..e63c3bd9541ec
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/menu_anchor.dart
@@ -0,0 +1,86 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class MenuAnchorUseCase extends UseCase {
+  MenuAnchorUseCase();
+
+  @override
+  String get name => 'MenuAnchor';
+
+  @override
+  String get route => '/menu-anchor';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.core];
+
+  @override
+  Widget build(BuildContext context) => const _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  const _MainWidget();
+
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  String _lastSelection = 'None';
+
+  @override
+  Widget build(BuildContext context) {
+    final String pageTitle = getUseCaseName(MenuAnchorUseCase());
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        children: <Widget>[
+          Semantics(liveRegion: true, child: Text('Last Selection: $_lastSelection')),
+          Semantics(
+            label: 'Enabled menu anchor',
+            child: MenuAnchor(
+              key: const Key('enabled menu anchor'),
+              builder: (BuildContext context, MenuController controller, Widget? child) {
+                return ElevatedButton(
+                  onPressed: () {
+                    if (controller.isOpen) {
+                      controller.close();
+                    } else {
+                      controller.open();
+                    }
+                  },
+                  child: const Text('Open Menu'),
+                );
+              },
+              menuChildren: <Widget>[
+                MenuItemButton(
+                  onPressed: () {
+                    setState(() {
+                      _lastSelection = 'Item 1';
+                    });
+                  },
+                  child: const Text('Item 1'),
+                ),
+                const MenuItemButton(child: Text('Disabled Item')),
+              ],
+            ),
+          ),
+          Semantics(
+            label: 'Disabled menu anchor',
+            child: MenuAnchor(
+              key: const Key('disabled menu anchor'),
+              builder: (BuildContext context, MenuController controller, Widget? child) {
+                return const ElevatedButton(onPressed: null, child: Text('Disabled Menu Button'));
+              },
+              menuChildren: const <Widget>[MenuItemButton(child: Text('Disabled Item'))],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/menu_bar.dart b/dev/a11y_assessments/lib/use_cases/menu_bar.dart
new file mode 100644
index 0000000000000..7cddfd95b4cc0
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/menu_bar.dart
@@ -0,0 +1,113 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class MenuBarUseCase extends UseCase {
+  MenuBarUseCase();
+
+  @override
+  String get name => 'MenuBar';
+
+  @override
+  String get route => '/menu-bar';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.core];
+
+  @override
+  Widget build(BuildContext context) => const _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  const _MainWidget();
+
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  String _lastSelection = 'None';
+
+  @override
+  Widget build(BuildContext context) {
+    final String pageTitle = getUseCaseName(MenuBarUseCase());
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        children: <Widget>[
+          Semantics(liveRegion: true, child: Text('Last Selection: $_lastSelection')),
+          Semantics(
+            label: 'Enabled menu bar',
+            child: MenuBar(
+              key: const Key('enabled menu bar'),
+              children: <Widget>[
+                SubmenuButton(
+                  menuChildren: <Widget>[
+                    MenuItemButton(
+                      onPressed: () {
+                        setState(() {
+                          _lastSelection = 'Save';
+                        });
+                      },
+                      child: const Text('Save'),
+                    ),
+                    const MenuItemButton(child: Text('Disabled Item')),
+                  ],
+                  child: const Text('File'),
+                ),
+                SubmenuButton(
+                  menuChildren: <Widget>[
+                    MenuItemButton(
+                      onPressed: () {
+                        setState(() {
+                          _lastSelection = 'About';
+                        });
+                      },
+                      child: const Text('About'),
+                    ),
+                    SubmenuButton(
+                      menuChildren: <Widget>[
+                        MenuItemButton(
+                          onPressed: () {
+                            setState(() {
+                              _lastSelection = 'Documentation';
+                            });
+                          },
+                          child: const Text('Documentation'),
+                        ),
+                        MenuItemButton(
+                          onPressed: () {
+                            setState(() {
+                              _lastSelection = 'Send Feedback';
+                            });
+                          },
+                          child: const Text('Send Feedback'),
+                        ),
+                      ],
+                      child: const Text('Online Help'),
+                    ),
+                  ],
+                  child: const Text('Help'),
+                ),
+              ],
+            ),
+          ),
+          Semantics(
+            label: 'Disabled menu bar',
+            child: const MenuBar(
+              key: Key('disabled menu bar'),
+              children: <Widget>[
+                SubmenuButton(menuChildren: <Widget>[], child: Text('Disabled File')),
+                MenuItemButton(child: Text('Disabled Help')),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/radio.dart b/dev/a11y_assessments/lib/use_cases/radio.dart
new file mode 100644
index 0000000000000..bd39862dfee62
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/radio.dart
@@ -0,0 +1,88 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class RadioUseCase extends UseCase {
+  RadioUseCase();
+
+  @override
+  String get name => 'Radio';
+
+  @override
+  String get route => '/radio';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => _MainWidget();
+}
+
+enum Option { option1, option2, option3 }
+
+class _MainWidget extends StatefulWidget {
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  Option? _value = Option.option1;
+
+  String pageTitle = getUseCaseName(RadioUseCase());
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: Center(
+        child: RadioGroup<Option>(
+          groupValue: _value,
+          onChanged: (Option? value) {
+            setState(() {
+              _value = value;
+            });
+          },
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  Semantics(
+                    label: 'Option 1',
+                    child: const Radio<Option>(value: Option.option1),
+                  ),
+                  const Text('Option 1'),
+                ],
+              ),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  Semantics(
+                    label: 'Option 2',
+                    child: const Radio<Option>(value: Option.option2),
+                  ),
+                  const Text('Option 2'),
+                ],
+              ),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  Semantics(
+                    label: 'Disabled Option',
+                    child: const Radio<Option>(value: Option.option3, enabled: false),
+                  ),
+                  const Text('Disabled Option'),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/search_bar.dart b/dev/a11y_assessments/lib/use_cases/search_bar.dart
new file mode 100644
index 0000000000000..678d88967e7f0
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/search_bar.dart
@@ -0,0 +1,148 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class SearchBarUseCase extends UseCase {
+  SearchBarUseCase();
+
+  @override
+  String get name => 'SearchBar';
+
+  @override
+  String get route => '/search-bar';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.core];
+
+  @override
+  Widget build(BuildContext context) => _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  final String pageTitle = getUseCaseName(SearchBarUseCase());
+  String _statusMessage = '';
+
+  static const List<String> _kOptions = <String>[
+    'apple',
+    'banana',
+    'cherry',
+    'date',
+    'elderberry',
+    'fig',
+    'grape',
+    'honeydew',
+    'icicle',
+    'jackfruit',
+    'kiwi',
+    'lemon',
+    'mango',
+    'nectarine',
+    'orange',
+    'papaya',
+    'quince',
+    'raspberry',
+    'strawberry',
+    'tangerine',
+    'umbrella',
+    'vanilla',
+    'watermelon',
+    'xylophone',
+    'yuzu',
+    'zucchini',
+  ];
+
+  void _handleSearch(String value) {
+    setState(() {
+      _statusMessage = 'Searched for "$value"';
+    });
+    ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Searched for "$value"')));
+  }
+
+  Iterable<Widget> _getSuggestions(SearchController controller) {
+    final String input = controller.value.text;
+    return _kOptions
+        .where((String option) => option.contains(input.toLowerCase()))
+        .map(
+          (String filteredOption) => ListTile(
+            title: Text(filteredOption),
+            onTap: () {
+              controller.closeView(filteredOption);
+              _handleSearch(filteredOption);
+            },
+          ),
+        );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        children: <Widget>[
+          Semantics(
+            label: 'Enabled search bar',
+            child: SearchAnchor(
+              builder: (BuildContext context, SearchController controller) {
+                return SearchBar(
+                  key: const Key('enabled search bar'),
+                  controller: controller,
+                  hintText: 'Search...',
+                  onTap: () {
+                    controller.openView();
+                  },
+                  onChanged: (_) {
+                    controller.openView();
+                  },
+                  onSubmitted: (String value) {
+                    _handleSearch(value);
+                  },
+                  leading: const Icon(Icons.search),
+                  trailing: <Widget>[
+                    IconButton(
+                      tooltip: 'Clear',
+                      icon: const Icon(Icons.clear),
+                      onPressed: () {
+                        controller.clear();
+                        setState(() {
+                          _statusMessage = 'Search cleared';
+                        });
+                      },
+                    ),
+                  ],
+                );
+              },
+              suggestionsBuilder: (BuildContext context, SearchController controller) {
+                return _getSuggestions(controller);
+              },
+            ),
+          ),
+          Semantics(
+            label: 'Disabled search bar',
+            child: const SearchBar(
+              key: Key('disabled search bar'),
+              hintText: 'Search...',
+              enabled: false,
+            ),
+          ),
+          if (_statusMessage.isNotEmpty)
+            Semantics(
+              liveRegion: true,
+              child: Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Text(_statusMessage, key: const Key('status message')),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/switch.dart b/dev/a11y_assessments/lib/use_cases/switch.dart
new file mode 100644
index 0000000000000..12fec196399e7
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/switch.dart
@@ -0,0 +1,57 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class SwitchUseCase extends UseCase {
+  SwitchUseCase();
+
+  @override
+  String get name => 'Switch';
+
+  @override
+  String get route => '/switch';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  bool _value = false;
+
+  String pageTitle = getUseCaseName(SwitchUseCase());
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: ListView(
+        children: <Widget>[
+          Semantics(
+            label: 'Enabled switch',
+            child: Switch(
+              value: _value,
+              onChanged: (bool value) {
+                setState(() {
+                  _value = value;
+                });
+              },
+            ),
+          ),
+          Semantics(label: 'Disabled switch', child: const Switch(value: false, onChanged: null)),
+        ],
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/text_form_field.dart b/dev/a11y_assessments/lib/use_cases/text_form_field.dart
new file mode 100644
index 0000000000000..9b5012afaf67f
--- /dev/null
+++ b/dev/a11y_assessments/lib/use_cases/text_form_field.dart
@@ -0,0 +1,106 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import '../utils.dart';
+import 'use_cases.dart';
+
+class TextFormFieldUseCase extends UseCase {
+  TextFormFieldUseCase();
+
+  @override
+  String get name => 'TextFormField';
+
+  @override
+  String get route => '/text-form-field';
+
+  @override
+  List<Tag> get tags => <Tag>[Tag.batch3, Tag.core];
+
+  @override
+  Widget build(BuildContext context) => _MainWidget();
+}
+
+class _MainWidget extends StatefulWidget {
+  @override
+  State<_MainWidget> createState() => _MainWidgetState();
+}
+
+class _MainWidgetState extends State<_MainWidget> {
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final String pageTitle = getUseCaseName(TextFormFieldUseCase());
+  String _statusMessage = '';
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Semantics(headingLevel: 1, child: Text('$pageTitle Demo'))),
+      body: Form(
+        key: _formKey,
+        child: ListView(
+          children: <Widget>[
+            Semantics(
+              label: 'Enabled text form field',
+              child: TextFormField(
+                key: const Key('enabled text form field'),
+                maxLines: null,
+                decoration: const InputDecoration(
+                  labelText: 'Email',
+                  suffixText: '@gmail.com',
+                  hintText: 'Enter your email',
+                ),
+                validator: (String? value) {
+                  if (value == null || value.isEmpty) {
+                    return 'Please enter some text';
+                  }
+                  return null;
+                },
+              ),
+            ),
+            Semantics(
+              label: 'Disabled text form field',
+              child: TextFormField(
+                key: const Key('disabled text form field'),
+                maxLines: null,
+                decoration: const InputDecoration(
+                  labelText: 'Email',
+                  suffixText: '@gmail.com',
+                  hintText: 'Enter your email',
+                ),
+                enabled: false,
+                initialValue: 'xyz',
+              ),
+            ),
+            ElevatedButton(
+              key: const Key('submit button'),
+              onPressed: () {
+                if (_formKey.currentState!.validate()) {
+                  setState(() {
+                    _statusMessage = 'Form submitted successfully!';
+                  });
+                  ScaffoldMessenger.of(
+                    context,
+                  ).showSnackBar(const SnackBar(content: Text('Form submitted successfully!')));
+                } else {
+                  setState(() {
+                    _statusMessage = 'Validation failed';
+                  });
+                }
+              },
+              child: const Text('Submit'),
+            ),
+            if (_statusMessage.isNotEmpty)
+              Semantics(
+                liveRegion: true,
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Text(_statusMessage, key: const Key('status message')),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/dev/a11y_assessments/lib/use_cases/use_cases.dart b/dev/a11y_assessments/lib/use_cases/use_cases.dart
index caaa14e8e9b30..410cdad9c1cce 100644
--- a/dev/a11y_assessments/lib/use_cases/use_cases.dart
+++ b/dev/a11y_assessments/lib/use_cases/use_cases.dart
@@ -11,39 +11,49 @@ import 'app_bar.dart';
 import 'auto_complete.dart';
 import 'back_button.dart';
 import 'badge.dart';
+import 'bottom_app_bar.dart';
 import 'card.dart';
+import 'check_box.dart';
 import 'check_box_list_tile.dart';
 import 'close_button.dart';
 import 'date_picker.dart';
 import 'dialog.dart';
 import 'drawer.dart';
+import 'dropdown_menu.dart';
 import 'elevated_button.dart';
 import 'expansion_tile.dart';
 import 'filled_button.dart';
 import 'floating_action_button.dart';
 import 'icon_button.dart';
 import 'material_banner.dart';
+import 'menu_anchor.dart';
+import 'menu_bar.dart';
 import 'navigation_bar.dart';
 import 'navigation_drawer.dart';
 import 'navigation_rail.dart';
 import 'outlined_button.dart';
 import 'popup_menu_button.dart';
+import 'radio.dart';
 import 'radio_list_tile.dart';
 import 'range_slider.dart';
+import 'search_bar.dart';
 import 'segmented_button.dart';
 import 'slider.dart';
 import 'snack_bar.dart';
+import 'switch.dart';
 import 'switch_list_tile.dart';
 import 'tab_bar_view.dart';
 import 'text_button.dart';
 import 'text_field.dart';
 import 'text_field_password.dart';
+import 'text_form_field.dart';
 import 'toggle_buttons.dart';
 
 /// Tags for accessibility assessment use cases.
 enum Tag {
   batch1('First batch of widgets for VPAT assessment'),
   batch2('Second batch of widgets for VPAT assessment, Q2 2026'),
+  batch3('Third batch of widgets for VPAT assessment, Q3 2023'),
   core('Essential use-cases requested for various a11y certifications'),
 
   /// An additional use-case that the team considers important to cover, even if
@@ -70,6 +80,7 @@ abstract class UseCase {
 
 final List<UseCase> useCases = <UseCase>[
   AboutListTileUseCase(),
+  CheckBoxUseCase(),
   CheckBoxListTile(),
   DialogUseCase(),
   SliderUseCase(),
@@ -82,9 +93,11 @@ final List<UseCase> useCases = <UseCase>[
   MaterialBannerUseCase(),
   NavigationBarUseCase(),
   TextButtonUseCase(),
+  RadioUseCase(),
   RadioListTileUseCase(),
   ActionChipUseCase(),
   SnackBarUseCase(),
+  SwitchUseCase(),
   SwitchListTileUseCase(),
   ExpansionTileUseCase(),
   CardUseCase(),
@@ -103,4 +116,10 @@ final List<UseCase> useCases = <UseCase>[
   ToggleButtonsUseCase(),
   BackButtonUseCase(),
   CloseButtonUseCase(),
+  TextFormFieldUseCase(),
+  SearchBarUseCase(),
+  DropdownMenuUseCase(),
+  MenuAnchorUseCase(),
+  MenuBarUseCase(),
+  BottomAppBarUseCase(),
 ];
diff --git a/dev/a11y_assessments/test/accessibility_guideline_test.dart b/dev/a11y_assessments/test/accessibility_guideline_test.dart
index 6bff0b0699e95..f082d3717e5f6 100644
--- a/dev/a11y_assessments/test/accessibility_guideline_test.dart
+++ b/dev/a11y_assessments/test/accessibility_guideline_test.dart
@@ -4,6 +4,9 @@
 
 import 'package:a11y_assessments/main.dart';
 import 'package:a11y_assessments/use_cases/date_picker.dart';
+import 'package:a11y_assessments/use_cases/menu_anchor.dart';
+import 'package:a11y_assessments/use_cases/menu_bar.dart';
+import 'package:a11y_assessments/use_cases/search_bar.dart';
 import 'package:a11y_assessments/use_cases/use_cases.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';
@@ -31,6 +34,11 @@ void main() {
   });
 
   for (final UseCase useCase in useCases) {
+    // TODO(chunhtai): remove this when https://github.com/flutter/flutter/issues/190884 and
+    // https://github.com/flutter/flutter/issues/190864 are fixed.
+    if (useCase is SearchBarUseCase || useCase is MenuAnchorUseCase || useCase is MenuBarUseCase) {
+      continue;
+    }
     for (final Brightness brightness in Brightness.values) {
       testWidgets('testing accessibility guideline for ${useCase.name} - ${brightness.name}', (
         WidgetTester tester,
@@ -46,10 +54,15 @@ void main() {
           controller.jumpTo(controller.offset + 400);
           await tester.pumpAndSettle();
         }
+
+        // The button may still be off-screen if it is in cache extent.
+        await tester.ensureVisible(find.byKey(Key(useCase.name)));
+        await tester.pumpAndSettle();
         await tester.tap(find.byKey(Key(useCase.name)));
         await tester.pumpAndSettle();
 
-        await _expectMeetsGuidelines(tester);
+        final skipTap = useCase.name == DatePickerUseCase().name;
+        await _expectMeetsGuidelines(tester, skipTapTarget: skipTap);
 
         // After checking the guideline for the main page,
         // iterate through all tappable semantic nodes on the current screen.
@@ -75,10 +88,7 @@ void main() {
           // Re-check the accessibility guidelines after the tap action.
           // The DatePicker use case has known issues with tap target sizes
           // So we skip these checks for this use case .
-          await _expectMeetsGuidelines(
-            tester,
-            skipTapTarget: useCase.name == DatePickerUseCase().name,
-          );
+          await _expectMeetsGuidelines(tester, skipTapTarget: skipTap);
         }
       });
     }
diff --git a/dev/a11y_assessments/test/bottom_app_bar_test.dart b/dev/a11y_assessments/test/bottom_app_bar_test.dart
new file mode 100644
index 0000000000000..8817ca31f5cf5
--- /dev/null
+++ b/dev/a11y_assessments/test/bottom_app_bar_test.dart
@@ -0,0 +1,23 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/bottom_app_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('bottom app bar test', (WidgetTester tester) async {
+    await pumpsUseCase(tester, BottomAppBarUseCase());
+    expect(find.byType(BottomAppBar), findsOneWidget);
+    expect(find.text('Selected: None'), findsOneWidget);
+
+    await tester.tap(find.byTooltip('Open menu'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Selected: Menu'), findsOneWidget);
+    expect(find.byType(SnackBar), findsOneWidget);
+  });
+}
diff --git a/dev/a11y_assessments/test/check_box_test.dart b/dev/a11y_assessments/test/check_box_test.dart
new file mode 100644
index 0000000000000..9ebe833de7fee
--- /dev/null
+++ b/dev/a11y_assessments/test/check_box_test.dart
@@ -0,0 +1,27 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/check_box.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('check box use case renders check boxes and toggles state', (
+    WidgetTester tester,
+  ) async {
+    await pumpsUseCase(tester, CheckBoxUseCase());
+    expect(find.byType(Checkbox), findsNWidgets(2));
+
+    Checkbox checkbox = tester.widget(find.byType(Checkbox).first);
+    expect(checkbox.value, isFalse);
+
+    await tester.tap(find.byType(Checkbox).first);
+    await tester.pumpAndSettle();
+
+    checkbox = tester.widget(find.byType(Checkbox).first);
+    expect(checkbox.value, isTrue);
+  });
+}
diff --git a/dev/a11y_assessments/test/dropdown_menu_test.dart b/dev/a11y_assessments/test/dropdown_menu_test.dart
new file mode 100644
index 0000000000000..716e7b22f6966
--- /dev/null
+++ b/dev/a11y_assessments/test/dropdown_menu_test.dart
@@ -0,0 +1,43 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/dropdown_menu.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('dropdown menu can run', (WidgetTester tester) async {
+    await pumpsUseCase(tester, DropdownMenuUseCase());
+    expect(find.byType(DropdownMenu<String>), findsExactly(2));
+
+    // Test the enabled dropdown menu
+    {
+      final Finder finder = find.byKey(const Key('enabled dropdown menu'));
+      await tester.tap(
+        find.descendant(of: finder, matching: find.byIcon(Icons.arrow_drop_down)).first,
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.widgetWithText(MenuItemButton, 'banana'), findsWidgets);
+      await tester.tap(find.widgetWithText(MenuItemButton, 'banana').last, warnIfMissed: false);
+      await tester.pumpAndSettle();
+    }
+
+    // Test the disabled dropdown menu
+    {
+      final Finder finder = find.byKey(const Key('disabled dropdown menu'));
+      final DropdownMenu<String> dropdownMenu = tester.widget<DropdownMenu<String>>(finder);
+      expect(dropdownMenu.enabled, isFalse);
+    }
+  });
+
+  testWidgets('dropdown menu demo page has one h1 tag', (WidgetTester tester) async {
+    await pumpsUseCase(tester, DropdownMenuUseCase());
+    final Finder findHeadingLevelOnes = find.bySemanticsLabel('DropdownMenu Demo');
+    await tester.pumpAndSettle();
+    expect(findHeadingLevelOnes, findsOne);
+  });
+}
diff --git a/dev/a11y_assessments/test/menu_anchor_test.dart b/dev/a11y_assessments/test/menu_anchor_test.dart
new file mode 100644
index 0000000000000..43593c4aba3c2
--- /dev/null
+++ b/dev/a11y_assessments/test/menu_anchor_test.dart
@@ -0,0 +1,53 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/menu_anchor.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('menu anchor can run', (WidgetTester tester) async {
+    await pumpsUseCase(tester, MenuAnchorUseCase());
+    expect(find.byType(MenuAnchor), findsExactly(2));
+
+    // Test the enabled menu anchor
+    {
+      final Finder finder = find.byKey(const Key('enabled menu anchor'));
+      final Finder button = find.descendant(of: finder, matching: find.byType(ElevatedButton));
+      await tester.tap(button);
+      await tester.pumpAndSettle();
+
+      expect(find.widgetWithText(MenuItemButton, 'Item 1'), findsWidgets);
+      await tester.tap(find.widgetWithText(MenuItemButton, 'Item 1').last, warnIfMissed: false);
+      await tester.pumpAndSettle();
+      expect(find.text('Last Selection: Item 1'), findsOneWidget);
+      expect(
+        find.ancestor(
+          of: find.text('Last Selection: Item 1'),
+          matching: find.byWidgetPredicate(
+            (Widget w) => w is Semantics && w.properties.liveRegion == true,
+          ),
+        ),
+        findsOneWidget,
+      );
+    }
+
+    // Test the disabled menu anchor
+    {
+      final Finder finder = find.byKey(const Key('disabled menu anchor'));
+      final Finder button = find.descendant(of: finder, matching: find.byType(ElevatedButton));
+      final ElevatedButton elevatedButton = tester.widget<ElevatedButton>(button);
+      expect(elevatedButton.enabled, isFalse);
+    }
+  });
+
+  testWidgets('menu anchor demo page has one h1 tag', (WidgetTester tester) async {
+    await pumpsUseCase(tester, MenuAnchorUseCase());
+    final Finder findHeadingLevelOnes = find.bySemanticsLabel('MenuAnchor Demo');
+    await tester.pumpAndSettle();
+    expect(findHeadingLevelOnes, findsOne);
+  });
+}
diff --git a/dev/a11y_assessments/test/menu_bar_test.dart b/dev/a11y_assessments/test/menu_bar_test.dart
new file mode 100644
index 0000000000000..f06c2f85c7973
--- /dev/null
+++ b/dev/a11y_assessments/test/menu_bar_test.dart
@@ -0,0 +1,76 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/menu_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('menu bar can run', (WidgetTester tester) async {
+    await pumpsUseCase(tester, MenuBarUseCase());
+    expect(find.byType(MenuBar), findsExactly(2));
+
+    // Test the enabled menu bar
+    {
+      final Finder finder = find.byKey(const Key('enabled menu bar'));
+      final Finder fileMenu = find.descendant(
+        of: finder,
+        matching: find.widgetWithText(SubmenuButton, 'File'),
+      );
+      await tester.tap(fileMenu);
+      await tester.pumpAndSettle();
+
+      expect(find.widgetWithText(MenuItemButton, 'Save'), findsWidgets);
+      await tester.tap(find.widgetWithText(MenuItemButton, 'Save').last, warnIfMissed: false);
+      await tester.pumpAndSettle();
+      expect(find.text('Last Selection: Save'), findsOneWidget);
+
+      await tester.tap(find.text('Help'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('About'), findsOneWidget);
+      expect(find.text('Online Help'), findsOneWidget);
+
+      await tester.tap(find.text('Online Help'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Documentation'), findsOneWidget);
+      await tester.tap(find.text('Documentation'), warnIfMissed: false);
+      await tester.pumpAndSettle();
+      expect(find.text('Last Selection: Documentation'), findsOneWidget);
+      expect(
+        find.ancestor(
+          of: find.text('Last Selection: Documentation'),
+          matching: find.byWidgetPredicate(
+            (Widget w) => w is Semantics && w.properties.liveRegion == true,
+          ),
+        ),
+        findsOneWidget,
+      );
+    }
+
+    // Test the disabled menu bar
+    {
+      final Finder finder = find.byKey(const Key('disabled menu bar'));
+      final SubmenuButton disabledSubmenu = tester.widget<SubmenuButton>(
+        find.descendant(of: finder, matching: find.byType(SubmenuButton)),
+      );
+      expect(disabledSubmenu.menuChildren, isEmpty);
+
+      final MenuItemButton disabledItem = tester.widget<MenuItemButton>(
+        find.descendant(of: finder, matching: find.byType(MenuItemButton)),
+      );
+      expect(disabledItem.onPressed, isNull);
+    }
+  });
+
+  testWidgets('menu bar demo page has one h1 tag', (WidgetTester tester) async {
+    await pumpsUseCase(tester, MenuBarUseCase());
+    final Finder findHeadingLevelOnes = find.bySemanticsLabel('MenuBar Demo');
+    await tester.pumpAndSettle();
+    expect(findHeadingLevelOnes, findsOne);
+  });
+}
diff --git a/dev/a11y_assessments/test/radio_test.dart b/dev/a11y_assessments/test/radio_test.dart
new file mode 100644
index 0000000000000..055175da22035
--- /dev/null
+++ b/dev/a11y_assessments/test/radio_test.dart
@@ -0,0 +1,28 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/radio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('radio use case renders radio group and radio buttons and toggles state', (
+    WidgetTester tester,
+  ) async {
+    await pumpsUseCase(tester, RadioUseCase());
+    expect(find.byType(RadioGroup<Option>), findsOneWidget);
+    expect(find.byType(Radio<Option>), findsNWidgets(3));
+
+    RadioGroup<Option> radioGroup = tester.widget(find.byType(RadioGroup<Option>));
+    expect(radioGroup.groupValue, Option.option1);
+
+    await tester.tap(find.byType(Radio<Option>).at(1));
+    await tester.pumpAndSettle();
+
+    radioGroup = tester.widget(find.byType(RadioGroup<Option>));
+    expect(radioGroup.groupValue, Option.option2);
+  });
+}
diff --git a/dev/a11y_assessments/test/search_bar_test.dart b/dev/a11y_assessments/test/search_bar_test.dart
new file mode 100644
index 0000000000000..c1a5845571635
--- /dev/null
+++ b/dev/a11y_assessments/test/search_bar_test.dart
@@ -0,0 +1,44 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/search_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('search bar can run', (WidgetTester tester) async {
+    await pumpsUseCase(tester, SearchBarUseCase());
+    expect(find.byType(SearchBar), findsExactly(2));
+
+    // Test the enabled search bar
+    {
+      final Finder finder = find.byKey(const Key('enabled search bar'));
+      await tester.tap(finder);
+      await tester.pumpAndSettle();
+      await tester.enterText(find.byType(TextField).last, 'app');
+      await tester.pumpAndSettle();
+      expect(find.text('apple'), findsOneWidget);
+
+      await tester.tap(find.text('apple'));
+      await tester.pumpAndSettle();
+      expect(find.text('Searched for "apple"'), findsWidgets);
+    }
+
+    // Test the disabled search bar
+    {
+      final Finder finder = find.byKey(const Key('disabled search bar'));
+      final SearchBar searchBar = tester.widget<SearchBar>(finder);
+      expect(searchBar.enabled, isFalse);
+    }
+  });
+
+  testWidgets('search bar demo page has one h1 tag', (WidgetTester tester) async {
+    await pumpsUseCase(tester, SearchBarUseCase());
+    final Finder findHeadingLevelOnes = find.bySemanticsLabel('SearchBar Demo');
+    await tester.pumpAndSettle();
+    expect(findHeadingLevelOnes, findsOne);
+  });
+}
diff --git a/dev/a11y_assessments/test/switch_test.dart b/dev/a11y_assessments/test/switch_test.dart
new file mode 100644
index 0000000000000..e055213677bad
--- /dev/null
+++ b/dev/a11y_assessments/test/switch_test.dart
@@ -0,0 +1,27 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/switch.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('switch use case renders switch widgets and toggles state', (
+    WidgetTester tester,
+  ) async {
+    await pumpsUseCase(tester, SwitchUseCase());
+    expect(find.byType(Switch), findsNWidgets(2));
+
+    Switch switchWidget = tester.widget(find.byType(Switch).first);
+    expect(switchWidget.value, isFalse);
+
+    await tester.tap(find.byType(Switch).first);
+    await tester.pumpAndSettle();
+
+    switchWidget = tester.widget(find.byType(Switch).first);
+    expect(switchWidget.value, isTrue);
+  });
+}
diff --git a/dev/a11y_assessments/test/text_form_field_test.dart b/dev/a11y_assessments/test/text_form_field_test.dart
new file mode 100644
index 0000000000000..2c35940676cb2
--- /dev/null
+++ b/dev/a11y_assessments/test/text_form_field_test.dart
@@ -0,0 +1,64 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:a11y_assessments/use_cases/text_form_field.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'test_utils.dart';
+
+void main() {
+  testWidgets('text form field use case renders form and validates fields', (
+    WidgetTester tester,
+  ) async {
+    await pumpsUseCase(tester, TextFormFieldUseCase());
+    expect(find.byType(Form), findsOneWidget);
+    expect(find.byType(TextFormField), findsExactly(2));
+
+    // Test the enabled text form field
+    {
+      final Finder finder = find.byKey(const Key('enabled text form field'));
+      await tester.tap(finder);
+      await tester.pumpAndSettle();
+      await tester.enterText(finder, 'abc');
+      await tester.pumpAndSettle();
+      expect(find.text('abc'), findsOneWidget);
+    }
+
+    // Test the disabled text form field
+    {
+      final Finder finder = find.byKey(const Key('disabled text form field'));
+      final TextFormField textField = tester.widget<TextFormField>(finder);
+      expect(textField.enabled, isFalse);
+    }
+
+    // Test form validation on empty input
+    {
+      final Finder finder = find.byKey(const Key('enabled text form field'));
+      await tester.enterText(finder, '');
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('submit button')));
+      await tester.pumpAndSettle();
+      expect(find.text('Please enter some text'), findsOneWidget);
+      expect(find.text('Validation failed'), findsOneWidget);
+    }
+
+    // Test successful form submission feedback
+    {
+      final Finder finder = find.byKey(const Key('enabled text form field'));
+      await tester.enterText(finder, 'test@example.com');
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('submit button')));
+      await tester.pumpAndSettle();
+      expect(find.text('Form submitted successfully!'), findsWidgets);
+    }
+  });
+
+  testWidgets('text form field demo page has one h1 tag', (WidgetTester tester) async {
+    await pumpsUseCase(tester, TextFormFieldUseCase());
+    final Finder findHeadingLevelOnes = find.bySemanticsLabel('TextFormField Demo');
+    await tester.pumpAndSettle();
+    expect(findHeadingLevelOnes, findsOne);
+  });
+}
diff --git a/dev/analysis_options.yaml b/dev/analysis_options.yaml
index 1a940d0a68e08..9f2f6429f6f80 100644
--- a/dev/analysis_options.yaml
+++ b/dev/analysis_options.yaml
@@ -1,5 +1,9 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: flutter_analyzer_plugin
+
 linter:
   rules:
     avoid_print: false # We use prints as debugging tools here a lot.
diff --git a/dev/benchmarks/macrobenchmarks/lib/common.dart b/dev/benchmarks/macrobenchmarks/lib/common.dart
index fde9f2dc35dff..1060fe627225e 100644
--- a/dev/benchmarks/macrobenchmarks/lib/common.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/common.dart
@@ -45,6 +45,7 @@ const String kDrawAtlasPageRouteName = '/draw_atlas';
 const String kAnimatedAdvancedBlend = '/animated_advanced_blend';
 const String kRRectBlurRouteName = '/rrect_blur';
 const String kRSuperellipseBlurRouteName = '/rsuperellipse_blur';
+const String kTextShadowPerfRouteName = '/text_shadow_perf';
 
 const String kOpacityPeepholeOneRectRouteName = '$kOpacityPeepholeRouteName/one_big_rect';
 const String kOpacityPeepholeColumnOfOpacityRouteName =
diff --git a/dev/benchmarks/macrobenchmarks/lib/main.dart b/dev/benchmarks/macrobenchmarks/lib/main.dart
index 922ca84fb86f2..afb4e194ada9a 100644
--- a/dev/benchmarks/macrobenchmarks/lib/main.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/main.dart
@@ -44,6 +44,7 @@ import 'src/simple_animation.dart';
 import 'src/simple_scroll.dart';
 import 'src/sliders.dart';
 import 'src/text.dart';
+import 'src/text_shadow_perf.dart';
 import 'src/very_long_picture_scrolling.dart';
 
 const String kMacrobenchmarks = 'Macrobenchmarks';
@@ -118,6 +119,7 @@ class MacrobenchmarksApp extends StatelessWidget {
             const DrawArcsPage(paintStyle: PaintingStyle.fill),
         kDrawArcsAllStrokeStylesPageRouteName: (BuildContext context) =>
             const DrawArcsPage(paintStyle: PaintingStyle.stroke),
+        kTextShadowPerfRouteName: (BuildContext context) => const TextShadowPerfPage(),
       },
     );
   }
@@ -429,6 +431,13 @@ class HomePage extends StatelessWidget {
               Navigator.pushNamed(context, kDrawArcsAllStrokeStylesPageRouteName);
             },
           ),
+          ElevatedButton(
+            key: const Key(kTextShadowPerfRouteName),
+            child: const Text('Text Shadow Performance'),
+            onPressed: () {
+              Navigator.pushNamed(context, kTextShadowPerfRouteName);
+            },
+          ),
         ],
       ),
     );
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/text_shadow_perf.dart b/dev/benchmarks/macrobenchmarks/lib/src/text_shadow_perf.dart
new file mode 100644
index 0000000000000..952b9d12bdc4c
--- /dev/null
+++ b/dev/benchmarks/macrobenchmarks/lib/src/text_shadow_perf.dart
@@ -0,0 +1,133 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+/// Macrobenchmark page reproducing the text shadow scrolling workload from
+/// https://github.com/flutter/flutter/issues/190395.
+class TextShadowPerfPage extends StatefulWidget {
+  const TextShadowPerfPage({super.key});
+
+  @override
+  State<TextShadowPerfPage> createState() => _TextShadowPerfPageState();
+}
+
+class _TextShadowPerfPageState extends State<TextShadowPerfPage>
+    with SingleTickerProviderStateMixin {
+  late final ScrollController _scrollController;
+  late final AnimationController _animationController;
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController = ScrollController();
+    _animationController = AnimationController(vsync: this, duration: const Duration(seconds: 10))
+      ..repeat(reverse: true);
+    _animationController.addListener(_onAnimationTick);
+  }
+
+  void _onAnimationTick() {
+    if (_scrollController.hasClients && _scrollController.position.maxScrollExtent > 0) {
+      _scrollController.jumpTo(
+        _animationController.value * _scrollController.position.maxScrollExtent,
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.removeListener(_onAnimationTick);
+    _animationController.dispose();
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    const columnCount = 7;
+    const groupsPerColumn = 28;
+
+    return Scaffold(
+      backgroundColor: const Color(0xff080808),
+      body: ScrollConfiguration(
+        behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
+        child: SingleChildScrollView(
+          controller: _scrollController,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: List<Widget>.generate(columnCount, (int column) {
+              return Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.all(6),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: List<Widget>.generate(groupsPerColumn, (int row) {
+                      return _TextShadowGroup(index: column * groupsPerColumn + row);
+                    }),
+                  ),
+                ),
+              );
+            }),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _TextShadowGroup extends StatelessWidget {
+  const _TextShadowGroup({required this.index});
+
+  final int index;
+
+  static const List<Shadow> _shadows = <Shadow>[Shadow(blurRadius: 1.0)];
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 230,
+      child: Align(
+        alignment: Alignment.bottomLeft,
+        child: Padding(
+          padding: const EdgeInsets.all(12),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(
+                'Synthetic text item $index',
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 10,
+                  fontWeight: FontWeight.bold,
+                  shadows: _shadows,
+                ),
+              ),
+              Row(
+                children: <Widget>[
+                  Text(
+                    '${8 + index % 14}:30',
+                    style: const TextStyle(
+                      color: Color(0xff43ddff),
+                      fontSize: 9,
+                      fontWeight: FontWeight.bold,
+                      shadows: _shadows,
+                    ),
+                  ),
+                  const Spacer(),
+                  Text(
+                    'Ep ${1 + index % 24}',
+                    style: const TextStyle(color: Colors.white70, fontSize: 9, shadows: _shadows),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/dev/benchmarks/macrobenchmarks/test_driver/text_shadow_perf_test.dart b/dev/benchmarks/macrobenchmarks/test_driver/text_shadow_perf_test.dart
new file mode 100644
index 0000000000000..37d2fc6dd78df
--- /dev/null
+++ b/dev/benchmarks/macrobenchmarks/test_driver/text_shadow_perf_test.dart
@@ -0,0 +1,16 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:macrobenchmarks/common.dart';
+
+import 'util.dart';
+
+void main() {
+  macroPerfTest(
+    'text_shadow_perf',
+    kTextShadowPerfRouteName,
+    pageDelay: const Duration(seconds: 1),
+    duration: const Duration(seconds: 10),
+  );
+}
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
index dad6843d9ab11..7b02442d58f1d 100644
--- a/dev/bots/analyze.dart
+++ b/dev/bots/analyze.dart
@@ -7,29 +7,15 @@ import 'dart:core' hide print;
 import 'dart:io' hide exit;
 import 'dart:typed_data';
 
-import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/analysis/utilities.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:collection/equality.dart';
 import 'package:crypto/crypto.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
 import 'allowlist.dart';
-import 'custom_rules/analyze.dart';
-import 'custom_rules/avoid_future_catcherror.dart';
-import 'custom_rules/no_double_clamp.dart';
-import 'custom_rules/no_stop_watches.dart';
-import 'custom_rules/protect_public_state_subtypes.dart';
-import 'custom_rules/render_box_intrinsics.dart';
 import 'run_command.dart';
 import 'utils.dart';
 
-final String flutterPackages = path.join(flutterRoot, 'packages');
-final String flutterExamples = path.join(flutterRoot, 'examples');
-
 /// The path to the `dart` executable; set at the top of `main`
 late final String dart;
 
@@ -223,30 +209,11 @@ List<Validation> _getValidations({
       'All tool test files end in _test.dart...',
       () => verifyToolTestsEndInTestDart(flutterRoot),
     ),
-    Validation('no-sync-star-async-star', 'No sync*/async*', () async {
-      await verifyNoSyncAsyncStar(flutterPackages);
-      await verifyNoSyncAsyncStar(flutterExamples, minimumMatches: 200);
-    }),
-    Validation(
-      'no-runtime-type',
-      'No runtimeType in toString...',
-      () => verifyNoRuntimeTypeInToString(flutterRoot),
-    ),
     Validation(
       'no-checked-mode',
       'Debug mode instead of checked mode...',
       () => verifyNoCheckedMode(flutterRoot),
     ),
-    Validation(
-      'issue-links',
-      'Links for creating GitHub issues...',
-      () => verifyIssueLinks(flutterRoot),
-    ),
-    Validation(
-      'repository-links',
-      'Links to repositories...',
-      () => verifyRepositoryLinks(flutterRoot),
-    ),
     Validation('no-binaries', 'Unexpected binaries...', () => verifyNoBinaries(flutterRoot)),
     Validation(
       'no-trailing-spaces',
@@ -258,25 +225,12 @@ List<Validation> _getValidations({
       'Spaces after flow control statements...',
       () => verifySpacesAfterFlowControlStatements(flutterRoot),
     ),
-    Validation('deprecations', 'Deprecations...', () => verifyDeprecations(flutterRoot)),
-    Validation('golden-tags', 'Goldens...', () => verifyGoldenTags(flutterPackages)),
-    Validation(
-      'skip-test-comments',
-      'Skip test comments...',
-      () => verifySkipTestComments(flutterRoot),
-    ),
     Validation('no-missing-license', 'Licenses...', () => verifyNoMissingLicense(flutterRoot)),
-    Validation('no-test-imports', 'Test imports...', () => verifyNoTestImports(flutterRoot)),
     Validation(
       'no-bad-imports-flutter',
       'Bad imports (framework)...',
       () => verifyNoBadImportsInFlutter(flutterRoot),
     ),
-    Validation(
-      'no-bad-imports-tools',
-      'Bad imports (tools)...',
-      () => verifyNoBadImportsInFlutterTools(flutterRoot),
-    ),
     Validation(
       'internationalization',
       'Internationalization...',
@@ -287,17 +241,6 @@ List<Validation> _getValidations({
       'Localization files of stocks app...',
       () => verifyStockAppLocalizations(flutterRoot),
     ),
-    Validation(
-      'integration-timeouts',
-      'Integration test timeouts...',
-      () => verifyIntegrationTestTimeouts(flutterRoot),
-    ),
-    Validation(
-      'null-fields',
-      'null initialized debug fields...',
-      () => verifyNullInitializedDebugExpensiveFields(flutterRoot),
-    ),
-    Validation('taboo', 'Taboo words...', () => verifyTabooDocumentation(flutterRoot)),
     Validation('lint-kotlin', 'Lint Kotlin files...', () => lintKotlinFiles(flutterRoot)),
     Validation(
       'lint-kotlin-templates',
@@ -327,11 +270,6 @@ List<Validation> _getValidations({
     //     path.join(flutterRoot, 'dev', 'tools', 'bin', 'format.dart'),
     //   ], workingDirectory: flutterRoot),
     // ),
-    Validation(
-      'private-lints',
-      'Private lints...',
-      () => _verifyPrivateLints(flutterRoot, getDartAnalyzeResult()),
-    ),
     Validation('executable-allowlist', 'Executable allowlist...', () => _checkForNewExecutables()),
     Validation(
       'dart-analysis-watch',
@@ -387,22 +325,19 @@ List<Validation> _getValidations({
         path.join(flutterRoot, 'dev', 'bots', 'check_tests_cross_imports.dart'),
       ], workingDirectory: flutterRoot),
     ),
+    Validation(
+      'cross-imports-examples',
+      'Examples cross-import test validation...',
+      () => runCommand(dart, <String>[
+        '--enable-asserts',
+        path.join(flutterRoot, 'dev', 'bots', 'check_examples_cross_imports.dart'),
+      ], workingDirectory: flutterRoot),
+    ),
   ];
 }
 
 // TESTS
 
-FeatureSet _parsingFeatureSet() => FeatureSet.latestLanguageVersion();
-
-_Line _getLine(ParseStringResult parseResult, int offset) {
-  final int lineNumber = parseResult.lineInfo.getLocation(offset).lineNumber;
-  final String content = parseResult.content.substring(
-    parseResult.lineInfo.getOffsetOfLine(lineNumber - 1),
-    parseResult.lineInfo.getOffsetOfLine(lineNumber) - 1,
-  );
-  return _Line(lineNumber, content);
-}
-
 Future<void> verifyReleaseBranchState(String workringDirerctory) async {
   final ProcessResult result = await Process.run(dart, <String>[
     'bin/check_engine_version.dart',
@@ -674,289 +609,6 @@ Future<void> verifyToolTestsEndInTestDart(String workingDirectory) async {
   }
 }
 
-Future<void> verifyNoSyncAsyncStar(String workingDirectory, {int minimumMatches = 2000}) async {
-  final syncPattern = RegExp(r'\s*?a?sync\*\s*?{');
-  final ignorePattern = RegExp(r'^\s*?// The following uses a?sync\* because:? ');
-  final commentPattern = RegExp(r'^\s*?//');
-  final errors = <String>[];
-  await for (final File file in _allFiles(
-    workingDirectory,
-    'dart',
-    minimumMatches: minimumMatches,
-  )) {
-    if (file.path.contains('test')) {
-      continue;
-    }
-    final List<String> lines = file.readAsLinesSync();
-    for (var index = 0; index < lines.length; index += 1) {
-      final String line = lines[index];
-      if (line.startsWith(commentPattern)) {
-        continue;
-      }
-      if (line.contains(syncPattern)) {
-        int lookBehindIndex = index - 1;
-        var hasExplanation = false;
-        while (lookBehindIndex >= 0 && lines[lookBehindIndex].startsWith(commentPattern)) {
-          if (lines[lookBehindIndex].startsWith(ignorePattern)) {
-            hasExplanation = true;
-            break;
-          }
-          lookBehindIndex -= 1;
-        }
-        if (!hasExplanation) {
-          errors.add('${file.path}:$index: sync*/async* without an explanation.');
-        }
-      }
-    }
-  }
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      '${bold}Do not use sync*/async* methods. See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-syncasync for details.$reset',
-      ...errors,
-    ]);
-  }
-}
-
-final RegExp _findGoldenTestPattern = RegExp(r'matchesGoldenFile\(');
-final RegExp _findGoldenDefinitionPattern = RegExp(r'matchesGoldenFile\(Object');
-final RegExp _leadingComment = RegExp(r'//');
-final RegExp _goldenTagPattern1 = RegExp(r'@Tags\(');
-final RegExp _goldenTagPattern2 = RegExp(r"'reduced-test-set'");
-
-/// Only golden file tests in the flutter package are subject to reduced testing,
-/// for example, invocations in flutter_test to validate comparator
-/// functionality do not require tagging.
-const String _ignoreGoldenTag = '// flutter_ignore: golden_tag (see analyze.dart)';
-const String _ignoreGoldenTagForFile = '// flutter_ignore_for_file: golden_tag (see analyze.dart)';
-
-Future<void> verifyGoldenTags(String workingDirectory, {int minimumMatches = 2000}) async {
-  final errors = <String>[];
-  await for (final File file in _allFiles(
-    workingDirectory,
-    'dart',
-    minimumMatches: minimumMatches,
-  )) {
-    var needsTag = false;
-    var hasTagNotation = false;
-    var hasReducedTag = false;
-    var ignoreForFile = false;
-    final List<String> lines = file.readAsLinesSync();
-    for (final line in lines) {
-      if (line.contains(_goldenTagPattern1)) {
-        hasTagNotation = true;
-      }
-      if (line.contains(_goldenTagPattern2)) {
-        hasReducedTag = true;
-      }
-      if (line.contains(_findGoldenTestPattern) &&
-          !line.contains(_findGoldenDefinitionPattern) &&
-          !line.contains(_leadingComment) &&
-          !line.contains(_ignoreGoldenTag)) {
-        needsTag = true;
-      }
-      if (line.contains(_ignoreGoldenTagForFile)) {
-        ignoreForFile = true;
-      }
-      // If the file is being ignored or a reduced test tag is already accounted
-      // for, skip parsing the rest of the lines for golden file tests.
-      if (ignoreForFile || (hasTagNotation && hasReducedTag)) {
-        break;
-      }
-    }
-    // If a reduced test tag is already accounted for, move on to the next file.
-    if (ignoreForFile || (hasTagNotation && hasReducedTag)) {
-      continue;
-    }
-    // If there are golden file tests, ensure they are tagged for all reduced
-    // test environments.
-    if (needsTag) {
-      if (!hasTagNotation) {
-        errors.add(
-          '${file.path}: Files containing golden tests must be tagged using '
-          "@Tags(<String>['reduced-test-set']) at the top of the file before import statements.",
-        );
-      } else if (!hasReducedTag) {
-        errors.add(
-          '${file.path}: Files containing golden tests must be tagged with '
-          "'reduced-test-set'.",
-        );
-      }
-    }
-  }
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      ...errors,
-      '${bold}See: https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Writing-a-golden-file-test-for-package-flutter.md$reset',
-    ]);
-  }
-}
-
-class _DeprecationMessagesVisitor extends RecursiveAstVisitor<void> {
-  _DeprecationMessagesVisitor(this.parseResult, this.filePath);
-
-  final ParseStringResult parseResult;
-  final String filePath;
-  final List<String> errors = <String>[];
-
-  /// Some deprecation notices are special, for example they're used to annotate members that
-  /// will never go away and were never allowed but which we are trying to show messages for.
-  /// (One example would be a library that intentionally conflicts with a member in another
-  /// library to indicate that it is incompatible with that other library. Another would be
-  /// the regexp just above...)
-  static const Pattern ignoreDeprecration =
-      '// flutter_ignore: deprecation_syntax (see analyze.dart)';
-
-  /// Some deprecation notices are exempt for historical reasons. They must have an issue listed.
-  static final RegExp legacyDeprecation = RegExp(
-    r'// flutter_ignore: deprecation_syntax, https://github.com/flutter/flutter/issues/\d+',
-  );
-
-  static final RegExp deprecationVersionPattern = RegExp(
-    r'This feature was deprecated after v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(?<build>-\d+\.\d+\.pre)?\.$',
-  );
-
-  void _addErrorWithLineInfo(AstNode node, {required String error}) {
-    final int lineNumber = parseResult.lineInfo.getLocation(node.offset).lineNumber;
-    errors.add('$filePath:$lineNumber: $error');
-  }
-
-  @override
-  void visitAnnotation(Annotation node) {
-    super.visitAnnotation(node);
-    final bool shouldCheckAnnotation =
-        node.name.name == 'Deprecated' &&
-        !hasInlineIgnore(node, parseResult, ignoreDeprecration) &&
-        !hasInlineIgnore(node, parseResult, legacyDeprecation);
-    if (!shouldCheckAnnotation) {
-      return;
-    }
-    final NodeList<Expression>? arguments = node.arguments?.arguments;
-    if (arguments == null || arguments.length != 1) {
-      _addErrorWithLineInfo(
-        node,
-        error: 'A @Deprecation annotation must have exactly one deprecation notice String.',
-      );
-      return;
-    }
-    final Expression deprecationNotice = arguments.first;
-    if (deprecationNotice is! AdjacentStrings) {
-      _addErrorWithLineInfo(node, error: 'Deprecation notice must be an adjacent string.');
-      return;
-    }
-    final List<StringLiteral> strings = deprecationNotice.strings;
-    final Iterator<StringLiteral> deprecationMessageIterator = strings.iterator;
-    final bool isNotEmpty = deprecationMessageIterator.moveNext();
-    assert(isNotEmpty); // An AdjacentString always has 2 or more string literals.
-
-    final [...List<StringLiteral> messageLiterals, StringLiteral versionLiteral] = strings;
-
-    // Verify the version literal has the correct pattern.
-    final RegExpMatch? versionMatch = versionLiteral is SimpleStringLiteral
-        ? deprecationVersionPattern.firstMatch(versionLiteral.value)
-        : null;
-    if (versionMatch == null) {
-      _addErrorWithLineInfo(
-        versionLiteral,
-        error:
-            'Deprecation notice must end with a line saying "This feature was deprecated after v<version>.".',
-      );
-      return;
-    }
-
-    final int major = int.parse(versionMatch.namedGroup('major')!);
-    final int minor = int.parse(versionMatch.namedGroup('minor')!);
-    final int patch = int.parse(versionMatch.namedGroup('patch')!);
-    final hasBuild = versionMatch.namedGroup('build') != null;
-    // There was a beta release that was mistakenly labeled 3.1.0 without a build.
-    final bool specialBeta = major == 3 && minor == 1 && patch == 0;
-    if (!specialBeta && (major > 1 || (major == 1 && minor >= 20))) {
-      if (!hasBuild) {
-        _addErrorWithLineInfo(
-          versionLiteral,
-          error:
-              'Deprecation notice does not accurately indicate a beta branch version number; please see https://docs.flutter.dev/install/archive to find the latest beta build version number.',
-        );
-        return;
-      }
-    }
-
-    // Verify the version literal has the correct pattern.
-    assert(messageLiterals.isNotEmpty); // An AdjacentString always has 2 or more string literals.
-    for (final message in messageLiterals) {
-      if (message is! SingleStringLiteral) {
-        _addErrorWithLineInfo(
-          message,
-          error: 'Deprecation notice does not match required pattern.',
-        );
-        return;
-      }
-      if (!message.isSingleQuoted) {
-        _addErrorWithLineInfo(
-          message,
-          error:
-              'Deprecation notice does not match required pattern. You might have used double quotes (") for the string instead of single quotes (\').',
-        );
-        return;
-      }
-    }
-    final String fullExplanation = messageLiterals
-        .map((StringLiteral message) => message.stringValue ?? '')
-        .join()
-        .trimRight();
-    if (fullExplanation.isEmpty) {
-      _addErrorWithLineInfo(
-        messageLiterals.last,
-        error:
-            'Deprecation notice should be a grammatically correct sentence and end with a period; There might not be an explanatory message.',
-      );
-      return;
-    }
-    final firstChar = String.fromCharCode(fullExplanation.runes.first);
-    if (firstChar.toUpperCase() != firstChar) {
-      _addErrorWithLineInfo(
-        messageLiterals.first,
-        error:
-            'Deprecation notice should be a grammatically correct sentence and start with a capital letter; see style guide: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md',
-      );
-      return;
-    }
-    if (!fullExplanation.endsWith('.') &&
-        !fullExplanation.endsWith('?') &&
-        !fullExplanation.endsWith('!')) {
-      _addErrorWithLineInfo(
-        messageLiterals.last,
-        error:
-            'Deprecation notice should be a grammatically correct sentence and end with a period; notice appears to be "$fullExplanation".',
-      );
-      return;
-    }
-  }
-}
-
-Future<void> verifyDeprecations(String workingDirectory, {int minimumMatches = 2000}) async {
-  final errors = <String>[];
-  await for (final File file in _allFiles(
-    workingDirectory,
-    'dart',
-    minimumMatches: minimumMatches,
-  )) {
-    final ParseStringResult parseResult = parseFile(
-      featureSet: _parsingFeatureSet(),
-      path: file.absolute.path,
-    );
-    final visitor = _DeprecationMessagesVisitor(parseResult, file.path);
-    visitor.visitCompilationUnit(parseResult.unit);
-    errors.addAll(visitor.errors);
-  }
-  // Fail if any errors
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      ...errors,
-      '${bold}See: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes$reset',
-    ]);
-  }
-}
-
 String _generateLicense(String prefix) {
   return '${prefix}Copyright 2014 The Flutter Authors. All rights reserved.\n'
       '${prefix}Use of this source code is governed by a BSD-style license that can be\n'
@@ -1107,113 +759,6 @@ Future<void> _verifyNoMissingLicenseForExtension(
   }
 }
 
-class _Line {
-  _Line(this.line, this.content);
-
-  final int line;
-  final String content;
-}
-
-Iterable<_Line> _getTestSkips(File file) {
-  final ParseStringResult parseResult = parseFile(
-    featureSet: _parsingFeatureSet(),
-    path: file.absolute.path,
-  );
-  final visitor = _TestSkipLinesVisitor<CompilationUnit>(parseResult);
-  visitor.visitCompilationUnit(parseResult.unit);
-  return visitor.skips;
-}
-
-class _TestSkipLinesVisitor<T> extends RecursiveAstVisitor<T> {
-  _TestSkipLinesVisitor(this.parseResult) : skips = <_Line>{};
-
-  final ParseStringResult parseResult;
-  final Set<_Line> skips;
-
-  static bool isTestMethod(String name) {
-    return name.startsWith('test') || name == 'group' || name == 'expect';
-  }
-
-  static final Pattern _skipTestIntentionalPattern = RegExp(r'// .*[intended]');
-  static final Pattern _skipTestTrackingBugPattern = RegExp(
-    r'// .*https+?://github.com/.*/issues/\d+',
-  );
-  bool _hasValidJustificationComment(Label skipLabel) {
-    return hasInlineIgnore(skipLabel, parseResult, _skipTestIntentionalPattern) ||
-        hasInlineIgnore(skipLabel, parseResult, _skipTestTrackingBugPattern);
-  }
-
-  @override
-  T? visitMethodInvocation(MethodInvocation node) {
-    if (isTestMethod(node.methodName.toString())) {
-      for (final Expression argument in node.argumentList.arguments) {
-        if (argument is NamedExpression &&
-            argument.name.label.name == 'skip' &&
-            !_hasValidJustificationComment(argument.name)) {
-          skips.add(_getLine(parseResult, argument.beginToken.charOffset));
-        }
-      }
-    }
-    return super.visitMethodInvocation(node);
-  }
-}
-
-Future<void> verifySkipTestComments(String workingDirectory) async {
-  final errors = <String>[];
-  final Stream<File> testFiles = _allFiles(
-    workingDirectory,
-    'dart',
-    minimumMatches: 1500,
-  ).where((File f) => f.path.endsWith('_test.dart'));
-
-  await for (final File file in testFiles) {
-    for (final _Line skip in _getTestSkips(file)) {
-      errors.add('${file.path}:${skip.line}: skip test without a justification comment.');
-    }
-  }
-
-  // Fail if any errors
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      ...errors,
-      '\n${bold}See: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#skipped-tests$reset',
-    ]);
-  }
-}
-
-final RegExp _testImportPattern = RegExp(r'''import (['"])([^'"]+_test\.dart)\1''');
-const Set<String> _exemptTestImports = <String>{
-  'package:flutter_test/flutter_test.dart',
-  'hit_test.dart',
-  'package:test_api/src/backend/live_test.dart',
-  'package:integration_test/integration_test.dart',
-};
-
-Future<void> verifyNoTestImports(String workingDirectory) async {
-  final errors = <String>[];
-  assert("// foo\nimport 'binding_test.dart' as binding;\n'".contains(_testImportPattern));
-  final List<File> dartFiles = await _allFiles(
-    path.join(workingDirectory, 'packages'),
-    'dart',
-    minimumMatches: 1500,
-  ).toList();
-  for (final file in dartFiles) {
-    for (final String line in file.readAsLinesSync()) {
-      final Match? match = _testImportPattern.firstMatch(line);
-      if (match != null && !_exemptTestImports.contains(match.group(2))) {
-        errors.add(file.path);
-      }
-    }
-  }
-  // Fail if any errors
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      '${bold}The following file(s) import a test directly. Test utilities should be in their own file.$reset',
-      ...errors,
-    ]);
-  }
-}
-
 Future<void> verifyNoBadImportsInFlutter(String workingDirectory) async {
   final errors = <String>[];
   final String libPath = path.join(workingDirectory, 'packages', 'flutter', 'lib');
@@ -1249,11 +794,7 @@ Future<void> verifyNoBadImportsInFlutter(String workingDirectory) async {
   // Verify that the imports are well-ordered.
   final dependencyMap = <String, Set<String>>{};
   for (final directory in directories) {
-    dependencyMap[directory] = await _findFlutterDependencies(
-      path.join(srcPath, directory),
-      errors,
-      checkForMeta: directory != 'foundation',
-    );
+    dependencyMap[directory] = await _findFlutterDependencies(path.join(srcPath, directory));
   }
   assert(
     dependencyMap['material']!.contains('widgets') &&
@@ -1304,61 +845,6 @@ Future<void> verifyNoBadImportsInFlutter(String workingDirectory) async {
   }
 }
 
-Future<void> verifyNoBadImportsInFlutterTools(String workingDirectory) async {
-  final errors = <String>[];
-  final List<File> files = await _allFiles(
-    path.join(workingDirectory, 'packages', 'flutter_tools', 'lib'),
-    'dart',
-    minimumMatches: 200,
-  ).toList();
-  for (final file in files) {
-    if (file.readAsStringSync().contains('package:flutter_tools/')) {
-      errors.add('$yellow${file.path}$reset imports flutter_tools.');
-    }
-  }
-  // Fail if any errors
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      if (errors.length == 1)
-        '${bold}An error was detected when looking at import dependencies within the flutter_tools package:$reset'
-      else
-        '${bold}Multiple errors were detected when looking at import dependencies within the flutter_tools package:$reset',
-      ...errors.map((String paragraph) => '$paragraph\n'),
-    ]);
-  }
-}
-
-Future<void> verifyIntegrationTestTimeouts(String workingDirectory) async {
-  final errors = <String>[];
-  final String dev = path.join(workingDirectory, 'dev');
-  final List<File> files = await _allFiles(dev, 'dart', minimumMatches: 1)
-      .where(
-        (File file) =>
-            file.path.contains('test_driver') &&
-            (file.path.endsWith('_test.dart') || file.path.endsWith('util.dart')),
-      )
-      .toList();
-  for (final file in files) {
-    final String contents = file.readAsStringSync();
-    final int testCount = ' test('.allMatches(contents).length;
-    final int timeoutNoneCount = 'timeout: Timeout.none'.allMatches(contents).length;
-    if (testCount != timeoutNoneCount) {
-      errors.add(
-        '$yellow${file.path}$reset has at least $testCount test(s) but only $timeoutNoneCount `Timeout.none`(s).',
-      );
-    }
-  }
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      if (errors.length == 1)
-        '${bold}An error was detected when looking at integration test timeouts:$reset'
-      else
-        '${bold}Multiple errors were detected when looking at integration test timeouts:$reset',
-      ...errors.map((String paragraph) => '$paragraph\n'),
-    ]);
-  }
-}
-
 Future<void> verifyInternationalizations(String workingDirectory, String dartExecutable) async {
   final EvalResult materialGenResult = await _evalCommand(dartExecutable, <String>[
     path.join('dev', 'tools', 'localization', 'bin', 'gen_localizations.dart'),
@@ -1486,66 +972,6 @@ Future<void> verifyNoCheckedMode(String workingDirectory) async {
   }
 }
 
-Future<void> verifyNoRuntimeTypeInToString(String workingDirectory) async {
-  final String flutterLib = path.join(workingDirectory, 'packages', 'flutter', 'lib');
-  final excludedFiles = <String>{
-    path.join(flutterLib, 'src', 'foundation', 'object.dart'), // Calls this from within an assert.
-  };
-  final List<File> files = await _allFiles(
-    flutterLib,
-    'dart',
-    minimumMatches: 400,
-  ).where((File file) => !excludedFiles.contains(file.path)).toList();
-  final toStringRegExp = RegExp(r'^\s+String\s+to(.+?)?String(.+?)?\(\)\s+(\{|=>)');
-  final problems = <String>[];
-  for (final file in files) {
-    final List<String> lines = file.readAsLinesSync();
-    for (var index = 0; index < lines.length; index++) {
-      if (toStringRegExp.hasMatch(lines[index])) {
-        final int sourceLine = index + 1;
-        bool checkForRuntimeType(String line) {
-          if (line.contains(r'$runtimeType') || line.contains('runtimeType.toString()')) {
-            problems.add('${file.path}:$sourceLine}: toString calls runtimeType.toString');
-            return true;
-          }
-          return false;
-        }
-
-        if (checkForRuntimeType(lines[index])) {
-          continue;
-        }
-        if (lines[index].contains('=>')) {
-          while (!lines[index].contains(';')) {
-            index++;
-            assert(index < lines.length, 'Source file $file has unterminated toString method.');
-            if (checkForRuntimeType(lines[index])) {
-              break;
-            }
-          }
-        } else {
-          int openBraceCount =
-              '{'.allMatches(lines[index]).length - '}'.allMatches(lines[index]).length;
-          while (!lines[index].contains('}') && openBraceCount > 0) {
-            index++;
-            assert(
-              index < lines.length,
-              'Source file $file has unbalanced braces in a toString method.',
-            );
-            if (checkForRuntimeType(lines[index])) {
-              break;
-            }
-            openBraceCount += '{'.allMatches(lines[index]).length;
-            openBraceCount -= '}'.allMatches(lines[index]).length;
-          }
-        }
-      }
-    }
-  }
-  if (problems.isNotEmpty) {
-    foundError(problems);
-  }
-}
-
 Future<void> verifyNoTrailingSpaces(String workingDirectory, {int minimumMatches = 4000}) async {
   final List<File> files = await _allFiles(workingDirectory, null, minimumMatches: minimumMatches)
       .where((File file) => path.basename(file.path) != 'serviceaccount.enc')
@@ -1617,165 +1043,6 @@ Future<void> verifySpacesAfterFlowControlStatements(
   }
 }
 
-String _bullets(String value) => ' * $value';
-
-Future<void> verifyIssueLinks(String workingDirectory) async {
-  const issueLinkPrefix = 'https://github.com/flutter/flutter/issues/new';
-  const stops = <String>{'\n', ' ', "'", '"', r'\', ')', '>'};
-  assert(
-    !stops.contains('.'),
-  ); // instead of "visit https://foo." say "visit: https://foo", it copy-pastes better
-  const kGiveTemplates =
-      'Prefer to provide a link either to $issueLinkPrefix/choose (the list of issue '
-      'templates) or to a specific template directly ($issueLinkPrefix?template=...).\n';
-  final Set<String> templateNames =
-      Directory(path.join(workingDirectory, '.github', 'ISSUE_TEMPLATE'))
-          .listSync()
-          .whereType<File>()
-          .where(
-            (File file) =>
-                path.extension(file.path) == '.md' || path.extension(file.path) == '.yml',
-          )
-          .map<String>((File file) => path.basename(file.path))
-          .toSet();
-  final kTemplates = 'The available templates are:\n${templateNames.map(_bullets).join("\n")}';
-  final problems = <String>[];
-  final suggestions = <String>{};
-  final List<File> files = await _gitFiles(workingDirectory);
-  for (final file in files) {
-    if (path.basename(file.path).endsWith('_test.dart') ||
-        path.basename(file.path) == 'analyze.dart' ||
-        FileSystemEntity.isLinkSync(file.path)) {
-      continue; // Skip tests, they're not public-facing. Skip symlinks.
-    }
-    final Uint8List bytes = file.readAsBytesSync();
-    // We allow invalid UTF-8 here so that binaries don't trip us up.
-    // There's a separate test in this file that verifies that all text
-    // files are actually valid UTF-8 (see verifyNoBinaries below).
-    final String contents = utf8.decode(bytes, allowMalformed: true);
-    var start = 0;
-    while ((start = contents.indexOf(issueLinkPrefix, start)) >= 0) {
-      int end = start + issueLinkPrefix.length;
-      while (end < contents.length && !stops.contains(contents[end])) {
-        end += 1;
-      }
-      final String url = contents.substring(start, end);
-      if (url == issueLinkPrefix) {
-        if (file.path != path.join(workingDirectory, 'dev', 'bots', 'analyze.dart')) {
-          problems.add('${file.path} contains a direct link to $issueLinkPrefix.');
-          suggestions.add(kGiveTemplates);
-          suggestions.add(kTemplates);
-        }
-      } else if (url.startsWith('$issueLinkPrefix?')) {
-        final Uri parsedUrl = Uri.parse(url);
-        final List<String>? templates = parsedUrl.queryParametersAll['template'];
-        if (templates == null) {
-          problems.add('${file.path} contains $url, which has no "template" argument specified.');
-          suggestions.add(kGiveTemplates);
-          suggestions.add(kTemplates);
-        } else if (templates.length != 1) {
-          problems.add(
-            '${file.path} contains $url, which has ${templates.length} templates specified.',
-          );
-          suggestions.add(kGiveTemplates);
-          suggestions.add(kTemplates);
-        } else if (!templateNames.contains(templates.single)) {
-          problems.add(
-            '${file.path} contains $url, which specifies a non-existent template ("${templates.single}").',
-          );
-          suggestions.add(kTemplates);
-        } else if (parsedUrl.queryParametersAll.keys.length > 1) {
-          problems.add(
-            '${file.path} contains $url, which the analyze.dart script is not sure how to handle.',
-          );
-          suggestions.add(
-            'Update analyze.dart to handle the URLs above, or change them to the expected pattern.',
-          );
-        }
-      } else if (url != '$issueLinkPrefix/choose') {
-        problems.add(
-          '${file.path} contains $url, which the analyze.dart script is not sure how to handle.',
-        );
-        suggestions.add(
-          'Update analyze.dart to handle the URLs above, or change them to the expected pattern.',
-        );
-      }
-      start = end;
-    }
-  }
-  assert(problems.isEmpty == suggestions.isEmpty);
-  if (problems.isNotEmpty) {
-    foundError(<String>[...problems, ...suggestions]);
-  }
-}
-
-Future<void> verifyRepositoryLinks(String workingDirectory) async {
-  const stops = <String>{'\n', ' ', "'", '"', r'\', ')', '>'};
-  assert(
-    !stops.contains('.'),
-  ); // instead of "visit https://foo." say "visit: https://foo", it copy-pastes better
-
-  // Repos whose default branch is still 'master'
-  const repoExceptions = <String>{
-    'chromium/chromium',
-    'clojure/clojure',
-    'dart-lang/test', // TODO(guidezpl): remove when https://github.com/dart-lang/test/issues/2209 is closed
-    'eseidelGoogle/bezier_perf',
-    'flutter/devtools', // TODO(guidezpl): remove when https://github.com/flutter/devtools/issues/7551 is closed
-    'flutter/flutter-intellij', // TODO(guidezpl): remove when https://github.com/flutter/flutter-intellij/issues/7342 is closed
-    'flutter/platform_tests', // TODO(guidezpl): remove when subtask in https://github.com/flutter/flutter/issues/121564 is complete
-    'flutter/web_installers',
-    'glfw/glfw',
-    'GoogleCloudPlatform/artifact-registry-maven-tools',
-    'material-components/material-components-android', // TODO(guidezpl): remove when https://github.com/material-components/material-components-android/issues/4144 is closed
-    'ninja-build/ninja',
-    'torvalds/linux',
-    'tpn/winsdk-10',
-  };
-
-  // See dev/bots/test/analyze-test-input/root/packages/foo/bad_repository_links.dart
-  // for examples of repository links that are not allowed.
-  final pattern = RegExp(
-    r'^(https:\/\/(?:cs\.opensource\.google|github|raw\.githubusercontent|source\.chromium|([a-z0-9\-]+)\.googlesource)\.)',
-  );
-
-  final problems = <String>[];
-  final suggestions = <String>{};
-  final List<File> files = await _allFiles(workingDirectory, null, minimumMatches: 10).toList();
-  for (final file in files) {
-    final Uint8List bytes = file.readAsBytesSync();
-    // We allow invalid UTF-8 here so that binaries don't trip us up.
-    // There's a separate test in this file that verifies that all text
-    // files are actually valid UTF-8 (see verifyNoBinaries below).
-    final String contents = utf8.decode(bytes, allowMalformed: true);
-    var start = 0;
-    while ((start = contents.indexOf('https://', start)) >= 0) {
-      // Find all 'https://' links
-      int end = start + 8; // Length of 'https://'
-      while (end < contents.length && !stops.contains(contents[end])) {
-        end += 1;
-      }
-      final String url = contents.substring(start, end).replaceAll('\r', '');
-
-      if (pattern.hasMatch(url) && !repoExceptions.any(url.contains)) {
-        if (url.contains('master')) {
-          problems.add('${file.path} contains $url, which uses the banned "master" branch.');
-          suggestions.add(
-            'Change the URLs above to the expected pattern by '
-            'using the "main" branch if it exists, otherwise adding the '
-            'repository to the list of exceptions in analyze.dart.',
-          );
-        }
-      }
-      start = end;
-    }
-  }
-  assert(problems.isEmpty == suggestions.isEmpty);
-  if (problems.isNotEmpty) {
-    foundError(<String>[...problems, ...suggestions]);
-  }
-}
-
 @immutable
 class Hash256 {
   const Hash256(this.a, this.b, this.c, this.d);
@@ -2481,95 +1748,6 @@ Future<void> _checkConsumerDependencies() async {
   }
 }
 
-class _DebugOnlyFieldVisitor extends RecursiveAstVisitor<void> {
-  _DebugOnlyFieldVisitor(this.parseResult);
-
-  final ParseStringResult parseResult;
-  final List<AstNode> errors = <AstNode>[];
-
-  static const String _kDebugOnlyAnnotation = '_debugOnly';
-  static final RegExp _nullInitializedField = RegExp(r'kDebugMode \? [\w<> ,{}()]+ : null;');
-
-  @override
-  void visitFieldDeclaration(FieldDeclaration node) {
-    super.visitFieldDeclaration(node);
-    if (node.metadata.any(
-      (Annotation annotation) => annotation.name.name == _kDebugOnlyAnnotation,
-    )) {
-      if (!node.toSource().contains(_nullInitializedField)) {
-        errors.add(node.fields); // Use the fields node for line number.
-      }
-    }
-  }
-}
-
-Future<void> verifyNullInitializedDebugExpensiveFields(
-  String workingDirectory, {
-  int minimumMatches = 400,
-}) async {
-  final String flutterLib = path.join(workingDirectory, 'packages', 'flutter', 'lib');
-  final List<File> files = await _allFiles(
-    flutterLib,
-    'dart',
-    minimumMatches: minimumMatches,
-  ).toList();
-  final errors = <String>[];
-  for (final file in files) {
-    final ParseStringResult parsedFile = parseFile(
-      featureSet: _parsingFeatureSet(),
-      path: file.absolute.path,
-    );
-    final visitor = _DebugOnlyFieldVisitor(parsedFile);
-    visitor.visitCompilationUnit(parsedFile.unit);
-    for (final AstNode badNode in visitor.errors) {
-      errors.add(
-        '${file.path}:${parsedFile.lineInfo.getLocation(badNode.offset).lineNumber}: fields annotated with @_debugOnly must null initialize.',
-      );
-    }
-  }
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      ...errors,
-      '',
-      '$bold${red}Fields annotated with @_debugOnly must null initialize,$reset',
-      'to ensure both the field and initializer are removed from profile/release mode.',
-      'These fields should be written as:',
-      'field = kDebugMode ? <DebugValue> : null;',
-    ]);
-  }
-}
-
-final RegExp tabooPattern = RegExp(r'^ *///.*\b(simply|note:|note that)\b', caseSensitive: false);
-
-Future<void> verifyTabooDocumentation(String workingDirectory, {int minimumMatches = 100}) async {
-  final errors = <String>[];
-  await for (final File file in _allFiles(
-    workingDirectory,
-    'dart',
-    minimumMatches: minimumMatches,
-  )) {
-    final List<String> lines = file.readAsLinesSync();
-    for (var index = 0; index < lines.length; index += 1) {
-      final String line = lines[index];
-      final Match? match = tabooPattern.firstMatch(line);
-      if (match != null) {
-        errors.add(
-          '${file.path}:${index + 1}: Found use of the taboo word "${match.group(1)}" in documentation string.',
-        );
-      }
-    }
-  }
-  if (errors.isNotEmpty) {
-    foundError(<String>[
-      ...errors,
-      '',
-      '${bold}Avoid the word "simply" in documentation. See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#use-the-passive-voice-recommend-do-not-require-never-say-things-are-simple for details.$reset',
-      '${bold}In many cases these words can be omitted without loss of generality; in other cases it may require a bit of rewording to avoid implying that the task is simple.$reset',
-      '${bold}Similarly, avoid using "note:" or the phrase "note that". See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-empty-prose for details.$reset',
-    ]);
-  }
-}
-
 final Map<String, String> _kKotlinTemplateKeys = <String, String>{
   'androidIdentifier': 'dummyPackage',
   'pluginClass': 'PluginClass',
@@ -2832,38 +2010,18 @@ Future<void> _checkForNewExecutables() async {
 }
 
 final RegExp _importPattern = RegExp(r'''^\s*import (['"])package:flutter/([^.]+)\.dart\1''');
-final RegExp _importMetaPattern = RegExp(r'''^\s*import (['"])package:meta/meta\.dart\1''');
 
-Future<Set<String>> _findFlutterDependencies(
-  String srcPath,
-  List<String> errors, {
-  bool checkForMeta = false,
-}) async {
-  return _allFiles(srcPath, 'dart', minimumMatches: 1)
-      .map<Set<String>>((File file) {
-        final result = <String>{};
-        for (final String line in file.readAsLinesSync()) {
-          Match? match = _importPattern.firstMatch(line);
-          if (match != null) {
-            result.add(match.group(2)!);
-          }
-          if (checkForMeta) {
-            match = _importMetaPattern.firstMatch(line);
-            if (match != null) {
-              errors.add(
-                '${file.path}\nThis package imports the ${yellow}meta$reset package.\n'
-                'You should instead import the "foundation.dart" library.',
-              );
-            }
-          }
-        }
-        return result;
-      })
-      .reduce((Set<String>? value, Set<String> element) {
-        value ??= <String>{};
-        value.addAll(element);
-        return value;
-      });
+Future<Set<String>> _findFlutterDependencies(String srcPath) async {
+  return _allFiles(srcPath, 'dart', minimumMatches: 1).expand<String>((File file) {
+    final result = <String>{};
+    for (final String line in file.readAsLinesSync()) {
+      final Match? match = _importPattern.firstMatch(line);
+      if (match != null) {
+        result.add(match.group(2)!);
+      }
+    }
+    return result;
+  }).toSet();
 }
 
 List<T>? _deepSearch<T>(Map<T, Set<T>> map, T start, [Set<T>? seen]) {
@@ -2883,14 +2041,11 @@ List<T>? _deepSearch<T>(Map<T, Set<T>> map, T start, [Set<T>? seen]) {
       key,
     });
     if (result != null) {
-      result.insert(0, start);
-      // Only report the shortest chains.
-      // For example a->b->a, rather than c->a->b->a.
-      // Since we visit every node, we know the shortest chains are those
-      // that start and end on the loop.
       if (result.first == result.last) {
         return result;
       }
+      result.insert(0, start);
+      return result;
     }
   }
   return null;
@@ -2908,47 +2063,6 @@ bool _isGeneratedPluginRegistrant(File file) {
           filename == 'generated_plugin_registrant.cc');
 }
 
-Future<void> _verifyPrivateLints(String flutterRoot, CommandResult? dartAnalyzeResult) async {
-  if (dartAnalyzeResult == null) {
-    foundError(<String>[
-      'The "dart-analysis" rule must run before "private-lints".',
-      'Ensure "dart-analysis" is not skipped and is included in --only if used.',
-    ]);
-    return;
-  }
-  // Only run the private lints when the code is free of type errors. The
-  // lints are easier to write when they can assume, for example, there is no
-  // inheritance cycles.
-  if (dartAnalyzeResult.exitCode == 0) {
-    final rules = <AnalyzeRule>[
-      noDoubleClamp,
-      noStopwatches,
-      renderBoxIntrinsicCalculation,
-      protectPublicStateSubtypes,
-    ];
-    final String ruleNames = rules.map((AnalyzeRule rule) => '\n * $rule').join();
-    printProgress('Analyzing code in the framework with the following rules:$ruleNames');
-    await analyzeWithRules(
-      flutterRoot,
-      rules,
-      includePaths: const <String>['packages/flutter/lib'],
-      excludePaths: const <String>['packages/flutter/lib/fix_data'],
-    );
-    final testRules = <AnalyzeRule>[noStopwatches];
-    final String testRuleNames = testRules.map((AnalyzeRule rule) => '\n * $rule').join();
-    printProgress('Analyzing code in the test folder with the following rules:$testRuleNames');
-    await analyzeWithRules(flutterRoot, testRules, includePaths: <String>['packages/flutter/test']);
-    final toolRules = <AnalyzeRule>[AvoidFutureCatchError()];
-    final String toolRuleNames = toolRules.map((AnalyzeRule rule) => '\n * $rule').join();
-    printProgress('Analyzing code in the tool with the following rules:$toolRuleNames');
-    await analyzeWithRules(
-      flutterRoot,
-      toolRules,
-      includePaths: const <String>['packages/flutter_tools/lib', 'packages/flutter_tools/test'],
-    );
-  }
-}
-
 Future<void> _verifyMegaGallery(
   String flutterRoot,
   String dart,
diff --git a/dev/bots/analyze_snippet_code.dart b/dev/bots/analyze_snippet_code.dart
index 5bcd78a98cef0..823180f42fb11 100644
--- a/dev/bots/analyze_snippet_code.dart
+++ b/dev/bots/analyze_snippet_code.dart
@@ -7,8 +7,9 @@
 
 // In general, please prefer using full linked examples in API docs.
 //
-// For documentation on creating sample code, see ../../examples/api/README.md
-// See also our style guide's discussion on documentation and sample code:
+// For documentation on creating sample code, see
+// ../../packages/flutter/examples/api/README.md See also our style guide's
+// discussion on documentation and sample code:
 // https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
 //
 // This tool is used to analyze smaller snippets of code in the API docs.
@@ -1008,13 +1009,13 @@ class _SnippetChecker {
 
     _copyPubspec(
       path.join(_contentDirectory.path, _pubspecName),
-      path.join(_flutterRoot, 'examples', 'api', _pubspecName),
+      path.join(_flutterRoot, 'packages', 'flutter', 'examples', 'api', _pubspecName),
     );
     final targetAnalysisOptions = File(path.join(_contentDirectory.path, 'analysis_options.yaml'));
     if (!targetAnalysisOptions.existsSync()) {
-      // Use the same analysis_options.yaml configuration that's used for examples/api.
+      // Use the same analysis_options.yaml configuration that's used for packages/flutter/examples/api.
       final sourceAnalysisOptions = File(
-        path.join(_flutterRoot, 'examples', 'api', 'analysis_options.yaml'),
+        path.join(_flutterRoot, 'packages', 'flutter', 'examples', 'api', 'analysis_options.yaml'),
       );
       if (!sourceAnalysisOptions.existsSync()) {
         throw 'Cannot find analysis_options.yaml at ${sourceAnalysisOptions.path}, which is also used to analyze code snippets.';
@@ -1028,7 +1029,7 @@ class _SnippetChecker {
   void _copyPubspec(String targetPath, String sourcePath) {
     final targetPubSpec = File(targetPath);
     if (!targetPubSpec.existsSync()) {
-      // Copying pubspec.yaml from examples/api into temp directory.
+      // Copying pubspec.yaml from packages/flutter/examples/api into temp directory.
       final sourcePubSpec = File(sourcePath);
       if (!sourcePubSpec.existsSync()) {
         throw 'Cannot find pubspec.yaml at ${sourcePubSpec.path}, which is also used to analyze code snippets.';
diff --git a/dev/bots/check_code_samples.dart b/dev/bots/check_code_samples.dart
index b8921f5008b5f..89d714b3fee0d 100644
--- a/dev/bots/check_code_samples.dart
+++ b/dev/bots/check_code_samples.dart
@@ -16,7 +16,13 @@ import 'utils.dart';
 
 final String _scriptLocation = path.fromUri(Platform.script);
 final String _flutterRoot = path.dirname(path.dirname(path.dirname(_scriptLocation)));
-final String _exampleDirectoryPath = path.join(_flutterRoot, 'examples', 'api');
+final String _exampleDirectoryPath = path.join(
+  _flutterRoot,
+  'packages',
+  'flutter',
+  'examples',
+  'api',
+);
 final String _packageDirectoryPath = path.join(_flutterRoot, 'packages');
 final String _dartUIDirectoryPath = path.join(
   _flutterRoot,
@@ -128,6 +134,10 @@ class SampleChecker {
   final Directory flutterRoot;
   final FileSystem filesystem;
 
+  // The `exampleBase` is where the paths in "See code in" are relative to.
+  // Defaults to <flutter_root>/packages/flutter.
+  Directory get exampleBase => examples.parent.parent;
+
   bool checkCodeSamples() {
     filesystem.currentDirectory = flutterRoot;
 
@@ -258,7 +268,7 @@ class SampleChecker {
   List<String> checkForMissingLinks(List<File> exampleFilenames, Set<String> searchStrings) {
     final missingFilenames = <String>[];
     for (final example in exampleFilenames) {
-      final String relativePath = getRelativePath(example);
+      final String relativePath = getRelativePath(example, exampleBase);
       if (!searchStrings.contains(relativePath)) {
         missingFilenames.add(relativePath);
       }
diff --git a/dev/bots/check_examples_cross_imports.dart b/dev/bots/check_examples_cross_imports.dart
index c0bbe0a117a00..1a86515c88496 100644
--- a/dev/bots/check_examples_cross_imports.dart
+++ b/dev/bots/check_examples_cross_imports.dart
@@ -18,6 +18,13 @@ import 'utils.dart';
 final String _scriptLocation = path.fromUri(Platform.script);
 final String _flutterRoot = path.dirname(path.dirname(path.dirname(_scriptLocation)));
 final String _examplesDirectoryPath = path.join(_flutterRoot, 'examples');
+final String _apiDocDirectoryPath = path.join(
+  _flutterRoot,
+  'packages',
+  'flutter',
+  'examples',
+  'api',
+);
 
 void main(List<String> args) {
   final argParser = ArgParser();
@@ -26,7 +33,13 @@ void main(List<String> args) {
     'examples',
     valueHelp: 'path',
     defaultsTo: _examplesDirectoryPath,
-    help: 'A location where the examples are found.',
+    help: 'A location where the non-API examples are found.',
+  );
+  argParser.addOption(
+    'api-doc',
+    valueHelp: 'path',
+    defaultsTo: _apiDocDirectoryPath,
+    help: 'A location where the API documents are found.',
   );
   argParser.addOption(
     'flutter-root',
@@ -56,10 +69,12 @@ void main(List<String> args) {
 
   const FileSystem filesystem = LocalFileSystem();
   final Directory examplesDirectory = filesystem.directory(parsedArgs['examples']! as String);
+  final Directory apiDocDirectory = filesystem.directory(parsedArgs['api-doc']! as String);
   final Directory flutterRoot = filesystem.directory(parsedArgs['flutter-root']! as String);
 
   final checker = ExamplesCrossImportChecker(
     examplesDirectory: examplesDirectory,
+    apiDocDirectory: apiDocDirectory,
     flutterRoot: flutterRoot,
   );
 
@@ -81,11 +96,13 @@ void main(List<String> args) {
 class ExamplesCrossImportChecker {
   ExamplesCrossImportChecker({
     required this.examplesDirectory,
+    required this.apiDocDirectory,
     required this.flutterRoot,
     this.filesystem = const LocalFileSystem(),
   });
 
   final Directory examplesDirectory;
+  final Directory apiDocDirectory;
   final Directory flutterRoot;
   final FileSystem filesystem;
 
@@ -98,508 +115,508 @@ class ExamplesCrossImportChecker {
   // TODO(justinmc): Fix all of these tests so there are no cross imports.
   // See https://github.com/flutter/flutter/issues/187645.
   static final Set<String> knownExamplesCrossImports = <String>{
-    'examples/api/lib/animation/animation_controller/animated_digit.0.dart',
-    'examples/api/lib/animation/curves/curve2_d.0.dart',
-    'examples/api/test/animation/animation_controller/animated_digit.0_test.dart',
-    'examples/api/test/animation/curves/curve2_d.0_test.dart',
-    'examples/api/lib/foundation/key/value_key.0.dart',
-    'examples/api/test/foundation/key/value_key.0_test.dart',
-    'examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart',
-    'examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart',
-    'examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart',
-    'examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart',
-    'examples/api/lib/painting/gradient/linear_gradient.0.dart',
-    'examples/api/lib/painting/star_border/star_border.0.dart',
-    'examples/api/lib/painting/axis_direction/axis_direction.0.dart',
-    'examples/api/lib/painting/borders/border_side.stroke_align.0.dart',
-    'examples/api/lib/painting/linear_border/linear_border.0.dart',
-    'examples/api/lib/painting/image_provider/image_provider.0.dart',
-    'examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart',
-    'examples/api/test/painting/gradient/linear_gradient.0_test.dart',
-    'examples/api/test/painting/star_border/star_border.0_test.dart',
-    'examples/api/test/painting/axis_direction/axis_direction.0_test.dart',
-    'examples/api/test/painting/borders/border_side.stroke_align.0_test.dart',
-    'examples/api/test/painting/linear_border/linear_border.0_test.dart',
-    'examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart',
-    'examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart',
-    'examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart',
-    'examples/api/lib/rendering/growth_direction/growth_direction.0.dart',
-    'examples/api/lib/rendering/box/parent_data.0.dart',
-    'examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart',
-    'examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart',
-    'examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart',
-    'examples/api/test/rendering/growth_direction/growth_direction.0_test.dart',
-    'examples/api/test/rendering/box/parent_data.0_test.dart',
-    'examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart',
-    'examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart',
-    'examples/api/lib/services/binding/handle_request_app_exit.0.dart',
-    'examples/api/lib/services/text_input/text_input_control.0.dart',
-    'examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart',
-    'examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart',
-    'examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart',
-    'examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart',
-    'examples/api/test/services/text_input/text_input_control.0_test.dart',
-    'examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart',
-    'examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart',
-    'examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart',
-    'examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart',
-    'examples/api/lib/widgets/animated_grid/animated_grid.0.dart',
-    'examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart',
-    'examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart',
-    'examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart',
-    'examples/api/lib/widgets/editable_text/text_editing_controller.0.dart',
-    'examples/api/lib/widgets/editable_text/text_editing_controller.1.dart',
-    'examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart',
-    'examples/api/lib/widgets/page/page_can_pop.0.dart',
-    'examples/api/lib/widgets/undo_history/undo_history_controller.0.dart',
-    'examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart',
-    'examples/api/lib/widgets/form/form.1.dart',
-    'examples/api/lib/widgets/form/form.0.dart',
-    'examples/api/lib/widgets/layout_builder/layout_builder.0.dart',
-    'examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart',
-    'examples/api/lib/widgets/restoration/restoration_mixin.0.dart',
-    'examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart',
-    'examples/api/lib/widgets/drag_target/draggable.0.dart',
-    'examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart',
-    'examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart',
-    'examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart',
-    'examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart',
-    'examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart',
-    'examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart',
-    'examples/api/lib/widgets/keep_alive/keep_alive.0.dart',
-    'examples/api/lib/widgets/safe_area/safe_area.0.dart',
-    'examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart',
-    'examples/api/lib/widgets/animated_size/animated_size.0.dart',
-    'examples/api/lib/widgets/framework/error_widget.0.dart',
-    'examples/api/lib/widgets/framework/build_owner.0.dart',
-    'examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart',
-    'examples/api/lib/widgets/sliver/sliver_list.0.dart',
-    'examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_tree.1.dart',
-    'examples/api/lib/widgets/sliver/sliver_tree.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_floating_header.0.dart',
-    'examples/api/lib/widgets/sliver/decorated_sliver.1.dart',
-    'examples/api/lib/widgets/sliver/sliver_opacity.1.dart',
-    'examples/api/lib/widgets/sliver/decorated_sliver.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart',
-    'examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart',
-    'examples/api/lib/widgets/heroes/hero.0.dart',
-    'examples/api/lib/widgets/heroes/hero.1.dart',
-    'examples/api/lib/widgets/dismissible/dismissible.0.dart',
-    'examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart',
-    'examples/api/lib/widgets/preferred_size/preferred_size.0.dart',
-    'examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart',
-    'examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart',
-    'examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart',
-    'examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart',
-    'examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart',
-    'examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart',
-    'examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart',
-    'examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart',
-    'examples/api/lib/widgets/async/stream_builder.0.dart',
-    'examples/api/lib/widgets/async/future_builder.0.dart',
-    'examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart',
-    'examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart',
-    'examples/api/lib/widgets/animated_list/animated_list_separated.0.dart',
-    'examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart',
-    'examples/api/lib/widgets/animated_list/animated_list.0.dart',
-    'examples/api/lib/widgets/basic/fractionally_sized_box.0.dart',
-    'examples/api/lib/widgets/basic/physical_shape.0.dart',
-    'examples/api/lib/widgets/basic/aspect_ratio.2.dart',
-    'examples/api/lib/widgets/basic/flow.0.dart',
-    'examples/api/lib/widgets/basic/aspect_ratio.0.dart',
-    'examples/api/lib/widgets/basic/clip_rrect.0.dart',
-    'examples/api/lib/widgets/basic/ignore_pointer.0.dart',
-    'examples/api/lib/widgets/basic/fitted_box.0.dart',
-    'examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart',
-    'examples/api/lib/widgets/basic/listener.0.dart',
-    'examples/api/lib/widgets/basic/clip_rrect.1.dart',
-    'examples/api/lib/widgets/basic/offstage.0.dart',
-    'examples/api/lib/widgets/basic/aspect_ratio.1.dart',
-    'examples/api/lib/widgets/basic/overflowbox.0.dart',
-    'examples/api/lib/widgets/basic/indexed_stack.0.dart',
-    'examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart',
-    'examples/api/lib/widgets/basic/expanded.1.dart',
-    'examples/api/lib/widgets/basic/mouse_region.0.dart',
-    'examples/api/lib/widgets/basic/expanded.0.dart',
-    'examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart',
-    'examples/api/lib/widgets/basic/absorb_pointer.0.dart',
-    'examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart',
-    'examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart',
-    'examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart',
-    'examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart',
-    'examples/api/lib/widgets/autofill/autofill_group.0.dart',
-    'examples/api/lib/widgets/scroll_view/list_view.1.dart',
-    'examples/api/lib/widgets/scroll_view/list_view.0.dart',
-    'examples/api/lib/widgets/scroll_view/grid_view.0.dart',
-    'examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart',
-    'examples/api/lib/widgets/binding/widget_binding_observer.0.dart',
-    'examples/api/lib/widgets/image/image.loading_builder.0.dart',
-    'examples/api/lib/widgets/image/image.error_builder.0.dart',
-    'examples/api/lib/widgets/image/image.frame_builder.0.dart',
-    'examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart',
-    'examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart',
-    'examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart',
-    'examples/api/lib/widgets/color_filter/color_filtered.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_padding.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_align.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_slide.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_container.0.dart',
-    'examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart',
-    'examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart',
-    'examples/api/lib/widgets/radio_group/radio_group.0.dart',
-    'examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart',
-    'examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart',
-    'examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart',
-    'examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart',
-    'examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart',
-    'examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart',
-    'examples/api/lib/widgets/page_storage/page_storage.0.dart',
-    'examples/api/lib/widgets/table/table.0.dart',
-    'examples/api/lib/widgets/notification_listener/notification.0.dart',
-    'examples/api/lib/widgets/inherited_model/inherited_model.0.dart',
-    'examples/api/lib/widgets/focus_scope/focus.2.dart',
-    'examples/api/lib/widgets/focus_scope/focus_scope.0.dart',
-    'examples/api/lib/widgets/focus_scope/focus.1.dart',
-    'examples/api/lib/widgets/focus_scope/focus.0.dart',
-    'examples/api/lib/widgets/pop_scope/pop_scope.1.dart',
-    'examples/api/lib/widgets/pop_scope/pop_scope.0.dart',
-    'examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart',
-    'examples/api/lib/widgets/shortcuts/shortcuts.0.dart',
-    'examples/api/lib/widgets/shortcuts/character_activator.0.dart',
-    'examples/api/lib/widgets/shortcuts/shortcuts.1.dart',
-    'examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart',
-    'examples/api/lib/widgets/shortcuts/single_activator.0.dart',
-    'examples/api/lib/widgets/shortcuts/logical_key_set.0.dart',
-    'examples/api/lib/widgets/actions/action_listener.0.dart',
-    'examples/api/lib/widgets/actions/action.action_overridable.0.dart',
-    'examples/api/lib/widgets/actions/focusable_action_detector.0.dart',
-    'examples/api/lib/widgets/actions/actions.0.dart',
-    'examples/api/lib/widgets/widget_state/widget_state_property.0.dart',
-    'examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart',
-    'examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart',
-    'examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart',
-    'examples/api/lib/widgets/magnifier/magnifier.0.dart',
-    'examples/api/lib/widgets/navigator/restorable_route_future.0.dart',
-    'examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart',
-    'examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart',
-    'examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart',
-    'examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart',
-    'examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart',
-    'examples/api/lib/widgets/navigator/navigator.0.dart',
-    'examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart',
-    'examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart',
-    'examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart',
-    'examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart',
-    'examples/api/lib/widgets/page_view/page_view.0.dart',
-    'examples/api/lib/widgets/page_view/page_view.1.dart',
-    'examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart',
-    'examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart',
-    'examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart',
-    'examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart',
-    'examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart',
-    'examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart',
-    'examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart',
-    'examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart',
-    'examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart',
-    'examples/api/lib/widgets/text/ui_testing_with_text.dart',
-    'examples/api/lib/widgets/text/text.0.dart',
-    'examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart',
-    'examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart',
-    'examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart',
-    'examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart',
-    'examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart',
-    'examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart',
-    'examples/api/lib/widgets/transitions/positioned_transition.0.dart',
-    'examples/api/lib/widgets/transitions/listenable_builder.3.dart',
-    'examples/api/lib/widgets/transitions/matrix_transition.0.dart',
-    'examples/api/lib/widgets/transitions/listenable_builder.2.dart',
-    'examples/api/lib/widgets/transitions/size_transition.0.dart',
-    'examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart',
-    'examples/api/lib/widgets/transitions/animated_builder.0.dart',
-    'examples/api/lib/widgets/transitions/decorated_box_transition.0.dart',
-    'examples/api/lib/widgets/transitions/rotation_transition.0.dart',
-    'examples/api/lib/widgets/transitions/fade_transition.0.dart',
-    'examples/api/lib/widgets/transitions/animated_widget.0.dart',
-    'examples/api/lib/widgets/transitions/align_transition.0.dart',
-    'examples/api/lib/widgets/transitions/listenable_builder.1.dart',
-    'examples/api/lib/widgets/transitions/listenable_builder.0.dart',
-    'examples/api/lib/widgets/transitions/default_text_style_transition.0.dart',
-    'examples/api/lib/widgets/transitions/slide_transition.0.dart',
-    'examples/api/lib/widgets/transitions/scale_transition.0.dart',
-    'examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart',
-    'examples/api/lib/widgets/windows/popup.0.dart',
-    'examples/api/lib/widgets/windows/tooltip.0.dart',
-    'examples/api/lib/widgets/windows/satellite.0.dart',
-    'examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart',
-    'examples/api/lib/widgets/overlay/overlay_portal.0.dart',
-    'examples/api/lib/widgets/overlay/overlay.0.dart',
-    'examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart',
-    'examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart',
-    'examples/api/lib/widgets/focus_manager/focus_node.0.dart',
-    'examples/api/lib/widgets/restoration_properties/restorable_value.0.dart',
-    'examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart',
-    'examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart',
-    'examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart',
-    'examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart',
-    'examples/api/lib/widgets/routes/show_general_dialog.0.dart',
-    'examples/api/lib/widgets/routes/local_history_entry.0.dart',
-    'examples/api/lib/widgets/routes/route_observer.0.dart',
-    'examples/api/lib/widgets/routes/flexible_route_transitions.1.dart',
-    'examples/api/lib/widgets/routes/flexible_route_transitions.0.dart',
-    'examples/api/lib/widgets/routes/popup_route.0.dart',
-    'examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart',
-    'examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart',
-    'examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart',
-    'examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart',
-    'examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart',
-    'examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart',
-    'examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart',
-    'examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart',
-    'examples/api/test/widgets/animated_grid/animated_grid.0_test.dart',
-    'examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart',
-    'examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart',
-    'examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart',
-    'examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart',
-    'examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart',
-    'examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart',
-    'examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart',
-    'examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart',
-    'examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart',
-    'examples/api/test/widgets/form/form.0_test.dart',
-    'examples/api/test/widgets/form/form.1_test.dart',
-    'examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart',
-    'examples/api/test/widgets/restoration/restoration_mixin.0_test.dart',
-    'examples/api/test/widgets/drag_target/draggable.0_test.dart',
-    'examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart',
-    'examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart',
-    'examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart',
-    'examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart',
-    'examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart',
-    'examples/api/test/widgets/keep_alive/keep_alive.0_test.dart',
-    'examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart',
-    'examples/api/test/widgets/safe_area/safe_area.0_test.dart',
-    'examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart',
-    'examples/api/test/widgets/animated_size/animated_size.0_test.dart',
-    'examples/api/test/widgets/framework/build_owner.0_test.dart',
-    'examples/api/test/widgets/framework/error_widget.0_test.dart',
-    'examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart',
-    'examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart',
-    'examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart',
-    'examples/api/test/widgets/sliver/sliver_opacity.1_test.dart',
-    'examples/api/test/widgets/sliver/decorated_sliver.0_test.dart',
-    'examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart',
-    'examples/api/test/widgets/sliver/decorated_sliver.1_test.dart',
-    'examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart',
-    'examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart',
-    'examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart',
-    'examples/api/test/widgets/heroes/hero.0_test.dart',
-    'examples/api/test/widgets/heroes/hero.1_test.dart',
-    'examples/api/test/widgets/dismissible/dismissible.0_test.dart',
-    'examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart',
-    'examples/api/test/widgets/preferred_size/preferred_size.0_test.dart',
-    'examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart',
-    'examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart',
-    'examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart',
-    'examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart',
-    'examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart',
-    'examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart',
-    'examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart',
-    'examples/api/test/widgets/async/stream_builder.0_test.dart',
-    'examples/api/test/widgets/async/future_builder.0_test.dart',
-    'examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart',
-    'examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart',
-    'examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart',
-    'examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart',
-    'examples/api/test/widgets/animated_list/animated_list.0_test.dart',
-    'examples/api/test/widgets/basic/physical_shape.0_test.dart',
-    'examples/api/test/widgets/basic/aspect_ratio.2_test.dart',
-    'examples/api/test/widgets/basic/indexed_stack.0_test.dart',
-    'examples/api/test/widgets/basic/clip_rrect.1_test.dart',
-    'examples/api/test/widgets/basic/absorb_pointer.0_test.dart',
-    'examples/api/test/widgets/basic/listener.0_test.dart',
-    'examples/api/test/widgets/basic/clip_rrect.0_test.dart',
-    'examples/api/test/widgets/basic/mouse_region.0_test.dart',
-    'examples/api/test/widgets/basic/expanded.0_test.dart',
-    'examples/api/test/widgets/basic/fitted_box.0_test.dart',
-    'examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart',
-    'examples/api/test/widgets/basic/aspect_ratio.0_test.dart',
-    'examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart',
-    'examples/api/test/widgets/basic/expanded.1_test.dart',
-    'examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart',
-    'examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart',
-    'examples/api/test/widgets/basic/aspect_ratio.1_test.dart',
-    'examples/api/test/widgets/basic/flow.0_test.dart',
-    'examples/api/test/widgets/basic/overflowbox.0_test.dart',
-    'examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart',
-    'examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart',
-    'examples/api/test/widgets/autofill/autofill_group.0_test.dart',
-    'examples/api/test/widgets/scroll_view/list_view.1_test.dart',
-    'examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart',
-    'examples/api/test/widgets/scroll_view/list_view.0_test.dart',
-    'examples/api/test/widgets/image/image.loading_builder.0_test.dart',
-    'examples/api/test/widgets/image/image.error_builder.0_test.dart',
-    'examples/api/test/widgets/image/image.frame_builder.0_test.dart',
-    'examples/api/test/widgets/color_filter/color_filtered.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_align.0_test.dart',
-    'examples/api/test/widgets/implicit_animations/animated_container.0_test.dart',
-    'examples/api/test/widgets/radio_group/radio_group.0_test.dart',
-    'examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart',
-    'examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart',
-    'examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart',
-    'examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart',
-    'examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart',
-    'examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart',
-    'examples/api/test/widgets/page_storage/page_storage.0_test.dart',
-    'examples/api/test/widgets/table/table.0_test.dart',
-    'examples/api/test/widgets/notification_listener/notification.0_test.dart',
-    'examples/api/test/widgets/inherited_model/inherited_model.0_test.dart',
-    'examples/api/test/widgets/focus_scope/focus.0_test.dart',
-    'examples/api/test/widgets/focus_scope/focus.1_test.dart',
-    'examples/api/test/widgets/focus_scope/focus.2_test.dart',
-    'examples/api/test/widgets/focus_scope/focus_scope.0_test.dart',
-    'examples/api/test/widgets/pop_scope/pop_scope.1_test.dart',
-    'examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart',
-    'examples/api/test/widgets/shortcuts/character_activator.0_test.dart',
-    'examples/api/test/widgets/actions/action_listener.0_test.dart',
-    'examples/api/test/widgets/actions/focusable_action_detector.0_test.dart',
-    'examples/api/test/widgets/actions/actions.0_test.dart',
-    'examples/api/test/widgets/actions/action.action_overridable.0_test.dart',
-    'examples/api/test/widgets/widget_state/widget_state_property.0_test.dart',
-    'examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart',
-    'examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart',
-    'examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart',
-    'examples/api/test/widgets/magnifier/magnifier.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart',
-    'examples/api/test/widgets/navigator/restorable_route_future.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart',
-    'examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart',
-    'examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart',
-    'examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart',
-    'examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart',
-    'examples/api/test/widgets/page_view/page_view.0_test.dart',
-    'examples/api/test/widgets/page_view/page_view.1_test.dart',
-    'examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart',
-    'examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart',
-    'examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart',
-    'examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart',
-    'examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart',
-    'examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart',
-    'examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart',
-    'examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart',
-    'examples/api/test/widgets/text/text.0_test.dart',
-    'examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart',
-    'examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart',
-    'examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart',
-    'examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart',
-    'examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart',
-    'examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart',
-    'examples/api/test/widgets/transitions/listenable_builder.3_test.dart',
-    'examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/matrix_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/listenable_builder.2_test.dart',
-    'examples/api/test/widgets/transitions/align_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/size_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/fade_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/listenable_builder.1_test.dart',
-    'examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/slide_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/positioned_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/animated_builder.0_test.dart',
-    'examples/api/test/widgets/transitions/listenable_builder.0_test.dart',
-    'examples/api/test/widgets/transitions/scale_transition.0_test.dart',
-    'examples/api/test/widgets/transitions/animated_widget.0_test.dart',
-    'examples/api/test/widgets/transitions/rotation_transition.0_test.dart',
-    'examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart',
-    'examples/api/test/widgets/overlay/overlay.0_test.dart',
-    'examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart',
-    'examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart',
-    'examples/api/test/widgets/focus_manager/focus_node.0_test.dart',
-    'examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart',
-    'examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart',
-    'examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart',
-    'examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart',
-    'examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart',
-    'examples/api/test/widgets/routes/popup_route.0_test.dart',
-    'examples/api/test/widgets/routes/show_general_dialog.0_test.dart',
-    'examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart',
-    'examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart',
-    'examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart',
-    'examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart',
-    'examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart',
-    'examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart',
-    'examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart',
-    'examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart',
-    'examples/flutter_view/lib/main.dart',
-    'examples/image_list/lib/main.dart',
-    'examples/multiple_windows/lib/app/main_window.dart',
-    'examples/multiple_windows/lib/app/tooltip_button.dart',
-    'examples/multiple_windows/lib/app/tooltip_window_edit_dialog.dart',
-    'examples/multiple_windows/lib/app/dialog_window_content.dart',
-    'examples/multiple_windows/lib/app/dialog_window_edit_dialog.dart',
-    'examples/multiple_windows/lib/app/popup_window_content.dart',
-    'examples/multiple_windows/lib/app/window_content.dart',
-    'examples/multiple_windows/lib/app/window_edit_dialog.dart',
-    'examples/multiple_windows/lib/app/rotated_wire_cube.dart',
-    'examples/multiple_windows/lib/app/popup_window_edit_dialog.dart',
-    'examples/multiple_windows/lib/app/tooltip_window_content.dart',
-    'examples/multiple_windows/lib/app/popup_button.dart',
-    'examples/multiple_windows/lib/app/window_settings_dialog.dart',
-    'examples/multiple_windows/lib/main.dart',
-    'examples/multiple_windows/test/multiple_windows_test.dart',
-    'examples/platform_view/lib/main.dart',
-    'examples/splash/lib/main.dart',
-    'examples/splash/test/splash_test.dart',
+    'packages/flutter/examples/api/lib/animation/animation_controller/animated_digit.0.dart',
+    'packages/flutter/examples/api/lib/animation/curves/curve2_d.0.dart',
+    'packages/flutter/examples/api/test/animation/animation_controller/animated_digit.0_test.dart',
+    'packages/flutter/examples/api/test/animation/curves/curve2_d.0_test.dart',
+    'packages/flutter/examples/api/lib/foundation/key/value_key.0.dart',
+    'packages/flutter/examples/api/test/foundation/key/value_key.0_test.dart',
+    'packages/flutter/examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart',
+    'packages/flutter/examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart',
+    'packages/flutter/examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart',
+    'packages/flutter/examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart',
+    'packages/flutter/examples/api/lib/painting/gradient/linear_gradient.0.dart',
+    'packages/flutter/examples/api/lib/painting/star_border/star_border.0.dart',
+    'packages/flutter/examples/api/lib/painting/axis_direction/axis_direction.0.dart',
+    'packages/flutter/examples/api/lib/painting/borders/border_side.stroke_align.0.dart',
+    'packages/flutter/examples/api/lib/painting/linear_border/linear_border.0.dart',
+    'packages/flutter/examples/api/lib/painting/image_provider/image_provider.0.dart',
+    'packages/flutter/examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart',
+    'packages/flutter/examples/api/test/painting/gradient/linear_gradient.0_test.dart',
+    'packages/flutter/examples/api/test/painting/star_border/star_border.0_test.dart',
+    'packages/flutter/examples/api/test/painting/axis_direction/axis_direction.0_test.dart',
+    'packages/flutter/examples/api/test/painting/borders/border_side.stroke_align.0_test.dart',
+    'packages/flutter/examples/api/test/painting/linear_border/linear_border.0_test.dart',
+    'packages/flutter/examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart',
+    'packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart',
+    'packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart',
+    'packages/flutter/examples/api/lib/rendering/growth_direction/growth_direction.0.dart',
+    'packages/flutter/examples/api/lib/rendering/box/parent_data.0.dart',
+    'packages/flutter/examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart',
+    'packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart',
+    'packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart',
+    'packages/flutter/examples/api/test/rendering/growth_direction/growth_direction.0_test.dart',
+    'packages/flutter/examples/api/test/rendering/box/parent_data.0_test.dart',
+    'packages/flutter/examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart',
+    'packages/flutter/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart',
+    'packages/flutter/examples/api/lib/services/binding/handle_request_app_exit.0.dart',
+    'packages/flutter/examples/api/lib/services/text_input/text_input_control.0.dart',
+    'packages/flutter/examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart',
+    'packages/flutter/examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart',
+    'packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart',
+    'packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart',
+    'packages/flutter/examples/api/test/services/text_input/text_input_control.0_test.dart',
+    'packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart',
+    'packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart',
+    'packages/flutter/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_grid/animated_grid.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart',
+    'packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart',
+    'packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.0.dart',
+    'packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.1.dart',
+    'packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart',
+    'packages/flutter/examples/api/lib/widgets/page/page_can_pop.0.dart',
+    'packages/flutter/examples/api/lib/widgets/undo_history/undo_history_controller.0.dart',
+    'packages/flutter/examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart',
+    'packages/flutter/examples/api/lib/widgets/form/form.1.dart',
+    'packages/flutter/examples/api/lib/widgets/form/form.0.dart',
+    'packages/flutter/examples/api/lib/widgets/layout_builder/layout_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart',
+    'packages/flutter/examples/api/lib/widgets/restoration/restoration_mixin.0.dart',
+    'packages/flutter/examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart',
+    'packages/flutter/examples/api/lib/widgets/drag_target/draggable.0.dart',
+    'packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart',
+    'packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart',
+    'packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart',
+    'packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart',
+    'packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart',
+    'packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart',
+    'packages/flutter/examples/api/lib/widgets/keep_alive/keep_alive.0.dart',
+    'packages/flutter/examples/api/lib/widgets/safe_area/safe_area.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_size/animated_size.0.dart',
+    'packages/flutter/examples/api/lib/widgets/framework/error_widget.0.dart',
+    'packages/flutter/examples/api/lib/widgets/framework/build_owner.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_list.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.1.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_floating_header.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.1.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_opacity.1.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart',
+    'packages/flutter/examples/api/lib/widgets/heroes/hero.0.dart',
+    'packages/flutter/examples/api/lib/widgets/heroes/hero.1.dart',
+    'packages/flutter/examples/api/lib/widgets/dismissible/dismissible.0.dart',
+    'packages/flutter/examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart',
+    'packages/flutter/examples/api/lib/widgets/preferred_size/preferred_size.0.dart',
+    'packages/flutter/examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart',
+    'packages/flutter/examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart',
+    'packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart',
+    'packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart',
+    'packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart',
+    'packages/flutter/examples/api/lib/widgets/async/stream_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/async/future_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart',
+    'packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_list/animated_list_separated.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_list/animated_list.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/fractionally_sized_box.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/physical_shape.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.2.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/flow.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/clip_rrect.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/ignore_pointer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/fitted_box.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/listener.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/clip_rrect.1.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/offstage.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.1.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/overflowbox.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/indexed_stack.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/expanded.1.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/mouse_region.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/expanded.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart',
+    'packages/flutter/examples/api/lib/widgets/basic/absorb_pointer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart',
+    'packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart',
+    'packages/flutter/examples/api/lib/widgets/autofill/autofill_group.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_view/list_view.1.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_view/list_view.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_view/grid_view.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart',
+    'packages/flutter/examples/api/lib/widgets/binding/widget_binding_observer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/image/image.loading_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/image/image.error_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/image/image.frame_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart',
+    'packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart',
+    'packages/flutter/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart',
+    'packages/flutter/examples/api/lib/widgets/color_filter/color_filtered.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_padding.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_align.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_slide.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_container.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart',
+    'packages/flutter/examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart',
+    'packages/flutter/examples/api/lib/widgets/radio_group/radio_group.0.dart',
+    'packages/flutter/examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart',
+    'packages/flutter/examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/page_storage/page_storage.0.dart',
+    'packages/flutter/examples/api/lib/widgets/table/table.0.dart',
+    'packages/flutter/examples/api/lib/widgets/notification_listener/notification.0.dart',
+    'packages/flutter/examples/api/lib/widgets/inherited_model/inherited_model.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_scope/focus.2.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_scope/focus_scope.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_scope/focus.1.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_scope/focus.0.dart',
+    'packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.1.dart',
+    'packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.0.dart',
+    'packages/flutter/examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/character_activator.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.1.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/single_activator.0.dart',
+    'packages/flutter/examples/api/lib/widgets/shortcuts/logical_key_set.0.dart',
+    'packages/flutter/examples/api/lib/widgets/actions/action_listener.0.dart',
+    'packages/flutter/examples/api/lib/widgets/actions/action.action_overridable.0.dart',
+    'packages/flutter/examples/api/lib/widgets/actions/focusable_action_detector.0.dart',
+    'packages/flutter/examples/api/lib/widgets/actions/actions.0.dart',
+    'packages/flutter/examples/api/lib/widgets/widget_state/widget_state_property.0.dart',
+    'packages/flutter/examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart',
+    'packages/flutter/examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart',
+    'packages/flutter/examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart',
+    'packages/flutter/examples/api/lib/widgets/magnifier/magnifier.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/restorable_route_future.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator.0.dart',
+    'packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart',
+    'packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart',
+    'packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart',
+    'packages/flutter/examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/page_view/page_view.0.dart',
+    'packages/flutter/examples/api/lib/widgets/page_view/page_view.1.dart',
+    'packages/flutter/examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart',
+    'packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart',
+    'packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart',
+    'packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart',
+    'packages/flutter/examples/api/lib/widgets/text/ui_testing_with_text.dart',
+    'packages/flutter/examples/api/lib/widgets/text/text.0.dart',
+    'packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart',
+    'packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart',
+    'packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart',
+    'packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart',
+    'packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart',
+    'packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/positioned_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.3.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/matrix_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.2.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/size_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/animated_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/decorated_box_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/rotation_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/fade_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/animated_widget.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/align_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.1.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/default_text_style_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/slide_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/scale_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart',
+    'packages/flutter/examples/api/lib/widgets/windows/popup.0.dart',
+    'packages/flutter/examples/api/lib/widgets/windows/tooltip.0.dart',
+    'packages/flutter/examples/api/lib/widgets/windows/satellite.0.dart',
+    'packages/flutter/examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart',
+    'packages/flutter/examples/api/lib/widgets/overlay/overlay_portal.0.dart',
+    'packages/flutter/examples/api/lib/widgets/overlay/overlay.0.dart',
+    'packages/flutter/examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart',
+    'packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.0.dart',
+    'packages/flutter/examples/api/lib/widgets/restoration_properties/restorable_value.0.dart',
+    'packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart',
+    'packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart',
+    'packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart',
+    'packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/show_general_dialog.0.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/local_history_entry.0.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/route_observer.0.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.1.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.0.dart',
+    'packages/flutter/examples/api/lib/widgets/routes/popup_route.0.dart',
+    'packages/flutter/examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart',
+    'packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart',
+    'packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart',
+    'packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart',
+    'packages/flutter/examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart',
+    'packages/flutter/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart',
+    'packages/flutter/examples/api/lib/widgets/expansible/expansible.0.dart',
+    'packages/flutter/examples/api/lib/widgets/selection_container/selection_container.0.dart',
+    'packages/flutter/examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart',
+    'packages/flutter/examples/api/lib/widgets/platform_menu_bar/platform_menu_bar.0.dart',
+    'packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.1.dart',
+    'packages/flutter/examples/api/lib/widgets/context_menu/context_menu_controller.0.dart',
+    'packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.0.dart',
+    'packages/flutter/examples/api/lib/widgets/selectable_region/selectable_region.0.dart',
+    'packages/flutter/examples/api/test/widgets/animated_grid/animated_grid.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/form/form.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/form/form.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/restoration/restoration_mixin.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/drag_target/draggable.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/keep_alive/keep_alive.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/safe_area/safe_area.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_size/animated_size.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/framework/build_owner.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/framework/error_widget.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_opacity.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/heroes/hero.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/heroes/hero.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/dismissible/dismissible.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/preferred_size/preferred_size.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart',
+    'packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/async/stream_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/async/future_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_list/animated_list.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/physical_shape.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/aspect_ratio.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/indexed_stack.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/clip_rrect.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/absorb_pointer.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/listener.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/clip_rrect.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/mouse_region.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/expanded.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/fitted_box.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/aspect_ratio.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/expanded.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/aspect_ratio.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/flow.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/basic/overflowbox.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/autofill/autofill_group.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_view/list_view.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_view/list_view.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/image/image.loading_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/image/image.error_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/image/image.frame_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/color_filter/color_filtered.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_align.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/implicit_animations/animated_container.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/radio_group/radio_group.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/page_storage/page_storage.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/table/table.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/notification_listener/notification.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/inherited_model/inherited_model.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_scope/focus.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_scope/focus.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_scope/focus.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_scope/focus_scope.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/pop_scope/pop_scope.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/shortcuts/character_activator.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/actions/action_listener.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/actions/focusable_action_detector.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/actions/actions.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/actions/action.action_overridable.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/widget_state/widget_state_property.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/magnifier/magnifier.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/restorable_route_future.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/page_view/page_view.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/page_view/page_view.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart',
+    'packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/text/text.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/listenable_builder.3_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/matrix_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/listenable_builder.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/align_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/size_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/fade_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/listenable_builder.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/slide_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/positioned_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/animated_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/listenable_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/scale_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/animated_widget.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/transitions/rotation_transition.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/overlay/overlay.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/focus_manager/focus_node.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart',
+    'packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/routes/popup_route.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/routes/show_general_dialog.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart',
+    'packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/selection_container/selection_container_disabled.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/selection_container/selection_container.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/platform_menu_bar/platform_menu_bar.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/context_menu/context_menu_controller.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.0_test.dart',
+    'packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.1_test.dart',
+    'packages/flutter/examples/api/test/widgets/selectable_region/selectable_region.0_test.dart',
     'examples/texture/lib/main.dart',
   };
 
-  static final RegExp _examplesPrefix = RegExp(r'examples');
+  static final RegExp _examplesPrefix = RegExp(
+    r'packages[/\\]flutter[/\\]examples[/\\]api|examples',
+  );
 
-  /// Find the `examples/api/lib` and `examples/api/test` directories
-  /// which contain the API examples and relevant tests.
+  /// Find the `packages/flutter/examples/api/lib` and
+  /// `packages/flutter/examples/api/test` directories which contain the API
+  /// examples and relevant tests.
   ///
-  /// For the cross imports checker, only the `examples/api/lib` and `examples/api/test` directories are relevant.
-  /// The other directories in `examples/api` are either generated (e.g. build or .dart_tool),
-  /// platform directories for the samples (e.g. windows or linux),
-  /// or a shim for the integration test driver.
+  /// For the cross imports checker, only the
+  /// `packages/flutter/examples/api/lib` and
+  /// `packages/flutter/examples/api/test` directories are relevant. The other
+  /// directories in `packages/flutter/examples/api` are either generated (e.g.
+  /// build or .dart_tool), platform directories for the samples (e.g. windows
+  /// or linux), or a shim for the integration test driver.
   ({Directory libDirectory, Directory testDirectory}) _findExamplesSlashApiDirectories(
     Directory examplesSlashApiDirectory,
   ) {
@@ -617,11 +634,11 @@ class ExamplesCrossImportChecker {
     }
 
     if (examplesSlashApiLibDirectory == null) {
-      throw StateError('Could not find lib directory in examples/api.');
+      throw StateError('Could not find lib directory in packages/flutter/examples/api.');
     }
 
     if (examplesSlashApiTestDirectory == null) {
-      throw StateError('Could not find test directory in examples/api.');
+      throw StateError('Could not find test directory in packages/flutter/examples/api.');
     }
 
     return (
@@ -636,9 +653,14 @@ class ExamplesCrossImportChecker {
 
     const _ExamplesLibrary examplesRoot = _GenericExampleLibrary('examples');
     final Map<_ExamplesLibrary, Set<File>> mapping = {examplesRoot: {}};
+    final List<FileSystemEntity> allExampleFiles = [
+      ...examplesDirectory.listSync(),
+      if (!apiDocDirectory.absolute.path.startsWith(examplesDirectory.absolute.path))
+        apiDocDirectory,
+    ];
 
     // List the files directly under `examples` and then walk the subdirectories.
-    for (final FileSystemEntity fileSystemEntity in examplesDirectory.listSync()) {
+    for (final fileSystemEntity in allExampleFiles) {
       if (fileSystemEntity is File && fileSystemEntity.absolute.path.contains(dartFilePattern)) {
         mapping[examplesRoot]?.add(fileSystemEntity);
 
@@ -655,7 +677,7 @@ class ExamplesCrossImportChecker {
         continue;
       }
 
-      // The examples/api folder contains examples in a single Flutter project,
+      // The packages/flutter/examples/api folder contains examples in a single Flutter project,
       // grouped in subfolders in lib/ and test/, so these need to be handled separately.
       if (directoryName == 'api') {
         final examplesSlashApiLibrary = _ExamplesLibrary.fromDirectory(
@@ -663,7 +685,7 @@ class ExamplesCrossImportChecker {
           flutterRoot: flutterRoot,
         );
 
-        // First list the files directly under examples/api.
+        // First list the files directly under packages/flutter/examples/api.
         mapping[examplesSlashApiLibrary] = {
           for (final File file in fileSystemEntity.listSync().whereType<File>())
             if (file.absolute.path.contains(dartFilePattern)) file,
@@ -672,7 +694,9 @@ class ExamplesCrossImportChecker {
         final (:Directory libDirectory, :Directory testDirectory) =
             _findExamplesSlashApiDirectories(fileSystemEntity);
 
-        // Handle the files under examples/api/lib/sample_templates and examples/api/test/sample_templates,
+        // Handle the files under
+        // `packages/flutter/examples/api/lib/sample_templates` and
+        // `packages/flutter/examples/api/test/sample_templates`,
         // which list individual files with a specific file pattern.
         mapping.addAll(
           _getExamplesSlashApiSampleTemplatesFiles(
@@ -707,12 +731,21 @@ class ExamplesCrossImportChecker {
 
   /// Get a list of all the filenames that end in ".dart" for the given examples directory.
   ///
-  /// The [directory] must not be a subdirectory of `examples/api`.
+  /// The [directory] must not be a subdirectory of `packages/flutter/examples/api`.
   Set<File> _getExampleFilesForDirectory(Directory directory, {required Pattern dartFilePattern}) {
-    final String examplesSlashApiPath = path.join(flutterRoot.absolute.path, 'examples', 'api');
+    final String examplesSlashApiPath = path.join(
+      flutterRoot.absolute.path,
+      'packages',
+      'flutter',
+      'examples',
+      'api',
+    );
 
     if (directory.absolute.path.startsWith(examplesSlashApiPath)) {
-      throw ArgumentError('Directory must not be an examples/api subdirectory.', 'directory');
+      throw ArgumentError(
+        'Directory must not be an packages/flutter/examples/api subdirectory.',
+        'directory',
+      );
     }
 
     final files = <File>{};
@@ -746,7 +779,9 @@ class ExamplesCrossImportChecker {
   }
 
   /// Get a list of all the filenames that end in ".dart", grouped by library,
-  /// for the subdrectories of `examples/api/lib/sample_templates` and `examples/api/test/sample_templates`.
+  /// for the subdrectories of
+  /// `packages/flutter/examples/api/lib/sample_templates` and
+  /// `packages/flutter/examples/api/test/sample_templates`.
   Map<_SampleTemplatesLibraryFile, Set<File>> _getExamplesSlashApiSampleTemplatesFiles({
     required Directory libDirectory,
     required Directory testDirectory,
@@ -779,8 +814,9 @@ class ExamplesCrossImportChecker {
   }
 
   /// Get a list of all the filenames that end in ".dart", grouped by library,
-  /// for the subdirectories of `examples/api`,
-  /// except `examples/api/lib/sample_templates` and `examples/api/test/sample_templates`.
+  /// for the subdirectories of `packages/flutter/examples/api`, except
+  /// `packages/flutter/examples/api/lib/sample_templates` and
+  /// `packages/flutter/examples/api/test/sample_templates`.
   Map<_ExamplesLibrary, Set<File>> _getExamplesSlashApiExamples({
     required Directory libDirectory,
     required Directory testDirectory,
@@ -882,7 +918,8 @@ class ExamplesCrossImportChecker {
 
     // Find any known cross imports that weren't found, and are therefore fixed.
     // Pre-compute all library prefixes so that root libraries (e.g. `examples`,
-    // `examples/api`) don't claim entries that belong to a more-specific sub-library.
+    // `packages/flutter/examples/api`) don't claim entries that belong to a
+    // more-specific sub-library.
     // TODO(justinmc): Remove this after all known cross imports have been
     // fixed.
     // See https://github.com/flutter/flutter/issues/187645.
@@ -930,6 +967,9 @@ class ExamplesCrossImportChecker {
 }
 
 /// The examples that we are concerned with cross importing.
+///
+/// Include the API docs in `packages/flutter/examples/api` and non-API docs in
+/// `examples`.
 sealed class _ExamplesLibrary implements CrossImportCheckedLibrary {
   const _ExamplesLibrary(this._name);
 
@@ -947,33 +987,33 @@ sealed class _ExamplesLibrary implements CrossImportCheckedLibrary {
 
     return switch (relativePath) {
       _
-          when relativePath.startsWith('examples/api/lib/cupertino') ||
-              relativePath.startsWith('examples/api/test/cupertino') =>
+          when relativePath.startsWith('packages/flutter/examples/api/lib/cupertino') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/cupertino') =>
         _CupertinoApiExampleLibrary(relativePath),
 
       _
-          when relativePath.startsWith('examples/api/lib/material') ||
-              relativePath.startsWith('examples/api/test/material') =>
+          when relativePath.startsWith('packages/flutter/examples/api/lib/material') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/material') =>
         _MaterialApiExampleLibrary(relativePath),
       _
-          when relativePath.startsWith('examples/api/lib/animation') ||
-              relativePath.startsWith('examples/api/lib/foundation') ||
-              relativePath.startsWith('examples/api/lib/gestures') ||
-              relativePath.startsWith('examples/api/lib/painting') ||
-              relativePath.startsWith('examples/api/lib/rendering') ||
-              relativePath.startsWith('examples/api/lib/services') ||
-              relativePath.startsWith('examples/api/lib/ui') ||
-              relativePath.startsWith('examples/api/lib/widgets') =>
+          when relativePath.startsWith('packages/flutter/examples/api/lib/animation') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/foundation') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/gestures') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/painting') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/rendering') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/services') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/ui') ||
+              relativePath.startsWith('packages/flutter/examples/api/lib/widgets') =>
         _ApiExampleLibrary(relativePath),
       _
-          when relativePath.startsWith('examples/api/test/animation') ||
-              relativePath.startsWith('examples/api/test/foundation') ||
-              relativePath.startsWith('examples/api/test/gestures') ||
-              relativePath.startsWith('examples/api/test/painting') ||
-              relativePath.startsWith('examples/api/test/rendering') ||
-              relativePath.startsWith('examples/api/test/services') ||
-              relativePath.startsWith('examples/api/test/ui') ||
-              relativePath.startsWith('examples/api/test/widgets') =>
+          when relativePath.startsWith('packages/flutter/examples/api/test/animation') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/foundation') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/gestures') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/painting') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/rendering') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/services') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/ui') ||
+              relativePath.startsWith('packages/flutter/examples/api/test/widgets') =>
         _ApiExampleLibrary(relativePath),
       _
           when relativePath.startsWith('examples/flutter_view') ||
@@ -987,7 +1027,9 @@ sealed class _ExamplesLibrary implements CrossImportCheckedLibrary {
               relativePath.startsWith('examples/splash') ||
               relativePath.startsWith('examples/texture') =>
         _ApiExampleLibrary(relativePath),
-      _ when relativePath.startsWith('examples/api') || relativePath.startsWith('examples') =>
+      _
+          when relativePath.startsWith('packages/flutter/examples/api') ||
+              relativePath.startsWith('examples') =>
         _ApiExampleLibrary(relativePath),
       _ => throw UnimplementedError('Unknown library: $relativePath'),
     };
@@ -1026,61 +1068,65 @@ sealed class _ExamplesLibrary implements CrossImportCheckedLibrary {
   }
 }
 
-/// Any API example - not related to Material or Cupertino - inside `examples/api`, and its tests.
+/// Any API example - not related to Material or Cupertino - inside
+/// `packages/flutter/examples/api`, and its tests.
 ///
-/// For example `examples/api/lib/foundation` and `examples/api/test/foundation`.
+/// For example
+/// `packages/flutter/examples/api/lib/foundation` and
+/// `packages/flutter/examples/api/test/foundation`.
 final class _ApiExampleLibrary extends _ExamplesLibrary {
   const _ApiExampleLibrary(super.name);
 }
 
-/// The examples in `examples/api/lib/cupertino`
-/// and their tests in `examples/api/test/cupertino`.
+/// The examples in `packages/flutter/examples/api/lib/cupertino`
+/// and their tests in `packages/flutter/examples/api/test/cupertino`.
 final class _CupertinoApiExampleLibrary extends _ExamplesLibrary {
   const _CupertinoApiExampleLibrary(super.name);
 
   @override
   bool canImport(LibraryCrossImportStatementType import) {
-    // While the Cupertino examples under `examples/api` are not allowed to import Material,
-    // the actual samples have been relocated to `packages/cupertino_ui`,
-    // where their cross imports will be addressed separately.
-    // The existing samples in `examples/api` are the now defunct orginal samples.
-    // For the purpose of the checker, allow all imports.
+    // While the Cupertino examples under `packages/flutter/examples/api` are
+    // not allowed to import Material, the actual samples have been relocated to
+    // `packages/cupertino_ui`, where their cross imports will be addressed
+    // separately.  The existing samples in `packages/flutter/examples/api` are
+    // the now defunct orginal samples.  For the purpose of the checker, allow
+    // all imports.
     return true;
   }
 }
 
-/// Any non-API example, not in `examples/api`,
+/// Any non-API example, not in `packages/flutter/examples/api`,
 /// such as `examples/flutter_view` or `examples/hello_world`.
 final class _GenericExampleLibrary extends _ExamplesLibrary {
   const _GenericExampleLibrary(super.name);
 }
 
-/// The examples in `examples/api/lib/material`
-/// and their tests in `examples/api/test/material`.
+/// The examples in `packages/flutter/examples/api/lib/material`
+/// and their tests in `packages/flutter/examples/api/test/material`.
 final class _MaterialApiExampleLibrary extends _ExamplesLibrary {
   const _MaterialApiExampleLibrary(super.name);
 
   @override
   bool canImport(LibraryCrossImportStatementType import) {
-    // While the Material examples under `examples/api` are not allowed to import Cupertino,
+    // While the Material examples under `packages/flutter/examples/api` are not allowed to import Cupertino,
     // the actual samples have been relocated to `packages/material_ui`,
     // where their cross imports will be addressed separately.
-    // The existing samples in `examples/api` are the now defunct orginal samples.
+    // The existing samples in `packages/flutter/examples/api` are the now defunct orginal samples.
     // For the purpose of the checker, allow all imports.
     return true;
   }
 }
 
-/// The examples in `examples/api/lib/sample_templates`
-/// and their tests in `examples/api/test/sample_templates`.
+/// The examples in `packages/flutter/examples/api/lib/sample_templates`
+/// and their tests in `packages/flutter/examples/api/test/sample_templates`.
 ///
 /// The sample templates are individual files, rather than directories.
 final class _SampleTemplatesLibraryFile extends _ExamplesLibrary {
   const _SampleTemplatesLibraryFile._(super.name, this._filePath);
 
   factory _SampleTemplatesLibraryFile.fromFile(File file) {
-    const examplesLibPrefix = 'examples/api/lib/sample_templates';
-    const examplesTestPrefix = 'examples/api/test/sample_templates';
+    const examplesLibPrefix = 'packages/flutter/examples/api/lib/sample_templates';
+    const examplesTestPrefix = 'packages/flutter/examples/api/test/sample_templates';
     final String filePath = file.absolute.path.replaceAll(Platform.pathSeparator, '/');
 
     final int libIndex = filePath.indexOf(examplesLibPrefix);
diff --git a/dev/bots/check_tests_cross_imports.dart b/dev/bots/check_tests_cross_imports.dart
index 1810b2696d1c8..446fde67cd350 100644
--- a/dev/bots/check_tests_cross_imports.dart
+++ b/dev/bots/check_tests_cross_imports.dart
@@ -120,18 +120,15 @@ class TestsCrossImportChecker {
   static final Set<String> knownWidgetsCrossImports = <String>{
     'packages/flutter/test/widgets/page_transitions_test.dart',
     'packages/flutter/test/widgets/routes_test.dart',
-    'packages/flutter/test/widgets/app_test.dart',
     'packages/flutter/test/widgets/routes_transition_test.dart',
     'packages/flutter/test/widgets/editable_text_test.dart',
     'packages/flutter/test/widgets/scrollbar_test.dart',
-    'packages/flutter/test/widgets/inherited_test.dart',
     'packages/flutter/test/widgets/heroes_test.dart',
     'packages/flutter/test/widgets/drawer_test.dart',
     'packages/flutter/test/widgets/nested_scroll_view_test.dart',
     'packages/flutter/test/widgets/scrollable_selection_test.dart',
     'packages/flutter/test/widgets/page_transitions_builder_test.dart',
     'packages/flutter/test/widgets/navigator_test.dart',
-    'packages/flutter/test/widgets/navigator_restoration_test.dart',
     'packages/flutter/test/widgets/form_test.dart',
     'packages/flutter/test/widgets/text_selection_toolbar_utils.dart',
     'packages/flutter/test/widgets/live_text_utils.dart',
@@ -188,7 +185,6 @@ class TestsCrossImportChecker {
     'packages/flutter_test/lib/src/widget_tester.dart',
     'packages/flutter_test/lib/src/finders.dart',
     'packages/flutter_test/lib/src/matchers.dart',
-    'packages/flutter_test/test/accessibility_window_test.dart',
     'packages/flutter_test/test/widget_tester_test.dart',
     'packages/flutter_test/test/accessibility_test.dart',
     'packages/flutter_test/test/finders_test.dart',
diff --git a/dev/bots/cross_imports_checker_utils.dart b/dev/bots/cross_imports_checker_utils.dart
index da55972cc1296..467c2b908d1b3 100644
--- a/dev/bots/cross_imports_checker_utils.dart
+++ b/dev/bots/cross_imports_checker_utils.dart
@@ -26,7 +26,8 @@ abstract interface class CrossImportCheckedLibrary {
 
   /// The short name of the library.
   ///
-  /// For example `packages/flutter/test/widgets` or `examples/api/foo`.
+  /// For example `packages/flutter/test/widgets` or
+  /// `packages/flutter/examples/api/foo`.
   String get libraryName;
 
   /// The message that instructs how to remove now-fixed cross imports for this library,
diff --git a/dev/bots/custom_rules/analyze.dart b/dev/bots/custom_rules/analyze.dart
deleted file mode 100644
index 3ffc1d9783dc7..0000000000000
--- a/dev/bots/custom_rules/analyze.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:io' show Directory;
-
-import 'package:analyzer/dart/analysis/analysis_context.dart';
-import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/analysis/session.dart';
-import 'package:path/path.dart' as path;
-
-import '../utils.dart';
-
-/// Analyzes the dart source files in the given `flutterRootDirectory` with the
-/// given [AnalyzeRule]s.
-///
-/// The `includePath` parameter takes a collection of paths relative to the given
-/// `flutterRootDirectory`. It specifies the files or directory this function
-/// should analyze. Defaults to null in which case this function analyzes the
-/// all dart source files in `flutterRootDirectory`.
-///
-/// The `excludePath` parameter takes a collection of paths relative to the given
-/// `flutterRootDirectory` that this function should skip analyzing.
-///
-/// If a compilation unit can not be resolved, this function ignores the
-/// corresponding dart source file and logs an error using [foundError].
-Future<void> analyzeWithRules(
-  String flutterRootDirectory,
-  List<AnalyzeRule> rules, {
-  Iterable<String>? includePaths,
-  Iterable<String>? excludePaths,
-}) async {
-  if (!Directory(flutterRootDirectory).existsSync()) {
-    foundError(<String>['Analyzer error: the specified $flutterRootDirectory does not exist.']);
-  }
-  final Iterable<String> includes =
-      includePaths?.map(
-        (String relativePath) => path.canonicalize('$flutterRootDirectory/$relativePath'),
-      ) ??
-      <String>[path.canonicalize(flutterRootDirectory)];
-  final collection = AnalysisContextCollection(
-    includedPaths: includes.toList(),
-    excludedPaths: excludePaths
-        ?.map((String relativePath) => path.canonicalize('$flutterRootDirectory/$relativePath'))
-        .toList(),
-  );
-
-  final analyzerErrors = <String>[];
-  for (final AnalysisContext context in collection.contexts) {
-    final Iterable<String> analyzedFilePaths = context.contextRoot.analyzedFiles();
-    final AnalysisSession session = context.currentSession;
-
-    for (final filePath in analyzedFilePaths) {
-      final SomeResolvedUnitResult unit = await session.getResolvedUnit(filePath);
-      if (unit is ResolvedUnitResult) {
-        for (final rule in rules) {
-          rule.applyTo(unit);
-        }
-      } else {
-        analyzerErrors.add(
-          'Analyzer error: file $unit could not be resolved. Expected "ResolvedUnitResult", got ${unit.runtimeType}.',
-        );
-      }
-    }
-  }
-
-  if (analyzerErrors.isNotEmpty) {
-    foundError(analyzerErrors);
-  }
-  for (final verifier in rules) {
-    verifier.reportViolations(flutterRootDirectory);
-  }
-}
-
-/// An interface that defines a set of best practices, and collects information
-/// about code that violates the best practices in a [ResolvedUnitResult].
-///
-/// The [analyzeWithRules] function scans and analyzes the specified
-/// source directory using the dart analyzer package, and applies custom rules
-/// defined in the form of this interface on each resulting [ResolvedUnitResult].
-/// The [reportViolations] method will be called at the end, once all
-/// [ResolvedUnitResult]s are parsed.
-///
-/// Implementers can assume each [ResolvedUnitResult] is valid compilable dart
-/// code, as the caller only applies the custom rules once the code passes
-/// `flutter analyze`.
-abstract class AnalyzeRule {
-  /// Applies this rule to the given [ResolvedUnitResult] (typically a file), and
-  /// collects information about violations occurred in the compilation unit.
-  void applyTo(ResolvedUnitResult unit);
-
-  /// Reports all violations in the resolved compilation units [applyTo] was
-  /// called on, if any.
-  ///
-  /// This method is called once all [ResolvedUnitResult] are parsed.
-  ///
-  /// The implementation typically calls [foundErrors] to report violations.
-  void reportViolations(String workingDirectory);
-}
diff --git a/dev/bots/custom_rules/avoid_future_catcherror.dart b/dev/bots/custom_rules/avoid_future_catcherror.dart
deleted file mode 100644
index 59ff3817a93a7..0000000000000
--- a/dev/bots/custom_rules/avoid_future_catcherror.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/type.dart';
-
-import '../utils.dart';
-import 'analyze.dart';
-
-/// Don't use Future.catchError or Future.onError.
-///
-/// See https://github.com/flutter/flutter/pull/130662 for more context.
-///
-/// **BAD:**
-///
-/// ```dart
-/// Future<Object?> doSomething() {
-///   return doSomethingAsync().catchError((_) => null);
-/// }
-///
-/// Future<Object?> doSomethingAsync() {
-///   return Future<Object>.error(Exception('error'));
-/// }
-/// ```
-///
-/// **GOOD:**
-///
-/// ```dart
-/// Future<Object?> doSomething() {
-///   return doSomethingAsync().then(
-///     (Object? obj) => obj,
-///     onError: (_) => null,
-///   );
-/// }
-///
-/// Future<Object?> doSomethingAsync() {
-///   return Future<Object>.error(Exception('error'));
-/// }
-/// ```
-class AvoidFutureCatchError extends AnalyzeRule {
-  final Map<ResolvedUnitResult, List<AstNode>> _errors = <ResolvedUnitResult, List<AstNode>>{};
-
-  @override
-  void applyTo(ResolvedUnitResult unit) {
-    final visitor = _Visitor();
-    unit.unit.visitChildren(visitor);
-    if (visitor._offendingNodes.isNotEmpty) {
-      _errors.putIfAbsent(unit, () => <AstNode>[]).addAll(visitor._offendingNodes);
-    }
-  }
-
-  @override
-  void reportViolations(String workingDirectory) {
-    if (_errors.isEmpty) {
-      return;
-    }
-
-    foundError(<String>[
-      for (final MapEntry<ResolvedUnitResult, List<AstNode>> entry in _errors.entries)
-        for (final AstNode node in entry.value)
-          '${locationInFile(entry.key, node, workingDirectory)}: ${node.parent}',
-      '\n${bold}Future.catchError and Future.onError are not type safe--instead use Future.then: https://github.com/dart-lang/sdk/issues/51248$reset',
-    ]);
-  }
-
-  @override
-  String toString() => 'Avoid "Future.catchError" and "Future.onError"';
-}
-
-class _Visitor extends RecursiveAstVisitor<void> {
-  _Visitor();
-
-  final List<AstNode> _offendingNodes = <AstNode>[];
-
-  @override
-  void visitMethodInvocation(MethodInvocation node) {
-    if (node case MethodInvocation(
-      methodName: SimpleIdentifier(name: 'onError' || 'catchError'),
-      realTarget: Expression(staticType: DartType(isDartAsyncFuture: true)),
-    )) {
-      _offendingNodes.add(node);
-    }
-  }
-}
diff --git a/dev/bots/custom_rules/protect_public_state_subtypes.dart b/dev/bots/custom_rules/protect_public_state_subtypes.dart
deleted file mode 100644
index e0fc557ed4839..0000000000000
--- a/dev/bots/custom_rules/protect_public_state_subtypes.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(nate-thegrate): remove this file if @protected changes, or add a test if it doesn't.
-// https://github.com/dart-lang/sdk/issues/57094
-
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
-
-import '../utils.dart';
-import 'analyze.dart';
-
-final AnalyzeRule protectPublicStateSubtypes = _ProtectPublicStateSubtypes();
-
-class _ProtectPublicStateSubtypes implements AnalyzeRule {
-  final Map<ResolvedUnitResult, List<MethodDeclaration>> _errors =
-      <ResolvedUnitResult, List<MethodDeclaration>>{};
-
-  @override
-  void applyTo(ResolvedUnitResult unit) {
-    final visitor = _StateSubclassVisitor();
-    unit.unit.visitChildren(visitor);
-    final List<MethodDeclaration> unprotected = visitor.unprotectedMethods;
-    if (unprotected.isNotEmpty) {
-      _errors.putIfAbsent(unit, () => <MethodDeclaration>[]).addAll(unprotected);
-    }
-  }
-
-  @override
-  void reportViolations(String workingDirectory) {
-    if (_errors.isEmpty) {
-      return;
-    }
-
-    foundError(<String>[
-      for (final MapEntry<ResolvedUnitResult, List<MethodDeclaration>> entry in _errors.entries)
-        for (final MethodDeclaration method in entry.value)
-          '${locationInFile(entry.key, method, workingDirectory)}: $method - missing "@protected" annotation.',
-      '\nPublic State subtypes should add @protected when overriding methods,',
-      'to avoid exposing internal logic to developers.',
-    ]);
-  }
-
-  @override
-  String toString() => 'Add "@protected" to public State subtypes';
-}
-
-class _StateSubclassVisitor extends SimpleAstVisitor<void> {
-  final List<MethodDeclaration> unprotectedMethods = <MethodDeclaration>[];
-
-  /// Holds the `State` class [DartType].
-  static DartType? stateType;
-
-  static bool isPublicStateSubtype(InterfaceElement element) {
-    if (!element.isPublic) {
-      return false;
-    }
-    if (stateType != null) {
-      return element.allSupertypes.contains(stateType);
-    }
-    for (final InterfaceType superType in element.allSupertypes) {
-      if (superType.element.name == 'State') {
-        stateType = superType;
-        return true;
-      }
-    }
-    return false;
-  }
-
-  @override
-  void visitClassDeclaration(ClassDeclaration node) {
-    if (isPublicStateSubtype(node.declaredFragment!.element)) {
-      node.visitChildren(this);
-    }
-  }
-
-  /// Checks whether overridden `State` methods have the `@protected` annotation,
-  /// and adds the declaration to [unprotectedMethods] if not.
-  @override
-  void visitMethodDeclaration(MethodDeclaration node) {
-    switch (node.name.lexeme) {
-      case 'initState':
-      case 'didUpdateWidget':
-      case 'didChangeDependencies':
-      case 'reassemble':
-      case 'deactivate':
-      case 'activate':
-      case 'dispose':
-      case 'build':
-      case 'debugFillProperties':
-        if (!node.declaredFragment!.element.metadata.hasProtected) {
-          unprotectedMethods.add(node);
-        }
-    }
-  }
-}
diff --git a/dev/bots/custom_rules/render_box_intrinsics.dart b/dev/bots/custom_rules/render_box_intrinsics.dart
deleted file mode 100644
index 82bb66e358282..0000000000000
--- a/dev/bots/custom_rules/render_box_intrinsics.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
-
-import '../utils.dart';
-import 'analyze.dart';
-
-/// Verify that no RenderBox subclasses call compute* instead of get* for
-/// computing the intrinsic dimensions. The [candidates] variable contains the
-/// full list of RenderBox intrinsic method invocations checked by this rule.
-final AnalyzeRule renderBoxIntrinsicCalculation = _RenderBoxIntrinsicCalculationRule();
-
-const Map<String, String> candidates = <String, String>{
-  'computeDryBaseline': 'getDryBaseline',
-  'computeDryLayout': 'getDryLayout',
-  'computeDistanceToActualBaseline': 'getDistanceToBaseline, or getDistanceToActualBaseline',
-  'computeMaxIntrinsicHeight': 'getMaxIntrinsicHeight',
-  'computeMinIntrinsicHeight': 'getMinIntrinsicHeight',
-  'computeMaxIntrinsicWidth': 'getMaxIntrinsicWidth',
-  'computeMinIntrinsicWidth': 'getMinIntrinsicWidth',
-};
-
-class _RenderBoxIntrinsicCalculationRule implements AnalyzeRule {
-  final Map<ResolvedUnitResult, List<(AstNode, String)>> _errors =
-      <ResolvedUnitResult, List<(AstNode, String)>>{};
-
-  @override
-  void applyTo(ResolvedUnitResult unit) {
-    final visitor = _RenderBoxSubclassVisitor();
-    unit.unit.visitChildren(visitor);
-    final List<(AstNode, String)> violationsInUnit = visitor.violationNodes;
-    if (violationsInUnit.isNotEmpty) {
-      _errors.putIfAbsent(unit, () => <(AstNode, String)>[]).addAll(violationsInUnit);
-    }
-  }
-
-  @override
-  void reportViolations(String workingDirectory) {
-    if (_errors.isEmpty) {
-      return;
-    }
-
-    foundError(<String>[
-      for (final MapEntry<ResolvedUnitResult, List<(AstNode, String)>> entry in _errors.entries)
-        for (final (AstNode node, String suggestion) in entry.value)
-          '${locationInFile(entry.key, node, workingDirectory)}: ${node.parent}. Consider calling $suggestion instead.',
-      '\n${bold}Typically the get* methods should be used to obtain the intrinsics of a RenderBox.$reset',
-    ]);
-  }
-
-  @override
-  String toString() => 'RenderBox subclass intrinsic calculation best practices';
-}
-
-class _RenderBoxSubclassVisitor extends RecursiveAstVisitor<void> {
-  final List<(AstNode, String)> violationNodes = <(AstNode, String)>[];
-
-  static final Map<InterfaceElement, bool> _isRenderBoxClassElementCache =
-      <InterfaceElement, bool>{};
-  // The cached version, call this method instead of _checkIfImplementsRenderBox.
-  static bool _implementsRenderBox(InterfaceElement interfaceElement) {
-    // Framework naming convention: a RenderObject subclass names have "Render" in its name.
-    if (!interfaceElement.name!.contains('Render')) {
-      return false;
-    }
-    return interfaceElement.name == 'RenderBox' ||
-        _isRenderBoxClassElementCache.putIfAbsent(
-          interfaceElement,
-          () => _checkIfImplementsRenderBox(interfaceElement),
-        );
-  }
-
-  static bool _checkIfImplementsRenderBox(InterfaceElement element) {
-    return element.allSupertypes.any(
-      (InterfaceType interface) => _implementsRenderBox(interface.element),
-    );
-  }
-
-  // We don't care about directives, comments, or asserts.
-  @override
-  void visitImportDirective(ImportDirective node) {}
-  @override
-  void visitExportDirective(ExportDirective node) {}
-  @override
-  void visitComment(Comment node) {}
-  @override
-  void visitAssertStatement(AssertStatement node) {}
-
-  @override
-  void visitClassDeclaration(ClassDeclaration node) {
-    // Ignore the RenderBox class implementation: that's the only place the
-    // compute* methods are supposed to be called.
-    if (node.name.lexeme != 'RenderBox') {
-      super.visitClassDeclaration(node);
-    }
-  }
-
-  @override
-  void visitSimpleIdentifier(SimpleIdentifier node) {
-    final String? correctMethodName = candidates[node.name];
-    if (correctMethodName == null) {
-      return;
-    }
-    final bool isCallingSuperImplementation = switch (node.parent) {
-      PropertyAccess(target: SuperExpression()) ||
-      MethodInvocation(target: SuperExpression()) => true,
-      _ => false,
-    };
-    if (isCallingSuperImplementation) {
-      return;
-    }
-    final Element? declaredInClassElement = node.element?.enclosingElement;
-    if (declaredInClassElement is InterfaceElement &&
-        _implementsRenderBox(declaredInClassElement)) {
-      violationNodes.add((node, correctMethodName));
-    }
-  }
-}
diff --git a/dev/bots/luci_resultdb.dart b/dev/bots/luci_resultdb.dart
new file mode 100644
index 0000000000000..668e82a0194a4
--- /dev/null
+++ b/dev/bots/luci_resultdb.dart
@@ -0,0 +1,400 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'tool_subsharding.dart';
+
+/// Reads and decodes the `LUCI_CONTEXT` JSON file, or returns null if it is not
+/// set or cannot be read.
+///
+/// `LUCI_CONTEXT` is a file path (in the `LUCI_CONTEXT` environment variable)
+/// pointing at a JSON document that LUCI populates for the running build.
+Map<String, Object?>? readLuciContext([Map<String, String>? environment]) {
+  final Map<String, String> env = environment ?? Platform.environment;
+  final String? luciContextPath = env['LUCI_CONTEXT'];
+  if (luciContextPath == null || luciContextPath.isEmpty) {
+    return null;
+  }
+  final file = File(luciContextPath);
+  if (!file.existsSync()) {
+    return null;
+  }
+  // Be defensive: an unreadable file or malformed JSON must never crash the
+  // test run, since this is called outside the reporting try/catch.
+  try {
+    if (json.decode(file.readAsStringSync()) case final Map<String, Object?> decoded) {
+      return decoded;
+    }
+    return null;
+  } catch (_) {
+    return null;
+  }
+}
+
+/// A client for the [ResultDB Recorder][recorder] `BatchCreateTestResults` API.
+///
+/// This uploads test results directly to the build's ResultDB invocation using
+/// the `update_token` from `LUCI_CONTEXT["resultdb"]["current_invocation"]`.
+///
+/// This works even when the build is not running under `rdb stream` (which is
+/// the case for the Flutter recipe): bbagent creates the invocation and exposes
+/// `current_invocation` in `LUCI_CONTEXT`, without needing a separate result
+/// streaming sidecar.
+///
+/// [recorder]: https://pkg.go.dev/go.chromium.org/luci/resultdb/proto/v1
+class ResultDbRecorder {
+  ResultDbRecorder({
+    required this.host,
+    required this.invocation,
+    required this.updateToken,
+    HttpClient? httpClient,
+  }) : _client = httpClient ?? HttpClient();
+
+  /// The ResultDB hostname (for example, `results.api.luci.app`).
+  final String host;
+
+  /// The invocation name (for example, `invocations/build-123`).
+  final String invocation;
+
+  /// The token that authorizes writes to [invocation].
+  final String updateToken;
+
+  final HttpClient _client;
+
+  /// Creates a [ResultDbRecorder] from the `LUCI_CONTEXT`, or returns null if
+  /// ResultDB is not configured for the current invocation.
+  static ResultDbRecorder? fromEnvironment([Map<String, String>? environment]) {
+    final Map<String, Object?>? luciContext = readLuciContext(environment);
+    if (luciContext case {
+      'resultdb': {
+        'hostname': final String host,
+        'current_invocation': {'name': final String name, 'update_token': final String updateToken},
+      },
+    }) {
+      return ResultDbRecorder(host: host, invocation: name, updateToken: updateToken);
+    }
+    return null;
+  }
+
+  /// Reports the given [testResults] to the invocation via
+  /// `BatchCreateTestResults`.
+  ///
+  /// Throws an [HttpException] if the server responds with a non-200 status.
+  Future<void> reportTestResults(List<LuciTestResult> testResults) async {
+    if (testResults.isEmpty) {
+      return;
+    }
+    final Uri url = Uri.parse(
+      'https://$host/prpc/luci.resultdb.v1.Recorder/BatchCreateTestResults',
+    );
+    for (final List<LuciTestResult> batch in _batches(testResults)) {
+      final HttpClientRequest request = await _client.postUrl(url);
+      request.headers.set(HttpHeaders.contentTypeHeader, 'application/json');
+      request.headers.set(HttpHeaders.acceptHeader, 'application/json');
+      // The Recorder authorizes writes to the invocation via this header.
+      request.headers.set('update-token', updateToken);
+      request.add(
+        utf8.encode(
+          json.encode(<String, Object?>{
+            'invocation': invocation,
+            'requests': <Map<String, Object?>>[
+              for (final LuciTestResult result in batch)
+                <String, Object?>{'testResult': result.toJson()},
+            ],
+          }),
+        ),
+      );
+      final HttpClientResponse response = await request.close();
+      final String body = await response.transform(utf8.decoder).join();
+      if (response.statusCode != HttpStatus.ok) {
+        throw HttpException(
+          'ResultDB BatchCreateTestResults failed with status ${response.statusCode}: $body',
+        );
+      }
+    }
+  }
+
+  /// Closes the underlying HTTP client.
+  void close() {
+    _client.close(force: true);
+  }
+}
+
+/// The maximum number of test results to send in a single request.
+const int _kBatchSize = 500;
+
+/// Splits [testResults] into batches of at most [_kBatchSize].
+Iterable<List<LuciTestResult>> _batches(List<LuciTestResult> testResults) sync* {
+  for (var i = 0; i < testResults.length; i += _kBatchSize) {
+    final int end = (i + _kBatchSize < testResults.length) ? i + _kBatchSize : testResults.length;
+    yield testResults.sublist(i, end);
+  }
+}
+
+/// A ResultDB [structured test id][id] (`testIdStructured`).
+///
+/// Using a structured id lets the "Test Results" UI present the test file and
+/// the individual test name as separate columns.
+///
+/// [id]: https://pkg.go.dev/go.chromium.org/luci/resultdb/proto/v1#TestIdentifier
+class LuciStructuredTestId {
+  const LuciStructuredTestId({
+    required this.moduleName,
+    required this.caseName,
+    this.moduleScheme = 'flat',
+    this.moduleVariant = const <String, String>{},
+  });
+
+  /// The module name; for Flutter this is the test file relative to the repo
+  /// root.
+  final String moduleName;
+
+  /// The scheme the module belongs to. `flat` has no intermediate (coarse/fine)
+  /// hierarchy levels.
+  final String moduleScheme;
+
+  /// The module variant definition (empty for Flutter's tests).
+  final Map<String, String> moduleVariant;
+
+  /// The case name; for Flutter this is the individual test name.
+  final String caseName;
+
+  /// The JSON representation used by the ResultDB Recorder API.
+  Map<String, Object?> toJson() => <String, Object?>{
+    'moduleName': moduleName,
+    'moduleScheme': moduleScheme,
+    'moduleVariant': moduleVariant,
+    'caseName': caseName,
+  };
+}
+
+/// A single ResultDB [`TestResult`][result], describing the outcome of one
+/// individual test case.
+///
+/// [result]: https://pkg.go.dev/go.chromium.org/luci/resultdb/proto/v1#TestResult
+class LuciTestResult {
+  const LuciTestResult({
+    required this.testId,
+    required this.resultId,
+    required this.expected,
+    required this.status,
+    required this.duration,
+  });
+
+  /// The structured id identifying the test file and case.
+  final LuciStructuredTestId testId;
+
+  /// An id that is unique within the invocation for a given [testId].
+  final String resultId;
+
+  /// Whether this result is expected (`true`) rather than an unexpected
+  /// regression (`false`).
+  final bool expected;
+
+  /// The ResultDB `TestStatus` enum value (`PASS`, `FAIL`, or `SKIP`).
+  final String status;
+
+  /// The test duration as a proto `Duration` string (for example, `0.100000s`).
+  final String duration;
+
+  /// The JSON representation used by the ResultDB Recorder API.
+  Map<String, Object?> toJson() => <String, Object?>{
+    'testIdStructured': testId.toJson(),
+    'resultId': resultId,
+    'expected': expected,
+    'status': status,
+    'duration': duration,
+  };
+}
+
+/// Converts the parsed [results] into a list of [LuciTestResult]s, one per
+/// (non-hidden) individual test case.
+///
+/// Each result uses a *structured* test id (`testIdStructured`) so the "Test
+/// Results" tab can separate the file from the test name: the module name is the
+/// test file (relative to the repo root) and the case name is the individual
+/// test name. The `flat` scheme is used because it has no intermediate
+/// (coarse/fine) hierarchy levels.
+///
+/// [workingDirectory] is the directory the shard ran `flutter test`/`dart test`
+/// in; it is used to resolve relative suite paths. [rootDirectory], when
+/// provided, is stripped from the front of the (resolved) suite path so that the
+/// module name is reported relative to the repository root (for example,
+/// `packages/flutter/test/foo_test.dart` instead of an absolute path or a bare
+/// `test/foo_test.dart`).
+///
+/// When [expectFailure] is true, the entire `flutter test` invocation was
+/// expected to fail (for example, the `test_smoke_test` negative tests run with
+/// `expectFailure: true`). In that case every reported result is marked as
+/// `expected`, so ResultDB records them as expected failures rather than
+/// surfacing them as red regressions in the "Test Results" tab.
+List<LuciTestResult> convertToLuciTestResultsFormat(
+  TestFileReporterResults results, {
+  bool expectFailure = false,
+  String? workingDirectory,
+  String? rootDirectory,
+}) {
+  var counter = 0;
+  return <LuciTestResult>[
+    for (final testResult in results.testResults.values)
+      if (!testResult.hidden)
+        LuciTestResult(
+          // A structured test id: the module is the test file and the case is the
+          // individual test name, so ResultDB presents them as separate columns.
+          testId: LuciStructuredTestId(
+            moduleName: _sanitizeModuleName(
+              switch (results.allTestSpecs[testResult.suiteID]?.path) {
+                final String path when path.isNotEmpty => _repoRelativeSuitePath(
+                  path,
+                  workingDirectory,
+                  rootDirectory,
+                ),
+                _ => testResult.name,
+              },
+            ),
+            caseName: _sanitizeCaseName(testResult.name),
+          ),
+          // Result ids must be unique within the invocation for a given test id.
+          resultId: '${counter++}',
+          expected: expectFailure || testResult.actual == testResult.expected,
+          status: _sinkStatus(testResult),
+          duration: '${testResult.seconds.toStringAsFixed(6)}s',
+        ),
+  ];
+}
+
+/// Returns [suitePath] as a forward-slash path relative to the repository root.
+///
+/// Suite paths reported by the test runner may be absolute (e.g.
+/// `/b/s/w/.../flutter/dev/foo/bar_test.dart`) or relative to the directory the
+/// shard ran in (e.g. `test/bar_test.dart` for a `packages/flutter` shard).
+/// Relative paths are first resolved against [workingDirectory], then
+/// [rootDirectory] (the repo root) is stripped, so every module name is a
+/// consistent, repo-relative path regardless of where the shard ran.
+String _repoRelativeSuitePath(String suitePath, String? workingDirectory, String? rootDirectory) {
+  var p = suitePath;
+  if (workingDirectory != null && workingDirectory.isNotEmpty && !_isAbsolutePath(p)) {
+    p = '${_stripTrailingSeparators(workingDirectory)}/$p';
+  }
+  // Normalize separators so the id is stable and readable across platforms.
+  p = p.replaceAll(r'\', '/');
+  if (rootDirectory != null && rootDirectory.isNotEmpty) {
+    final root = '${_stripTrailingSeparators(rootDirectory.replaceAll(r'\', '/'))}/';
+    if (p.startsWith(root)) {
+      p = p.substring(root.length);
+    }
+  }
+  return p;
+}
+
+/// Whether [p] is an absolute path on POSIX (`/foo`) or Windows (`C:\foo`,
+/// `C:/foo` or `\foo`).
+bool _isAbsolutePath(String p) => switch (p) {
+  String(isEmpty: true) => false,
+  _ when p.startsWith('/') || p.startsWith(r'\') => true,
+  // Windows drive-letter path, e.g. `C:\...` or `C:/...`.
+  _ => p.length >= 3 && p[1] == ':' && (p[2] == r'\' || p[2] == '/'),
+};
+
+/// Removes any trailing `/` or `\` separators from [p].
+String _stripTrailingSeparators(String p) {
+  int end = p.length;
+  while (end > 0 && (p[end - 1] == '/' || p[end - 1] == r'\')) {
+    end--;
+  }
+  return p.substring(0, end);
+}
+
+/// The maximum length, in bytes, of a structured test id module name.
+const int _kMaxModuleNameBytes = 300;
+
+/// The maximum length, in bytes, of a structured test id case name.
+const int _kMaxCaseNameBytes = 512;
+
+/// Matches ASCII control characters (including newlines and tabs) and DEL.
+final RegExp _controlCharacters = RegExp(r'[\x00-\x1f\x7f]');
+
+/// Makes [moduleName] safe for a ResultDB structured test id.
+///
+/// The module name must be non-empty, printable UTF-8 of at most
+/// [_kMaxModuleNameBytes] bytes. Colons are allowed (they commonly appear in
+/// build target names), so no escaping is required.
+String _sanitizeModuleName(String moduleName) {
+  // Replace control characters (including newlines/tabs) with spaces.
+  final String sanitized = moduleName.replaceAll(_controlCharacters, ' ');
+  return _truncateToBytes(sanitized.isEmpty ? 'unknown' : sanitized, _kMaxModuleNameBytes);
+}
+
+/// Makes [caseName] safe for a ResultDB structured (non-legacy) test id case
+/// name.
+///
+/// Unlike the legacy id format, a non-legacy scheme's case name must:
+///  * escape `\` and `:` with a backslash (`:` denotes hierarchy separators),
+///  * not start with a character in U+0020..U+002C (unless it is `*fixture`),
+///  * be non-empty, printable UTF-8 of at most [_kMaxCaseNameBytes] bytes.
+///
+/// Keeping this robust prevents a single unusual test name from causing the
+/// whole batch of results to be rejected.
+String _sanitizeCaseName(String caseName) {
+  // Replace control characters (including newlines/tabs) with spaces.
+  String sanitized = caseName.replaceAll(_controlCharacters, ' ');
+  // "*fixture" is a reserved value (used for setup/teardown); leave it as-is.
+  if (sanitized != '*fixture') {
+    // Escape backslashes first, then colons (order matters).
+    sanitized = sanitized.replaceAll(r'\', r'\\').replaceAll(':', r'\:');
+  }
+  if (sanitized.isEmpty) {
+    sanitized = 'unnamed test';
+  }
+  // The first character must not be in U+0020..U+002C (space and !"#$%&'()*+,).
+  final int first = sanitized.codeUnitAt(0);
+  if (sanitized != '*fixture' && first >= 0x20 && first <= 0x2c) {
+    sanitized = '_$sanitized';
+  }
+  sanitized = _truncateToBytes(sanitized, _kMaxCaseNameBytes);
+  // Truncation must not leave a dangling (unpaired) trailing backslash, which
+  // would be an invalid escape sequence.
+  return _stripDanglingBackslash(sanitized);
+}
+
+/// Truncates [value] so its UTF-8 encoding is at most [maxBytes] bytes, without
+/// splitting a UTF-16 code unit.
+String _truncateToBytes(String value, int maxBytes) {
+  if (utf8.encode(value).length <= maxBytes) {
+    return value;
+  }
+  // A UTF-8 encoding is always at least as long (in bytes) as the string's
+  // UTF-16 code unit length, so truncating to [maxBytes] code units first keeps
+  // the byte-length loop below to at most [maxBytes] iterations (avoiding O(N^2)
+  // behavior on very long names).
+  if (value.length > maxBytes) {
+    value = value.substring(0, maxBytes);
+  }
+  while (utf8.encode(value).length > maxBytes) {
+    value = value.substring(0, value.length - 1);
+  }
+  return value;
+}
+
+/// Removes a trailing backslash if it would be left unpaired (for example after
+/// truncation), so the value remains a valid escaped string.
+String _stripDanglingBackslash(String value) {
+  var trailing = 0;
+  for (int i = value.length - 1; i >= 0 && value[i] == r'\'; i--) {
+    trailing++;
+  }
+  if (trailing.isOdd) {
+    return value.substring(0, value.length - 1);
+  }
+  return value;
+}
+
+/// Maps a parsed [testResult] to a ResultDB `TestStatus` enum value.
+String _sinkStatus(TestResult testResult) => switch (testResult) {
+  TestResult(skipped: true) => 'SKIP',
+  TestResult(actual: 'PASS') => 'PASS',
+  _ => 'FAIL',
+};
diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
index 1e54419e38689..4231663fe676d 100644
--- a/dev/bots/prepare_package.dart
+++ b/dev/bots/prepare_package.dart
@@ -59,6 +59,13 @@ Future<void> main(List<String> rawArguments) async {
         'successful creation of the archive. Will publish under this '
         'directory: $baseUrl$releaseFolder',
   );
+  argParser.addOption(
+    'target_arch',
+    allowed: TargetArch.values.map<String>((TargetArch arch) => arch.name),
+    help:
+        'The target architecture of the package to create. '
+        'Defaults to the architecture of the host machine running the script.',
+  );
   argParser.addFlag('force', abbr: 'f', help: 'Overwrite a previously uploaded package.');
   argParser.addFlag(
     'dry_run',
@@ -117,6 +124,10 @@ Future<void> main(List<String> rawArguments) async {
 
   final publish = parsedArguments['publish'] as bool;
   final dryRun = parsedArguments['dry_run'] as bool;
+  final targetArchName = parsedArguments['target_arch'] as String?;
+  final TargetArch? targetArch = targetArchName == null
+      ? null
+      : TargetArch.values.byName(targetArchName);
   final Branch branch = Branch.values.byName(parsedArguments['branch'] as String);
   final creator = ArchiveCreator(
     tempDir,
@@ -125,6 +136,7 @@ Future<void> main(List<String> rawArguments) async {
     branch,
     fs: fs,
     strict: publish && !dryRun,
+    targetArch: targetArch,
   );
   var exitCode = 0;
   late String message;
diff --git a/dev/bots/prepare_package/archive_creator.dart b/dev/bots/prepare_package/archive_creator.dart
index 931a9e1237d96..35a9e5f7b05a7 100644
--- a/dev/bots/prepare_package/archive_creator.dart
+++ b/dev/bots/prepare_package/archive_creator.dart
@@ -30,6 +30,9 @@ class ArchiveCreator {
   ///
   /// If subprocessOutput is true, then output from processes invoked during
   /// archive creation is echoed to stderr and stdout.
+  ///
+  /// If [targetArch] is set, the archive is built for that architecture rather
+  /// than the architecture of the host machine.
   factory ArchiveCreator(
     Directory tempDir,
     Directory outputDir,
@@ -41,6 +44,7 @@ class ArchiveCreator {
     ProcessManager? processManager,
     bool strict = true,
     bool subprocessOutput = true,
+    TargetArch? targetArch,
   }) {
     final Directory flutterRoot = fs.directory(path.join(tempDir.path, 'flutter'));
     final processRunner = ProcessRunner(
@@ -48,6 +52,14 @@ class ArchiveCreator {
       subprocessOutput: subprocessOutput,
       platform: platform,
     )..environment['PUB_CACHE'] = path.join(tempDir.path, '.pub-cache');
+    if (targetArch != null) {
+      // This environment is passed to `bin/internal/update_dart_sdk.{sh,ps1}`,
+      // which run before the tool itself and pick the Dart SDK to download.
+      // `flutter` commands below also pick this up, which results in
+      // `OperatingSystemUtils.hostPlatform` being set and used when we select
+      // which engine artifacts to cache.
+      processRunner.environment['FLUTTER_HOST_ARCH'] = targetArch.name;
+    }
     final String flutterExecutable = path.join(flutterRoot.absolute.path, 'bin', 'flutter');
     final String dartExecutable = path.join(
       flutterRoot.absolute.path,
@@ -71,6 +83,7 @@ class ArchiveCreator {
       httpReader: httpReader ?? http.readBytes,
       flutterExecutable: flutterExecutable,
       dartExecutable: dartExecutable,
+      targetArch: targetArch,
     );
   }
 
@@ -87,6 +100,7 @@ class ArchiveCreator {
     required this.revision,
     required this.strict,
     required this.tempDir,
+    this.targetArch,
   }) : assert(revision.length == 40),
        _processRunner = processRunner,
        _flutter = flutterExecutable,
@@ -99,6 +113,21 @@ class ArchiveCreator {
   /// The branch to build the archive for. The branch must contain [revision].
   final Branch branch;
 
+  /// The target host architecture to build the archive for.
+  ///
+  /// This is the host architecture of the Flutter tool inside the archive we
+  /// are building and is used to select the Dart SDK and host engine artifacts
+  /// to be bundled in the archive. For example, if the archive creator is
+  /// running on an arm64 host but producing an SDK to be used by an x64 host,
+  /// this will be x64.
+  ///
+  /// This is passed to the tool via the `FLUTTER_HOST_ARCH` environment
+  /// variable. When null, defaults to the current host architecture.
+  ///
+  /// Warning: The scripts and tool that consume this are the ones in the
+  /// [branch] being packaged, not the ones this script was run from.
+  final TargetArch? targetArch;
+
   /// The git revision hash to build the archive for. This revision has
   /// to be available in the [branch], although it doesn't have to be
   /// at HEAD, since we clone the branch and then reset to this revision
@@ -145,7 +174,8 @@ class ArchiveCreator {
   Future<String> get _archiveName async {
     final String os = platform.operatingSystem.toLowerCase();
     // Include the intended host architecture in the file name for non-x64.
-    final arch = await _dartArch == 'x64' ? '' : '${await _dartArch}_';
+    final String effectiveArch = targetArch?.name ?? await _dartArch;
+    final arch = effectiveArch == 'x64' ? '' : '${effectiveArch}_';
     // We don't use .tar.xz on Mac because although it can unpack them
     // on the command line (with tar), the "Archive Utility" that runs
     // when you double-click on them just does some crazy behavior (it
@@ -240,7 +270,22 @@ class ArchiveCreator {
     final result = json.decode(versionJson) as Map<String, dynamic>;
     result.forEach((String key, dynamic value) => versionMap[key] = value.toString());
     versionMap[frameworkVersionTag] = gitVersion;
-    versionMap[dartTargetArchTag] = await _dartArch;
+
+    // The archive filename is derived from [targetArch], but the arch published
+    // in the release metadata is derived from the Dart SDK that was actually
+    // downloaded.
+    //
+    // Perform a paranoid check to be sure that FLUTTER_HOST_ARCH triggered the
+    // download of the artifacts for [targetArch] and fail loudly if not.
+    final String dartArch = await _dartArch;
+    if (targetArch case final TargetArch arch when arch.name != dartArch) {
+      throw PreparePackageException(
+        'Requested an archive for ${arch.name}, but the Dart SDK in the archive '
+        'is $dartArch. Check that FLUTTER_HOST_ARCH was correctly handled in '
+        'bin/internal/update_dart_sdk.sh and bin/internal/update_dart_sdk.ps1.',
+      );
+    }
+    versionMap[dartTargetArchTag] = dartArch;
     return versionMap;
   }
 
@@ -384,7 +429,14 @@ class ArchiveCreator {
   Future<void> _populateCaches() async {
     await _runFlutter(<String>['doctor']);
     await _runFlutter(<String>['update-packages']);
-    await _runFlutter(<String>['precache']);
+    // `FLUTTER_HOST_ARCH` in the environment has already selected the host
+    // artifacts by this point, so this is a no-op. We pass the flag anyway for
+    // future-proofing and so the architecture is recorded in the logs for
+    // visibility/debugging.
+    await _runFlutter(<String>[
+      'precache',
+      if (targetArch case final TargetArch arch) '--host-arch=${arch.name}',
+    ]);
     await _runFlutter(<String>['ide-config']);
 
     // Create each of the templates, since they will call 'pub get' on
diff --git a/dev/bots/prepare_package/common.dart b/dev/bots/prepare_package/common.dart
index 03e6a6b0cd280..2bc23e4a831cd 100644
--- a/dev/bots/prepare_package/common.dart
+++ b/dev/bots/prepare_package/common.dart
@@ -20,6 +20,13 @@ const String dartTargetArchTag = 'dartTargetArch';
 
 enum Branch { beta, stable, master, main }
 
+/// The CPU architecture a Flutter SDK archive is built for.
+///
+/// This is the architecture of the machine the packaged SDK will run on, which
+/// is not necessarily the architecture of the machine building the package: on
+/// CI we cross-package x64 archives on arm64 macOS hosts.
+enum TargetArch { x64, arm64 }
+
 /// Exception class for when a process fails to run, so we can catch
 /// it and provide something more readable than a stack trace.
 final class PreparePackageException implements Exception {
diff --git a/dev/bots/suite_runners/run_android_hardware_smoke_tests.dart b/dev/bots/suite_runners/run_android_hardware_smoke_tests.dart
index b667dc6845e73..80c2a2e6cf70e 100644
--- a/dev/bots/suite_runners/run_android_hardware_smoke_tests.dart
+++ b/dev/bots/suite_runners/run_android_hardware_smoke_tests.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:io' show Platform;
+import 'dart:io' as io;
 
 import 'package:file/file.dart';
 import 'package:file/local.dart';
@@ -36,13 +36,7 @@ Future<void> runAndroidHardwareSmokeTests({
 
   final String testDir = path.join('dev', 'integration_tests', 'android_hardware_smoke_test');
 
-  // Regenerate standard Android Gradle wrappers
-  await runCommand('flutter', <String>[
-    'create',
-    '--platform=android',
-    '--no-overwrite',
-    '.',
-  ], workingDirectory: testDir);
+  await _regenerateAndroidWrappers(testDir);
 
   final String androidDir = path.join(testDir, 'android');
   final File androidManifestXml = const LocalFileSystem().file(
@@ -55,35 +49,20 @@ Future<void> runAndroidHardwareSmokeTests({
   );
 
   try {
-    // Replace whatever the current backend is with the specified backend.
-    final impellerBackendMetadata = RegExp(_impellerBackendMetadata(value: '[^"]*'));
-    if (!impellerBackendMetadata.hasMatch(androidManifestContents)) {
-      throw StateError(
-        'Could not find io.flutter.embedding.android.ImpellerBackend meta-data tag inside AndroidManifest.xml',
-      );
-    }
-    androidManifestXml.writeAsStringSync(
-      androidManifestContents.replaceFirst(
-        impellerBackendMetadata,
-        _impellerBackendMetadata(value: backend.name),
-      ),
-    );
+    _setAndroidManifestBackend(androidManifestXml, androidManifestContents, backend);
 
-    // 1. Run driver tests to generate reference screenshots
-    await runCommand('flutter', <String>[
-      'drive',
-      '--driver=test_driver/driver_test.dart',
-      '--target=integration_test/integration_test_wrapper.dart',
-      '--no-dds',
-      '--no-enable-dart-profiling',
-    ], workingDirectory: testDir);
+    // 1. Run driver tests to generate reference screenshots (with retry loop)
+    final bool success = await _runRetryLoop(testDir);
+    if (!success) {
+      return;
+    }
 
     if (runInstrumented) {
       final String gradle = path.absolute(
-        path.join(androidDir, Platform.isWindows ? 'gradlew.bat' : 'gradlew'),
+        path.join(androidDir, io.Platform.isWindows ? 'gradlew.bat' : 'gradlew'),
       );
 
-      // 3. Build and run the instrumented tests.
+      // 2. Build and run the instrumented tests.
       await runCommand(gradle, <String>[
         ':app:connectedDebugAndroidTest',
         '-Pandroid.testInstrumentationRunnerArguments.class=com.example.android_hardware_smoke_test.FlutterActivityTest',
@@ -98,3 +77,91 @@ Future<void> runAndroidHardwareSmokeTests({
     _cleanGoldensDirectory(destinationDir);
   }
 }
+
+Future<void> _regenerateAndroidWrappers(String testDir) async {
+  await runCommand('flutter', <String>[
+    'create',
+    '--platform=android',
+    '--no-overwrite',
+    '.',
+  ], workingDirectory: testDir);
+}
+
+void _setAndroidManifestBackend(File file, String contents, ImpellerBackend backend) {
+  final impellerBackendMetadata = RegExp(_impellerBackendMetadata(value: '[^"]*'));
+  if (!impellerBackendMetadata.hasMatch(contents)) {
+    throw StateError(
+      'Could not find io.flutter.embedding.android.ImpellerBackend meta-data tag inside AndroidManifest.xml',
+    );
+  }
+  file.writeAsStringSync(
+    contents.replaceFirst(impellerBackendMetadata, _impellerBackendMetadata(value: backend.name)),
+  );
+}
+
+Future<bool> _runRetryLoop(String testDir) async {
+  const maxAttempts = 3;
+  var exitCode = 0;
+
+  for (var attempt = 1; attempt <= maxAttempts; attempt++) {
+    // Clear logcat buffer before running
+    await runCommand('adb', <String>['logcat', '-c']);
+
+    final driveArgs = <String>[
+      'drive',
+      '--driver=test_driver/driver_test.dart',
+      '--target=integration_test/integration_test_wrapper.dart',
+      '--no-dds',
+      '--no-enable-dart-profiling',
+    ];
+
+    if (attempt > 1) {
+      driveArgs.add('--no-build');
+    }
+
+    final Command command = await startCommand('flutter', driveArgs, workingDirectory: testDir);
+    exitCode = await command.process.exitCode;
+    if (exitCode == 0) {
+      return true;
+    }
+
+    io.stderr.writeln(
+      'flutter drive failed with exit code $exitCode on attempt $attempt/$maxAttempts.',
+    );
+
+    // Inspect the process logcat on failure to detect if a transient EGL/graphics context
+    // negotiation error occurred during startup, enabling a safe activity/process level retry.
+    final bool hasEglWarning = await _checkForTransientEglFailure();
+    if (!hasEglWarning) {
+      // Non-retryable error: exit immediately and log specific failure
+      foundError(<String>[
+        'Android Hardware Smoke Tests driver run failed with exit code $exitCode and no transient EGL warning was found in logcat.',
+      ]);
+      return false;
+    }
+
+    // Retryable EGL warning: log progress and continue if attempts remain
+    if (attempt < maxAttempts) {
+      io.stderr.writeln(
+        'attempt $attempt of $maxAttempts: detected retryable EGL initialization warning. Retrying...',
+      );
+    }
+  }
+
+  // Loop finished: exhausted all attempts
+  foundError(<String>[
+    'Android Hardware Smoke Tests driver run failed to initialize EGL after $maxAttempts attempts.',
+  ]);
+  return false;
+}
+
+Future<bool> _checkForTransientEglFailure() async {
+  try {
+    final String logcatOutput = await runAndGetStdout('adb', <String>['logcat', '-d']).join('\n');
+    return logcatOutput.contains('Failed to choose config with EGL_SWAP_BEHAVIOR_PRESERVED') ||
+        logcatOutput.contains('Failed to initialize 101010-2 format');
+  } catch (e) {
+    io.stderr.writeln('Warning: Failed to check logcat for EGL failure: $e');
+    return false;
+  }
+}
diff --git a/dev/bots/suite_runners/run_framework_tests.dart b/dev/bots/suite_runners/run_framework_tests.dart
index 0b32d1ac18e5e..4376a2c37a79c 100644
--- a/dev/bots/suite_runners/run_framework_tests.dart
+++ b/dev/bots/suite_runners/run_framework_tests.dart
@@ -87,10 +87,13 @@ Future<void> frameworkTestsRunner() async {
     ], workingDirectory: flutterRoot);
     await runCommand(dart, <String>[
       path.join(flutterRoot, 'dev', 'tools', 'examples_smoke_test.dart'),
-    ], workingDirectory: path.join(flutterRoot, 'examples', 'api'));
-    for (final FileSystemEntity entity in Directory(
-      path.join(flutterRoot, 'examples'),
-    ).listSync()) {
+    ], workingDirectory: path.join(flutterRoot, 'packages', 'flutter', 'examples', 'api'));
+    final List<FileSystemEntity> allExamplesDir = [
+      ...Directory(path.join(flutterRoot, 'examples')).listSync(),
+      ...Directory(path.join(flutterRoot, 'packages', 'flutter', 'examples')).listSync(),
+    ];
+
+    for (final entity in allExamplesDir) {
       if (entity is! Directory || !Directory(path.join(entity.path, 'test')).existsSync()) {
         continue;
       }
@@ -298,6 +301,7 @@ Future<void> frameworkTestsRunner() async {
       path.join(flutterRoot, 'dev', 'integration_tests', 'android_semantics_testing'),
       fatalWarnings: false,
     );
+    await runDartTest(path.join(flutterRoot, 'dev', 'flutter_analyzer_plugin'));
     await runFlutterTest(path.join(flutterRoot, 'dev', 'integration_tests', 'ui'));
     await runFlutterTest(path.join(flutterRoot, 'dev', 'manual_tests'));
     await runFlutterTest(path.join(flutterRoot, 'dev', 'tools'));
diff --git a/dev/bots/suite_runners/run_web_tests.dart b/dev/bots/suite_runners/run_web_tests.dart
index 5551e97b51d56..68ee994e501b5 100644
--- a/dev/bots/suite_runners/run_web_tests.dart
+++ b/dev/bots/suite_runners/run_web_tests.dart
@@ -250,7 +250,7 @@ class WebTestsSuite {
   }
 
   Future<void> runWebSkwasmUnitTests() {
-    return _runWebUnitTests(useWasm: true, webShardCount: 8);
+    return _runWebUnitTests(useWasm: true, webShardCount: 2);
   }
 
   /// Runs one of the `dev/integration_tests/web_e2e_tests` tests.
@@ -590,7 +590,7 @@ class WebTestsSuite {
     //
     // We make sure the last shard ends in _last so it's easier to catch mismatches
     // between `.ci.yaml` and `test.dart`.
-    subshards['${webShardCount - 1}_last'] = () async {
+    Future<void> lastShardRunner() async {
       await _runFlutterWebTest(
         flutterPackageDirectory.path,
         allTests.sublist((webShardCount - 1) * testsPerShard, allTests.length),
@@ -602,7 +602,10 @@ class WebTestsSuite {
       await _runFlutterWebTest(path.join(flutterRoot, 'packages', 'flutter_driver'), <String>[
         path.join('test', 'src', 'web_tests', 'web_extension_test.dart'),
       ], useWasm);
-    };
+    }
+
+    subshards['${webShardCount - 1}'] = lastShardRunner;
+    subshards['${webShardCount - 1}_last'] = lastShardRunner;
 
     await selectSubshard(subshards);
   }
diff --git a/dev/bots/test/analyze-test-input/ktlint-baseline.xml b/dev/bots/test/analyze-test-input/ktlint-baseline.xml
index da312850b537a..d9fd2a0b8503b 100644
--- a/dev/bots/test/analyze-test-input/ktlint-baseline.xml
+++ b/dev/bots/test/analyze-test-input/ktlint-baseline.xml
@@ -33,7 +33,7 @@
     <file name="dev/tracing_tests/android/app/src/main/kotlin/com/example/tracing_tests/MainActivity.kt">
         <error line="1" column="9" source="standard:package-name" />
     </file>
-    <file name="examples/api/android/app/src/main/kotlin/dev/flutter/flutter_api_samples/MainActivity.kt">
+    <file name="packages/flutter/examples/api/android/app/src/main/kotlin/dev/flutter/flutter_api_samples/MainActivity.kt">
         <error line="1" column="9" source="standard:package-name" />
     </file>
 </baseline>
diff --git a/dev/bots/test/analyze-test-input/root/packages/flutter/lib/renderbox_intrinsics.dart b/dev/bots/test/analyze-test-input/root/packages/flutter/lib/renderbox_intrinsics.dart
index 4342be20da6d8..23e7330fb9fdb 100644
--- a/dev/bots/test/analyze-test-input/root/packages/flutter/lib/renderbox_intrinsics.dart
+++ b/dev/bots/test/analyze-test-input/root/packages/flutter/lib/renderbox_intrinsics.dart
@@ -2,7 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../foo/fake_render_box.dart';
+abstract class RenderBox {
+  void computeDryBaseline() {}
+  void computeDryLayout() {}
+  void computeDistanceToActualBaseline() {}
+  void computeMaxIntrinsicHeight() {}
+  void computeMinIntrinsicHeight() {}
+  void computeMaxIntrinsicWidth() {}
+  void computeMinIntrinsicWidth() {}
+}
 
 mixin ARenderBoxMixin on RenderBox {
   @override
diff --git a/dev/bots/test/analyze-test-input/root/packages/foo/bad_repository_links.dart b/dev/bots/test/analyze-test-input/root/packages/foo/bad_repository_links.dart
deleted file mode 100644
index 38417c1831201..0000000000000
--- a/dev/bots/test/analyze-test-input/root/packages/foo/bad_repository_links.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Check out https://android.googlesource.com/+/master/file1
-// Check out https://chromium.googlesource.com/+/master/file1
-// Check out https://cs.opensource.google.com/+/master/file1
-// Check out https://dart.googlesource.com/+/master/file1
-// Check out https://flutter.googlesource.com/+/master/file1
-// Check out https://source.chromium.org/+/master/file1
-// Check out https://github.com/flutter/flutter/tree/master/file1
-// Check out https://raw.githubusercontent.com/flutter/flutter/blob/master/file1
diff --git a/dev/bots/test/analyze-test-input/root/packages/foo/fake_render_box.dart b/dev/bots/test/analyze-test-input/root/packages/foo/fake_render_box.dart
deleted file mode 100644
index 1ed5cc8ea31e9..0000000000000
--- a/dev/bots/test/analyze-test-input/root/packages/foo/fake_render_box.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-abstract class RenderBox {
-  void computeDryBaseline() {}
-  void computeDryLayout() {}
-  void computeDistanceToActualBaseline() {}
-  void computeMaxIntrinsicHeight() {}
-  void computeMinIntrinsicHeight() {}
-  void computeMaxIntrinsicWidth() {}
-  void computeMinIntrinsicWidth() {}
-}
diff --git a/dev/bots/test/analyze_test.dart b/dev/bots/test/analyze_test.dart
index 3b577d34d0c63..20438f022f4b0 100644
--- a/dev/bots/test/analyze_test.dart
+++ b/dev/bots/test/analyze_test.dart
@@ -7,10 +7,6 @@ import 'dart:io';
 import 'package:path/path.dart' as path;
 
 import '../analyze.dart';
-import '../custom_rules/analyze.dart';
-import '../custom_rules/no_double_clamp.dart';
-import '../custom_rules/no_stop_watches.dart';
-import '../custom_rules/render_box_intrinsics.dart';
 import '../utils.dart';
 import 'common.dart';
 
@@ -67,57 +63,6 @@ void main() {
     expect(result, matchesErrorsInFile(fixture, endsWith: <String>['', 'Error summary']));
   });
 
-  test('analyze.dart - verifyDeprecations', () async {
-    final String result = await capture(
-      () => verifyDeprecations(testRootPath, minimumMatches: 2),
-      shouldHaveErrors: true,
-    );
-    final fixture = File(path.join(testRootPath, 'packages', 'foo', 'deprecation.dart'));
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          'See: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes',
-        ],
-      ),
-    );
-  });
-
-  test('analyze.dart - verifyGoldenTags', () async {
-    final List<String> result = (await capture(
-      () => verifyGoldenTags(testRootPath, minimumMatches: 6),
-      shouldHaveErrors: true,
-    )).split('\n');
-    const noTag =
-        "Files containing golden tests must be tagged using @Tags(<String>['reduced-test-set']) "
-        'at the top of the file before import statements.';
-    const missingTag = "Files containing golden tests must be tagged with 'reduced-test-set'.";
-    final List<String> lines = <String>[
-      '║ test/analyze-test-input/root/packages/foo/golden_missing_tag.dart: $missingTag',
-      '║ test/analyze-test-input/root/packages/foo/golden_no_tag.dart: $noTag',
-    ].map((String line) => line.replaceAll('/', Platform.isWindows ? r'\' : '/')).toList();
-    expect(
-      result.length,
-      4 + lines.length,
-      reason: 'output had unexpected number of lines:\n${result.join('\n')}',
-    );
-    expect(
-      result[0],
-      '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════',
-    );
-    expect(result.getRange(1, result.length - 3).toSet(), lines.toSet());
-    expect(
-      result[result.length - 3],
-      '║ See: https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Writing-a-golden-file-test-for-package-flutter.md',
-    );
-    expect(
-      result[result.length - 2],
-      '╚═══════════════════════════════════════════════════════════════════════════════',
-    );
-    expect(result[result.length - 1], ''); // trailing newline
-  });
-
   test('analyze.dart - verifyNoMissingLicense', () async {
     final String result = await capture(
       () => verifyNoMissingLicense(testRootPath, checkMinimums: false),
@@ -158,34 +103,6 @@ void main() {
     );
   });
 
-  test('analyze.dart - verifyRepositoryLinks', () async {
-    final String result = await capture(
-      () => verifyRepositoryLinks(testRootPath),
-      shouldHaveErrors: true,
-    );
-    const bannedBranch = 'master';
-    final file = Platform.isWindows
-        ? r'test\analyze-test-input\root\packages\foo\bad_repository_links.dart'
-        : 'test/analyze-test-input/root/packages/foo/bad_repository_links.dart';
-    final String lines = <String>[
-      '║ $file contains https://android.googlesource.com/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://chromium.googlesource.com/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://cs.opensource.google.com/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://dart.googlesource.com/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://flutter.googlesource.com/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://source.chromium.org/+/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://github.com/flutter/flutter/tree/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ $file contains https://raw.githubusercontent.com/flutter/flutter/blob/$bannedBranch/file1, which uses the banned "master" branch.',
-      '║ Change the URLs above to the expected pattern by using the "main" branch if it exists, otherwise adding the repository to the list of exceptions in analyze.dart.',
-    ].join('\n');
-    expect(
-      result,
-      '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════\n'
-      '$lines\n'
-      '╚═══════════════════════════════════════════════════════════════════════════════\n',
-    );
-  });
-
   test('analyze.dart - verifyNoBinaries - positive', () async {
     final String result = await capture(
       () => verifyNoBinaries(
@@ -263,139 +180,31 @@ void main() {
     );
   });
 
-  test('analyze.dart - verifyNullInitializedDebugExpensiveFields', () async {
-    final String result = await capture(
-      () => verifyNullInitializedDebugExpensiveFields(testRootPath, minimumMatches: 1),
-      shouldHaveErrors: true,
-    );
-
-    final fixture = File(path.join(testRootPath, 'packages', 'flutter', 'lib', 'bar.dart'));
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          '',
-          'Fields annotated with @_debugOnly must null initialize,',
-          'to ensure both the field and initializer are removed from profile/release mode.',
-          'These fields should be written as:',
-          'field = kDebugMode ? <DebugValue> : null;',
-        ],
-      ),
-    );
-  });
-
-  test('analyze.dart - verifyTabooDocumentation', () async {
-    final String result = await capture(
-      () => verifyTabooDocumentation(testRootPath, minimumMatches: 1),
-      shouldHaveErrors: true,
-    );
-
-    final fixture = File(path.join(testRootPath, 'packages', 'flutter', 'lib', 'taboo_words.dart'));
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          '',
-          'Avoid the word "simply" in documentation. See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#use-the-passive-voice-recommend-do-not-require-never-say-things-are-simple for details.',
-          'In many cases these words can be omitted without loss of generality; in other cases it may require a bit of rewording to avoid implying that the task is simple.',
-          'Similarly, avoid using "note:" or the phrase "note that". See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-empty-prose for details.',
-        ],
-      ),
-    );
-  });
-
-  test('analyze.dart - clampDouble', () async {
-    final String result = await capture(
-      () => analyzeWithRules(
-        testRootPath,
-        <AnalyzeRule>[noDoubleClamp],
-        includePaths: <String>['packages/flutter/lib'],
-      ),
-      shouldHaveErrors: true,
-    );
-
-    final fixture = File(
-      path.join(testRootPath, 'packages', 'flutter', 'lib', 'double_clamp.dart'),
-    );
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          '', // empty line before the last sentence.
-          'For performance reasons, we use a custom "clampDouble" function instead of using "double.clamp".',
-        ],
-      ),
-    );
-  });
-
-  test('analyze.dart - stopwatch', () async {
-    final String result = await capture(
-      () => analyzeWithRules(
-        testRootPath,
-        <AnalyzeRule>[noStopwatches],
-        includePaths: <String>['packages/flutter/lib'],
-      ),
-      shouldHaveErrors: true,
-    );
-
-    final fixture = File(path.join(testRootPath, 'packages', 'flutter', 'lib', 'stopwatch.dart'));
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          '',
-          'Stopwatches introduce flakes by falling out of sync with the FakeAsync used in testing.',
-          'A Stopwatch that stays in sync with FakeAsync is available through the Gesture or Test bindings, through samplingClock.',
-        ],
-      ),
-    );
-  });
-
-  test('analyze.dart - RenderBox intrinsics', () async {
-    final String result = await capture(
-      () => analyzeWithRules(
-        testRootPath,
-        <AnalyzeRule>[renderBoxIntrinsicCalculation],
-        includePaths: <String>['packages/flutter/lib'],
-      ),
-      shouldHaveErrors: true,
-    );
-    final fixture = File(
-      path.join(testRootPath, 'packages', 'flutter', 'lib', 'renderbox_intrinsics.dart'),
-    );
-    expect(
-      result,
-      matchesErrorsInFile(
-        fixture,
-        endsWith: <String>[
-          '',
-          'Typically the get* methods should be used to obtain the intrinsics of a RenderBox.',
-        ],
-      ),
-    );
-  });
-
   test('analyze.dart - verifyMaterialFilesAreUpToDateWithTemplateFiles', () async {
-    String result = await capture(
-      () => verifyMaterialFilesAreUpToDateWithTemplateFiles(testGenDefaultsPath, dartPath),
-      shouldHaveErrors: true,
-    );
-    final String lines = <String>[
-      '║ chip.dart is not up-to-date with the token template file.',
-    ].map((String line) => line.replaceAll('/', Platform.isWindows ? r'\' : '/')).join('\n');
-    const errorStart = '╔═';
-    result = result.substring(result.indexOf(errorStart));
-    expect(
-      result,
-      '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════\n'
-      '$lines\n'
-      '║ See: https://github.com/flutter/flutter/blob/main/dev/tools/gen_defaults to update the token template files.\n'
-      '╚═══════════════════════════════════════════════════════════════════════════════\n',
-    );
+    final chipFile = File(
+      path.join(testGenDefaultsPath, 'packages', 'flutter', 'lib', 'src', 'material', 'chip.dart'),
+    );
+    final String originalContent = chipFile.readAsStringSync();
+    try {
+      String result = await capture(
+        () => verifyMaterialFilesAreUpToDateWithTemplateFiles(testGenDefaultsPath, dartPath),
+        shouldHaveErrors: true,
+      );
+      final String lines = <String>[
+        '║ chip.dart is not up-to-date with the token template file.',
+      ].map((String line) => line.replaceAll('/', Platform.isWindows ? r'\' : '/')).join('\n');
+      const errorStart = '╔═';
+      result = result.substring(result.indexOf(errorStart));
+      expect(
+        result,
+        '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════\n'
+        '$lines\n'
+        '║ See: https://github.com/flutter/flutter/blob/main/dev/tools/gen_defaults to update the token template files.\n'
+        '╚═══════════════════════════════════════════════════════════════════════════════\n',
+      );
+    } finally {
+      chipFile.writeAsStringSync(originalContent);
+    }
   });
 
   test('analyze.dart - help flag', () async {
diff --git a/dev/bots/test/check_code_samples_test.dart b/dev/bots/test/check_code_samples_test.dart
index 0a78cd47e7b4d..8de914b0b3286 100644
--- a/dev/bots/test/check_code_samples_test.dart
+++ b/dev/bots/test/check_code_samples_test.dart
@@ -20,13 +20,16 @@ void main() {
   late Directory dartUIPath;
   late Directory flutterRoot;
 
+  Directory exampleBase() => examples.parent.parent;
+
   String getRelativePath(File file, [Directory? from]) {
     from ??= flutterRoot;
-    return path.relative(file.absolute.path, from: flutterRoot.absolute.path);
+    return path.relative(file.absolute.path, from: from.absolute.path);
   }
 
   void writeLink({required File source, required File example, String? alternateLink}) {
-    final String link = alternateLink ?? ' ** See code in ${getRelativePath(example)} **';
+    final String relativePath = getRelativePath(example, exampleBase());
+    final String link = alternateLink ?? ' ** See code in $relativePath **';
     source
       ..createSync(recursive: true)
       ..writeAsStringSync('''
@@ -45,8 +48,14 @@ void main() {
     bool missingTests = false,
     bool malformedLinks = false,
   }) {
-    final Directory examplesLib = examples.childDirectory('lib').childDirectory('layer')
-      ..createSync(recursive: true);
+    final Directory examplesLib =
+        packages
+            .childDirectory('flutter')
+            .childDirectory('examples')
+            .childDirectory('api')
+            .childDirectory('lib')
+            .childDirectory('layer')
+          ..createSync(recursive: true);
     final File fooExample = examplesLib.childFile('foo_example.0.dart')
       ..createSync(recursive: true)
       ..writeAsStringSync('// Example for foo');
@@ -58,8 +67,14 @@ void main() {
         ..createSync(recursive: true)
         ..writeAsStringSync('// Example that is not linked');
     }
-    final Directory examplesTests = examples.childDirectory('test').childDirectory('layer')
-      ..createSync(recursive: true);
+    final Directory examplesTests =
+        packages
+            .childDirectory('flutter')
+            .childDirectory('examples')
+            .childDirectory('api')
+            .childDirectory('test')
+            .childDirectory('layer')
+          ..createSync(recursive: true);
     examplesTests.childFile('foo_example.0_test.dart')
       ..createSync(recursive: true)
       ..writeAsStringSync('// test for foo example');
@@ -109,8 +124,13 @@ void main() {
       path.join(path.rootPrefix(fs.currentDirectory.absolute.path), 'flutter sdk'),
     )..createSync(recursive: true);
     fs.currentDirectory = flutterRoot;
-    examples = flutterRoot.childDirectory('examples').childDirectory('api')
-      ..createSync(recursive: true);
+    examples =
+        flutterRoot
+            .childDirectory('packages')
+            .childDirectory('flutter')
+            .childDirectory('examples')
+            .childDirectory('api')
+          ..createSync(recursive: true);
     packages = flutterRoot.childDirectory('packages')..createSync(recursive: true);
     dartUIPath =
         flutterRoot
@@ -194,7 +214,7 @@ void main() {
         <String>[
               '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════',
               '║ The following example test files are missing:',
-              '║   examples/api/test/layer/bar_example.0_test.dart',
+              '║   packages/flutter/examples/api/test/layer/bar_example.0_test.dart',
               '╚═══════════════════════════════════════════════════════════════════════════════',
             ]
             .map((String line) {
diff --git a/dev/bots/test/check_examples_cross_imports_test.dart b/dev/bots/test/check_examples_cross_imports_test.dart
index 809cd6b4be40d..3e2620658f203 100644
--- a/dev/bots/test/check_examples_cross_imports_test.dart
+++ b/dev/bots/test/check_examples_cross_imports_test.dart
@@ -13,8 +13,11 @@ import '../cross_imports_checker_utils.dart';
 import 'common.dart';
 import 'cross_imports_checker_test_utils.dart';
 
-// A pattern that matches `examples/api/lib/**` and `examples/api/test/**`, for use in tests.
-final _kExamplesSlashApiLibraryPattern = RegExp(r'^examples/api/(lib|test)/[a-z_]+');
+// A pattern that matches `packages/flutter/examples/api/lib/**` and
+// `packages/flutter/examples/api/test/**`, for use in tests.
+final _kExamplesSlashApiLibraryPattern = RegExp(
+  r'^packages/flutter/examples/api/(lib|test)/[a-z_]+',
+);
 
 void main() {
   late ExamplesCrossImportChecker checker;
@@ -58,9 +61,17 @@ void main() {
     fs.currentDirectory = flutterRoot;
 
     final Directory examplesDirectory = flutterRoot.childDirectory('examples')..createSync();
+    final Directory apiDocDirectory =
+        flutterRoot
+            .childDirectory('packages')
+            .childDirectory('flutter')
+            .childDirectory('examples')
+            .childDirectory('api')
+          ..createSync(recursive: true);
 
     checker = ExamplesCrossImportChecker(
       examplesDirectory: examplesDirectory,
+      apiDocDirectory: apiDocDirectory,
       flutterRoot: flutterRoot,
       filesystem: fs,
     );
@@ -125,8 +136,7 @@ void main() {
   });
 
   test('examples/api/lib/sample_templates templates produce no violations when valid', () async {
-    final Directory sampleTemplatesDirectory = checker.examplesDirectory
-        .childDirectory('api')
+    final Directory sampleTemplatesDirectory = checker.apiDocDirectory
         .childDirectory('lib')
         .childDirectory('sample_templates');
 
@@ -152,8 +162,7 @@ void main() {
   });
 
   test('examples/api/lib/sample_templates templates produce violations when invalid', () async {
-    final Directory sampleTemplatesDirectory = checker.examplesDirectory
-        .childDirectory('api')
+    final Directory sampleTemplatesDirectory = checker.apiDocDirectory
         .childDirectory('lib')
         .childDirectory('sample_templates');
 
@@ -175,16 +184,16 @@ void main() {
 
     final String lines = <String>[
       '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/lib/sample_templates has a disallowed import of Material. Refactor it or move it to the Material examples.',
-      '║   examples/api/lib/sample_templates/cupertino.0.dart',
+      '║ The following file in packages/flutter/examples/api/lib/sample_templates has a disallowed import of Material. Refactor it or move it to the Material examples.',
+      '║   packages/flutter/examples/api/lib/sample_templates/cupertino.0.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
       '╔═╡ERROR #2╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/lib/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
-      '║   examples/api/lib/sample_templates/material.0.dart',
+      '║ The following file in packages/flutter/examples/api/lib/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
+      '║   packages/flutter/examples/api/lib/sample_templates/material.0.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
       '╔═╡ERROR #3╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/lib/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
-      '║   examples/api/lib/sample_templates/widgets.0.dart',
+      '║ The following file in packages/flutter/examples/api/lib/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
+      '║   packages/flutter/examples/api/lib/sample_templates/widgets.0.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
     ].join('\n');
     expect(result, equals('$lines\n'));
@@ -192,8 +201,7 @@ void main() {
   });
 
   test('examples/api/test/sample_templates templates produce no violations when valid', () async {
-    final Directory sampleTemplatesDirectory = checker.examplesDirectory
-        .childDirectory('api')
+    final Directory sampleTemplatesDirectory = checker.apiDocDirectory
         .childDirectory('test')
         .childDirectory('sample_templates');
 
@@ -219,8 +227,7 @@ void main() {
   });
 
   test('examples/api/test/sample_templates templates produce violations when invalid', () async {
-    final Directory sampleTemplatesDirectory = checker.examplesDirectory
-        .childDirectory('api')
+    final Directory sampleTemplatesDirectory = checker.apiDocDirectory
         .childDirectory('test')
         .childDirectory('sample_templates');
 
@@ -242,16 +249,16 @@ void main() {
 
     final String lines = <String>[
       '╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/test/sample_templates has a disallowed import of Material. Refactor it or move it to the Material examples.',
-      '║   examples/api/test/sample_templates/cupertino.0_test.dart',
+      '║ The following file in packages/flutter/examples/api/test/sample_templates has a disallowed import of Material. Refactor it or move it to the Material examples.',
+      '║   packages/flutter/examples/api/test/sample_templates/cupertino.0_test.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
       '╔═╡ERROR #2╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/test/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
-      '║   examples/api/test/sample_templates/material.0_test.dart',
+      '║ The following file in packages/flutter/examples/api/test/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
+      '║   packages/flutter/examples/api/test/sample_templates/material.0_test.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
       '╔═╡ERROR #3╞════════════════════════════════════════════════════════════════════',
-      '║ The following file in examples/api/test/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
-      '║   examples/api/test/sample_templates/widgets.0_test.dart',
+      '║ The following file in packages/flutter/examples/api/test/sample_templates has a disallowed import of Cupertino. Refactor it or move it to the Cupertino examples.',
+      '║   packages/flutter/examples/api/test/sample_templates/widgets.0_test.dart',
       '╚═══════════════════════════════════════════════════════════════════════════════',
     ].join('\n');
     expect(result, equals('$lines\n'));
@@ -802,8 +809,8 @@ void main() {
 
     buildKnownCrossImportExamplesFiles();
 
-    const examplesApiMaterialLibraryName = 'examples/api/lib/material';
-    const examplesApiMaterialTestLibraryName = 'examples/api/test/material';
+    const examplesApiMaterialLibraryName = 'packages/flutter/examples/api/lib/material';
+    const examplesApiMaterialTestLibraryName = 'packages/flutter/examples/api/test/material';
     const LibraryCrossImportStatementType importStatement = .cupertino;
 
     final Directory examplesMaterialLibFilesDirectory = getDirectoryForExamplesSlashApiLibrary(
@@ -817,13 +824,19 @@ void main() {
     );
 
     writeImportInFiles(
-      {'examples/api/lib/material/qux.dart', 'examples/api/lib/material/baz/foo.dart'},
+      {
+        'packages/flutter/examples/api/lib/material/qux.dart',
+        'packages/flutter/examples/api/lib/material/baz/foo.dart',
+      },
       inDirectory: examplesMaterialLibFilesDirectory,
       importString: importStatement.importString,
     );
 
     writeImportInFiles(
-      {'examples/api/test/material/qux_test.dart', 'examples/api/test/material/baz/foo_test.dart'},
+      {
+        'packages/flutter/examples/api/test/material/qux_test.dart',
+        'packages/flutter/examples/api/test/material/baz/foo_test.dart',
+      },
       inDirectory: examplesMaterialTestFilesDirectory,
       importString: importStatement.importString,
     );
@@ -844,8 +857,8 @@ void main() {
 
     buildKnownCrossImportExamplesFiles();
 
-    const examplesApiCupertinoLibraryName = 'examples/api/lib/cupertino';
-    const examplesApiCupertinoTestLibraryName = 'examples/api/test/cupertino';
+    const examplesApiCupertinoLibraryName = 'packages/flutter/examples/api/lib/cupertino';
+    const examplesApiCupertinoTestLibraryName = 'packages/flutter/examples/api/test/cupertino';
     const LibraryCrossImportStatementType importStatement = .material;
 
     final Directory examplesCupertinoLibFilesDirectory = getDirectoryForExamplesSlashApiLibrary(
@@ -859,15 +872,18 @@ void main() {
     );
 
     writeImportInFiles(
-      {'examples/api/lib/cupertino/qux.dart', 'examples/api/lib/cupertino/baz/foo.dart'},
+      {
+        'packages/flutter/examples/api/lib/cupertino/qux.dart',
+        'packages/flutter/examples/api/lib/cupertino/baz/foo.dart',
+      },
       inDirectory: examplesCupertinoLibFilesDirectory,
       importString: importStatement.importString,
     );
 
     writeImportInFiles(
       {
-        'examples/api/test/cupertino/qux_test.dart',
-        'examples/api/test/cupertino/baz/foo_test.dart',
+        'packages/flutter/examples/api/test/cupertino/qux_test.dart',
+        'packages/flutter/examples/api/test/cupertino/baz/foo_test.dart',
       },
       inDirectory: examplesCupertinoTestFilesDirectory,
       importString: importStatement.importString,
@@ -891,13 +907,13 @@ void main() {
 /// Returns [LibraryCrossImportStatementType.material] for any other library,
 /// such as `examples/layers/rendering/spinning_square.dart`.
 LibraryCrossImportStatementType getCrossImportStatementForExamplesLibraryFile(String filePath) {
-  if (filePath.startsWith('examples/api/lib/material/') ||
-      filePath.startsWith('examples/api/test/material/')) {
+  if (filePath.startsWith('packages/flutter/examples/api/lib/material/') ||
+      filePath.startsWith('packages/flutter/examples/api/test/material/')) {
     return LibraryCrossImportStatementType.cupertino;
   }
 
-  if (filePath.startsWith('examples/api/lib/cupertino/') ||
-      filePath.startsWith('examples/api/test/cupertino/')) {
+  if (filePath.startsWith('packages/flutter/examples/api/lib/cupertino/') ||
+      filePath.startsWith('packages/flutter/examples/api/test/cupertino/')) {
     return LibraryCrossImportStatementType.material;
   }
 
@@ -941,19 +957,20 @@ bool hasNoKnownCrossImports(String libraryName) {
 
 /// Returns whether the given [libraryName] matches the Material examples under `examples/api`.
 bool isMaterialExample(String libraryName) {
-  return libraryName == 'examples/api/lib/material' || libraryName == 'examples/api/test/material';
+  return libraryName == 'packages/flutter/examples/api/lib/material' ||
+      libraryName == 'packages/flutter/examples/api/test/material';
 }
 
 /// Returns whether the given [libraryName] matches the Cupertino examples under `examples/api`.
 bool isCupertinoExample(String libraryName) {
-  return libraryName == 'examples/api/lib/cupertino' ||
-      libraryName == 'examples/api/test/cupertino';
+  return libraryName == 'packages/flutter/examples/api/lib/cupertino' ||
+      libraryName == 'packages/flutter/examples/api/test/cupertino';
 }
 
 /// Returns whether the given [libraryName] matches the root `examples` or `examples/api` directories,
 /// which contain subdirectories with examples, but should themselves be void of examples.
 bool isExamplesRoot(String libraryName) {
-  return libraryName == 'examples' || libraryName == 'examples/api';
+  return libraryName == 'examples' || libraryName == 'packages/flutter/examples/api';
 }
 
 // A utility that keeps track of the directories under test,
@@ -961,7 +978,11 @@ bool isExamplesRoot(String libraryName) {
 class _CrossImportsExamplesDirectories {
   factory _CrossImportsExamplesDirectories(Directory examplesDirectory) {
     return _CrossImportsExamplesDirectories._(
-      examplesSlashApiDirectory: examplesDirectory.childDirectory('api'),
+      examplesSlashApiDirectory: examplesDirectory.parent
+          .childDirectory('packages')
+          .childDirectory('flutter')
+          .childDirectory('examples')
+          .childDirectory('api'),
       examplesFlutterViewDirectory: examplesDirectory.childDirectory('flutter_view'),
       examplesHelloWorldDirectory: examplesDirectory.childDirectory('hello_world'),
       examplesImageListDirectory: examplesDirectory.childDirectory('image_list'),
@@ -1064,7 +1085,7 @@ class _CrossImportsExamplesDirectories {
 
   /// Get the examples directory for the given [libraryName].
   Directory examplesFilesDirectoryFor(String libraryName, Directory examplesDirectory) {
-    const unsupportedPrefix = 'examples/api';
+    const unsupportedPrefix = 'packages/flutter/examples/api';
 
     if (libraryName.startsWith(unsupportedPrefix) &&
         libraryName.length > unsupportedPrefix.length) {
@@ -1076,7 +1097,7 @@ class _CrossImportsExamplesDirectories {
 
     return switch (libraryName) {
       'examples' => examplesDirectory,
-      'examples/api' => examplesSlashApiDirectory,
+      'packages/flutter/examples/api' => examplesSlashApiDirectory,
       'examples/flutter_view' => examplesFlutterViewDirectory,
       'examples/hello_world' => examplesHelloWorldDirectory,
       'examples/image_list' => examplesImageListDirectory,
@@ -1095,7 +1116,7 @@ class _CrossImportsExamplesDirectories {
 // A mapping of `examples/**` test cases for the cross imports checker, excluding `examples/api/**`.
 const crossImportsGenericExamplesTestCases = <String>[
   'examples',
-  'examples/api',
+  'packages/flutter/examples/api',
   'examples/flutter_view',
   'examples/hello_world',
   'examples/image_list',
@@ -1111,20 +1132,20 @@ const crossImportsGenericExamplesTestCases = <String>[
 // A mapping of `examples/api/lib/**` and `examples/api/test/**` test cases for the cross imports checker,
 // excluding `examples/api/lib/sample_templates` and `examples/api/test/sample_templates`.
 const crossImportsExamplesApiTestCases = <String>[
-  'examples/api/lib/animation',
-  'examples/api/lib/foundation',
-  'examples/api/lib/gestures',
-  'examples/api/lib/painting',
-  'examples/api/lib/rendering',
-  'examples/api/lib/services',
-  'examples/api/lib/ui',
-  'examples/api/lib/widgets',
-  'examples/api/test/animation',
-  'examples/api/test/foundation',
-  'examples/api/test/gestures',
-  'examples/api/test/painting',
-  'examples/api/test/rendering',
-  'examples/api/test/services',
-  'examples/api/test/ui',
-  'examples/api/test/widgets',
+  'packages/flutter/examples/api/lib/animation',
+  'packages/flutter/examples/api/lib/foundation',
+  'packages/flutter/examples/api/lib/gestures',
+  'packages/flutter/examples/api/lib/painting',
+  'packages/flutter/examples/api/lib/rendering',
+  'packages/flutter/examples/api/lib/services',
+  'packages/flutter/examples/api/lib/ui',
+  'packages/flutter/examples/api/lib/widgets',
+  'packages/flutter/examples/api/test/animation',
+  'packages/flutter/examples/api/test/foundation',
+  'packages/flutter/examples/api/test/gestures',
+  'packages/flutter/examples/api/test/painting',
+  'packages/flutter/examples/api/test/rendering',
+  'packages/flutter/examples/api/test/services',
+  'packages/flutter/examples/api/test/ui',
+  'packages/flutter/examples/api/test/widgets',
 ];
diff --git a/dev/bots/test/luci_resultdb_test.dart b/dev/bots/test/luci_resultdb_test.dart
new file mode 100644
index 0000000000000..1531cf368d178
--- /dev/null
+++ b/dev/bots/test/luci_resultdb_test.dart
@@ -0,0 +1,328 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:file/memory.dart';
+
+import '../luci_resultdb.dart';
+import '../tool_subsharding.dart';
+import 'common.dart';
+
+const String _kMetrics = '''
+{"protocolVersion":"0.1.1","runnerVersion":"1.25.0","pid":1,"type":"start","time":0}
+{"suite":{"id":0,"platform":"vm","path":"test/foo_test.dart"},"type":"suite","time":0}
+{"test":{"id":1,"name":"loading test/foo_test.dart","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":null,"column":null,"url":null},"type":"testStart","time":0}
+{"testID":1,"result":"success","skipped":false,"hidden":true,"type":"testDone","time":1}
+{"test":{"id":2,"name":"passing test","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":10,"column":3,"url":"file:///foo"},"type":"testStart","time":2}
+{"testID":2,"result":"success","skipped":false,"hidden":false,"type":"testDone","time":102}
+{"test":{"id":3,"name":"failing test","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":20,"column":3,"url":"file:///foo"},"type":"testStart","time":102}
+{"testID":3,"result":"failure","skipped":false,"hidden":false,"type":"testDone","time":152}
+{"test":{"id":4,"name":"skipped test","suiteID":0,"groupIDs":[],"metadata":{"skip":true,"skipReason":null},"line":30,"column":3,"url":"file:///foo"},"type":"testStart","time":152}
+{"testID":4,"result":"success","skipped":true,"hidden":false,"type":"testDone","time":152}
+{"success":false,"type":"done","time":200}''';
+
+TestFileReporterResults _parse() {
+  final fileSystem = MemoryFileSystem.test();
+  final File file = fileSystem.file('metrics');
+  file.writeAsStringSync(_kMetrics);
+  return TestFileReporterResults.fromFile(file);
+}
+
+String _caseName(LuciTestResult result) => result.testId.caseName;
+
+void main() {
+  group('convertToLuciTestResultsFormat', () {
+    test('converts each non-hidden test into a structured ResultDB TestResult', () {
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(_parse());
+
+      // The hidden "loading ..." bookkeeping test is excluded.
+      expect(results, hasLength(3));
+
+      final byCase = <String, LuciTestResult>{
+        for (final LuciTestResult r in results) _caseName(r): r,
+      };
+
+      expect(byCase.keys, containsAll(<String>['passing test', 'failing test', 'skipped test']));
+      // The module name is the test file, and the scheme is the level-free
+      // 'flat' scheme, so file and test name are separate columns in the UI.
+      for (final LuciTestResult(
+            testId: LuciStructuredTestId(:moduleName, :moduleScheme, :moduleVariant),
+          )
+          in results) {
+        expect(moduleName, 'test/foo_test.dart');
+        expect(moduleScheme, 'flat');
+        expect(moduleVariant, <String, String>{});
+      }
+    });
+
+    test('strips rootDirectory prefix from absolute suite paths', () {
+      const metrics =
+          '{"protocolVersion":"0.1.1","runnerVersion":"1.25.0","pid":1,"type":"start","time":0}\n'
+          '{"suite":{"id":0,"platform":"vm","path":"/b/s/w/ir/x/w/flutter/dev/foo/bar_test.dart"},"type":"suite","time":0}\n'
+          '{"test":{"id":2,"name":"my test","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":10,"column":3,"url":"file:///foo"},"type":"testStart","time":2}\n'
+          '{"testID":2,"result":"success","skipped":false,"hidden":false,"type":"testDone","time":102}\n'
+          '{"success":true,"type":"done","time":200}';
+      final fileSystem = MemoryFileSystem.test();
+      final File file = fileSystem.file('metrics')..writeAsStringSync(metrics);
+      final parsed = TestFileReporterResults.fromFile(file);
+
+      final List<LuciTestResult> stripped = convertToLuciTestResultsFormat(
+        parsed,
+        rootDirectory: '/b/s/w/ir/x/w/flutter',
+      );
+      final [LuciTestResult(testId: LuciStructuredTestId(:moduleName, :caseName))] = stripped;
+      expect(moduleName, 'dev/foo/bar_test.dart');
+      expect(caseName, 'my test');
+
+      // Without a rootDirectory, the absolute path is preserved.
+      final [
+        LuciTestResult(testId: LuciStructuredTestId(moduleName: String unstrippedModuleName)),
+      ] = convertToLuciTestResultsFormat(
+        parsed,
+      );
+      expect(unstrippedModuleName, '/b/s/w/ir/x/w/flutter/dev/foo/bar_test.dart');
+    });
+
+    test('resolves relative suite paths against the working directory', () {
+      const metrics =
+          '{"protocolVersion":"0.1.1","runnerVersion":"1.25.0","pid":1,"type":"start","time":0}\n'
+          '{"suite":{"id":0,"platform":"vm","path":"test/bar_test.dart"},"type":"suite","time":0}\n'
+          '{"test":{"id":2,"name":"my test","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":10,"column":3,"url":"file:///foo"},"type":"testStart","time":2}\n'
+          '{"testID":2,"result":"success","skipped":false,"hidden":false,"type":"testDone","time":102}\n'
+          '{"success":true,"type":"done","time":200}';
+      final fileSystem = MemoryFileSystem.test();
+      final File file = fileSystem.file('metrics')..writeAsStringSync(metrics);
+      final parsed = TestFileReporterResults.fromFile(file);
+
+      // A `packages/flutter` shard reports suite paths relative to its working
+      // directory; resolving against it yields a repo-relative module name.
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(
+        parsed,
+        workingDirectory: '/b/s/w/ir/x/w/flutter/packages/flutter',
+        rootDirectory: '/b/s/w/ir/x/w/flutter',
+      );
+      final [LuciTestResult(testId: LuciStructuredTestId(:moduleName))] = results;
+      expect(moduleName, 'packages/flutter/test/bar_test.dart');
+    });
+
+    test('escapes colons and backslashes in the case name', () {
+      const metrics =
+          '{"protocolVersion":"0.1.1","runnerVersion":"1.25.0","pid":1,"type":"start","time":0}\n'
+          '{"suite":{"id":0,"platform":"vm","path":"test/foo_test.dart"},"type":"suite","time":0}\n'
+          '{"test":{"id":2,"name":"Group: sub\\\\path does x","suiteID":0,"groupIDs":[],"metadata":{"skip":false,"skipReason":null},"line":10,"column":3,"url":"file:///foo"},"type":"testStart","time":2}\n'
+          '{"testID":2,"result":"success","skipped":false,"hidden":false,"type":"testDone","time":102}\n'
+          '{"success":true,"type":"done","time":200}';
+      final fileSystem = MemoryFileSystem.test();
+      final File file = fileSystem.file('metrics')..writeAsStringSync(metrics);
+      final parsed = TestFileReporterResults.fromFile(file);
+
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(parsed);
+      // The raw test name is `Group: sub\path does x`; ':' becomes '\:' and the
+      // backslash becomes '\\'.
+      final [LuciTestResult(testId: LuciStructuredTestId(:caseName))] = results;
+      expect(caseName, r'Group\: sub\\path does x');
+    });
+
+    test('maps status and expectedness correctly', () {
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(_parse());
+      final byId = <String, LuciTestResult>{
+        for (final LuciTestResult r in results) _caseName(r): r,
+      };
+
+      final LuciTestResult pass = byId['passing test']!;
+      expect((pass.status, pass.expected), ('PASS', true));
+
+      final LuciTestResult fail = byId['failing test']!;
+      expect((fail.status, fail.expected), ('FAIL', false));
+
+      final LuciTestResult skip = byId['skipped test']!;
+      expect((skip.status, skip.expected), ('SKIP', true));
+    });
+
+    test('marks failing tests as expected when expectFailure is true', () {
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(
+        _parse(),
+        expectFailure: true,
+      );
+      final byId = <String, LuciTestResult>{
+        for (final LuciTestResult r in results) _caseName(r): r,
+      };
+
+      // The failing test keeps its FAIL status but is now an *expected* failure,
+      // so ResultDB won't surface it as a red regression (e.g. the
+      // test_smoke_test negative tests run with expectFailure: true).
+      final LuciTestResult fail = byId['failing test']!;
+      expect((fail.status, fail.expected), ('FAIL', true));
+
+      // Passing and skipped tests remain expected as well.
+      expect(byId['passing test']!.expected, true);
+      expect(byId['skipped test']!.expected, true);
+    });
+
+    test('emits a proto Duration string and unique result ids', () {
+      final List<LuciTestResult> results = convertToLuciTestResultsFormat(_parse());
+
+      for (final r in results) {
+        expect(r.duration, matches(r'^\d+\.\d+s$'));
+      }
+      final resultIds = <String>{for (final LuciTestResult r in results) r.resultId};
+      expect(resultIds, hasLength(results.length));
+
+      // The passing test ran from t=2ms to t=102ms => 0.1s.
+      final LuciTestResult pass = results.firstWhere(
+        (LuciTestResult r) => _caseName(r) == 'passing test',
+      );
+      expect(pass.duration, '0.100000s');
+    });
+  });
+
+  group('ResultDbRecorder.fromEnvironment', () {
+    test('returns null when resultdb is absent from LUCI_CONTEXT', () {
+      final Directory dir = Directory.systemTemp.createTempSync('luci_resultdb_test');
+      addTearDown(() => tryToDelete(dir));
+      final context = File('${dir.path}/luci_context.json')
+        ..writeAsStringSync(json.encode(<String, Object?>{'luciexe': <String, Object?>{}}));
+      expect(
+        ResultDbRecorder.fromEnvironment(<String, String>{'LUCI_CONTEXT': context.path}),
+        isNull,
+      );
+    });
+
+    test('returns null (does not throw) when LUCI_CONTEXT is malformed JSON', () {
+      final Directory dir = Directory.systemTemp.createTempSync('luci_resultdb_test');
+      addTearDown(() => tryToDelete(dir));
+      final context = File('${dir.path}/luci_context.json')..writeAsStringSync('{not valid json');
+      expect(
+        ResultDbRecorder.fromEnvironment(<String, String>{'LUCI_CONTEXT': context.path}),
+        isNull,
+      );
+    });
+
+    test('parses hostname and current_invocation from LUCI_CONTEXT', () {
+      final Directory dir = Directory.systemTemp.createTempSync('luci_resultdb_test');
+      addTearDown(() => tryToDelete(dir));
+      final context = File('${dir.path}/luci_context.json')
+        ..writeAsStringSync(
+          json.encode(<String, Object?>{
+            'resultdb': <String, Object?>{
+              'hostname': 'results.api.luci.app',
+              'current_invocation': <String, Object?>{
+                'name': 'invocations/build-123',
+                'update_token': 'tok',
+              },
+            },
+          }),
+        );
+      final ResultDbRecorder? recorder = ResultDbRecorder.fromEnvironment(<String, String>{
+        'LUCI_CONTEXT': context.path,
+      });
+      if (recorder case final rec?) {
+        expect(
+          (rec.host, rec.invocation, rec.updateToken),
+          ('results.api.luci.app', 'invocations/build-123', 'tok'),
+        );
+        rec.close();
+      } else {
+        fail('Expected non-null recorder');
+      }
+    });
+  });
+
+  group('ResultDbRecorder.reportTestResults', () {
+    test('serializes each result under requests[].testResult', () async {
+      final HttpServer server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+      addTearDown(() => server.close(force: true));
+
+      final bodies = <Map<String, Object?>>[];
+      final tokens = <String>[];
+      final paths = <String>[];
+      server.listen((HttpRequest request) async {
+        paths.add(request.uri.path);
+        tokens.add(request.headers.value('update-token') ?? '');
+        final String body = await utf8.decoder.bind(request).join();
+        bodies.add(json.decode(body) as Map<String, Object?>);
+        request.response.statusCode = HttpStatus.ok;
+        request.response.write('{}');
+        await request.response.close();
+      });
+
+      // Use a client whose https requests are redirected to our http server by
+      // connecting directly; HttpClient does not allow that, so we instead
+      // exercise the batching/serialization logic against the local server by
+      // constructing the recorder with an http HttpClient is not needed: the
+      // body format is what we assert here through the public API.
+      final recorder = _HttpRecorder(
+        host: '${server.address.host}:${server.port}',
+        invocation: 'invocations/build-123',
+        updateToken: 'my-token',
+      );
+      addTearDown(recorder.close);
+
+      await recorder.reportTestResults(<LuciTestResult>[
+        const LuciTestResult(
+          testId: LuciStructuredTestId(moduleName: 'm', caseName: 'a'),
+          resultId: '0',
+          status: 'PASS',
+          expected: true,
+          duration: '0.000000s',
+        ),
+        const LuciTestResult(
+          testId: LuciStructuredTestId(moduleName: 'm', caseName: 'b'),
+          resultId: '1',
+          status: 'FAIL',
+          expected: false,
+          duration: '0.000000s',
+        ),
+      ]);
+
+      expect(bodies, hasLength(1));
+      expect(paths.single, '/prpc/luci.resultdb.v1.Recorder/BatchCreateTestResults');
+      expect(tokens.single, 'my-token');
+      if (bodies.single case {
+        'invocation': 'invocations/build-123',
+        'requests': [{'testResult': {'testIdStructured': {'caseName': 'a'}}}, _],
+      }) {
+        // Matched expected structure.
+      } else {
+        fail('Unexpected body: ${bodies.single}');
+      }
+    });
+  });
+}
+
+/// A [ResultDbRecorder] that talks plain HTTP, for testing against a local
+/// [HttpServer] (the production recorder always uses https).
+class _HttpRecorder extends ResultDbRecorder {
+  _HttpRecorder({required super.host, required super.invocation, required super.updateToken});
+
+  @override
+  Future<void> reportTestResults(List<LuciTestResult> testResults) async {
+    final client = HttpClient();
+    try {
+      final Uri url = Uri.parse(
+        'http://$host/prpc/luci.resultdb.v1.Recorder/BatchCreateTestResults',
+      );
+      final HttpClientRequest request = await client.postUrl(url);
+      request.headers.set(HttpHeaders.contentTypeHeader, 'application/json');
+      request.headers.set('update-token', updateToken);
+      request.add(
+        utf8.encode(
+          json.encode(<String, Object?>{
+            'invocation': invocation,
+            'requests': <Map<String, Object?>>[
+              for (final LuciTestResult result in testResults)
+                <String, Object?>{'testResult': result.toJson()},
+            ],
+          }),
+        ),
+      );
+      final HttpClientResponse response = await request.close();
+      await response.drain<void>();
+    } finally {
+      client.close(force: true);
+    }
+  }
+}
diff --git a/dev/bots/test/prepare_package_test.dart b/dev/bots/test/prepare_package_test.dart
index a962174a47953..35dcf9823de66 100644
--- a/dev/bots/test/prepare_package_test.dart
+++ b/dev/bots/test/prepare_package_test.dart
@@ -155,68 +155,25 @@ void main() {
         tryToDelete(tempDir);
       });
 
-      test('sets PUB_CACHE properly', () async {
+      /// The subprocesses expected during archive creation, keyed by command-line.
+      ///
+      /// [dartArch] is the architecture `dart --version` reports for the Dart
+      /// SDK downloaded into the archive. [archiveArch] is the architecture
+      /// expected in the archive filename, or null for x64, which is unadorned.
+      /// [precacheArgs] are appended to the `flutter precache` invocation.
+      Map<String, List<ProcessResult>?> expectedCalls({
+        required String dartArch,
+        String? archiveArch,
+        List<String> precacheArgs = const <String>[],
+      }) {
         final String createBase = path.join(tempDir.absolute.path, 'create_');
+        final archPrefix = archiveArch == null ? '' : '${archiveArch}_';
         final String archiveName = path.join(
           tempDir.absolute.path,
-          'flutter_${platformName}_v1.2.3-beta${platform.isLinux ? '.tar.xz' : '.zip'}',
-        );
-
-        processManager.addCommands(
-          convertResults(<String, List<ProcessResult>?>{
-            'git clone -b beta https://flutter.googlesource.com/mirrors/flutter': null,
-            'git reset --hard $testRef': null,
-            'git remote set-url origin https://github.com/flutter/flutter.git': null,
-            'git gc --prune=now --aggressive': null,
-            'git describe --tags --exact-match $testRef': <ProcessResult>[
-              ProcessResult(0, 0, 'v1.2.3', ''),
-            ],
-            '$flutter --version --machine': <ProcessResult>[
-              ProcessResult(0, 0, '{"dartSdkVersion": "3.2.1"}', ''),
-              ProcessResult(0, 0, '{"dartSdkVersion": "3.2.1"}', ''),
-            ],
-            '$dart --version': <ProcessResult>[
-              ProcessResult(
-                0,
-                0,
-                'Dart SDK version: 2.17.0-63.0.beta (beta) (Wed Jan 26 03:48:52 2022 -0800) on "${platformName}_x64"',
-                '',
-              ),
-            ],
-            if (platform.isWindows) '7za x ${path.join(tempDir.path, 'mingit.zip')}': null,
-            '$flutter doctor': null,
-            '$flutter update-packages': null,
-            '$flutter precache': null,
-            '$flutter ide-config': null,
-            '$flutter create --template=app ${createBase}app': null,
-            '$flutter create --template=package ${createBase}package': null,
-            '$flutter create --template=plugin ${createBase}plugin': null,
-            '$flutter pub cache list': <ProcessResult>[ProcessResult(0, 0, '{"packages":{}}', '')],
-            'git clean -f -x -- **/.packages': null,
-            'git clean -f -x -- **/.dart_tool/': null,
-            if (platform.isMacOS)
-              'codesign -vvvv --check-notarization ${path.join(tempDir.path, 'flutter', 'bin', 'cache', 'dart-sdk', 'bin', 'dart')}':
-                  null,
-            if (platform.isWindows) 'attrib -h .git': null,
-            if (platform.isWindows)
-              '7za a -tzip -mx=9 $archiveName flutter': null
-            else if (platform.isMacOS)
-              'zip -r -9 --symlinks $archiveName flutter': null
-            else if (platform.isLinux)
-              'tar cJf $archiveName --verbose flutter': null,
-          }),
+          'flutter_${platformName}_${archPrefix}v1.2.3-beta'
+          '${platform.isLinux ? '.tar.xz' : '.zip'}',
         );
-        await creator.initializeRepo();
-        await creator.createArchive();
-      });
-
-      test('calls the right commands for archive output', () async {
-        final String createBase = path.join(tempDir.absolute.path, 'create_');
-        final String archiveName = path.join(
-          tempDir.absolute.path,
-          'flutter_${platformName}_v1.2.3-beta${platform.isLinux ? '.tar.xz' : '.zip'}',
-        );
-        final calls = <String, List<ProcessResult>?>{
+        return <String, List<ProcessResult>?>{
           'git clone -b beta https://flutter.googlesource.com/mirrors/flutter': null,
           'git reset --hard $testRef': null,
           'git remote set-url origin https://github.com/flutter/flutter.git': null,
@@ -232,14 +189,14 @@ void main() {
             ProcessResult(
               0,
               0,
-              'Dart SDK version: 2.17.0-63.0.beta (beta) (Wed Jan 26 03:48:52 2022 -0800) on "${platformName}_x64"',
+              'Dart SDK version: 2.17.0-63.0.beta (beta) (Wed Jan 26 03:48:52 2022 -0800) on "${platformName}_$dartArch"',
               '',
             ),
           ],
           if (platform.isWindows) '7za x ${path.join(tempDir.path, 'mingit.zip')}': null,
           '$flutter doctor': null,
           '$flutter update-packages': null,
-          '$flutter precache': null,
+          <String>['$flutter precache', ...precacheArgs].join(' '): null,
           '$flutter ide-config': null,
           '$flutter create --template=app ${createBase}app': null,
           '$flutter create --template=package ${createBase}package': null,
@@ -258,7 +215,49 @@ void main() {
           else if (platform.isLinux)
             'tar cJf $archiveName --verbose flutter': null,
         };
-        processManager.addCommands(convertResults(calls));
+      }
+
+      /// The environment expected on every [ArchiveCreator] subprocess.
+      ///
+      /// This is the ambient environment, plus the archive's own pub cache,
+      /// plus the host architecture override when one was requested.
+      Map<String, String> expectedEnvironment({TargetArch? targetArch}) {
+        return <String, String>{
+          ...platform.environment,
+          'PUB_CACHE': path.join(tempDir.path, '.pub-cache'),
+          if (targetArch != null) 'FLUTTER_HOST_ARCH': targetArch.name,
+        };
+      }
+
+      test('sets PUB_CACHE properly', () async {
+        processManager.addCommands(
+          convertResults(expectedCalls(dartArch: 'x64'), environment: expectedEnvironment()),
+        );
+        await creator.initializeRepo();
+        await creator.createArchive();
+      });
+
+      test('calls the right commands for archive output', () async {
+        processManager.addCommands(convertResults(expectedCalls(dartArch: 'x64')));
+        await creator.initializeRepo();
+        await creator.createArchive();
+      });
+
+      test('adds the arch name to the archive for non-x64', () async {
+        processManager.addCommands(
+          convertResults(expectedCalls(dartArch: 'arm64', archiveArch: 'arm64')),
+        );
+        await creator.initializeRepo();
+        await creator.createArchive();
+      });
+
+      test('targetArch drives the precache arch and the tool environment', () async {
+        processManager.addCommands(
+          convertResults(
+            expectedCalls(dartArch: 'x64', precacheArgs: <String>['--host-arch=x64']),
+            environment: expectedEnvironment(targetArch: TargetArch.x64),
+          ),
+        );
         creator = ArchiveCreator(
           tempDir,
           tempDir,
@@ -269,60 +268,23 @@ void main() {
           subprocessOutput: false,
           platform: platform,
           httpReader: fakeHttpReader,
+          targetArch: TargetArch.x64,
         );
         await creator.initializeRepo();
         await creator.createArchive();
       });
 
-      test('adds the arch name to the archive for non-x64', () async {
-        final String createBase = path.join(tempDir.absolute.path, 'create_');
-        final String archiveName = path.join(
-          tempDir.absolute.path,
-          'flutter_${platformName}_arm64_v1.2.3-beta${platform.isLinux ? '.tar.xz' : '.zip'}',
-        );
-        final calls = <String, List<ProcessResult>?>{
-          'git clone -b beta https://flutter.googlesource.com/mirrors/flutter': null,
-          'git reset --hard $testRef': null,
-          'git remote set-url origin https://github.com/flutter/flutter.git': null,
-          'git gc --prune=now --aggressive': null,
-          'git describe --tags --exact-match $testRef': <ProcessResult>[
-            ProcessResult(0, 0, 'v1.2.3', ''),
-          ],
-          '$flutter --version --machine': <ProcessResult>[
-            ProcessResult(0, 0, '{"dartSdkVersion": "3.2.1"}', ''),
-            ProcessResult(0, 0, '{"dartSdkVersion": "3.2.1"}', ''),
-          ],
-          '$dart --version': <ProcessResult>[
-            ProcessResult(
-              0,
-              0,
-              'Dart SDK version: 2.17.0-63.0.beta (beta) (Wed Jan 26 03:48:52 2022 -0800) on "${platformName}_arm64"',
-              '',
+      test('targetArch names a non-x64 archive after the requested arch', () async {
+        processManager.addCommands(
+          convertResults(
+            expectedCalls(
+              dartArch: 'arm64',
+              archiveArch: 'arm64',
+              precacheArgs: <String>['--host-arch=arm64'],
             ),
-          ],
-          if (platform.isWindows) '7za x ${path.join(tempDir.path, 'mingit.zip')}': null,
-          '$flutter doctor': null,
-          '$flutter update-packages': null,
-          '$flutter precache': null,
-          '$flutter ide-config': null,
-          '$flutter create --template=app ${createBase}app': null,
-          '$flutter create --template=package ${createBase}package': null,
-          '$flutter create --template=plugin ${createBase}plugin': null,
-          '$flutter pub cache list': <ProcessResult>[ProcessResult(0, 0, '{"packages":{}}', '')],
-          'git clean -f -x -- **/.packages': null,
-          'git clean -f -x -- **/.dart_tool/': null,
-          if (platform.isMacOS)
-            'codesign -vvvv --check-notarization ${path.join(tempDir.path, 'flutter', 'bin', 'cache', 'dart-sdk', 'bin', 'dart')}':
-                null,
-          if (platform.isWindows) 'attrib -h .git': null,
-          if (platform.isWindows)
-            '7za a -tzip -mx=9 $archiveName flutter': null
-          else if (platform.isMacOS)
-            'zip -r -9 --symlinks $archiveName flutter': null
-          else if (platform.isLinux)
-            'tar cJf $archiveName --verbose flutter': null,
-        };
-        processManager.addCommands(convertResults(calls));
+            environment: expectedEnvironment(targetArch: TargetArch.arm64),
+          ),
+        );
         creator = ArchiveCreator(
           tempDir,
           tempDir,
@@ -333,11 +295,51 @@ void main() {
           subprocessOutput: false,
           platform: platform,
           httpReader: fakeHttpReader,
+          targetArch: TargetArch.arm64,
         );
         await creator.initializeRepo();
         await creator.createArchive();
       });
 
+      test('throws if the archived Dart SDK does not match targetArch', () async {
+        // The requested arch names the archive, but the arch published in the
+        // release metadata comes from the Dart SDK that was downloaded, so a
+        // disagreement has to fail the build rather than ship a mislabelled
+        // archive.
+        //
+        // The mismatch is caught in initializeRepo, so only the commands up to
+        // and including `dart --version` are ever run.
+        final Map<String, List<ProcessResult>?> calls = expectedCalls(dartArch: 'arm64');
+        final int callsBeforeThrow = calls.keys.toList().indexOf('$dart --version') + 1;
+        processManager.addCommands(
+          convertResults(
+            Map<String, List<ProcessResult>?>.fromEntries(calls.entries.take(callsBeforeThrow)),
+          ),
+        );
+        creator = ArchiveCreator(
+          tempDir,
+          tempDir,
+          testRef,
+          Branch.beta,
+          fs: fs,
+          processManager: processManager,
+          subprocessOutput: false,
+          platform: platform,
+          httpReader: fakeHttpReader,
+          targetArch: TargetArch.x64,
+        );
+        await expectLater(
+          creator.initializeRepo,
+          throwsA(
+            isA<PreparePackageException>().having(
+              (PreparePackageException error) => error.message,
+              'message',
+              contains('Requested an archive for x64, but the Dart SDK in the archive is arm64'),
+            ),
+          ),
+        );
+      });
+
       test('throws when a command errors out', () async {
         final calls = <String, List<ProcessResult>>{
           'git clone -b beta https://flutter.googlesource.com/mirrors/flutter': <ProcessResult>[
@@ -1228,18 +1230,26 @@ void main() {
   }
 }
 
-List<FakeCommand> convertResults(Map<String, List<ProcessResult>?> results) {
+/// Converts a map of command lines to their results into [FakeCommand]s.
+///
+/// If [environment] is given, each command is additionally expected to run with
+/// exactly that environment.
+List<FakeCommand> convertResults(
+  Map<String, List<ProcessResult>?> results, {
+  Map<String, String>? environment,
+}) {
   final commands = <FakeCommand>[];
   for (final String key in results.keys) {
     final List<ProcessResult>? candidates = results[key];
     final List<String> args = key.split(' ');
     if (candidates == null) {
-      commands.add(FakeCommand(command: args));
+      commands.add(FakeCommand(command: args, environment: environment));
     } else {
       for (final ProcessResult result in candidates) {
         commands.add(
           FakeCommand(
             command: args,
+            environment: environment,
             exitCode: result.exitCode,
             stderr: result.stderr.toString(),
             stdout: result.stdout.toString(),
diff --git a/dev/bots/tool_subsharding.dart b/dev/bots/tool_subsharding.dart
index 023f4fe287578..9d00b4b8bd229 100644
--- a/dev/bots/tool_subsharding.dart
+++ b/dev/bots/tool_subsharding.dart
@@ -25,9 +25,60 @@ class TestSpecs {
   }
 }
 
+/// The parsed result of a single test case as reported by the `dart test`
+/// JSON file reporter.
+class TestResult {
+  TestResult({required this.name, required this.suiteID, required this.startTime});
+
+  /// The full name of the test (including any group prefixes).
+  final String name;
+
+  /// The id of the suite (test file) that this test belongs to.
+  final int suiteID;
+
+  /// The time (in milliseconds, relative to the start of the run) at which the
+  /// test started.
+  final int startTime;
+
+  /// The time (in milliseconds, relative to the start of the run) at which the
+  /// test finished, or null if it never finished.
+  int? endTime;
+
+  /// The raw result reported by `dart test`: one of `success`, `failure`, or
+  /// `error`.
+  String result = 'success';
+
+  /// Whether the test was skipped.
+  bool skipped = false;
+
+  /// Whether the test is a "hidden" bookkeeping test (for example, the
+  /// synthetic "loading <suite>" test that `dart test` emits for each suite).
+  ///
+  /// Hidden tests are excluded from the reported results.
+  bool hidden = false;
+
+  /// The duration of the test, in seconds.
+  double get seconds => ((endTime ?? startTime) - startTime) / 1000.0;
+
+  /// Maps the `dart test` [result]/[skipped] to a `PASS`/`FAIL`/`SKIP` result
+  /// type.
+  String get actual => switch (this) {
+    TestResult(skipped: true) => 'SKIP',
+    TestResult(result: 'success') => 'PASS',
+    _ => 'FAIL',
+  };
+
+  /// The expected result type for this test.
+  ///
+  /// `dart test` has no concept of expected failures, so every non-skipped
+  /// test is expected to pass.
+  String get expected => skipped ? 'SKIP' : 'PASS';
+}
+
 class TestFileReporterResults {
   TestFileReporterResults._({
     required this.allTestSpecs,
+    required this.testResults,
     required this.hasFailedTests,
     required this.errors,
   });
@@ -39,6 +90,7 @@ class TestFileReporterResults {
     }
 
     final testSpecs = <int, TestSpecs>{};
+    final testResults = <int, TestResult>{};
     var hasFailedTests = true;
     final errors = <String>[];
 
@@ -51,46 +103,70 @@ class TestFileReporterResults {
       // TODO(godofredoc): remove when https://github.com/flutter/flutter/issues/145553 is fixed.
       final String sanitizedMetric = metric.replaceAll(RegExp(r'$.*{'), '{');
       final entry = json.decode(sanitizedMetric) as Map<String, Object?>;
-      if (entry.containsKey('suite')) {
-        final suite = entry['suite']! as Map<String, Object?>;
-        addTestSpec(suite, entry['time']! as int, testSpecs);
-      } else if (isMetricDone(entry, testSpecs)) {
-        final group = entry['group']! as Map<String, Object?>;
-        final suiteID = group['suiteID']! as int;
-        addMetricDone(suiteID, entry['time']! as int, testSpecs);
-      } else if (entry.containsKey('error')) {
-        final stackTrace = entry.containsKey('stackTrace') ? entry['stackTrace']! as String : '';
-        errors.add('${entry['error']}\n $stackTrace');
-      } else if (entry.containsKey('success') && entry['success'] == true) {
-        hasFailedTests = false;
+      switch (entry) {
+        case {'suite': final Map<String, Object?> suite, 'time': final int time}:
+          addTestSpec(suite, time, testSpecs);
+        case {'type': 'group', 'group': {'suiteID': final int suiteID}, 'time': final int time}
+            when testSpecs.containsKey(suiteID):
+          addMetricDone(suiteID, time, testSpecs);
+        case {'type': 'testStart', 'test': final Map<String, Object?> test, 'time': final int time}:
+          addTestStart(test, time, testResults);
+        case {'type': 'testDone'}:
+          addTestDone(entry, testResults);
+        case {'error': final Object? error}:
+          final String stackTrace = entry['stackTrace'] as String? ?? '';
+          errors.add('$error\n $stackTrace');
+        case {'success': true}:
+          hasFailedTests = false;
       }
     }
 
     return TestFileReporterResults._(
       allTestSpecs: testSpecs,
+      testResults: testResults,
       hasFailedTests: hasFailedTests,
       errors: errors,
     );
   }
 
   final Map<int, TestSpecs> allTestSpecs;
+  final Map<int, TestResult> testResults;
   final bool hasFailedTests;
   final List<String> errors;
 
   static void addTestSpec(Map<String, Object?> suite, int time, Map<int, TestSpecs> allTestSpecs) {
-    allTestSpecs[suite['id']! as int] = TestSpecs(path: suite['path']! as String, startTime: time);
+    if (suite case {'id': final int id, 'path': final String path}) {
+      allTestSpecs[id] = TestSpecs(path: path, startTime: time);
+    }
   }
 
   static void addMetricDone(int suiteID, int time, Map<int, TestSpecs> allTestSpecs) {
-    final TestSpecs testSpec = allTestSpecs[suiteID]!;
-    testSpec.endTime = time;
+    allTestSpecs[suiteID]?.endTime = time;
   }
 
-  static bool isMetricDone(Map<String, Object?> entry, Map<int, TestSpecs> allTestSpecs) {
-    if (entry.containsKey('group') && entry['type']! as String == 'group') {
-      final group = entry['group']! as Map<String, Object?>;
-      return allTestSpecs.containsKey(group['suiteID']! as int);
+  static bool isMetricDone(Map<String, Object?> entry, Map<int, TestSpecs> allTestSpecs) =>
+      switch (entry) {
+        {'type': 'group', 'group': {'suiteID': final int suiteID}} => allTestSpecs.containsKey(
+          suiteID,
+        ),
+        _ => false,
+      };
+
+  static void addTestStart(Map<String, Object?> test, int time, Map<int, TestResult> testResults) {
+    if (test case {'id': final int id, 'name': final String name, 'suiteID': final int suiteID}) {
+      testResults[id] = TestResult(name: name, suiteID: suiteID, startTime: time);
+    }
+  }
+
+  static void addTestDone(Map<String, Object?> entry, Map<int, TestResult> testResults) {
+    if (entry case {'testID': final int testID, 'time': final int time}) {
+      if (testResults[testID] case final testResult?) {
+        testResult
+          ..endTime = time
+          ..result = entry['result'] as String? ?? testResult.result
+          ..skipped = entry['skipped'] as bool? ?? false
+          ..hidden = entry['hidden'] as bool? ?? false;
+      }
     }
-    return false;
   }
 }
diff --git a/dev/bots/utils.dart b/dev/bots/utils.dart
index c2ba56a5d3848..3c39c8f42dc5c 100644
--- a/dev/bots/utils.dart
+++ b/dev/bots/utils.dart
@@ -18,6 +18,7 @@ import 'package:file/local.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
+import 'luci_resultdb.dart';
 import 'run_command.dart';
 import 'tool_subsharding.dart';
 
@@ -509,6 +510,9 @@ Future<void> runDartTest(
     }
   }
 
+  // Report the individual test cases to LUCI ResultDB (no-op when not on LUCI).
+  await reportTestResultsToResultDb(test, workingDirectory: workingDirectory);
+
   // metriciFile is a transitional file that needs to be deleted once it is parsed.
   // TODO(godofredoc): Ensure metricFile is parsed and aggregated before deleting.
   // https://github.com/flutter/flutter/issues/146003
@@ -586,6 +590,17 @@ Future<void> runFlutterTest(
   // TODO(godofredoc): Ensure metricFile is parsed and aggregated before deleting.
   // https://github.com/flutter/flutter/issues/146003
   if (!dryRun) {
+    // Parse the test results and report the individual test cases to LUCI
+    // ResultDB (no-op off LUCI) so `flutter test`-based shards populate the
+    // "Test Results" tab.
+    if (metricFile.existsSync()) {
+      final test = TestFileReporterResults.fromFile(metricFile);
+      await reportTestResultsToResultDb(
+        test,
+        workingDirectory: workingDirectory,
+        expectFailure: expectFailure,
+      );
+    }
     metricFile.deleteSync();
   }
 
@@ -597,6 +612,53 @@ Future<void> runFlutterTest(
   }
 }
 
+/// Reports the individual test cases in [test] to LUCI ResultDB so that they
+/// show up in the "Test Results" tab of the LUCI build.
+///
+/// Uses the ResultDB Recorder API, which is available whenever the build has a
+/// ResultDB invocation (the case for Flutter builds with ResultDB enabled).
+///
+/// This is a no-op when not running inside a LUCI build with ResultDB enabled
+/// (for example, local runs), and any failure to report is logged but does not
+/// fail the test run.
+///
+/// [workingDirectory] is the directory the shard ran the tests in; it is used to
+/// resolve relative suite paths into repo-relative module names.
+///
+/// When [expectFailure] is true, the whole `flutter test` invocation was
+/// expected to fail, so the reported results are marked as expected failures
+/// (rather than red regressions) in ResultDB.
+Future<void> reportTestResultsToResultDb(
+  TestFileReporterResults test, {
+  String? workingDirectory,
+  bool expectFailure = false,
+}) async {
+  final List<LuciTestResult> results = convertToLuciTestResultsFormat(
+    test,
+    expectFailure: expectFailure,
+    workingDirectory: workingDirectory,
+    rootDirectory: flutterRoot,
+  );
+  if (results.isEmpty) {
+    return;
+  }
+
+  ResultDbRecorder? recorder;
+  try {
+    recorder = ResultDbRecorder.fromEnvironment();
+    if (recorder == null) {
+      print('ResultDB is not available; skipping test result reporting.');
+      return;
+    }
+    await recorder.reportTestResults(results);
+    print('Reported ${results.length} test result(s) to ResultDB.');
+  } catch (e) {
+    print('Failed to report test results to ResultDB: $e');
+  } finally {
+    recorder?.close();
+  }
+}
+
 /// This will force the next run of the Flutter tool (if it uses the provided
 /// environment) to have asserts enabled, by setting an environment variable.
 void adjustEnvironmentToEnableFlutterAsserts(Map<String, String> environment) {
diff --git a/dev/devicelab/bin/tasks/flavors_test_ios.dart b/dev/devicelab/bin/tasks/flavors_test_ios.dart
index 0c81f5bf5f74b..6d94b65aa946f 100644
--- a/dev/devicelab/bin/tasks/flavors_test_ios.dart
+++ b/dev/devicelab/bin/tasks/flavors_test_ios.dart
@@ -18,37 +18,50 @@ import 'package:standard_message_codec/standard_message_codec.dart';
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
   await task(() async {
-    await createFlavorsTest().call();
-    await createIntegrationTestFlavorsTest().call();
-    // test install and uninstall of flavors app
-    final projectDir = '${flutterDirectory.path}/dev/integration_tests/flavors';
-    final TaskResult installTestsResult = await inDirectory(projectDir, () async {
-      final testResults = <TaskResult>[
-        await _testInstallDebugPaidFlavor(projectDir),
-        await _testInstallBogusFlavor(),
-      ];
-
-      final TaskResult? firstInstallFailure = testResults.firstWhereOrNull(
-        (TaskResult element) => element.failed,
-      );
-
-      return firstInstallFailure ?? TaskResult.success(null);
-    });
-
-    await _testFlavorWhenBuiltFromXcode(projectDir);
-
-    return installTestsResult;
+    String? simulatorDeviceId;
+    var res = TaskResult.success(null);
+    try {
+      await testWithNewIOSSimulator('flavors_test_ios', (String deviceId) async {
+        simulatorDeviceId = deviceId;
+        await createFlavorsTest(deviceIdOverride: deviceId).call();
+        await createIntegrationTestFlavorsTest(deviceIdOverride: deviceId).call();
+        // test install and uninstall of flavors app
+        final projectDir = '${flutterDirectory.path}/dev/integration_tests/flavors';
+        final TaskResult installTestsResult = await inDirectory(projectDir, () async {
+          final testResults = <TaskResult>[
+            await _testInstallDebugPaidFlavor(projectDir, deviceId),
+            await _testInstallBogusFlavor(deviceId),
+          ];
+
+          final TaskResult? firstInstallFailure = testResults.firstWhereOrNull(
+            (TaskResult element) => element.failed,
+          );
+
+          return firstInstallFailure ?? TaskResult.success(null);
+        });
+
+        if (installTestsResult.failed) {
+          res = installTestsResult;
+          return;
+        }
+
+        res = await _testFlavorWhenBuiltFromXcode(projectDir, deviceId);
+      });
+    } finally {
+      await removeIOSSimulator(simulatorDeviceId);
+    }
+    return res;
   });
 }
 
-Future<TaskResult> _testInstallDebugPaidFlavor(String projectDir) async {
-  await evalFlutter('install', options: <String>['--flavor', 'paid']);
+Future<TaskResult> _testInstallDebugPaidFlavor(String projectDir, String deviceId) async {
+  await evalFlutter('install', options: <String>['-d', deviceId, '--flavor', 'paid']);
   final Uint8List assetManifestFileData = File(
     path.join(
       projectDir,
       'build',
       'ios',
-      'iphoneos',
+      'iphonesimulator',
       'Paid App.app',
       'Frameworks',
       'App.framework',
@@ -77,18 +90,21 @@ Future<TaskResult> _testInstallDebugPaidFlavor(String projectDir) async {
     );
   }
 
-  await flutter('install', options: <String>['--flavor', 'paid', '--uninstall-only']);
+  await flutter(
+    'install',
+    options: <String>['-d', deviceId, '--flavor', 'paid', '--uninstall-only'],
+  );
 
   return TaskResult.success(null);
 }
 
-Future<TaskResult> _testInstallBogusFlavor() async {
+Future<TaskResult> _testInstallBogusFlavor(String deviceId) async {
   final stderr = StringBuffer();
   await evalFlutter(
     'install',
     canFail: true,
     stderr: stderr,
-    options: <String>['--flavor', 'bogus'],
+    options: <String>['-d', deviceId, '--flavor', 'bogus'],
   );
 
   final stderrString = stderr.toString();
@@ -102,13 +118,12 @@ Future<TaskResult> _testInstallBogusFlavor() async {
   return TaskResult.success(null);
 }
 
-Future<TaskResult> _testFlavorWhenBuiltFromXcode(String projectDir) async {
-  final Device device = await devices.workingDevice;
+Future<TaskResult> _testFlavorWhenBuiltFromXcode(String projectDir, String deviceId) async {
   await inDirectory(projectDir, () async {
     // This will put FLAVOR=free in the Flutter/Generated.xcconfig file
     await flutter(
       'build',
-      options: <String>['ios', '--config-only', '--debug', '--flavor', 'free'],
+      options: <String>['ios', '--simulator', '--config-only', '--debug', '--flavor', 'free'],
     );
   });
 
@@ -126,7 +141,7 @@ Future<TaskResult> _testFlavorWhenBuiltFromXcode(String projectDir) async {
 
   // Delete app bundle before build to ensure checks below do not use previously
   // built bundle.
-  final appPath = '$projectDir/$buildDir/$configuration-iphoneos/$productName.app';
+  final appPath = '$projectDir/$buildDir/$configuration-iphonesimulator/$productName.app';
   final appBundle = Directory(appPath);
   if (appBundle.existsSync()) {
     appBundle.deleteSync(recursive: true);
@@ -134,7 +149,7 @@ Future<TaskResult> _testFlavorWhenBuiltFromXcode(String projectDir) async {
 
   if (!await runXcodeBuild(
     platformDirectory: path.join(projectDir, 'ios'),
-    destination: 'id=${device.deviceId}',
+    destination: 'id=$deviceId',
     testName: 'flavors_test_ios',
     configuration: configuration,
     scheme: 'paid',
@@ -155,6 +170,7 @@ Future<TaskResult> _testFlavorWhenBuiltFromXcode(String projectDir) async {
   // Despite FLAVOR=free being in the Generated.xcconfig, the flavor found in
   // the test should be "paid" because it was built with the "Debug Paid" configuration.
   return createFlavorsTest(
+    deviceIdOverride: deviceId,
     extraOptions: <String>['--flavor', 'paid', '--use-application-binary=$appPath'],
   ).call();
 }
diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart b/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart
index 20cc0d36558b5..bc92094c545b3 100644
--- a/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart
+++ b/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart
@@ -4,9 +4,23 @@
 
 import 'package:flutter_devicelab/framework/devices.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/ios.dart';
+import 'package:flutter_devicelab/framework/task_result.dart';
 import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createEndToEndDriverTest());
+  await task(() async {
+    String? simulatorDeviceId;
+    var result = TaskResult.success(null);
+    try {
+      await testWithNewIOSSimulator('integration_ui_ios_driver', (String deviceId) async {
+        simulatorDeviceId = deviceId;
+        result = await createEndToEndDriverTest(deviceIdOverride: deviceId).call();
+      });
+    } finally {
+      await removeIOSSimulator(simulatorDeviceId);
+    }
+    return result;
+  });
 }
diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart b/dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart
index 75c075d719d29..3af09af71b31e 100644
--- a/dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart
+++ b/dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart
@@ -4,9 +4,23 @@
 
 import 'package:flutter_devicelab/framework/devices.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/ios.dart';
+import 'package:flutter_devicelab/framework/task_result.dart';
 import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createEndToEndFrameNumberTest());
+  await task(() async {
+    String? simulatorDeviceId;
+    var result = TaskResult.success(null);
+    try {
+      await testWithNewIOSSimulator('integration_ui_ios_frame_number', (String deviceId) async {
+        simulatorDeviceId = deviceId;
+        result = await createEndToEndFrameNumberTest(deviceIdOverride: deviceId).call();
+      });
+    } finally {
+      await removeIOSSimulator(simulatorDeviceId);
+    }
+    return result;
+  });
 }
diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart b/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart
index 0d8e84ae2ac9f..408c8f404f06c 100644
--- a/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart
+++ b/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart
@@ -4,9 +4,23 @@
 
 import 'package:flutter_devicelab/framework/devices.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/ios.dart';
+import 'package:flutter_devicelab/framework/task_result.dart';
 import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createEndToEndKeyboardTest());
+  await task(() async {
+    String? simulatorDeviceId;
+    var result = TaskResult.success(null);
+    try {
+      await testWithNewIOSSimulator('integration_ui_ios_keyboard_resize', (String deviceId) async {
+        simulatorDeviceId = deviceId;
+        result = await createEndToEndKeyboardTest(deviceIdOverride: deviceId).call();
+      });
+    } finally {
+      await removeIOSSimulator(simulatorDeviceId);
+    }
+    return result;
+  });
 }
diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart b/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart
index 1708f539f1fe9..a103558d201c9 100644
--- a/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart
+++ b/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart
@@ -4,9 +4,23 @@
 
 import 'package:flutter_devicelab/framework/devices.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/ios.dart';
+import 'package:flutter_devicelab/framework/task_result.dart';
 import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createEndToEndKeyboardTextfieldTest());
+  await task(() async {
+    String? simulatorDeviceId;
+    var result = TaskResult.success(null);
+    try {
+      await testWithNewIOSSimulator('integration_ui_ios_textfield', (String deviceId) async {
+        simulatorDeviceId = deviceId;
+        result = await createEndToEndKeyboardTextfieldTest(deviceIdOverride: deviceId).call();
+      });
+    } finally {
+      await removeIOSSimulator(simulatorDeviceId);
+    }
+    return result;
+  });
 }
diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
index 61426f1b09572..507a534108ce1 100644
--- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart
+++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
@@ -183,7 +183,7 @@ Future<void> main() async {
       pluginPubspec.writeAsStringSync(pluginPubspecContent, flush: true);
 
       await inDirectory(appPath, () async {
-        await flutter('clean');
+        await flutter('clean', options: <String>['--include-xcode-workspace']);
         await flutter('build', options: <String>['ios', '--no-codesign']);
       });
 
diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart b/dev/devicelab/bin/tasks/windows_engine_integration_golden_test.dart
similarity index 77%
rename from dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart
rename to dev/devicelab/bin/tasks/windows_engine_integration_golden_test.dart
index 49bb51d65485c..804761cb74d33 100644
--- a/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart
+++ b/dev/devicelab/bin/tasks/windows_engine_integration_golden_test.dart
@@ -7,6 +7,6 @@ import 'package:flutter_devicelab/framework/framework.dart';
 import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createEndToEndScreenshotTest());
+  deviceOperatingSystem = DeviceOperatingSystem.windows;
+  await task(createEngineIntegrationGoldenTest());
 }
diff --git a/dev/devicelab/bin/tasks/integration_ui_screenshot.dart b/dev/devicelab/bin/tasks/windows_text_shadow_perf__timeline_summary.dart
similarity index 62%
rename from dev/devicelab/bin/tasks/integration_ui_screenshot.dart
rename to dev/devicelab/bin/tasks/windows_text_shadow_perf__timeline_summary.dart
index 4a3c8cabbde08..5838db90cd488 100644
--- a/dev/devicelab/bin/tasks/integration_ui_screenshot.dart
+++ b/dev/devicelab/bin/tasks/windows_text_shadow_perf__timeline_summary.dart
@@ -4,9 +4,9 @@
 
 import 'package:flutter_devicelab/framework/devices.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:flutter_devicelab/tasks/integration_tests.dart';
+import 'package:flutter_devicelab/tasks/perf_tests.dart';
 
 Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.android;
-  await task(createEndToEndScreenshotTest());
+  deviceOperatingSystem = DeviceOperatingSystem.windows;
+  await task(createTextShadowPerfTest(createPlatforms: <String>['windows']));
 }
diff --git a/dev/devicelab/lib/framework/browser.dart b/dev/devicelab/lib/framework/browser.dart
index dd02b5c949cf6..18f9b0cd30794 100644
--- a/dev/devicelab/lib/framework/browser.dart
+++ b/dev/devicelab/lib/framework/browser.dart
@@ -10,6 +10,16 @@ import 'dart:math' as math;
 import 'package:path/path.dart' as path;
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 
+/// Flags passed to Chrome to disable GCM (Google Cloud Messaging) and MCS
+/// (Mobile Connection Server) background network registration calls and
+/// prevent deprecation error logs.
+const kGcmDisabledFlags = <String>[
+  '--disable-features=GCM',
+  '--gcm-checkin-url=http://127.0.0.1',
+  '--gcm-registration-url=http://127.0.0.1',
+  '--gcm-mcs-endpoint=127.0.0.1:0',
+];
+
 /// The number of samples used to extract metrics, such as noise, means,
 /// max/min values.
 ///
@@ -119,7 +129,13 @@ class Chrome {
       '--window-size=${options.windowWidth},${options.windowHeight}',
       '--disable-extensions',
       '--disable-popup-blocking',
+      '--disable-background-timer-throttling',
       '--disable-renderer-backgrounding',
+      '--disable-background-networking',
+      '--disable-sync',
+      '--disable-client-side-phishing-detection',
+      '--disable-notifications',
+      ...kGcmDisabledFlags,
       // Indicates that the browser is in "browse without sign-in" (Guest session) mode.
       '--bwsi',
       '--no-first-run',
@@ -230,7 +246,10 @@ class Chrome {
       //   provides tracing data from the GPU data
       //   disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1068259
       // TODO(yjbanov): extract useful GPU data
-      'categories': 'blink,blink.user_timing',
+      'traceConfig': <String, dynamic>{
+        'includedCategories': <String>['blink', 'blink.user_timing'],
+        'enableThreadCpuTime': true,
+      },
       'transferMode': 'SendAsStream',
     });
   }
@@ -465,10 +484,11 @@ Duration _computeAverageDuration(List<BlinkTraceEvent> events) {
     double previousValue,
     BlinkTraceEvent event,
   ) {
-    if (event.tdur == null) {
-      throw FormatException('Trace event lacks "tdur" field: $event');
+    final int? duration = event.tdur ?? event.dur;
+    if (duration == null) {
+      throw FormatException('Trace event lacks "tdur" and "dur" fields: $event');
     }
-    return previousValue + event.tdur!;
+    return previousValue + duration;
   });
   final int sampleCount = math.min(events.length, _kMeasuredSampleCount);
   return Duration(microseconds: sum ~/ sampleCount);
@@ -512,7 +532,8 @@ class BlinkTraceEvent {
       tid = _readInt(json, 'tid'),
       ts = _readInt(json, 'ts'),
       tts = _readInt(json, 'tts'),
-      tdur = _readInt(json, 'tdur');
+      tdur = _readInt(json, 'tdur'),
+      dur = _readInt(json, 'dur');
 
   /// Event-specific data.
   final Map<String, dynamic> args;
@@ -541,6 +562,9 @@ class BlinkTraceEvent {
   /// Event duration in microseconds.
   final int? tdur;
 
+  /// Wall-clock event duration in microseconds.
+  final int? dur;
+
   /// A "begin frame" event contains all of the scripting time of an animation
   /// frame (JavaScript, WebAssembly), plus a negligible amount of internal
   /// browser overhead.
@@ -628,6 +652,25 @@ int? _readInt(Map<String, dynamic> json, String key) {
 ///     Inconsistency detected by ld.so: ../elf/dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!
 const String _kGlibcError = 'Inconsistency detected by ld.so';
 
+/// Filters out non-fatal D-Bus connection error messages emitted by Chromium.
+///
+/// Headless Linux Chrome attempts to query Linux D-Bus desktop services (such as
+/// system theme, desktop notifications, and keyrings) when `DBUS_SESSION_BUS_ADDRESS`
+/// is missing or disabled. Chromium logs non-fatal fallback notices to stderr via
+/// `LOG(ERROR)` in `dbus/bus.cc` (see
+/// https://chromium.googlesource.com/chromium/src/+/refs/heads/main/dbus/bus.cc#405)
+/// and `dbus/object_proxy.cc`.
+///
+/// We filter out these benign D-Bus lines to prevent stderr log noise in CI,
+/// following the industry standard pattern used by open source projects to filter
+/// E2E test logs (e.g. https://github.com/kitelev/exocortex/blob/4290cdade669034e5f71c892fb3e1908c5a2fe12/packages/obsidian-plugin/docker-entrypoint-e2e.sh#L48-L49).
+bool _isDbusError(String line) {
+  return line.contains('ERROR:dbus/bus.cc') ||
+      line.contains('ERROR:dbus/object_proxy.cc') ||
+      line.contains('Failed to connect to the bus') ||
+      line.contains('org.freedesktop.DBus');
+}
+
 Future<io.Process> _spawnChromiumProcess(
   String executable,
   List<String> args, {
@@ -656,6 +699,7 @@ Future<io.Process> _spawnChromiumProcess(
     await process.stderr
         .transform(utf8.decoder)
         .transform(const LineSplitter())
+        .where((String line) => !_isDbusError(line))
         .map((String line) {
           if (!silent) {
             print('[CHROME STDERR]:$line');
diff --git a/dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart b/dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart
index 4c9d468563532..cb93a5d730315 100644
--- a/dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart
+++ b/dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart
@@ -55,7 +55,7 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE_ME-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE_ME-bin.zip
 
 ''';
 
diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart
index e39d562fc3088..5881dc7868d1a 100644
--- a/dev/devicelab/lib/tasks/integration_tests.dart
+++ b/dev/devicelab/lib/tasks/integration_tests.dart
@@ -22,21 +22,30 @@ TaskFunction createPlatformInteractionTest() {
   ).call;
 }
 
-TaskFunction createFlavorsTest({Map<String, String>? environment, List<String>? extraOptions}) {
+TaskFunction createFlavorsTest({
+  Map<String, String>? environment,
+  List<String>? extraOptions,
+  String? deviceIdOverride,
+}) {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/flavors',
     'lib/main.dart',
     extraOptions: extraOptions ?? <String>['--flavor', 'paid'],
     environment: environment,
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
-TaskFunction createIntegrationTestFlavorsTest({Map<String, String>? environment}) {
+TaskFunction createIntegrationTestFlavorsTest({
+  Map<String, String>? environment,
+  String? deviceIdOverride,
+}) {
   return IntegrationTest(
     '${flutterDirectory.path}/dev/integration_tests/flavors',
     'integration_test/integration_test.dart',
     extraOptions: <String>['--flavor', 'paid'],
     environment: environment,
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
@@ -88,39 +97,39 @@ TaskFunction createIOSPlatformViewTests() {
   ).call;
 }
 
-TaskFunction createEndToEndKeyboardTest() {
+TaskFunction createEndToEndKeyboardTest({String? deviceIdOverride}) {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/ui',
     'lib/keyboard_resize.dart',
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
-TaskFunction createEndToEndFrameNumberTest() {
+TaskFunction createEndToEndFrameNumberTest({String? deviceIdOverride}) {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/ui',
     'lib/frame_number.dart',
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
-TaskFunction createEndToEndDriverTest({Map<String, String>? environment}) {
+TaskFunction createEndToEndDriverTest({
+  Map<String, String>? environment,
+  String? deviceIdOverride,
+}) {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/ui',
     'lib/driver.dart',
     environment: environment,
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
-TaskFunction createEndToEndScreenshotTest() {
-  return DriverTest(
-    '${flutterDirectory.path}/dev/integration_tests/ui',
-    'lib/screenshot.dart',
-  ).call;
-}
-
-TaskFunction createEndToEndKeyboardTextfieldTest() {
+TaskFunction createEndToEndKeyboardTextfieldTest({String? deviceIdOverride}) {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/ui',
     'lib/keyboard_textfield.dart',
+    deviceIdOverride: deviceIdOverride,
   ).call;
 }
 
@@ -230,6 +239,14 @@ TaskFunction createWindowsStartupDriverTest({String? deviceIdOverride}) {
   ).call;
 }
 
+TaskFunction createEngineIntegrationGoldenTest() {
+  return IntegrationTest(
+    '${flutterDirectory.path}/dev/integration_tests/engine_integration_golden_test',
+    'integration_test/engine_integration_golden_test.dart',
+    createPlatforms: <String>['windows'],
+  ).call;
+}
+
 TaskFunction createWindowingDriverTest() {
   return () async {
     await flutter('config', options: const <String>['--enable-windowing']);
@@ -325,6 +342,7 @@ class IntegrationTest {
     this.environment,
     this.setup,
     this.tearDown,
+    this.deviceIdOverride,
   });
 
   final String testDirectory;
@@ -333,6 +351,7 @@ class IntegrationTest {
   final List<String> createPlatforms;
   final bool withTalkBack;
   final Map<String, String>? environment;
+  final String? deviceIdOverride;
 
   /// Run before flutter drive with the result from devices.workingDevice.
   final Future<void> Function(Device device)? setup;
@@ -342,9 +361,15 @@ class IntegrationTest {
 
   Future<TaskResult> call() {
     return inDirectory<TaskResult>(testDirectory, () async {
-      final Device device = await devices.workingDevice;
-      await device.unlock();
-      final String deviceId = device.deviceId;
+      String deviceId;
+      Device? selectedDevice;
+      if (deviceIdOverride != null) {
+        deviceId = deviceIdOverride!;
+      } else {
+        selectedDevice = await devices.workingDevice;
+        await selectedDevice.unlock();
+        deviceId = selectedDevice.deviceId;
+      }
       await flutter('packages', options: <String>['get']);
       await setup?.call(await devices.workingDevice);
 
@@ -356,7 +381,7 @@ class IntegrationTest {
       }
 
       if (withTalkBack) {
-        if (device is! AndroidDevice) {
+        if (selectedDevice is! AndroidDevice) {
           return TaskResult.failure(
             'A test that enables TalkBack can only be run on Android devices',
           );
diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index 0ba0733666f9d..2318376b6a446 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -376,6 +376,21 @@ TaskFunction createTextfieldPerfE2ETest() {
   ).run;
 }
 
+/// Creates a task that runs the text shadow performance benchmark.
+TaskFunction createTextShadowPerfTest({
+  bool? enableImpeller,
+  List<String> createPlatforms = const <String>[],
+}) {
+  return PerfTest(
+    '${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
+    'test_driver/run_app.dart',
+    'text_shadow_perf',
+    testDriver: 'test_driver/text_shadow_perf_test.dart',
+    enableImpeller: enableImpeller,
+    createPlatforms: createPlatforms,
+  ).run;
+}
+
 TaskFunction createVeryLongPictureScrollingPerfE2ETest({required bool enableImpeller}) {
   return PerfTest.e2e(
     '${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
diff --git a/dev/devicelab/lib/tasks/plugin_tests.dart b/dev/devicelab/lib/tasks/plugin_tests.dart
index f65c9c20f5353..ffd33ee96073a 100644
--- a/dev/devicelab/lib/tasks/plugin_tests.dart
+++ b/dev/devicelab/lib/tasks/plugin_tests.dart
@@ -459,6 +459,8 @@ Pod::Spec.new do |s|
   s.source           = { :path => '.' }
   s.source_files = "Classes", "Classes/**/*.{h,m}"
   s.dependency 'plugintest'
+  s.ios.deployment_target = '12.0'
+  s.osx.deployment_target = '10.14'
 end
 ''');
 
diff --git a/dev/devicelab/lib/tasks/web_benchmarks.dart b/dev/devicelab/lib/tasks/web_benchmarks.dart
index 335b9e9930b4d..ac81e4bc06c7c 100644
--- a/dev/devicelab/lib/tasks/web_benchmarks.dart
+++ b/dev/devicelab/lib/tasks/web_benchmarks.dart
@@ -73,6 +73,11 @@ Future<TaskResult> runWebBenchmark(WebBenchmarkOptions benchmarkOptions) async {
           '--web-browser-flag=--disable-background-timer-throttling',
           '--web-browser-flag=--disable-backgrounding-occluded-windows',
           '--web-browser-flag=--disable-renderer-backgrounding',
+          '--web-browser-flag=--disable-background-networking',
+          '--web-browser-flag=--disable-sync',
+          '--web-browser-flag=--disable-client-side-phishing-detection',
+          '--web-browser-flag=--disable-notifications',
+          ...kGcmDisabledFlags.map((String flag) => '--web-browser-flag=$flag'),
           '--web-browser-flag=--headless=new',
           '--web-browser-flag=--no-sandbox',
           '--web-browser-flag=--password-store=basic',
diff --git a/dev/flutter_analyzer_plugin/.gitignore b/dev/flutter_analyzer_plugin/.gitignore
new file mode 100644
index 0000000000000..3a85790408401
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/.gitignore
@@ -0,0 +1,3 @@
+# https://dart.dev/guides/libraries/private-files
+# Created by `dart pub`
+.dart_tool/
diff --git a/dev/flutter_analyzer_plugin/README.md b/dev/flutter_analyzer_plugin/README.md
new file mode 100644
index 0000000000000..48acf74d70b03
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/README.md
@@ -0,0 +1,549 @@
+# Flutter Analyzer Plugin
+
+`dev/flutter_analyzer_plugin` is a custom Dart Analysis Server plugin providing custom static analysis rules and lints tailored specifically for the `flutter/flutter` repository.
+
+This plugin replaces legacy regex-based and manual AST scripts (previously located in `dev/bots/analyze.dart`) with native, real-time analyzer diagnostics integrated directly into developer IDEs (VS Code, Android Studio) and the `flutter analyze` CLI.
+
+---
+
+## Table of Contents
+
+- [Plugin Overview & Architecture](#plugin-overview--architecture)
+- [Configuration](#configuration)
+  - [Loading the Plugin](#loading-the-plugin)
+  - [Rule Activation & Opt-Out](#rule-activation--opt-out)
+  - [Monorepo Path Resolution](#monorepo-path-resolution)
+- [Rules Reference](#rules-reference)
+- [Detailed Rule Specifications](#detailed-rule-specifications)
+  - [General & Global Rules](#general--global-rules)
+    - [`avoid_future_catch_error`](#avoid_future_catch_error)
+    - [`no_double_clamp`](#no_double_clamp)
+    - [`no_stopwatches`](#no_stopwatches)
+    - [`deprecation_syntax`](#deprecation_syntax)
+    - [`no_runtimetype_in_tostring`](#no_runtimetype_in_tostring)
+    - [`no_sync_async_star`](#no_sync_async_star)
+  - [Framework & Architecture Rules](#framework--architecture-rules)
+    - [`no_bad_imports_in_flutter`](#no_bad_imports_in_flutter)
+    - [`protect_public_state_subtypes`](#protect_public_state_subtypes)
+    - [`render_box_intrinsics`](#render_box_intrinsics)
+    - [`null_initialized_debug_expensive_fields`](#null_initialized_debug_expensive_fields)
+  - [Testing Rules](#testing-rules)
+    - [`skip_test_comments`](#skip_test_comments)
+    - [`integration_test_timeouts`](#integration_test_timeouts)
+- [Authoring & Testing Custom Rules](#authoring--testing-custom-rules)
+  - [1. Implementing an AnalysisRule](#1-implementing-an-analysisrule)
+  - [2. Registering the Rule](#2-registering-the-rule)
+  - [3. Writing Unit Tests](#3-writing-unit-tests)
+  - [4. Running Unit Tests](#4-running-unit-tests)
+  - [5. Best Practices & Migration Tips](#5-best-practices--migration-tips)
+
+---
+
+## Plugin Overview & Architecture
+
+The Flutter SDK repository utilizes custom static analysis rules to enforce architectural boundaries, performance invariants, test hygiene, and style conventions across its packages.
+
+The analysis options hierarchy is structured as follows:
+- **Base Options Files (`analysis_options_common.yaml`)**: Define baseline linter rules and analyzer settings shared across repositories and subtrees.
+- **Root `analysis_options.yaml`**: The repository root entrypoint, which includes the common baseline options and configures repository-level analyzer behaviors and exclusions.
+- **Subpackage `analysis_options.yaml` Files**: Packages and directories (such as `packages/flutter/lib`, `packages/flutter/test`, `packages/flutter_tools`, and `dev/`) include their parent analysis options and load `flutter_analyzer_plugin` via the `plugins:` block with the appropriate relative directory depth.
+
+---
+
+## Configuration
+
+### Loading the Plugin
+
+To load `flutter_analyzer_plugin` in a package or directory's `analysis_options.yaml`, add the plugin entry under the `plugins:` section:
+
+```yaml
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+```
+
+### Rule Activation & Opt-Out
+
+All warning and error rules registered within `flutter_analyzer_plugin` are **enabled by default** once the plugin is loaded.
+
+Packages or directories can explicitly opt out of specific rules (or re-enable them) using the `diagnostics:` section:
+
+```yaml
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+    diagnostics:
+      # Opt out of specific rules if necessary
+      no_stopwatches: false
+      avoid_future_catch_error: false
+```
+
+### Monorepo Path Resolution
+
+The analyzer requires all `analysis_options.yaml` files referencing `flutter_analyzer_plugin` to resolve to the exact same canonical directory path on disk. Ensure relative paths reflect the correct directory nesting depth:
+
+| Package / Directory Depth | Example Path | Configured Plugin Path |
+| :--- | :--- | :--- |
+| **Depth 1** | `dev/` | `path: flutter_analyzer_plugin` |
+| **Depth 2** | `packages/flutter_tools/`, `packages/flutter_test/` | `path: ../../dev/flutter_analyzer_plugin` |
+| **Depth 3** | `packages/flutter/lib/`, `packages/flutter/test/` | `path: ../../../dev/flutter_analyzer_plugin` |
+
+---
+
+## Rules Reference
+
+| Rule Name | Severity | Default | Scope | Summary |
+| :--- | :--- | :--- | :--- | :--- |
+| [`avoid_future_catch_error`](#avoid_future_catch_error) | `ERROR` | Enabled | Global | Disallow `.catchError` / `.onError` on `Future` (prefer `try`/`catch`). |
+| [`no_double_clamp`](#no_double_clamp) | `ERROR` | Enabled | Global | Disallow `double.clamp` / `num.clamp` (prefer `clampDouble`). |
+| [`no_stopwatches`](#no_stopwatches) | `ERROR` | Enabled | Global | Disallow raw `Stopwatch` instantiation (prefer `clock.stopwatch()`). |
+| [`deprecation_syntax`](#deprecation_syntax) | `ERROR` | Enabled | Global | Enforce standard multi-line formatting on `@Deprecated` annotations. |
+| [`no_runtimetype_in_tostring`](#no_runtimetype_in_tostring) | `ERROR` | Enabled | Global | Avoid calling `runtimeType.toString()` inside `toString()` methods. |
+| [`no_sync_async_star`](#no_sync_async_star) | `ERROR` | Enabled | Global | Disallow `sync*` and `async*` methods without an explanatory comment. |
+| [`no_bad_imports_in_flutter`](#no_bad_imports_in_flutter) | `ERROR` | Enabled | `packages/flutter/lib/src/` | Enforce layer hierarchy, prevent cycles, and forbid meta imports outside foundation. |
+| [`protect_public_state_subtypes`](#protect_public_state_subtypes) | `ERROR` | Enabled | `packages/flutter` | Require `@protected` on overridden lifecycle methods in public `State` classes. |
+| [`render_box_intrinsics`](#render_box_intrinsics) | `ERROR` | Enabled | `packages/flutter/lib/src/rendering/` | Disallow calling `compute*` intrinsic methods directly (use `get*`). |
+| [`null_initialized_debug_expensive_fields`](#null_initialized_debug_expensive_fields) | `ERROR` | Enabled | `packages/flutter` | Require `@_debugOnly` fields to be conditionally initialized via `kDebugMode ? <value> : null;`. |
+| [`skip_test_comments`](#skip_test_comments) | `ERROR` | Enabled | Test files | Require justification comments (e.g. `// [intended]` or issue link) for skipped tests. |
+| [`integration_test_timeouts`](#integration_test_timeouts) | `ERROR` | Enabled | `test_driver/` files | Require integration test files under `test_driver/` to set `timeout: Timeout.none`. |
+
+---
+
+## Detailed Rule Specifications
+
+### General & Global Rules
+
+#### `avoid_future_catch_error`
+- **Severity**: `ERROR`
+- **Scope**: Global (all Dart files where the plugin is enabled)
+- **Description**: Disallows calling `.catchError()` or `.onError()` on a `Future` instance.
+- **Rationale**: `Future.catchError` and `Future.onError` are not type-safe and can introduce subtle runtime bugs by bypassing strong type checks or returning unexpected dynamic types. Developers should use standard asynchronous `try`/`catch` blocks with `await`, or pass `onError` directly to `Future.then()`.
+- **References**: [Dart SDK Issue #51248](https://github.com/dart-lang/sdk/issues/51248)
+
+```dart
+// BAD:
+future.catchError((Object error) {
+  handleError(error);
+});
+
+// GOOD:
+try {
+  await future;
+} catch (error) {
+  handleError(error);
+}
+```
+
+---
+
+#### `no_double_clamp`
+- **Severity**: `ERROR`
+- **Scope**: Global (all Dart files where the plugin is enabled)
+- **Description**: Disallows direct invocations or tear-offs of `double.clamp()` and `num.clamp()`.
+- **Rationale**: Invoking `double.clamp` on numbers incurs boxing/unboxing overhead on web and VM runtimes. Furthermore, tear-offs of `num.clamp` lose integer type promotion. Calling `clampDouble(val, min, max)` from `dart:ui` or `package:flutter/foundation.dart` avoids runtime overhead and retains native floating-point performance.
+- **References**: [Flutter PR #103559](https://github.com/flutter/flutter/pull/103559), [Flutter Issue #103917](https://github.com/flutter/flutter/issues/103917)
+
+```dart
+// BAD:
+final double clamped = value.clamp(0.0, 1.0);
+
+// GOOD:
+final double clamped = clampDouble(value, 0.0, 1.0);
+```
+
+---
+
+#### `no_stopwatches`
+- **Severity**: `ERROR`
+- **Scope**: Global (all Dart files where the plugin is enabled)
+- **Description**: Disallows direct instantiation of `Stopwatch()` or calling functions that return a `Stopwatch`.
+- **Rationale**: Direct usage of `Stopwatch` relies on the host system clock, which can fall out of sync with `FakeAsync` during unit and widget tests, causing non-deterministic test flakes. Code should instead use `clock.stopwatch()` from `package:clock` (which binds with `FakeAsync` during tests) or use `dart:developer` timeline events for profiling.
+- **Inline Exemption**: Standard analyzer ignore comments (`// ignore: no_stopwatches`) or legacy inline directive `// flutter_ignore: stopwatch (see analyze.dart)`.
+
+```dart
+// BAD:
+final Stopwatch stopwatch = Stopwatch()..start();
+
+// GOOD:
+final Stopwatch stopwatch = clock.stopwatch()..start();
+```
+
+---
+
+#### `deprecation_syntax`
+- **Severity**: `ERROR`
+- **Scope**: Global (all library declarations and public APIs)
+- **Description**: Enforces standard multi-line string formatting on `@Deprecated` annotations.
+- **Rationale**: Standardizing deprecation messages ensures all deprecated APIs provide actionable migration instructions, state the exact version of deprecation, and link to the Flutter deprecation policy.
+- **Inline Exemption**: Standard analyzer ignore comments (`// ignore: deprecation_syntax`) or legacy inline directive `// flutter_ignore: deprecation_syntax (see analyze.dart)`.
+
+```dart
+// BAD:
+@Deprecated('Use newMethod instead')
+void oldMethod() {}
+
+// GOOD:
+@Deprecated(
+  'Use newMethod instead. '
+  'This feature was deprecated after v3.18.0-0.1.pre.'
+)
+void oldMethod() {}
+```
+
+---
+
+#### `no_runtimetype_in_tostring`
+- **Severity**: `ERROR`
+- **Scope**: Global (all `toString()` implementations)
+- **Description**: Disallows evaluating `runtimeType.toString()` or interpolating `$runtimeType` inside `toString()` methods.
+- **Rationale**: Calling `runtimeType.toString()` prevents compiler tree-shaking, impairs dead code elimination, leaks minified symbol names in release builds, and incurs unnecessary string allocation overhead. If class name reflection is necessary for debug diagnostics, it must be enclosed inside `assert()` or guarded by `kDebugMode`.
+
+```dart
+// BAD:
+@override
+String toString() => '$runtimeType(value: $value)';
+
+// GOOD:
+@override
+String toString() => 'MyClass(value: $value)';
+
+// GOOD (Debug-only):
+@override
+String toString() {
+  String? header;
+  assert(() {
+    header = '$runtimeType';
+    return true;
+  }());
+  return '${header ?? 'MyClass'}(value: $value)';
+}
+```
+
+---
+
+#### `no_sync_async_star`
+- **Severity**: `ERROR`
+- **Scope**: Global (all functions, methods, and closures)
+- **Description**: Disallows the use of `sync*` and `async*` generator functions unless accompanied by an explanatory comment.
+- **Rationale**: Generator functions (`sync*` and `async*`) introduce heavy state machine and iterator allocations in Dart. Standard loops, collections, or stream controllers are typically more performant. When generators are genuinely necessary, an explanation comment must clarify the rationale.
+- **References**: [Flutter Style Guide: Avoid sync\*/async\*](https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-syncasync)
+
+```dart
+// BAD:
+Iterable<int> countTo(int n) sync* {
+  for (int i = 0; i < n; i++) yield i;
+}
+
+// GOOD:
+// Uses sync* to lazily evaluate large datasets on demand.
+Iterable<int> countTo(int n) sync* {
+  for (int i = 0; i < n; i++) yield i;
+}
+```
+
+---
+
+### Framework & Architecture Rules
+
+#### `no_bad_imports_in_flutter`
+- **Severity**: `ERROR`
+- **Scope**: `packages/flutter/lib/src/`
+- **Description**: Enforces the strict Flutter layer dependency hierarchy, prohibits circular or recursive imports, enforces parity between `lib/*.dart` and `lib/src/*/`, and forbids importing `package:meta/meta.dart` outside `foundation`.
+- **Rationale**: Flutter adheres to a strict layered architecture:
+  `foundation` -> `animation` -> `painting` -> `gestures` -> `rendering` -> `widgets` -> `material` / `cupertino`
+  Lower layers must never import higher layers. Circular layer imports and direct `package:meta` imports (which must be re-exported through `foundation`) undermine modularity and package encapsulation.
+
+```dart
+// BAD (in packages/flutter/lib/src/painting/):
+import 'package:flutter/src/widgets/basic.dart'; // Upward layer import
+import 'package:meta/meta.dart'; // Meta imported outside foundation
+
+// GOOD (in packages/flutter/lib/src/painting/):
+import 'package:flutter/foundation.dart';
+```
+
+---
+
+#### `protect_public_state_subtypes`
+- **Severity**: `ERROR`
+- **Scope**: `packages/flutter` (classes extending `State`)
+- **Description**: Requires `@protected` annotations on overridden lifecycle methods in public classes extending `State`.
+- **Rationale**: Overridden lifecycle methods (`initState`, `build`, `dispose`, `setState`, `didUpdateWidget`, `didChangeDependencies`, `activate`, `deactivate`, `reassemble`, `debugFillProperties`) in public `State` subclasses become part of the public interface. Adding `@protected` prevents external consumers from invoking internal lifecycle logic directly.
+
+```dart
+// BAD:
+class MyPublicWidgetState extends State<MyPublicWidget> {
+  @override
+  void initState() {
+    super.initState();
+  }
+}
+
+// GOOD:
+class MyPublicWidgetState extends State<MyPublicWidget> {
+  @override
+  @protected
+  void initState() {
+    super.initState();
+  }
+}
+```
+
+---
+
+#### `render_box_intrinsics`
+- **Severity**: `ERROR`
+- **Scope**: `packages/flutter/lib/src/rendering/` (`RenderBox` subclasses)
+- **Description**: Disallows direct calls to intrinsic calculation methods (`compute*`) inside `RenderBox` subclasses and requires calling the corresponding cached `get*` methods instead.
+- **Rationale**: `compute*` methods perform raw, uncached geometry evaluations. Calling them directly bypasses `RenderBox` intrinsic dimension caching and can result in exponential layout recalculation time ($O(2^N)$ layout passes).
+
+| Uncached Method (Forbidden) | Cached Replacement (Required) |
+| :--- | :--- |
+| `computeDryBaseline` | `getDryBaseline` |
+| `computeDryLayout` | `getDryLayout` |
+| `computeDistanceToActualBaseline` | `getDistanceToBaseline` or `getDistanceToActualBaseline` |
+| `computeMaxIntrinsicHeight` | `getMaxIntrinsicHeight` |
+| `computeMinIntrinsicHeight` | `getMinIntrinsicHeight` |
+| `computeMaxIntrinsicWidth` | `getMaxIntrinsicWidth` |
+| `computeMinIntrinsicWidth` | `getMinIntrinsicWidth` |
+
+```dart
+// BAD (inside a RenderBox subclass):
+final double width = child.computeMinIntrinsicWidth(height);
+
+// GOOD:
+final double width = child.getMinIntrinsicWidth(height);
+```
+
+---
+
+#### `null_initialized_debug_expensive_fields`
+- **Severity**: `ERROR`
+- **Scope**: `packages/flutter`
+- **Description**: Requires all fields annotated with `@_debugOnly` to be conditionally initialized via `kDebugMode ? <value> : null;`.
+- **Rationale**: Expensive diagnostic objects and debug trackers must not allocate heap memory or execute costly initialization logic in profile and release builds. Initializing them with `kDebugMode ? <value> : null` enables the compiler and tree-shaker to eliminate both the field and its initializer in release builds.
+
+```dart
+// BAD:
+@_debugOnly
+List<StackTrace> _creationStackTraces = <StackTrace>[];
+
+// GOOD:
+@_debugOnly
+List<StackTrace>? _creationStackTraces = kDebugMode ? <StackTrace>[] : null;
+```
+
+---
+
+### Testing Rules
+
+#### `skip_test_comments`
+- **Severity**: `ERROR`
+- **Scope**: All repository test files (`*_test.dart`)
+- **Description**: Requires all skipped tests (`test(..., skip: ...)`) to include an inline justification comment explaining why the test is skipped.
+- **Rationale**: Tests should never be silently skipped or left skipped indefinitely without tracking. Every `skip:` argument must provide an intentional marker (such as `// [intended]`) or reference an active GitHub tracking issue link (e.g. `https://github.com/flutter/flutter/issues/<issue-number>`).
+
+```dart
+// BAD:
+test('flaky network test', () {}, skip: true);
+
+// GOOD:
+test('flaky network test', () {}, skip: true); // https://github.com/flutter/flutter/issues/<issue-number>
+
+// GOOD:
+test('platform specific test', () {},
+  // [intended] Not supported on Windows.
+  skip: !Platform.isLinux,
+);
+```
+
+---
+
+#### `integration_test_timeouts`
+- **Severity**: `ERROR`
+- **Scope**: Integration test suites under `test_driver/`
+- **Description**: Requires integration tests under `test_driver/` to explicitly configure `timeout: Timeout.none`.
+- **Rationale**: Host-driven integration and device lab tests involve application bootstrapping, emulator interactions, and golden screenshot comparisons that frequently exceed standard unit test timeouts (30 seconds). Explicitly specifying `timeout: Timeout.none` prevents spurious timeout failures under loaded CI test runners.
+
+```dart
+// BAD (in test_driver/app_test.dart):
+void main() {
+  test('starts app', () async {
+    ...
+  });
+}
+
+// GOOD (in test_driver/app_test.dart):
+void main() {
+  test('starts app', () async {
+    ...
+  }, timeout: Timeout.none);
+}
+```
+
+---
+
+## Authoring & Testing Custom Rules
+
+### 1. Implementing an AnalysisRule
+
+Custom rules inherit from `AnalysisRule` (from `package:analyzer/analysis_rule/analysis_rule.dart`).
+
+1. Place the new rule in `dev/flutter_analyzer_plugin/lib/src/rules/<rule_name>.dart`.
+2. Define a `LintCode` specifying diagnostic name, message, correction message, and `DiagnosticSeverity`.
+3. Implement `registerNodeProcessors` to attach an AST visitor to the node types of interest.
+
+```dart
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+class MyCustomRule extends AnalysisRule {
+  MyCustomRule()
+    : super(
+        name: code.name,
+        description: 'Verify adherence to Flutter repository practices.',
+      );
+
+  static const LintCode code = LintCode(
+    'my_custom_rule',
+    'Explanation of why the pattern is disallowed.',
+    correctionMessage: 'Recommended fix or alternatives.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addMethodInvocation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitMethodInvocation(MethodInvocation node) {
+    if (/* condition */ false) {
+      rule.reportAtNode(node);
+    }
+  }
+}
+```
+
+---
+
+### 2. Registering the Rule
+
+Register the rule in `dev/flutter_analyzer_plugin/lib/main.dart`:
+
+```dart
+import 'package:analysis_server_plugin/plugin.dart';
+import 'package:analysis_server_plugin/registry.dart';
+import 'src/rules/my_custom_rule.dart';
+
+class FlutterAnalyzerPlugin extends Plugin {
+  @override
+  void register(PluginRegistry registry) {
+    registry
+      ..registerWarningRule(MyCustomRule());
+  }
+
+  @override
+  String get name => 'flutter/flutter analyzer plugin';
+}
+```
+
+---
+
+### 3. Writing Unit Tests
+
+Rules must be covered by reflective tests using `package:analyzer_testing`:
+
+1. Create a test file in `dev/flutter_analyzer_plugin/test/<rule_name>_test.dart`.
+2. Extend `AnalysisRuleTest` and annotate the class with `@reflectiveTest`.
+3. Register the rule in `setUp()` using `Registry.ruleRegistry.registerWarningRule(...)` and define test cases using `assertDiagnostics()`.
+
+```dart
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/my_custom_rule.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class MyCustomRuleTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    // Registers the custom AnalysisRule with the test registry prior to running tests.
+    Registry.ruleRegistry.registerWarningRule(MyCustomRule());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => MyCustomRule.code.name;
+
+  Future<void> test_disallowedPattern() async {
+    await assertDiagnostics(
+      '''
+void test() {
+  badFunction();
+}
+''',
+      <ExpectedDiagnostic>[
+        lint(16, 13),
+      ],
+    );
+  }
+
+  Future<void> test_allowedPattern() async {
+    await assertNoDiagnostics(
+      '''
+void test() {
+  goodFunction();
+}
+''',
+    );
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(MyCustomRuleTest);
+  });
+}
+```
+
+---
+
+### 4. Running Unit Tests
+
+Because tests use `test_reflective_loader` (which depends on `dart:mirrors`), tests must be executed with the standalone Dart VM SDK rather than `flutter test`:
+
+```bash
+# 1. Resolve plugin dependencies
+cd dev/flutter_analyzer_plugin
+../../bin/flutter pub get
+
+# 2. Run unit tests using the Dart SDK
+../../bin/cache/dart-sdk/bin/dart test test/my_custom_rule_test.dart
+```
+
+---
+
+### 5. Best Practices & Migration Tips
+
+- **Filtering by File Path**: Obtain the current file path via `context.currentUnit!.file.path` rather than `declaredElement` (which may be unpopulated during AST node registration).
+- **Checking Generic Base Classes**: When checking if a class extends a generic base class (e.g. `State<T>`), cache the `InterfaceElement` (`superType.element`) rather than `DartType`, so subtype checks remain valid across different type arguments (`State<WidgetA>` vs `State<WidgetB>`).
+- **Verifying Compilation**: Before submitting plugin changes, verify the plugin compiles cleanly and passes analysis:
+  ```bash
+  bin/cache/dart-sdk/bin/dart analyze --fatal-infos dev/flutter_analyzer_plugin
+  ```
diff --git a/dev/flutter_analyzer_plugin/analysis_options.yaml b/dev/flutter_analyzer_plugin/analysis_options.yaml
new file mode 100644
index 0000000000000..2b89a7d3e3ba7
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/analysis_options.yaml
@@ -0,0 +1,14 @@
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+include: ../analysis_options.yaml
+
+linter:
+  rules:
+    unawaited_futures: true
diff --git a/dev/flutter_analyzer_plugin/lib/main.dart b/dev/flutter_analyzer_plugin/lib/main.dart
new file mode 100644
index 0000000000000..af15100e1889a
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/main.dart
@@ -0,0 +1,53 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analysis_server_plugin/plugin.dart';
+import 'package:analysis_server_plugin/registry.dart';
+
+import 'src/rules/avoid_future_catch_error.dart';
+import 'src/rules/deprecation_syntax.dart';
+import 'src/rules/golden_test_tags.dart';
+import 'src/rules/integration_test_timeouts.dart';
+import 'src/rules/issue_link_syntax.dart';
+import 'src/rules/no_bad_imports_in_flutter.dart';
+import 'src/rules/no_double_clamp.dart';
+import 'src/rules/no_runtimetype_in_tostring.dart';
+import 'src/rules/no_stopwatches.dart';
+import 'src/rules/no_sync_async_star.dart';
+import 'src/rules/no_test_imports.dart';
+import 'src/rules/null_initialized_debug_expensive_fields.dart';
+import 'src/rules/protect_public_state_subtypes.dart';
+import 'src/rules/render_box_intrinsics.dart';
+import 'src/rules/repository_link_syntax.dart';
+import 'src/rules/skip_test_comments.dart';
+import 'src/rules/taboo_documentation.dart';
+
+final FlutterAnalyzerPlugin plugin = FlutterAnalyzerPlugin();
+
+class FlutterAnalyzerPlugin extends Plugin {
+  @override
+  void register(PluginRegistry registry) {
+    registry
+      ..registerWarningRule(AvoidFutureCatchError())
+      ..registerWarningRule(DeprecationSyntax())
+      ..registerWarningRule(GoldenTestTags())
+      ..registerWarningRule(IntegrationTestTimeouts())
+      ..registerWarningRule(IssueLinkSyntax())
+      ..registerWarningRule(NoBadImportsInFlutter())
+      ..registerWarningRule(NoDoubleClamp())
+      ..registerWarningRule(NoRuntimeTypeInToString())
+      ..registerWarningRule(NoStopwatches())
+      ..registerWarningRule(NoSyncAsyncStar())
+      ..registerWarningRule(NoTestImports())
+      ..registerWarningRule(NullInitializedDebugExpensiveFields())
+      ..registerWarningRule(ProtectPublicStateSubtypes())
+      ..registerWarningRule(RenderBoxIntrinsicCalculationRule())
+      ..registerWarningRule(RepositoryLinkSyntax())
+      ..registerWarningRule(SkipTestComments())
+      ..registerWarningRule(TabooDocumentation());
+  }
+
+  @override
+  String get name => 'flutter/flutter analyzer plugin';
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/avoid_future_catch_error.dart b/dev/flutter_analyzer_plugin/lib/src/rules/avoid_future_catch_error.dart
new file mode 100644
index 0000000000000..790068e70897c
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/avoid_future_catch_error.dart
@@ -0,0 +1,52 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/error/error.dart';
+
+class AvoidFutureCatchError extends AnalysisRule {
+  AvoidFutureCatchError()
+    : super(
+        name: code.name,
+        description: 'Future.catchError and Future.onError are not type safe.',
+      );
+
+  static const LintCode code = LintCode(
+    'avoid_future_catch_error',
+    'Avoid using Future.catchError',
+    correctionMessage: 'Use Future.then instead (https://github.com/dart-lang/sdk/issues/51248).',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addMethodInvocation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitMethodInvocation(MethodInvocation node) {
+    if (node case MethodInvocation(
+      methodName: SimpleIdentifier(name: 'onError' || 'catchError'),
+      realTarget: Expression(staticType: DartType(isDartAsyncFuture: true)),
+    )) {
+      rule.reportAtNode(node);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/deprecation_syntax.dart b/dev/flutter_analyzer_plugin/lib/src/rules/deprecation_syntax.dart
new file mode 100644
index 0000000000000..402074c8266c4
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/deprecation_syntax.dart
@@ -0,0 +1,152 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+import 'package:analyzer/source/line_info.dart';
+
+/// A rule that enforces standard Flutter deprecation notice syntax.
+class DeprecationSyntax extends AnalysisRule {
+  /// Creates a new [DeprecationSyntax] rule.
+  DeprecationSyntax() : super(name: code.name, description: 'Verify deprecation syntax');
+
+  /// The diagnostic code produced when deprecation syntax does not conform to Flutter standards.
+  static const LintCode code = LintCode(
+    'deprecation_syntax',
+    'Deprecation syntax must conform to flutter standards.',
+    correctionMessage:
+        'See https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    registry.addAnnotation(this, _Visitor(this, context));
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  static const String _ignoreDeprecation =
+      '// flutter_ignore: deprecation_syntax (see analyze.dart)';
+  static final RegExp _legacyDeprecation = RegExp(
+    r'// flutter_ignore: deprecation_syntax, https://github\.com/flutter/flutter/issues/\d+',
+  );
+
+  static final RegExp _deprecationVersionPattern = RegExp(
+    r'This feature was deprecated after v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(?<build>-\d+\.\d+\.pre)?\.$',
+  );
+
+  bool _hasInlineIgnore(AstNode node, Pattern ignorePattern) {
+    final LineInfo lineInfo = context.currentUnit!.unit.lineInfo;
+    final int lineIndex = lineInfo.getLocation(node.offset).lineNumber - 1;
+    final String content = context.currentUnit!.content;
+
+    // Check preceding line.
+    if (lineIndex > 0) {
+      final String prevLine = content.substring(
+        lineInfo.getOffsetOfLine(lineIndex - 1),
+        lineInfo.getOffsetOfLine(lineIndex),
+      );
+      if (prevLine.contains(ignorePattern)) {
+        return true;
+      }
+    }
+
+    // Check the remainder of the current line.
+    final int currentLineEnd =
+        lineIndex + 1 < lineInfo.lineCount
+            ? lineInfo.getOffsetOfLine(lineIndex + 1)
+            : content.length;
+    final String textAfterNode = content.substring(node.offset, currentLineEnd);
+    return textAfterNode.contains(ignorePattern);
+  }
+
+  @override
+  void visitAnnotation(Annotation node) {
+    if (node.name.name != 'Deprecated') {
+      return;
+    }
+    if (_hasInlineIgnore(node, _ignoreDeprecation) || _hasInlineIgnore(node, _legacyDeprecation)) {
+      return;
+    }
+
+    if (node.arguments?.arguments case [
+      AdjacentStrings(:final List<StringLiteral> strings),
+    ] when strings.isNotEmpty) {
+      final List<StringLiteral> messageLiterals = strings.sublist(0, strings.length - 1);
+      final StringLiteral versionLiteral = strings.last;
+
+      final RegExpMatch? versionMatch = switch (versionLiteral) {
+        SimpleStringLiteral(:final String value) => _deprecationVersionPattern.firstMatch(value),
+        _ => null,
+      };
+      if (versionMatch == null) {
+        rule.reportAtNode(versionLiteral);
+        return;
+      }
+
+      final int major = int.parse(versionMatch.namedGroup('major')!);
+      final int minor = int.parse(versionMatch.namedGroup('minor')!);
+      final int patch = int.parse(versionMatch.namedGroup('patch')!);
+      final hasBuild = versionMatch.namedGroup('build') != null;
+      final bool specialBeta = major == 3 && minor == 1 && patch == 0;
+      if (!specialBeta && (major > 1 || (major == 1 && minor >= 20))) {
+        if (!hasBuild) {
+          rule.reportAtNode(versionLiteral);
+          return;
+        }
+      }
+
+      if (messageLiterals.isEmpty) {
+        rule.reportAtNode(node);
+        return;
+      }
+
+      for (final message in messageLiterals) {
+        if (message case SingleStringLiteral(isSingleQuoted: true)) {
+          continue;
+        }
+        rule.reportAtNode(message);
+        return;
+      }
+
+      final String fullExplanation =
+          messageLiterals
+              .map((StringLiteral message) => message.stringValue ?? '')
+              .join()
+              .trimRight();
+      if (fullExplanation.isEmpty) {
+        rule.reportAtNode(messageLiterals.last);
+        return;
+      }
+
+      final firstChar = String.fromCharCode(fullExplanation.runes.first);
+      if (firstChar.toUpperCase() != firstChar) {
+        rule.reportAtNode(messageLiterals.first);
+        return;
+      }
+
+      if (!fullExplanation.endsWith('.') &&
+          !fullExplanation.endsWith('?') &&
+          !fullExplanation.endsWith('!')) {
+        rule.reportAtNode(messageLiterals.last);
+        return;
+      }
+    } else {
+      rule.reportAtNode(node);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/golden_test_tags.dart b/dev/flutter_analyzer_plugin/lib/src/rules/golden_test_tags.dart
new file mode 100644
index 0000000000000..9052aafc0e270
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/golden_test_tags.dart
@@ -0,0 +1,121 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+const String _matchesGoldenFile = 'matchesGoldenFile';
+const String _reducedTestSetTag = 'reduced-test-set';
+const String _tagsAnnotation = 'Tags';
+
+/// Files containing golden tests must be tagged using `@Tags(<String>['reduced-test-set'])`.
+class GoldenTestTags extends AnalysisRule {
+  GoldenTestTags() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      "Files containing golden tests must be tagged using @Tags(<String>['reduced-test-set']) "
+      'at the top of the file before import statements.';
+
+  static const LintCode code = LintCode(
+    'golden_test_tags',
+    ruleDescription,
+    correctionMessage:
+        'See https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Writing-a-golden-file-test-for-package-flutter.md for details.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addMethodInvocation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  bool? _hasReducedTestSetTagCache;
+
+  bool _isReducedTestSetTag(Annotation annotation) {
+    final String? name = switch (annotation.name) {
+      SimpleIdentifier(:final String name) => name,
+      PrefixedIdentifier(:final SimpleIdentifier identifier) => identifier.name,
+      _ => null,
+    };
+    if (name != _tagsAnnotation) {
+      return false;
+    }
+    final ArgumentList? argumentList = annotation.arguments;
+    if (argumentList == null) {
+      return false;
+    }
+    for (final Expression argument in argumentList.arguments) {
+      final Expression expr = switch (argument) {
+        NamedExpression(:final Expression expression) => expression,
+        _ => argument,
+      };
+      if (expr case StringLiteral(
+        :final String? stringValue,
+      ) when stringValue == _reducedTestSetTag) {
+        return true;
+      }
+      if (expr
+          case ListLiteral(:final NodeList<CollectionElement> elements) ||
+              SetOrMapLiteral(:final NodeList<CollectionElement> elements)) {
+        for (final element in elements) {
+          if (element case StringLiteral(
+            :final String? stringValue,
+          ) when stringValue == _reducedTestSetTag) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  bool _hasReducedTestSetTag(CompilationUnit unit) {
+    return _hasReducedTestSetTagCache ??= _computeHasReducedTestSetTag(unit);
+  }
+
+  bool _computeHasReducedTestSetTag(CompilationUnit unit) {
+    for (final Directive directive in unit.directives) {
+      for (final Annotation annotation in directive.metadata) {
+        if (_isReducedTestSetTag(annotation)) {
+          return true;
+        }
+      }
+    }
+    for (final CompilationUnitMember declaration in unit.declarations) {
+      for (final Annotation annotation in declaration.metadata) {
+        if (_isReducedTestSetTag(annotation)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  @override
+  void visitMethodInvocation(MethodInvocation node) {
+    if (node.methodName.name != _matchesGoldenFile) {
+      return;
+    }
+
+    final CompilationUnit unit = context.currentUnit!.unit;
+    if (!_hasReducedTestSetTag(unit)) {
+      rule.reportAtNode(node);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/integration_test_timeouts.dart b/dev/flutter_analyzer_plugin/lib/src/rules/integration_test_timeouts.dart
new file mode 100644
index 0000000000000..5822a841da00e
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/integration_test_timeouts.dart
@@ -0,0 +1,69 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+/// Integration tests in flutter test_driver must have `timeout: Timeout.none`.
+class IntegrationTestTimeouts extends AnalysisRule {
+  IntegrationTestTimeouts() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      'Integration tests must specify `timeout: Timeout.none` to prevent them from getting stuck.';
+
+  static const LintCode code = LintCode(
+    'integration_test_timeouts',
+    ruleDescription,
+    correctionMessage: 'Add `timeout: Timeout.none` to the test() arguments.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final String filePath = context.definingUnit.file.path;
+    if (!filePath.contains('test_driver') && !filePath.contains('test.dart')) {
+      return;
+    }
+    final visitor = _Visitor(this);
+    registry.addMethodInvocation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule);
+
+  final AnalysisRule rule;
+
+  @override
+  void visitMethodInvocation(MethodInvocation node) {
+    if (node case MethodInvocation(
+      methodName: SimpleIdentifier(name: 'test'),
+      :final ArgumentList argumentList,
+    )) {
+      final bool hasTimeoutNone = argumentList.arguments.any((Expression argument) {
+        if (argument case NamedExpression(
+          name: Label(label: SimpleIdentifier(name: 'timeout')),
+          expression: PrefixedIdentifier(
+            prefix: SimpleIdentifier(name: 'Timeout'),
+            identifier: SimpleIdentifier(name: 'none'),
+          ),
+        )) {
+          return true;
+        }
+        return false;
+      });
+
+      if (!hasTimeoutNone) {
+        rule.reportAtNode(node.methodName);
+      }
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/issue_link_syntax.dart b/dev/flutter_analyzer_plugin/lib/src/rules/issue_link_syntax.dart
new file mode 100644
index 0000000000000..b5a217fb9b55c
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/issue_link_syntax.dart
@@ -0,0 +1,167 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+// Pattern matching GitHub issue URLs starting with the Flutter issue creation prefix.
+// Delimiters (whitespace, quotes, backslashes, parentheses, brackets) define the URL boundary.
+final RegExp _issueUrlPattern = RegExp(
+  r'''https:\/\/github\.com\/flutter\/flutter\/issues\/new[^\s'"\\)>]*''',
+);
+
+const String _issueLinkPrefix = 'https://github.com/flutter/flutter/issues/new';
+
+const Set<String> _validTemplates = <String>{
+  '01_activation.yml',
+  '02_bug.yml',
+  '03_feature_request.yml',
+  '04_performance_others.yml',
+  '05_performance_speed.yml',
+  '06_infrastructure.yml',
+  '07_design_doc.yml',
+  '08_first_party_packages.yml',
+  '09_wasm.yml',
+  '10_google3_bug.yml',
+  'config.yml',
+};
+
+/// Links to create GitHub issues must specify a valid template or use "/choose".
+class IssueLinkSyntax extends AnalysisRule {
+  IssueLinkSyntax() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      'GitHub issue links must specify a valid template or use "/choose".';
+
+  static const LintCode code = LintCode(
+    'issue_link_syntax',
+    'GitHub issue link must specify a valid template or use "/choose".',
+    correctionMessage:
+        'Prefer to provide a link either to https://github.com/flutter/flutter/issues/new/choose '
+        'or to a specific template directly (https://github.com/flutter/flutter/issues/new?template=...).',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final String filePath = context.definingUnit.file.path;
+    if (filePath.endsWith('_test.dart') || filePath.endsWith('issue_link_syntax.dart')) {
+      return;
+    }
+    final visitor = _Visitor(this);
+    registry
+      ..addAdjacentStrings(this, visitor)
+      ..addCompilationUnit(this, visitor)
+      ..addSimpleStringLiteral(this, visitor)
+      ..addStringInterpolation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule);
+
+  final AnalysisRule rule;
+
+  static bool _isValidIssueUrl(String url) {
+    if (url == _issueLinkPrefix) {
+      return false;
+    }
+    if (url == '$_issueLinkPrefix/choose') {
+      return true;
+    }
+    if (url.startsWith('$_issueLinkPrefix?')) {
+      final Uri? parsedUrl = Uri.tryParse(url);
+      if (parsedUrl == null) {
+        return false;
+      }
+      final List<String>? templates = parsedUrl.queryParametersAll['template'];
+      if (templates == null || templates.length != 1) {
+        return false;
+      }
+      if (!_validTemplates.contains(templates.single)) {
+        return false;
+      }
+      if (parsedUrl.queryParametersAll.keys.length > 1) {
+        return false;
+      }
+      return true;
+    }
+    return false;
+  }
+
+  static bool _hasInvalidIssueLink(String text) {
+    for (final RegExpMatch match in _issueUrlPattern.allMatches(text)) {
+      final String url = match[0]!;
+      if (!_isValidIssueUrl(url)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @override
+  void visitCompilationUnit(CompilationUnit node) {
+
+    // In the Dart analyzer AST, non-doc comments (`// ...`) are not represented
+    // as Comment AST nodes; they are attached to lexical tokens as precedingComments.
+    // We walk the token stream from beginToken to ensure all comments are inspected.
+    Token? token = node.beginToken;
+    while (token != null) {
+      Token? comment = token.precedingComments;
+      while (comment != null) {
+        if (_hasInvalidIssueLink(comment.lexeme)) {
+          rule.reportAtToken(comment);
+        }
+        comment = comment.next;
+      }
+      if (token.isEof) {
+        break;
+      }
+      token = token.next;
+    }
+  }
+
+  @override
+  void visitSimpleStringLiteral(SimpleStringLiteral node) {
+
+    // Ignore children of AdjacentStrings to avoid double-reporting;
+    // visitAdjacentStrings inspects the full concatenated literal.
+    if (node.parent is AdjacentStrings) {
+      return;
+    }
+    if (_hasInvalidIssueLink(node.value)) {
+      rule.reportAtNode(node);
+    }
+  }
+
+  @override
+  void visitStringInterpolation(StringInterpolation node) {
+    // Ignore children of AdjacentStrings to avoid double-reporting.
+    if (node.parent is AdjacentStrings) {
+      return;
+    }
+    for (final InterpolationElement element in node.elements) {
+      if (element is InterpolationString && _hasInvalidIssueLink(element.value)) {
+        rule.reportAtNode(node);
+        return;
+      }
+    }
+  }
+
+  @override
+  void visitAdjacentStrings(AdjacentStrings node) {
+    final String? value = node.stringValue;
+    if (value != null && _hasInvalidIssueLink(value)) {
+      rule.reportAtNode(node);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/no_bad_imports_in_flutter.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_bad_imports_in_flutter.dart
new file mode 100644
index 0000000000000..5a45888332c59
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_bad_imports_in_flutter.dart
@@ -0,0 +1,76 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+import 'package:path/path.dart' as path;
+
+/// Checks for bad imports in `package:flutter`.
+///
+/// Restricts `package:meta/meta.dart` imports within `lib/src/` (excluding
+/// `src/foundation/`), and prevents recursive self-imports (e.g. files under
+/// `lib/src/widgets/` importing `package:flutter/widgets.dart`).
+class NoBadImportsInFlutter extends AnalysisRule {
+  NoBadImportsInFlutter()
+    : super(name: code.name, description: 'Checks for bad imports in flutter package.');
+
+  static const code = LintCode(
+    'no_bad_imports_in_flutter',
+    'Bad import in flutter package.',
+    correctionMessage:
+        'Use relative imports or valid exported packages. Do not recursive import or import meta/meta.dart.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final String filePath = context.definingUnit.file.path;
+    if (!filePath.contains('packages/flutter/lib/src/') &&
+        !filePath.contains(r'packages\flutter\lib\src\')) {
+      return;
+    }
+    final visitor = _Visitor(this, filePath);
+    registry.addImportDirective(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.filePath);
+
+  final AnalysisRule rule;
+  final String filePath;
+
+  @override
+  void visitImportDirective(ImportDirective node) {
+    if (node.uri.stringValue case final String uriStr) {
+      final String absolutePath = filePath;
+
+      if (uriStr == 'package:meta/meta.dart') {
+        final bool isFoundation =
+            absolutePath.contains('src/foundation/') || absolutePath.contains(r'src\foundation\');
+        if (!isFoundation) {
+          rule.reportAtNode(node.uri);
+        }
+        return;
+      }
+
+      final List<String> pathParts = path.split(absolutePath);
+      final int srcIndex = pathParts.lastIndexOf('src');
+      if (srcIndex != -1 && srcIndex + 1 < pathParts.length) {
+        final String currentLayer = pathParts[srcIndex + 1];
+
+        if (uriStr == 'package:flutter/$currentLayer.dart') {
+          rule.reportAtNode(node.uri);
+        }
+      }
+    }
+  }
+}
diff --git a/dev/bots/custom_rules/no_double_clamp.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_double_clamp.dart
similarity index 52%
rename from dev/bots/custom_rules/no_double_clamp.dart
rename to dev/flutter_analyzer_plugin/lib/src/rules/no_double_clamp.dart
index 1f88beb9c3778..906b960cf3234 100644
--- a/dev/bots/custom_rules/no_double_clamp.dart
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_double_clamp.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-
-import '../utils.dart';
-import 'analyze.dart';
+import 'package:analyzer/error/error.dart';
 
 /// Verify that we use clampDouble instead of double.clamp for performance
 /// reasons.
@@ -17,51 +17,36 @@ import 'analyze.dart';
 /// See also:
 ///   * https://github.com/flutter/flutter/pull/103559
 ///   * https://github.com/flutter/flutter/issues/103917
-final AnalyzeRule noDoubleClamp = _NoDoubleClamp();
-
-class _NoDoubleClamp implements AnalyzeRule {
-  final Map<ResolvedUnitResult, List<AstNode>> _errors = <ResolvedUnitResult, List<AstNode>>{};
+class NoDoubleClamp extends AnalysisRule {
+  NoDoubleClamp()
+    : super(
+        name: code.name,
+        description:
+            'Verify that we use clampDouble instead of double.clamp for performance reasons.',
+      );
+
+  static const LintCode code = LintCode(
+    'no_double_clamp',
+    'Avoid double.clamp for performance reasons.',
+    correctionMessage: 'Use clampDouble instead.',
+    severity: DiagnosticSeverity.ERROR,
+  );
 
   @override
-  void applyTo(ResolvedUnitResult unit) {
-    final visitor = _DoubleClampVisitor();
-    unit.unit.visitChildren(visitor);
-    final List<AstNode> violationsInUnit = visitor.clampAccessNodes;
-    if (violationsInUnit.isNotEmpty) {
-      _errors.putIfAbsent(unit, () => <AstNode>[]).addAll(violationsInUnit);
-    }
-  }
+  DiagnosticCode get diagnosticCode => code;
 
   @override
-  void reportViolations(String workingDirectory) {
-    if (_errors.isEmpty) {
-      return;
-    }
-
-    foundError(<String>[
-      for (final MapEntry<ResolvedUnitResult, List<AstNode>> entry in _errors.entries)
-        for (final AstNode node in entry.value)
-          '${locationInFile(entry.key, node, workingDirectory)}: ${node.parent}',
-      '\n${bold}For performance reasons, we use a custom "clampDouble" function instead of using "double.clamp".$reset',
-    ]);
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addSimpleIdentifier(this, visitor);
   }
-
-  @override
-  String toString() => 'No "double.clamp"';
 }
 
-class _DoubleClampVisitor extends RecursiveAstVisitor<void> {
-  final List<AstNode> clampAccessNodes = <AstNode>[];
-
-  // We don't care about directives or comments.
-  @override
-  void visitImportDirective(ImportDirective node) {}
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
 
-  @override
-  void visitExportDirective(ExportDirective node) {}
-
-  @override
-  void visitComment(Comment node) {}
+  final AnalysisRule rule;
+  final RuleContext context;
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
@@ -69,9 +54,9 @@ class _DoubleClampVisitor extends RecursiveAstVisitor<void> {
       return;
     }
     final bool isAllowed = switch (node.parent) {
-      // PropertyAccess matches num.clamp in tear-off form. Always prefer
-      // doubleClamp over tear-offs: even when all 3 operands are int literals,
-      // the return type doesn't get promoted to int:
+      // PropertyAccess and PrefixedIdentifier match num.clamp in tear-off form.
+      // Always prefer doubleClamp over tear-offs: even when all 3 operands are
+      // int literals, the return type doesn't get promoted to int:
       // final x = 1.clamp(0, 2); // The inferred return type is int, where as:
       // final f = 1.clamp;
       // final y = f(0, 2)       // The inferred return type is num.
@@ -81,8 +66,14 @@ class _DoubleClampVisitor extends RecursiveAstVisitor<void> {
               DartType(isDartCoreNum: true) ||
               DartType(isDartCoreInt: true),
         ),
-      ) =>
-        false,
+      ) ||
+      PrefixedIdentifier(
+        prefix: Expression(
+          staticType: DartType(isDartCoreDouble: true) ||
+              DartType(isDartCoreNum: true) ||
+              DartType(isDartCoreInt: true),
+        ),
+      ) => false,
 
       // Expressions like `final int x = 1.clamp(0, 2);` should be allowed.
       MethodInvocation(
@@ -109,7 +100,7 @@ class _DoubleClampVisitor extends RecursiveAstVisitor<void> {
       _ => true,
     };
     if (!isAllowed) {
-      clampAccessNodes.add(node);
+      rule.reportAtNode(node);
     }
   }
 }
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/no_runtimetype_in_tostring.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_runtimetype_in_tostring.dart
new file mode 100644
index 0000000000000..4be49e0da4e9b
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_runtimetype_in_tostring.dart
@@ -0,0 +1,67 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+/// An analysis rule that verifies that runtimeType is not used in toString methods.
+class NoRuntimeTypeInToString extends AnalysisRule {
+  NoRuntimeTypeInToString()
+    : super(name: code.name, description: 'Verify that we do not use runtimeType in toString.');
+
+  static const LintCode code = LintCode(
+    'no_runtimetype_in_tostring',
+    'Avoid calling runtimeType in toString.',
+    correctionMessage: 'Use a fast literal or omit it.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addMethodDeclaration(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitMethodDeclaration(MethodDeclaration node) {
+    if (node case MethodDeclaration(:final FunctionBody body) when node.name.lexeme == 'toString') {
+      final bodyVisitor = _BodyVisitor(rule, context);
+      body.accept(bodyVisitor);
+    }
+  }
+}
+
+class _BodyVisitor extends RecursiveAstVisitor<void> {
+  _BodyVisitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitAssertStatement(AssertStatement node) {
+    // Ignore runtimeType calls inside asserts.
+  }
+
+  @override
+  void visitSimpleIdentifier(SimpleIdentifier node) {
+    if (node case SimpleIdentifier(name: 'runtimeType')) {
+      rule.reportAtNode(node);
+    }
+    super.visitSimpleIdentifier(node);
+  }
+}
diff --git a/dev/bots/custom_rules/no_stop_watches.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_stopwatches.dart
similarity index 52%
rename from dev/bots/custom_rules/no_stop_watches.dart
rename to dev/flutter_analyzer_plugin/lib/src/rules/no_stopwatches.dart
index cb5ea5ec51528..4d8fd422f1e97 100644
--- a/dev/bots/custom_rules/no_stop_watches.dart
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_stopwatches.dart
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/error/error.dart';
 import 'package:path/path.dart' as path;
 
-import '../utils.dart';
-import 'analyze.dart';
-
 // The comment pattern representing the "flutter_ignore" inline directive that
 // indicates the line should be exempt from the stopwatch check.
 final Pattern _ignoreStopwatch = RegExp(r'// flutter_ignore: .*stopwatch .*\(see analyze\.dart\)');
@@ -20,53 +20,40 @@ final Pattern _ignoreStopwatch = RegExp(r'// flutter_ignore: .*stopwatch .*\(see
 /// stopwatch can fall out of sync with the mocked time of FakeAsync in testing.
 /// The Clock object provides a safe stopwatch instead, which is paired with
 /// FakeAsync as part of the test binding.
-final AnalyzeRule noStopwatches = _NoStopwatches();
+class NoStopwatches extends AnalysisRule {
+  NoStopwatches() : super(name: code.name, description: ruleDescription);
 
-class _NoStopwatches implements AnalyzeRule {
-  final Map<ResolvedUnitResult, List<AstNode>> _errors = <ResolvedUnitResult, List<AstNode>>{};
+  static const String ruleDescription =
+      'Use of Stopwatches can introduce test flakes as the logical time of a stopwatch can fall '
+      'out of sync with the mocked time of FakeAsync in testing.';
 
-  @override
-  void applyTo(ResolvedUnitResult unit) {
-    final visitor = _StopwatchVisitor(unit);
-    unit.unit.visitChildren(visitor);
-    final List<AstNode> violationsInUnit = visitor.stopwatchAccessNodes;
-    if (violationsInUnit.isNotEmpty) {
-      _errors.putIfAbsent(unit, () => <AstNode>[]).addAll(violationsInUnit);
-    }
-  }
+  static const LintCode code = LintCode(
+    'no_stopwatches',
+    ruleDescription,
+    correctionMessage: 'Use clock.stopwatch() from package:clock instead.',
+    severity: DiagnosticSeverity.ERROR,
+  );
 
   @override
-  void reportViolations(String workingDirectory) {
-    if (_errors.isEmpty) {
-      return;
-    }
-
-    String locationInFile(ResolvedUnitResult unit, AstNode node) {
-      return '${path.relative(path.relative(unit.path, from: workingDirectory))}:${unit.lineInfo.getLocation(node.offset).lineNumber}';
-    }
-
-    foundError(<String>[
-      for (final MapEntry<ResolvedUnitResult, List<AstNode>> entry in _errors.entries)
-        for (final AstNode node in entry.value)
-          '${locationInFile(entry.key, node)}: ${node.parent}',
-      '\n${bold}Stopwatches introduce flakes by falling out of sync with the FakeAsync used in testing.$reset',
-      'A Stopwatch that stays in sync with FakeAsync is available through the Gesture or Test bindings, through samplingClock.',
-    ]);
-  }
+  DiagnosticCode get diagnosticCode => code;
 
   @override
-  String toString() => 'No "Stopwatch"';
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry
+      ..addConstructorName(this, visitor)
+      ..addSimpleIdentifier(this, visitor);
+  }
 }
 
 // This visitor finds invocation sites of Stopwatch (and subclasses) constructors
 // and references to "external" functions that return a Stopwatch (and subclasses),
-// including constructors, and put them in the stopwatchAccessNodes list.
-class _StopwatchVisitor extends RecursiveAstVisitor<void> {
-  _StopwatchVisitor(this.compilationUnit);
-
-  final ResolvedUnitResult compilationUnit;
+// including constructors.
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
 
-  final List<AstNode> stopwatchAccessNodes = <AstNode>[];
+  final AnalysisRule rule;
+  final RuleContext context;
 
   final Map<ClassElement, bool> _isStopwatchClassElementCache = <ClassElement, bool>{};
 
@@ -85,69 +72,59 @@ class _StopwatchVisitor extends RecursiveAstVisitor<void> {
     return classElement.library.isDartCore
         ? classElement.name == 'Stopwatch'
         : _isStopwatchClassElementCache.putIfAbsent(
-            classElement,
-            () => _checkIfImplementsStopwatchRecursively(classElement),
-          );
+          classElement,
+          () => _checkIfImplementsStopwatchRecursively(classElement),
+        );
   }
 
   bool _isInternal(LibraryElement libraryElement) {
     return path.isWithin(
-      compilationUnit.session.analysisContext.contextRoot.root.path,
+      libraryElement.session.analysisContext.contextRoot.root.path,
       libraryElement.firstFragment.source.fullName,
     );
   }
 
   bool _hasTrailingFlutterIgnore(AstNode node) {
-    return compilationUnit.content
+    return context.currentUnit!.content
         .substring(
           node.offset + node.length,
-          compilationUnit.lineInfo.getOffsetOfLineAfter(node.offset + node.length),
+          context.currentUnit!.unit.lineInfo.getOffsetOfLineAfter(node.offset + node.length),
         )
         .contains(_ignoreStopwatch);
   }
 
-  // We don't care about directives or comments, skip them.
-  @override
-  void visitImportDirective(ImportDirective node) {}
-
-  @override
-  void visitExportDirective(ExportDirective node) {}
-
-  @override
-  void visitComment(Comment node) {}
-
   @override
   void visitConstructorName(ConstructorName node) {
-    final Element? element = node.element;
-    if (element is! ConstructorElement) {
-      assert(false, '$element of $node is not a ConstructorElement.');
+    final ConstructorElement? element = node.element;
+    if (element == null) {
       return;
     }
     final bool isAllowed = switch (element.returnType) {
-      InterfaceType(element: final ClassElement classElement) => !_implementsStopwatch(
-        classElement,
-      ),
+      InterfaceType(element: final ClassElement classElement) =>
+        !_implementsStopwatch(classElement),
       InterfaceType(element: InterfaceElement()) => true,
     };
     if (isAllowed || _hasTrailingFlutterIgnore(node)) {
       return;
     }
-    stopwatchAccessNodes.add(node);
+    rule.reportAtNode(node);
   }
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
     final bool isAllowed = switch (node.element) {
       ExecutableElement(
-        returnType: DartType(element: final ClassElement classElement),
+        returnType: InterfaceType(element: final ClassElement classElement),
         library: final LibraryElement libraryElement,
-      ) =>
+      )
+          // Don't double report constructors and factories.
+          when node.element is! ConstructorElement =>
         _isInternal(libraryElement) || !_implementsStopwatch(classElement),
       Element() || null => true,
     };
     if (isAllowed || _hasTrailingFlutterIgnore(node)) {
       return;
     }
-    stopwatchAccessNodes.add(node);
+    rule.reportAtNode(node);
   }
 }
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/no_sync_async_star.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_sync_async_star.dart
new file mode 100644
index 0000000000000..c1f371919e0e0
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_sync_async_star.dart
@@ -0,0 +1,89 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+/// A rule that enforces explanation comments for `sync*` and `async*` methods.
+class NoSyncAsyncStar extends AnalysisRule {
+  /// Creates a new [NoSyncAsyncStar] rule.
+  NoSyncAsyncStar()
+    : super(
+        name: code.name,
+        description: 'Verify that we do not use sync*/async* methods without an explanation.',
+      );
+
+  /// The diagnostic code produced when `sync*` or `async*` is used without an explanation.
+  static const LintCode code = LintCode(
+    'no_sync_async_star',
+    'Do not use sync*/async* methods without an explanation comment.',
+    correctionMessage:
+        'See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-syncasync for details.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addFunctionDeclaration(this, visitor);
+    registry.addMethodDeclaration(this, visitor);
+    registry.addFunctionExpression(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+  static final RegExp _ignorePattern = RegExp(r'^\s*?// The following uses a?sync\* because:? ');
+
+  @override
+  void visitFunctionDeclaration(FunctionDeclaration node) {
+    _checkFunctionBody(node.functionExpression.body, node);
+  }
+
+  @override
+  void visitMethodDeclaration(MethodDeclaration node) {
+    _checkFunctionBody(node.body, node);
+  }
+
+  @override
+  void visitFunctionExpression(FunctionExpression node) {
+    if (node.parent is! FunctionDeclaration) {
+      _checkFunctionBody(node.body, node);
+    }
+  }
+
+  void _checkFunctionBody(FunctionBody body, AstNode node) {
+    if (body.isGenerator && !_hasExplanationComment(node)) {
+      rule.reportAtNode(node);
+    }
+  }
+
+  bool _hasExplanationComment(AstNode node) {
+    bool hasMatch(Token? startToken) {
+      for (
+        Token? comment = startToken?.precedingComments;
+        comment != null;
+        comment = comment.next
+      ) {
+        if (_ignorePattern.hasMatch(comment.lexeme)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    return hasMatch(node.beginToken) || hasMatch(node.parent?.beginToken);
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/no_test_imports.dart b/dev/flutter_analyzer_plugin/lib/src/rules/no_test_imports.dart
new file mode 100644
index 0000000000000..2b27d0d7df7de
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/no_test_imports.dart
@@ -0,0 +1,58 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+const _testSuffix = '_test.dart';
+
+const Set<String> _exemptTestImports = <String>{
+  'package:flutter_test/flutter_test.dart',
+  'hit_test.dart',
+  'package:test_api/src/backend/live_test.dart',
+  'package:integration_test/integration_test.dart',
+};
+
+/// Verifies that files do not import a test directly.
+class NoTestImports extends AnalysisRule {
+  NoTestImports()
+    : super(name: code.name, description: 'Verify that files do not import a test directly.');
+
+  /// The [LintCode] for this rule.
+  static const code = LintCode(
+    'no_test_imports',
+    'Do not import a test file directly. Test utilities should be in their own file.',
+    correctionMessage: 'Move test utilities to a non-test file or use an exempt test package.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addImportDirective(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitImportDirective(ImportDirective node) {
+    if (node.uri.stringValue case final String uriStr) {
+      if (uriStr.endsWith(_testSuffix) && !_exemptTestImports.contains(uriStr)) {
+        rule.reportAtNode(node.uri);
+      }
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/null_initialized_debug_expensive_fields.dart b/dev/flutter_analyzer_plugin/lib/src/rules/null_initialized_debug_expensive_fields.dart
new file mode 100644
index 0000000000000..20ef09cede619
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/null_initialized_debug_expensive_fields.dart
@@ -0,0 +1,76 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+/// An analysis rule that verifies that debug expensive fields annotated with @_debugOnly are null initialized.
+class NullInitializedDebugExpensiveFields extends AnalysisRule {
+  NullInitializedDebugExpensiveFields()
+    : super(
+        name: code.name,
+        description: 'Verify that debug expensive fields are null initialized.',
+      );
+
+  static const LintCode code = LintCode(
+    'null_initialized_debug_expensive_fields',
+    'Fields annotated with @_debugOnly must null initialize.',
+    correctionMessage: 'Initialize with: field = kDebugMode ? <DebugValue> : null;',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addFieldDeclaration(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitFieldDeclaration(FieldDeclaration node) {
+    final bool hasDebugOnly = node.metadata.any(
+      (Annotation annotation) => annotation.name.name == '_debugOnly',
+    );
+    if (!hasDebugOnly) {
+      return;
+    }
+
+    for (final VariableDeclaration variable in node.fields.variables) {
+      if (!_isCorrectInitializer(variable.initializer)) {
+        rule.reportAtNode(variable);
+      }
+    }
+  }
+
+  bool _isCorrectInitializer(Expression? initializer) {
+    if (initializer case ConditionalExpression(
+      :final Expression condition,
+      elseExpression: NullLiteral(),
+    )) {
+      var unwrappedCondition = condition;
+      while (unwrappedCondition is ParenthesizedExpression) {
+        unwrappedCondition = unwrappedCondition.expression;
+      }
+      return switch (unwrappedCondition) {
+        SimpleIdentifier(name: 'kDebugMode') => true,
+        PrefixedIdentifier(identifier: SimpleIdentifier(name: 'kDebugMode')) => true,
+        _ => false,
+      };
+    }
+    return false;
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/protect_public_state_subtypes.dart b/dev/flutter_analyzer_plugin/lib/src/rules/protect_public_state_subtypes.dart
new file mode 100644
index 0000000000000..0ec52305d74b6
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/protect_public_state_subtypes.dart
@@ -0,0 +1,98 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// TODO(nate-thegrate): remove this file if @protected changes, or add a test if it doesn't.
+// https://github.com/dart-lang/sdk/issues/57094
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/error/error.dart';
+
+class ProtectPublicStateSubtypes extends AnalysisRule {
+  ProtectPublicStateSubtypes()
+    : super(
+        name: code.name,
+        description:
+            'Public State subtypes should add @protected when overriding methods '
+            'to avoid exposing internal logic to developers.',
+      );
+
+  static const LintCode code = LintCode(
+    'protect_public_state_subtypes',
+    'Public State subtypes should add @protected when overriding methods '
+        'to avoid exposing internal logic to developers.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addClassDeclaration(this, visitor);
+  }
+}
+
+class _Visitor extends RecursiveAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  /// Holds the `State` class [InterfaceElement].
+  InterfaceElement? _stateElement;
+
+  bool _isPublicStateSubtype(InterfaceElement element) {
+    if (!element.isPublic) {
+      return false;
+    }
+    final InterfaceElement? stateElement = _stateElement;
+    if (stateElement != null) {
+      return element.allSupertypes.any((InterfaceType t) => t.element == stateElement);
+    }
+    for (final InterfaceType superType in element.allSupertypes) {
+      if (superType.element.name == 'State') {
+        _stateElement = superType.element;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @override
+  void visitClassDeclaration(ClassDeclaration node) {
+    final InterfaceElement? element = node.declaredFragment?.element;
+    if (element != null && _isPublicStateSubtype(element)) {
+      node.visitChildren(this);
+    }
+  }
+
+  /// Checks whether overridden `State` methods have the `@protected` annotation,
+  /// and reports the method if not.
+  @override
+  void visitMethodDeclaration(MethodDeclaration node) {
+    switch (node.name.lexeme) {
+      case 'initState':
+      case 'setState':
+      case 'didUpdateWidget':
+      case 'didChangeDependencies':
+      case 'reassemble':
+      case 'deactivate':
+      case 'activate':
+      case 'dispose':
+      case 'build':
+      case 'debugFillProperties':
+        final ExecutableElement? element = node.declaredFragment?.element;
+        if (element != null && !element.metadata.hasProtected) {
+          rule.reportAtNode(node);
+        }
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/render_box_intrinsics.dart b/dev/flutter_analyzer_plugin/lib/src/rules/render_box_intrinsics.dart
new file mode 100644
index 0000000000000..4769c70d78a3b
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/render_box_intrinsics.dart
@@ -0,0 +1,127 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/error/error.dart';
+
+/// Verify that no RenderBox subclasses call compute* instead of get* for
+/// computing the intrinsic dimensions. The [candidates] variable contains the
+/// full list of RenderBox intrinsic method invocations checked by this rule.
+const Map<String, String> candidates = <String, String>{
+  'computeDryBaseline': 'getDryBaseline',
+  'computeDryLayout': 'getDryLayout',
+  'computeDistanceToActualBaseline': 'getDistanceToBaseline, or getDistanceToActualBaseline',
+  'computeMaxIntrinsicHeight': 'getMaxIntrinsicHeight',
+  'computeMinIntrinsicHeight': 'getMinIntrinsicHeight',
+  'computeMaxIntrinsicWidth': 'getMaxIntrinsicWidth',
+  'computeMinIntrinsicWidth': 'getMinIntrinsicWidth',
+};
+
+class RenderBoxIntrinsicCalculationRule extends AnalysisRule {
+  RenderBoxIntrinsicCalculationRule()
+    : super(
+        name: code.name,
+        description: 'get* methods should be used to obtain the intrinsics of a RenderBox.',
+      );
+
+  static const LintCode code = LintCode(
+    'render_box_intrinsics',
+    'Typically the get* methods should be used to obtain the intrinsics of a RenderBox.',
+    correctionMessage: 'Consider calling {0} instead.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addSimpleIdentifier(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  final Map<InterfaceElement, bool> _isRenderBoxClassElementCache = <InterfaceElement, bool>{};
+
+  // The cached version, call this method instead of _checkIfImplementsRenderBox.
+  bool _implementsRenderBox(InterfaceElement interfaceElement) {
+    // Framework naming convention: a RenderObject subclass names have "Render" in its name.
+    final String? name = interfaceElement.name;
+    if (name == null || !name.contains('Render')) {
+      return false;
+    }
+    return name == 'RenderBox' ||
+        _isRenderBoxClassElementCache.putIfAbsent(
+          interfaceElement,
+          () => _checkIfImplementsRenderBox(interfaceElement),
+        );
+  }
+
+  bool _checkIfImplementsRenderBox(InterfaceElement element) {
+    return element.allSupertypes.any(
+      (InterfaceType interface) => _implementsRenderBox(interface.element),
+    );
+  }
+
+  static bool _checkIfRenderBoxParent(AstNode? node) {
+    if (node == null) {
+      return false;
+    }
+    if (node case ClassDeclaration(:final ClassNamePart namePart)) {
+      // Ignore the RenderBox class implementation: that's the only place the
+      // compute* methods are supposed to be called.
+      return namePart.typeName.lexeme == 'RenderBox';
+    }
+    return _checkIfRenderBoxParent(node.parent);
+  }
+
+  static bool _checkForCommentContext(AstNode? node) {
+    if (node == null) {
+      return false;
+    }
+    if (node is CommentReference) {
+      return true;
+    }
+    return _checkForCommentContext(node.parent);
+  }
+
+  @override
+  void visitSimpleIdentifier(SimpleIdentifier node) {
+    if (node.parent is CommentReference) {
+      return;
+    }
+    final String? correctMethodName = candidates[node.name];
+    if (correctMethodName == null) {
+      return;
+    }
+    if (_checkIfRenderBoxParent(node.parent) || _checkForCommentContext(node.parent)) {
+      return;
+    }
+    final bool isCallingSuperImplementation = switch (node.parent) {
+      PropertyAccess(target: SuperExpression()) ||
+      MethodInvocation(target: SuperExpression()) => true,
+      _ => false,
+    };
+    if (isCallingSuperImplementation) {
+      return;
+    }
+    final Element? declaredInClassElement = node.element?.enclosingElement;
+    if (declaredInClassElement is InterfaceElement &&
+        _implementsRenderBox(declaredInClassElement)) {
+      rule.reportAtNode(node, arguments: <Object>[correctMethodName]);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/repository_link_syntax.dart b/dev/flutter_analyzer_plugin/lib/src/rules/repository_link_syntax.dart
new file mode 100644
index 0000000000000..b6d2d3c8472c2
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/repository_link_syntax.dart
@@ -0,0 +1,133 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+// Pattern matching repository URLs from supported hosting domains.
+// Delimiters (whitespace, quotes, backslashes, parentheses, brackets) define the URL boundary.
+final RegExp _repoUrlPattern = RegExp(
+  r'''https:\/\/(?:cs\.opensource\.google|github|raw\.githubusercontent|source\.chromium|([a-z0-9\-]+)\.googlesource)\.[^\s'"\\)>]+''',
+);
+
+// Repos whose default branch is still 'master'
+const Set<String> _repoExceptions = <String>{
+  'clojure/clojure',
+  'dart-lang/test', // TODO(guidezpl): remove when https://github.com/dart-lang/test/issues/2209 is closed
+  'eseidelGoogle/bezier_perf',
+  'flutter/devtools', // TODO(guidezpl): remove when https://github.com/flutter/devtools/issues/7551 is closed
+  'glfw/glfw',
+  'GoogleCloudPlatform/artifact-registry-maven-tools',
+  'material-components/material-components-android', // TODO(guidezpl): remove when https://github.com/material-components/material-components-android/issues/4144 is closed
+  'ninja-build/ninja',
+  'torvalds/linux',
+  'tpn/winsdk-10',
+};
+
+const String _bannedBranch = 'master';
+
+/// Repository links must use the "main" branch rather than "master".
+class RepositoryLinkSyntax extends AnalysisRule {
+  RepositoryLinkSyntax() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      'Repository links must use the "main" branch rather than "master".';
+
+  static const LintCode code = LintCode(
+    'repository_link_syntax',
+    'Repository link uses the banned "master" branch.',
+    correctionMessage:
+        'Use the "main" branch if it exists, otherwise add the repository to the list of exceptions.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this);
+    registry
+      ..addAdjacentStrings(this, visitor)
+      ..addCompilationUnit(this, visitor)
+      ..addSimpleStringLiteral(this, visitor)
+      ..addStringInterpolation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule);
+
+  final AnalysisRule rule;
+
+  static bool _hasBannedRepositoryLink(String text) {
+    for (final RegExpMatch match in _repoUrlPattern.allMatches(text)) {
+      final String url = match[0]!.replaceAll('\r', '');
+      if (!_repoExceptions.any(url.contains) && url.contains(_bannedBranch)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @override
+  void visitCompilationUnit(CompilationUnit node) {
+    // In the Dart analyzer AST, non-doc comments (`// ...`) are not represented
+    // as Comment AST nodes; they are attached to lexical tokens as precedingComments.
+    // We walk the token stream from beginToken to ensure all comments are inspected.
+    Token? token = node.beginToken;
+    while (token != null) {
+      Token? comment = token.precedingComments;
+      while (comment != null) {
+        if (_hasBannedRepositoryLink(comment.lexeme)) {
+          rule.reportAtToken(comment);
+        }
+        comment = comment.next;
+      }
+      if (token.isEof) {
+        break;
+      }
+      token = token.next;
+    }
+  }
+
+  @override
+  void visitSimpleStringLiteral(SimpleStringLiteral node) {
+    // Ignore children of AdjacentStrings to avoid double-reporting;
+    // visitAdjacentStrings inspects the full concatenated literal.
+    if (node.parent is AdjacentStrings) {
+      return;
+    }
+    if (_hasBannedRepositoryLink(node.value)) {
+      rule.reportAtNode(node);
+    }
+  }
+
+  @override
+  void visitStringInterpolation(StringInterpolation node) {
+    // Ignore children of AdjacentStrings to avoid double-reporting.
+    if (node.parent is AdjacentStrings) {
+      return;
+    }
+    for (final InterpolationElement element in node.elements) {
+      if (element is InterpolationString && _hasBannedRepositoryLink(element.value)) {
+        rule.reportAtNode(node);
+        return;
+      }
+    }
+  }
+
+  @override
+  void visitAdjacentStrings(AdjacentStrings node) {
+    final String? value = node.stringValue;
+    if (value != null && _hasBannedRepositoryLink(value)) {
+      rule.reportAtNode(node);
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/skip_test_comments.dart b/dev/flutter_analyzer_plugin/lib/src/rules/skip_test_comments.dart
new file mode 100644
index 0000000000000..d5a84deb5f8d5
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/skip_test_comments.dart
@@ -0,0 +1,93 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+import 'package:analyzer/source/line_info.dart';
+
+final Pattern _skipTestIntentionalPattern = RegExp(r'// .*\[intended\]');
+final Pattern _skipTestTrackingBugPattern = RegExp(r'// .*https+?://github.com/.*/issues/\d+');
+
+/// Skipped tests should have a justification comment.
+class SkipTestComments extends AnalysisRule {
+  SkipTestComments() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      'Skipped tests must have a justification comment, such as a tracking bug link or "[intended]".';
+
+  static const LintCode code = LintCode(
+    'skip_test_comments',
+    ruleDescription,
+    correctionMessage: 'Add a comment with a GitHub issue link or "[intended]".',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  DiagnosticCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addMethodInvocation(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  static bool _isTestMethod(String name) {
+    return name.startsWith('test') || name == 'group' || name == 'expect';
+  }
+
+  bool _hasInlineIgnore(AstNode node, Pattern ignoreDirectivePattern) {
+    final RuleContextUnit compilationUnit = context.currentUnit!;
+    final LineInfo lineInfo = compilationUnit.unit.lineInfo;
+    final int lineNumber = lineInfo.getLocation(node.offset).lineNumber;
+    final String content = compilationUnit.content;
+
+    final int endOffset =
+        lineNumber < lineInfo.lineCount ? lineInfo.getOffsetOfLine(lineNumber) : content.length;
+    final String textAfterNode = content.substring(node.offset, endOffset);
+    if (textAfterNode.contains(ignoreDirectivePattern)) {
+      return true;
+    }
+
+    final int previousLineNumber = lineNumber - 1;
+    if (previousLineNumber <= 0) {
+      return false;
+    }
+    return content
+        .substring(
+          lineInfo.getOffsetOfLine(previousLineNumber - 1),
+          lineInfo.getOffsetOfLine(previousLineNumber),
+        )
+        .trimLeft()
+        .contains(ignoreDirectivePattern);
+  }
+
+  bool _hasValidJustificationComment(AstNode skipLabel) {
+    return _hasInlineIgnore(skipLabel, _skipTestIntentionalPattern) ||
+        _hasInlineIgnore(skipLabel, _skipTestTrackingBugPattern);
+  }
+
+  @override
+  void visitMethodInvocation(MethodInvocation node) {
+    if (_isTestMethod(node.methodName.name)) {
+      for (final Expression argument in node.argumentList.arguments) {
+        if (argument is NamedExpression &&
+            argument.name.label.name == 'skip' &&
+            !_hasValidJustificationComment(argument.name.label)) {
+          rule.reportAtNode(argument);
+        }
+      }
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/lib/src/rules/taboo_documentation.dart b/dev/flutter_analyzer_plugin/lib/src/rules/taboo_documentation.dart
new file mode 100644
index 0000000000000..5b69c272aa1d1
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/lib/src/rules/taboo_documentation.dart
@@ -0,0 +1,56 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/analysis_rule/rule_context.dart';
+import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/error/error.dart';
+
+final RegExp _tabooPattern = RegExp(r'\b(simply\b|note:|note that\b)', caseSensitive: false);
+
+/// Avoid taboo words ('simply', 'note:', 'note that') in documentation comments.
+class TabooDocumentation extends AnalysisRule {
+  TabooDocumentation() : super(name: code.name, description: ruleDescription);
+
+  static const String ruleDescription =
+      "Avoid taboo words ('simply', 'note:', 'note that') in documentation comments.";
+
+  static const LintCode code = LintCode(
+    'taboo_documentation',
+    ruleDescription,
+    correctionMessage:
+        'See https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#avoid-empty-prose for details.',
+    severity: DiagnosticSeverity.ERROR,
+  );
+
+  @override
+  LintCode get diagnosticCode => code;
+
+  @override
+  void registerNodeProcessors(RuleVisitorRegistry registry, RuleContext context) {
+    final visitor = _Visitor(this, context);
+    registry.addComment(this, visitor);
+  }
+}
+
+class _Visitor extends SimpleAstVisitor<void> {
+  _Visitor(this.rule, this.context);
+
+  final AnalysisRule rule;
+  final RuleContext context;
+
+  @override
+  void visitComment(Comment node) {
+    for (final Token token in node.tokens) {
+      final String lexeme = token.lexeme;
+      if (lexeme.startsWith('///') && _tabooPattern.hasMatch(lexeme)) {
+        rule.reportAtNode(node);
+        break;
+      }
+    }
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/pubspec.yaml b/dev/flutter_analyzer_plugin/pubspec.yaml
new file mode 100644
index 0000000000000..00535dfe8cad6
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/pubspec.yaml
@@ -0,0 +1,20 @@
+name: flutter_analyzer_plugin
+description: Custom analysis rules for flutter/flutter
+version: 0.0.1
+publish_to: none
+
+resolution: workspace
+
+environment:
+  sdk: ^3.7.0
+
+dependencies:
+  analysis_server_plugin: any
+  analyzer: any
+  path: any
+
+dev_dependencies:
+  analyzer_testing: any
+  test_reflective_loader: any
+
+# PUBSPEC CHECKSUM: jdpqac
diff --git a/dev/flutter_analyzer_plugin/test/avoid_future_catch_error_test.dart b/dev/flutter_analyzer_plugin/test/avoid_future_catch_error_test.dart
new file mode 100644
index 0000000000000..c558c0763f37b
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/avoid_future_catch_error_test.dart
@@ -0,0 +1,52 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/avoid_future_catch_error.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class AvoidFutureCatchErrorTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(AvoidFutureCatchError());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => AvoidFutureCatchError.code.name;
+
+  static const String source = '''
+import 'dart:async';
+
+// This extension isn't picked up from dart:async, so we just fake it.
+extension MyFutureExtension<T> on Future<T> {
+  Future<T> onError<E extends Object>(
+    FutureOr<T> handleError(E error, StackTrace stackTrace), {
+    bool test(E error)?,
+  }) {
+    return this;
+  }
+}
+
+void main() {
+  Future<void>.value().catchError((e, st) => null); // ERROR
+  Future<void>.value().onError((e, st) => null); // ERROR
+  Future<void>.value().then((_) => null, onError: (e, st) => null); // OK
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_avoid_future_catch_error() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[lint(313, 48), lint(374, 45)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(AvoidFutureCatchErrorTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/deprecation_syntax_test.dart b/dev/flutter_analyzer_plugin/test/deprecation_syntax_test.dart
new file mode 100644
index 0000000000000..341805a32b1de
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/deprecation_syntax_test.dart
@@ -0,0 +1,50 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/deprecation_syntax.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class DeprecationSyntaxTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(DeprecationSyntax());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => DeprecationSyntax.code.name;
+
+  static const String _invalidAnnotation =
+      '@Deprecated(\n'
+      "        'This is an invalid deprecation message. ' // missing version\n"
+      '      )';
+
+  static const String source = '''
+      @Deprecated(
+        'This is a valid deprecation message. '
+        'This feature was deprecated after v3.12.0-1.0.pre.'
+      )
+      void foo() {}
+
+      $_invalidAnnotation
+      void bar() {}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_deprecation_syntax() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(source.indexOf(_invalidAnnotation), _invalidAnnotation.length),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(DeprecationSyntaxTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/golden_test_tags_test.dart b/dev/flutter_analyzer_plugin/test/golden_test_tags_test.dart
new file mode 100644
index 0000000000000..3462deefc3ceb
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/golden_test_tags_test.dart
@@ -0,0 +1,194 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/golden_test_tags.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class GoldenTestTagsTest extends AnalysisRuleTest {
+  static const String _flutterTestPackageName = 'flutter_test';
+  static const String _flutterTestPackageRoot = '/packages/$_flutterTestPackageName';
+
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(GoldenTestTags());
+    super.setUp();
+
+    newFile('$_flutterTestPackageRoot/lib/flutter_test.dart', '''
+class Tags {
+  const Tags(Object tags);
+}
+
+void matchesGoldenFile(Object key) {}
+void expect(Object? actual, Object? matcher) {}
+''');
+    writeTestPackageConfig(
+      PackageConfigFileBuilder()
+        ..add(name: _flutterTestPackageName, rootPath: convertPath(_flutterTestPackageRoot)),
+    );
+  }
+
+  @override
+  String get analysisRule => GoldenTestTags.code.name;
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_missing_tag() async {
+    const source = '''
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertDiagnostics(source, [lint(66, 29)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_tag_with_type_arg() async {
+    const source = '''
+@Tags(<String>['reduced-test-set'])
+library;
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_tag_without_type_arg() async {
+    const source = '''
+@Tags(['reduced-test-set'])
+library;
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_tag_single_string_literal() async {
+    const source = '''
+@Tags('reduced-test-set')
+library;
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_tag_on_import() async {
+    const source = '''
+@Tags(['reduced-test-set'])
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_tag_with_multiple_tags() async {
+    const source = '''
+@Tags(<String>['other-tag', 'reduced-test-set'])
+library;
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_missing_reduced_tag() async {
+    const source = '''
+@Tags(<String>['other-tag'])
+library;
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertDiagnostics(source, [lint(105, 29)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_ignore_trailing_comment() async {
+    const source = '''
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png'); // ignore: golden_test_tags
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_ignore_previous_line_comment() async {
+    const source = '''
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  // ignore: golden_test_tags
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_ignore_for_file() async {
+    const source = '''
+// ignore_for_file: golden_test_tags
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  matchesGoldenFile('test.png');
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_golden_calls() async {
+    const source = '''
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  expect(1, 1);
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(GoldenTestTagsTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/integration_test_timeouts_test.dart b/dev/flutter_analyzer_plugin/test/integration_test_timeouts_test.dart
new file mode 100644
index 0000000000000..2fe5c8aa221ba
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/integration_test_timeouts_test.dart
@@ -0,0 +1,45 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/integration_test_timeouts.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class IntegrationTestTimeoutsTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(IntegrationTestTimeouts());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => IntegrationTestTimeouts.code.name;
+
+  static const String source = '''
+class Timeout {
+  static const Timeout none = Timeout();
+  const Timeout();
+}
+void test(String name, void Function() body, {Timeout? timeout}) {}
+
+void main() {
+  test('a test without timeout', () {}); // ERROR
+
+  test('a test with timeout', () {}, timeout: Timeout.none); // OK
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_integration_test_timeouts() async {
+    await assertDiagnostics(source, [lint(163, 4)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(IntegrationTestTimeoutsTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/issue_link_syntax_test.dart b/dev/flutter_analyzer_plugin/test/issue_link_syntax_test.dart
new file mode 100644
index 0000000000000..dc783d409d3f0
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/issue_link_syntax_test.dart
@@ -0,0 +1,141 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/issue_link_syntax.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class IssueLinkSyntaxTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(IssueLinkSyntax());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => IssueLinkSyntax.code.name;
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_issue_links() async {
+    const source = r'''
+// https://github.com/flutter/flutter/issues/new/choose
+// https://github.com/flutter/flutter/issues/new?template=02_bug.yml
+// https://github.com/flutter/flutter/issues/new?template=01_activation.yml
+
+void main() {
+  const String link1 = 'https://github.com/flutter/flutter/issues/new/choose';
+  const String link2 = 'https://github.com/flutter/flutter/issues/new?template=02_bug.yml';
+  final String name = 'test';
+  final String interpolated = '$name: https://github.com/flutter/flutter/issues/new/choose';
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_direct_link_in_comment() async {
+    const source = '''
+// https://github.com/flutter/flutter/issues/new
+void main() {}
+''';
+    await assertDiagnostics(source, [lint(0, 48)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_direct_link_in_string() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/flutter/issues/new';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 47)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_invalid_template_in_string() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/flutter/issues/new?template=invalid.yml';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 68)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_template_arg_in_string() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/flutter/issues/new?title=bug';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 57)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_extra_query_params_in_string() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/flutter/issues/new?template=02_bug.yml&labels=p1';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 77)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_interpolated_invalid_issue_link() async {
+    const source = r'''
+void main() {
+  final String foo = 'bar';
+  final String s = '$foo https://github.com/flutter/flutter/issues/new';
+}
+''';
+    await assertDiagnostics(source, [lint(61, 52)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_adjacent_strings_invalid_link() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/'
+      'flutter/issues/new?title=bug';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 66)]);
+  }
+}
+
+@reflectiveTest
+class IssueLinkSyntaxTestFileTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(IssueLinkSyntax());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => IssueLinkSyntax.code.name;
+
+  @override
+  String get testFileName => 'sample_test.dart';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_test_file_skipped() async {
+    const source = '''
+// https://github.com/flutter/flutter/issues/new
+void main() {
+  const String s = 'https://github.com/flutter/flutter/issues/new';
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(IssueLinkSyntaxTest);
+    defineReflectiveTests(IssueLinkSyntaxTestFileTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_bad_imports_in_flutter_test.dart b/dev/flutter_analyzer_plugin/test/no_bad_imports_in_flutter_test.dart
new file mode 100644
index 0000000000000..a9ae490c89b87
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_bad_imports_in_flutter_test.dart
@@ -0,0 +1,63 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_bad_imports_in_flutter.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'package_mixins/meta_mixin.dart';
+
+@reflectiveTest
+class NoBadImportsInFlutterTest extends AnalysisRuleTest with MetaPackage {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoBadImportsInFlutter());
+    super.setUp();
+
+    newPackage('flutter').addFile('lib/widgets.dart', 'const int widget = 1;');
+    writeTestPackageConfig(PackageConfigFileBuilder()..addMetaPackage(this));
+  }
+
+  @override
+  String get analysisRule => NoBadImportsInFlutter.code.name;
+
+  @override
+  String get testPackageRootPath => '$workspaceRootPath/packages/flutter';
+
+  @override
+  String get testPackageLibPath => '$testPackageRootPath/lib/src/widgets';
+
+  static const String source = '''
+import 'package:meta/meta.dart';
+
+@protected
+class Foo {}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_bad_imports_in_flutter() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[lint(7, 24)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_recursive_self_import() async {
+    await assertDiagnostics(
+      '''
+import 'package:flutter/widgets.dart';
+
+const int x = widget;
+''',
+      <ExpectedDiagnostic>[lint(7, 30)],
+    );
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoBadImportsInFlutterTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_double_clamp_test.dart b/dev/flutter_analyzer_plugin/test/no_double_clamp_test.dart
new file mode 100644
index 0000000000000..d49beee78f898
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_double_clamp_test.dart
@@ -0,0 +1,71 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_double_clamp.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class NoDoubleClampTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoDoubleClamp());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => NoDoubleClamp.code.name;
+
+  static const String source = '''
+class ClassWithAClampMethod {
+  ClassWithAClampMethod clamp(double min, double max) => this;
+}
+
+void testNoDoubleClamp(int input) {
+  final ClassWithAClampMethod nonDoubleClamp = ClassWithAClampMethod();
+  // ignore: unnecessary_nullable_for_final_variable_declarations
+  final ClassWithAClampMethod? nonDoubleClamp2 = nonDoubleClamp;
+  // ignore: unnecessary_nullable_for_final_variable_declarations
+  final int? nullableInt = input;
+  final double? nullableDouble = nullableInt?.toDouble();
+
+  nonDoubleClamp.clamp(0, 2);
+  input.clamp(0, 2);
+  input.clamp(0.0, 2); // ERROR: input.clamp(0.0, 2)
+  input.toDouble().clamp(0, 2); // ERROR: input.toDouble().clamp(0, 2)
+
+  nonDoubleClamp2?.clamp(0, 2);
+  nullableInt?.clamp(0, 2);
+  nullableInt?.clamp(0, 2.0); // ERROR: nullableInt?.clamp(0, 2.0)
+  nullableDouble?.clamp(0, 2); // ERROR: nullableDouble?.clamp(0, 2)
+
+  // ignore: unused_local_variable
+  final ClassWithAClampMethod Function(double, double)? tearOff1 = nonDoubleClamp2?.clamp;
+  // ignore: unused_local_variable
+  final num Function(num, num)? tearOff2 = nullableInt?.clamp; // ERROR: nullableInt?.clamp
+  // ignore: unused_local_variable
+  final num Function(num, num)? tearOff3 = nullableDouble?.clamp; // ERROR: nullableDouble?.clamp
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_double_clamp() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(553, 5),
+      lint(617, 5),
+      lint(745, 5),
+      lint(815, 5),
+      lint(1084, 5),
+      lint(1214, 5),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoDoubleClampTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_runtimetype_in_tostring_test.dart b/dev/flutter_analyzer_plugin/test/no_runtimetype_in_tostring_test.dart
new file mode 100644
index 0000000000000..fce469dd3789b
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_runtimetype_in_tostring_test.dart
@@ -0,0 +1,70 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_runtimetype_in_tostring.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class NoRuntimeTypeInToStringTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoRuntimeTypeInToString());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => NoRuntimeTypeInToString.code.name;
+
+  static const String source = r'''
+class GoodToString {
+  @override
+  String toString() {
+    return 'GoodToString';
+  }
+}
+
+class BadToString {
+  @override
+  String toString() {
+    return 'BadToString with $runtimeType';
+  }
+}
+
+class BadToString2 {
+  @override
+  String toString() => 'BadToString2 with ' + runtimeType.toString();
+}
+
+class OtherMethodWithRuntimeType {
+  void someMethod() {
+    print(runtimeType);
+  }
+}
+
+class GoodToStringWithAssert {
+  @override
+  String toString() {
+    assert(() {
+      print(runtimeType);
+      return true;
+    }());
+    return 'GoodToStringWithAssert';
+  }
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_runtimeType() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[lint(173, 11), lint(273, 11)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoRuntimeTypeInToStringTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_stopwatches_test.dart b/dev/flutter_analyzer_plugin/test/no_stopwatches_test.dart
new file mode 100644
index 0000000000000..01cf483cc900b
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_stopwatches_test.dart
@@ -0,0 +1,122 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_stopwatches.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'package_mixins/external_stopwatches_mixin.dart';
+
+@reflectiveTest
+class NoStopwatchesTest extends AnalysisRuleTest with ExternalStopwatchesPackage {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoStopwatches());
+    super.setUp();
+
+    writeTestPackageConfig(PackageConfigFileBuilder()..addExternalStopwatchesPackage(this));
+  }
+
+  @override
+  String get analysisRule => NoStopwatches.code.name;
+
+  static const String source = '''
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:external_stopwatches/external_stopwatches.dart' as externallib;
+
+typedef ExternalStopwatchConstructor = externallib.MyStopwatch Function();
+
+class StopwatchAtHome extends Stopwatch {
+  StopwatchAtHome();
+  StopwatchAtHome.create() : this();
+
+  Stopwatch get stopwatch => this;
+}
+
+void testNoStopwatches(Stopwatch stopwatch) {
+  // OK for now, but we probably want to catch public APIs that take a Stopwatch?
+  stopwatch.runtimeType;
+  // Bad: introducing Stopwatch from dart:core.
+  final Stopwatch localVariable = Stopwatch(); // ERROR: Stopwatch()
+  // Bad: introducing Stopwatch from dart:core.
+  Stopwatch().runtimeType; // ERROR: Stopwatch()
+
+  (localVariable..runtimeType) // OK: not directly introducing Stopwatch.
+      .runtimeType;
+
+  // Bad: introducing a Stopwatch subclass.
+  StopwatchAtHome().runtimeType; // ERROR: StopwatchAtHome()
+
+  // OK: not directly introducing Stopwatch.
+  Stopwatch anotherStopwatch = stopwatch;
+  // Bad: introducing a Stopwatch constructor.
+  StopwatchAtHome Function() constructor = StopwatchAtHome.new; // ERROR: StopwatchAtHome.new
+  assert(() {
+    anotherStopwatch = constructor()..runtimeType;
+    // Bad: introducing a Stopwatch constructor.
+    constructor = StopwatchAtHome.create; // ERROR: StopwatchAtHome.create
+    anotherStopwatch = constructor()..runtimeType;
+    return true;
+  }());
+  anotherStopwatch.runtimeType;
+
+  // Bad: introducing an external Stopwatch constructor.
+  externallib.MyStopwatch.create(); // ERROR: externallib.MyStopwatch.create()
+  ExternalStopwatchConstructor? externalConstructor;
+
+  assert(() {
+    // Bad: introducing an external Stopwatch constructor.
+    externalConstructor = externallib.MyStopwatch.new; // ERROR: externallib.MyStopwatch.new
+    return true;
+  }());
+  externalConstructor?.call();
+
+  // Bad: introducing an external Stopwatch.
+  externallib.stopwatch.runtimeType; // ERROR: externallib.stopwatch
+  // Bad: calling an external function that returns a Stopwatch.
+  externallib.createMyStopwatch().runtimeType; // ERROR: externallib.createMyStopwatch()
+  // Bad: calling an external function that returns a Stopwatch.
+  externallib.createStopwatch().runtimeType; // ERROR: externallib.createStopwatch()
+  // Bad: introducing the tear-off form of an external function that returns a Stopwatch.
+  externalConstructor = externallib.createMyStopwatch; // ERROR: externallib.createMyStopwatch
+
+  // OK: existing instance.
+  constructor.call().stopwatch;
+}
+
+void testStopwatchIgnore(Stopwatch stopwatch) {
+  Stopwatch().runtimeType; // flutter_ignore: stopwatch (see analyze.dart)
+  Stopwatch().runtimeType; // flutter_ignore: some_other_ignores, stopwatch (see analyze.dart)
+}
+''';
+
+  // ignore: unreachable_from_main, non_constant_identifier_names
+  Future<void> test_no_stopwatches() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(696, 9),
+      lint(781, 9),
+      lint(970, 15),
+      lint(1207, 19),
+      lint(1390, 22),
+      lint(1615, 30),
+      lint(1845, 27),
+      lint(2028, 9),
+      lint(2162, 17),
+      lint(2316, 15),
+      lint(2513, 17),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoStopwatchesTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_sync_async_star_test.dart b/dev/flutter_analyzer_plugin/test/no_sync_async_star_test.dart
new file mode 100644
index 0000000000000..2abdeac136326
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_sync_async_star_test.dart
@@ -0,0 +1,64 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_sync_async_star.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class NoSyncAsyncStarTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoSyncAsyncStar());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => NoSyncAsyncStar.code.name;
+
+  static const String _fooDeclaration =
+      'Stream<int> foo() async* {\n'
+      '        yield 1;\n'
+      '      }';
+
+  static const String _barDeclaration =
+      'Iterable<int> bar() sync* {\n'
+      '        yield 1;\n'
+      '      }';
+
+  static const String _nestedClosure = '() async* { yield 1; }';
+
+  static const String source = '''
+      $_fooDeclaration
+      $_barDeclaration
+      // The following uses async* because: Fake reason.
+      Stream<int> baz() async* {
+        yield 1;
+      }
+      // The following uses sync* because: Fake reason
+      Iterable<int> qux() sync* {
+        yield 1;
+      }
+      void nest() {
+        final f = $_nestedClosure;
+      }
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_no_sync_async_star() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(source.indexOf(_fooDeclaration), _fooDeclaration.length),
+      lint(source.indexOf(_barDeclaration), _barDeclaration.length),
+      lint(source.indexOf(_nestedClosure), _nestedClosure.length),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoSyncAsyncStarTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/no_test_imports_test.dart b/dev/flutter_analyzer_plugin/test/no_test_imports_test.dart
new file mode 100644
index 0000000000000..b7de41980920c
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/no_test_imports_test.dart
@@ -0,0 +1,122 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/no_test_imports.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class NoTestImportsTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NoTestImports());
+    super.setUp();
+
+    newFile('$testPackageLibPath/foo.dart', 'const int foo = 1;');
+    newFile('$testPackageLibPath/hit_test.dart', 'const int hitTest = 1;');
+    newFile('$testPackageLibPath/foo_test.dart', 'const int fooTest = 1;');
+    newPackage('flutter_test').addFile('lib/flutter_test.dart', 'const int flutterTest = 1;');
+    newPackage('test_api').addFile('lib/src/backend/live_test.dart', 'const int liveTest = 1;');
+    newPackage(
+      'integration_test',
+    ).addFile('lib/integration_test.dart', 'const int integrationTest = 1;');
+    newPackage('some_pkg').addFile('lib/bar_test.dart', 'const int barTest = 1;');
+    writeTestPackageConfig(PackageConfigFileBuilder());
+  }
+
+  @override
+  String get analysisRule => NoTestImports.code.name;
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_standard_import() async {
+    const source = '''
+import 'foo.dart';
+
+void main() {
+  const int x = foo;
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_exempt_flutter_test_import() async {
+    const source = '''
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  const int x = flutterTest;
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_exempt_hit_test_import() async {
+    const source = '''
+import 'hit_test.dart';
+
+void main() {
+  const int x = hitTest;
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_exempt_live_test_import() async {
+    const source = '''
+import 'package:test_api/src/backend/live_test.dart';
+
+void main() {
+  const int x = liveTest;
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_exempt_integration_test_import() async {
+    const source = '''
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  const int x = integrationTest;
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_relative_test_import_fails() async {
+    const source = '''
+import 'foo_test.dart';
+
+void main() {
+  const int x = fooTest;
+}
+''';
+    await assertDiagnostics(source, [lint(7, 15)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_package_test_import_fails() async {
+    const source = '''
+import 'package:some_pkg/bar_test.dart';
+
+void main() {
+  const int x = barTest;
+}
+''';
+    await assertDiagnostics(source, [lint(7, 32)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NoTestImportsTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/null_initialized_debug_expensive_fields_test.dart b/dev/flutter_analyzer_plugin/test/null_initialized_debug_expensive_fields_test.dart
new file mode 100644
index 0000000000000..8b01796da1225
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/null_initialized_debug_expensive_fields_test.dart
@@ -0,0 +1,79 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/null_initialized_debug_expensive_fields.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class NullInitializedDebugExpensiveFieldsTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(NullInitializedDebugExpensiveFields());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => NullInitializedDebugExpensiveFields.code.name;
+
+  static const String source = '''
+class GoodClass {
+  @_debugOnly
+  final int? _foo = kDebugMode ? 1 : null;
+}
+
+class BadClass {
+  @_debugOnly
+  final int? _foo = 1;
+}
+
+class BadClass2 {
+  @_debugOnly
+  int? _foo;
+}
+
+class BadClass3 {
+  @_debugOnly
+  final int? _foo = kDebugMode ? 1 : 2;
+}
+
+class GoodClass2 {
+  @_debugOnly
+  int? _foo = kDebugMode ? 1 : null;
+}
+
+class GoodClassWithParenthesizedDebugMode {
+  @_debugOnly
+  final int? _foo = (kDebugMode) ? 1 : null;
+}
+
+class GoodClassWithPrefixedDebugMode {
+  @_debugOnly
+  final int? _foo = foundation.kDebugMode ? 1 : null;
+}
+
+const _debugOnly = Object();
+const kDebugMode = true;
+abstract final class foundation {
+  static const bool kDebugMode = true;
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_null_initialized() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(122, 8),
+      lint(174, 4),
+      lint(228, 25),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(NullInitializedDebugExpensiveFieldsTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/package_mixins/external_stopwatches_mixin.dart b/dev/flutter_analyzer_plugin/test/package_mixins/external_stopwatches_mixin.dart
new file mode 100644
index 0000000000000..87374e48d8f72
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/package_mixins/external_stopwatches_mixin.dart
@@ -0,0 +1,70 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+
+extension ExternalStopwatchesExtension on PackageConfigFileBuilder {
+  PackageConfigFileBuilder addExternalStopwatchesPackage(AnalysisRuleTest test) {
+    add(
+      name: ExternalStopwatchesPackage._externalStopwatchesPackageName,
+      rootPath: test.convertPath(ExternalStopwatchesPackage._externalStopwatchesPackageRoot),
+    );
+    return this;
+  }
+}
+
+/// Mixin application that allows for `package:meta` imports in tests.
+mixin ExternalStopwatchesPackage on AnalysisRuleTest {
+  static const String _externalStopwatchesPackageName = 'external_stopwatches';
+  static const String _externalStopwatchesPackageRoot =
+      '/packages/$_externalStopwatchesPackageName';
+
+  @override
+  void setUp() {
+    super.setUp();
+    newFile('$_externalStopwatchesPackageRoot/lib/external_stopwatches.dart', '''
+// External Library that creates Stopwatches. This file will not be analyzed but
+// its symbols will be imported by tests.
+
+class MyStopwatch implements Stopwatch {
+  MyStopwatch();
+  MyStopwatch.create() : this();
+
+  @override
+  Duration get elapsed => throw UnimplementedError();
+
+  @override
+  int get elapsedMicroseconds => throw UnimplementedError();
+
+  @override
+  int get elapsedMilliseconds => throw UnimplementedError();
+
+  @override
+  int get elapsedTicks => throw UnimplementedError();
+
+  @override
+  int get frequency => throw UnimplementedError();
+
+  @override
+  bool get isRunning => throw UnimplementedError();
+
+  @override
+  void reset() {}
+
+  @override
+  void start() {}
+
+  @override
+  void stop() {}
+}
+
+final MyStopwatch stopwatch = MyStopwatch.create();
+
+MyStopwatch createMyStopwatch() => MyStopwatch();
+Stopwatch createStopwatch() => Stopwatch();
+
+''');
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/test/package_mixins/meta_mixin.dart b/dev/flutter_analyzer_plugin/test/package_mixins/meta_mixin.dart
new file mode 100644
index 0000000000000..8f322e02c2bf2
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/package_mixins/meta_mixin.dart
@@ -0,0 +1,35 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+
+extension MetaPackageConfigExtension on PackageConfigFileBuilder {
+  PackageConfigFileBuilder addMetaPackage(AnalysisRuleTest test) {
+    add(
+      name: MetaPackage._metaPackageName,
+      rootPath: test.convertPath(MetaPackage._metaPackageRoot),
+    );
+    return this;
+  }
+}
+
+/// Mixin application that allows for `package:meta` imports in tests.
+mixin MetaPackage on AnalysisRuleTest {
+  static const String _metaPackageName = 'meta';
+  static const String _metaPackageRoot = '/packages/$_metaPackageName';
+
+  @override
+  void setUp() {
+    super.setUp();
+    newFile('$_metaPackageRoot/lib/meta.dart', '''
+library meta;
+
+const protected = Object();
+const mustCallSuper = Object();
+const factory = Object();
+const optionalTypeArgs = Object();
+''');
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/test/package_mixins/widgets_mixin.dart b/dev/flutter_analyzer_plugin/test/package_mixins/widgets_mixin.dart
new file mode 100644
index 0000000000000..ba144746433e4
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/package_mixins/widgets_mixin.dart
@@ -0,0 +1,95 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+
+extension FlutterWidgetsPackageConfigExtension on PackageConfigFileBuilder {
+  PackageConfigFileBuilder addFlutterWidgetsPackage(AnalysisRuleTest test) {
+    add(
+      name: FlutterWidgetsPackage._flutterPackageName,
+      rootPath: test.convertPath(FlutterWidgetsPackage._flutterPackageRoot),
+    );
+    return this;
+  }
+}
+
+/// Mixin application that allows for `package:flutter/widgets.dart` imports in tests.
+mixin FlutterWidgetsPackage on AnalysisRuleTest {
+  static const String _flutterPackageName = 'flutter';
+  static const String _flutterPackageRoot = '/packages/$_flutterPackageName';
+
+  @override
+  void setUp() {
+    super.setUp();
+    newFile('$_flutterPackageRoot/lib/widgets.dart', '''
+library widgets;
+
+abstract class StatefulWidget {
+  const StatefulWidget();
+
+  @protected
+  @factory
+  State createState();
+}
+
+mixin Diagnosticable {
+  @protected
+  @mustCallSuper
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {}
+}
+
+class DiagnosticPropertiesBuilder {}
+class BuildContext {}
+class Widget {}
+
+typedef VoidCallback = void Function();
+
+@optionalTypeArgs
+abstract class State<T extends StatefulWidget> with Diagnosticable {
+  @protected
+  @mustCallSuper
+  void initState() {}
+
+  @mustCallSuper
+  @protected
+  void didUpdateWidget(covariant T oldWidget) {}
+
+  @protected
+  @mustCallSuper
+  void reassemble() {}
+
+  @protected
+  void setState(VoidCallback fn) {}
+
+  @protected
+  @mustCallSuper
+  void deactivate() {}
+
+  @protected
+  @mustCallSuper
+  void activate() {}
+
+  @protected
+  @mustCallSuper
+  void dispose() {}
+
+  @protected
+  Widget build(BuildContext context);
+
+  @protected
+  @mustCallSuper
+  void didChangeDependencies() {}
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+  }
+
+  // If @protected State methods are added or removed, the analysis rule should be
+  // updated accordingly (dev/flutter_analyzer_plugin/lib/src/rules/protect_public_state_subtypes.dart)
+}
+''');
+  }
+}
diff --git a/dev/flutter_analyzer_plugin/test/protect_public_state_subtypes_test.dart b/dev/flutter_analyzer_plugin/test/protect_public_state_subtypes_test.dart
new file mode 100644
index 0000000000000..60eeec43a8763
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/protect_public_state_subtypes_test.dart
@@ -0,0 +1,171 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/protect_public_state_subtypes.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'package_mixins/meta_mixin.dart';
+import 'package_mixins/widgets_mixin.dart';
+
+@reflectiveTest
+class ProtectPublicStateSubtypesTest extends AnalysisRuleTest
+    with MetaPackage, FlutterWidgetsPackage {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(ProtectPublicStateSubtypes());
+    super.setUp();
+
+    writeTestPackageConfig(
+      PackageConfigFileBuilder()
+        ..addFlutterWidgetsPackage(this)
+        ..addMetaPackage(this),
+    );
+  }
+
+  @override
+  String get analysisRule => ProtectPublicStateSubtypes.code.name;
+
+  static const String source = '''
+import 'package:flutter/widgets.dart';
+import 'package:meta/meta.dart';
+
+class MyWidget extends StatefulWidget {
+
+  @override
+  State createState() => MyWidgetStateBad();
+}
+
+class MyWidgetStateBad extends State<MyWidget>{
+  @override
+  void initState() { // ERROR
+    super.initState();
+  }
+
+  @override
+  void didUpdateWidget(covariant MyWidget oldWidget) { // ERROR
+    super.didUpdateWidget(oldWidget);
+  }
+
+  @override
+  void reassemble() { // ERROR
+    super.reassemble();
+  }
+
+  @override
+  void setState(VoidCallback fn) {} // ERROR
+
+  @override
+  void deactivate() { // ERROR
+    super.deactivate();
+  }
+
+  @override
+  void activate() { // ERROR
+    super.activate();
+  }
+
+  @override
+  void dispose() { // ERROR
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) => Widget();
+
+  @override
+  void didChangeDependencies() { // ERROR
+    super.didChangeDependencies();
+  }
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) { // ERROR
+    super.debugFillProperties(properties);
+  }
+}
+
+class MyWidgetStateValid extends State<MyWidget>{
+  @override
+  @protected
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  @protected
+  void didUpdateWidget(covariant MyWidget oldWidget) {
+    super.didUpdateWidget(oldWidget);
+  }
+
+  @override
+  @protected
+  void reassemble() {
+    super.reassemble();
+  }
+
+  @override
+  @protected
+  void setState(VoidCallback fn) {}
+
+  @override
+  @protected
+  void deactivate() {
+    super.deactivate();
+  }
+
+  @override
+  @protected
+  void activate() {
+    super.activate();
+  }
+
+  @override
+  @protected
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  @protected
+  Widget build(BuildContext context) => Widget();
+
+  @override
+  @protected
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+  }
+
+  @override
+  @protected
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+  }
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_protect_public_state_subtypes() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(224, 66),
+      lint(294, 115),
+      lint(413, 68),
+      lint(485, 45),
+      lint(543, 68),
+      lint(615, 64),
+      lint(683, 62),
+      lint(749, 59),
+      lint(812, 90),
+      lint(906, 134),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(ProtectPublicStateSubtypesTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/render_box_intrinsics_test.dart b/dev/flutter_analyzer_plugin/test/render_box_intrinsics_test.dart
new file mode 100644
index 0000000000000..b9a7b82e3984e
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/render_box_intrinsics_test.dart
@@ -0,0 +1,104 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
+import 'package:flutter_analyzer_plugin/src/rules/render_box_intrinsics.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class RenderBoxIntrinsicCalculationRuleTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(RenderBoxIntrinsicCalculationRule());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => RenderBoxIntrinsicCalculationRule.code.name;
+
+  static const String source = '''
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+abstract class RenderBox {
+  void computeDryBaseline() {}
+  void computeDryLayout() {}
+  void computeDistanceToActualBaseline() {}
+  void computeMaxIntrinsicHeight() {}
+  void computeMinIntrinsicHeight() {}
+  void computeMaxIntrinsicWidth() {}
+  void computeMinIntrinsicWidth() {}
+}
+
+mixin ARenderBoxMixin on RenderBox {
+  @override
+  void computeMaxIntrinsicWidth() {}
+
+  @override
+  void computeMinIntrinsicWidth() => computeMaxIntrinsicWidth(); // ERROR: computeMaxIntrinsicWidth(). Consider calling getMaxIntrinsicWidth instead.
+
+  @override
+  void computeMinIntrinsicHeight() {
+    final void Function() f =
+        computeMaxIntrinsicWidth; // ERROR: f = computeMaxIntrinsicWidth. Consider calling getMaxIntrinsicWidth instead.
+    f();
+  }
+}
+
+extension ARenderBoxExtension on RenderBox {
+  void test() {
+    computeDryBaseline(); // ERROR: computeDryBaseline(). Consider calling getDryBaseline instead.
+    computeDryLayout(); // ERROR: computeDryLayout(). Consider calling getDryLayout instead.
+  }
+}
+
+class RenderBoxSubclass1 extends RenderBox {
+  @override
+  void computeDryLayout() {
+    computeDistanceToActualBaseline(); // ERROR: computeDistanceToActualBaseline(). Consider calling getDistanceToBaseline, or getDistanceToActualBaseline instead.
+  }
+
+  @override
+  void computeDistanceToActualBaseline() {
+    computeMaxIntrinsicHeight(); // ERROR: computeMaxIntrinsicHeight(). Consider calling getMaxIntrinsicHeight instead.
+  }
+
+  /// [RenderBox.computeDryLayout]: // OK
+  double? getDryBaseline() {
+    return 0;
+  }
+}
+
+class RenderBoxSubclass2 extends RenderBox with ARenderBoxMixin {
+  @override
+  void computeMaxIntrinsicWidth() {
+    super.computeMinIntrinsicHeight(); // OK
+    super.computeMaxIntrinsicWidth(); // OK
+    final void Function() f = super.computeDryBaseline; // OK
+    f();
+  }
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_render_box_intrinsics() async {
+    await assertDiagnostics(source, <ExpectedDiagnostic>[
+      lint(585, 24),
+      lint(786, 24),
+      lint(980, 18),
+      lint(1079, 16),
+      lint(1264, 31),
+      lint(1488, 25),
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(RenderBoxIntrinsicCalculationRuleTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/repository_link_syntax_test.dart b/dev/flutter_analyzer_plugin/test/repository_link_syntax_test.dart
new file mode 100644
index 0000000000000..b41e179e75f6e
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/repository_link_syntax_test.dart
@@ -0,0 +1,110 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/repository_link_syntax.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class RepositoryLinkSyntaxTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(RepositoryLinkSyntax());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => RepositoryLinkSyntax.code.name;
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_repository_links() async {
+    const source = r'''
+// https://github.com/flutter/flutter/tree/main/file1
+// https://flutter.googlesource.com/+/main/file1
+// https://cs.opensource.google.com/+/main/file1
+// https://chromium.googlesource.com/+/main/file1
+// https://source.chromium.org/+/main/file1
+// https://raw.githubusercontent.com/flutter/flutter/blob/main/file1
+
+// Exempt repositories whose default branch is master:
+// https://github.com/clojure/clojure/tree/master/file1
+// https://github.com/dart-lang/test/tree/master/file1
+// https://github.com/glfw/glfw/tree/master/file1
+// https://github.com/ninja-build/ninja/tree/master/file1
+// https://github.com/torvalds/linux/tree/master/file1
+
+void main() {
+  const String link1 = 'https://github.com/flutter/flutter/tree/main/file1';
+  const String link2 = 'https://github.com/clojure/clojure/tree/master/file1';
+  final String name = 'test';
+  final String interpolated = '$name: https://github.com/flutter/flutter/tree/main/file1';
+}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_banned_master_in_comments() async {
+    const source = '''
+// Check out https://android.googlesource.com/+/master/file1
+// Check out https://chromium.googlesource.com/+/master/file1
+// Check out https://cs.opensource.google.com/+/master/file1
+// Check out https://dart.googlesource.com/+/master/file1
+// Check out https://flutter.googlesource.com/+/master/file1
+// Check out https://source.chromium.org/+/master/file1
+// Check out https://github.com/flutter/flutter/tree/master/file1
+// Check out https://raw.githubusercontent.com/flutter/flutter/blob/master/file1
+void main() {}
+''';
+    await assertDiagnostics(source, [
+      lint(0, 60),
+      lint(61, 61),
+      lint(123, 60),
+      lint(184, 57),
+      lint(242, 60),
+      lint(303, 55),
+      lint(359, 65),
+      lint(425, 80),
+    ]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_banned_master_in_string_literal() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/flutter/tree/master/file1';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 54)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_banned_master_in_interpolated_string() async {
+    const source = r'''
+void main() {
+  final String foo = 'bar';
+  final String s = '$foo https://flutter.googlesource.com/+/master/file1';
+}
+''';
+    await assertDiagnostics(source, [lint(61, 54)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_banned_master_in_adjacent_strings() async {
+    const source = '''
+void main() {
+  const String s = 'https://github.com/flutter/'
+      'flutter/tree/master/file1';
+}
+''';
+    await assertDiagnostics(source, [lint(33, 63)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(RepositoryLinkSyntaxTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/skip_test_comments_test.dart b/dev/flutter_analyzer_plugin/test/skip_test_comments_test.dart
new file mode 100644
index 0000000000000..be09562703937
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/skip_test_comments_test.dart
@@ -0,0 +1,41 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/skip_test_comments.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class SkipTestCommentsTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(SkipTestComments());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => SkipTestComments.code.name;
+
+  static const String source = '''
+void test(String name, void Function() body, {bool skip = false}) {}
+
+void main() {
+  test('a test', () {}, skip: true); // ERROR
+}
+''';
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_skip_test_comments() async {
+    await assertDiagnostics(source, [
+      lint(108, 10), // skip: true
+    ]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(SkipTestCommentsTest);
+  });
+}
diff --git a/dev/flutter_analyzer_plugin/test/taboo_documentation_test.dart b/dev/flutter_analyzer_plugin/test/taboo_documentation_test.dart
new file mode 100644
index 0000000000000..5a113cedffa09
--- /dev/null
+++ b/dev/flutter_analyzer_plugin/test/taboo_documentation_test.dart
@@ -0,0 +1,116 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:analyzer/src/lint/registry.dart';
+import 'package:analyzer_testing/analysis_rule/analysis_rule.dart';
+import 'package:flutter_analyzer_plugin/src/rules/taboo_documentation.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class TabooDocumentationTest extends AnalysisRuleTest {
+  @override
+  void setUp() {
+    Registry.ruleRegistry.registerWarningRule(TabooDocumentation());
+    super.setUp();
+  }
+
+  @override
+  String get analysisRule => TabooDocumentation.code.name;
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_valid_doc_comment() async {
+    const source = '''
+/// This is a valid documentation comment.
+/// It explains how the function works without taboo words.
+void validFunction() {}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_non_doc_comments_ignored() async {
+    const source = '''
+// Simply do this.
+// Note: this is a regular comment.
+// Note that this is allowed in regular comments.
+/*
+ * Note: block comments with simply are also ignored.
+ */
+void validFunction() {}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_similar_words_allowed() async {
+    const source = '''
+/// Simplify this expression.
+/// Notebook entry.
+/// Noted that previously.
+void validFunction() {}
+''';
+    await assertNoDiagnostics(source);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_simply() async {
+    const source = '''
+/// Simply avoid this.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 22)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_simply_in_middle_of_sentence() async {
+    const source = '''
+/// You can simply call this function.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 38)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_note_colon() async {
+    const source = '''
+/// Note: foo is taboo.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 23)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_note_that() async {
+    const source = '''
+/// Note that this is taboo.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 28)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_case_insensitive() async {
+    const source = '''
+/// SIMPLY avoid this.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 22)]);
+  }
+
+  // ignore: non_constant_identifier_names
+  Future<void> test_taboo_multiline_doc_comment() async {
+    const source = '''
+/// First line is fine.
+/// and simply do that.
+void badFunction() {}
+''';
+    await assertDiagnostics(source, [lint(0, 47)]);
+  }
+}
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(TabooDocumentationTest);
+  });
+}
diff --git a/dev/integration_tests/android_hardware_smoke_test/README.md b/dev/integration_tests/android_hardware_smoke_test/README.md
index ecc66472e7e82..dc4b83d732653 100644
--- a/dev/integration_tests/android_hardware_smoke_test/README.md
+++ b/dev/integration_tests/android_hardware_smoke_test/README.md
@@ -479,3 +479,38 @@ a single step, the test suite executes exactly once,
 remains low maintenance across AGP upgrades, and
 cleanly bubbles up any legitimate compiler or runner
 errors without silent try-catch blocks.
+
+---
+
+## 7. Graphics Initialization & Screenshot Retry Mechanisms
+
+To guarantee high stability against flakiness on emulators and physical hardware, the test suite implements a two-layered retry mechanism:
+
+### A. Process & Activity-Level Retries (Graphics Context Initialization)
+* **Goal**: Recovers from transient EGL or graphics context negotiation errors (e.g., `Failed to choose config with EGL_SWAP_BEHAVIOR_PRESERVED` or HWUI startup warnings) that occur globally when the Flutter Engine boots up.
+* **Mechanism**:
+  * **On Host (CI)**: If the `flutter drive` run fails, the host suite runner
+    ([`run_android_hardware_smoke_tests.dart`](dev/bots/suite_runners/run_android_hardware_smoke_tests.dart))
+    checks the device logcat. If transient EGL errors are detected, it restarts
+    the test run process (up to 3 attempts) to initialize a new EGL context in
+    a fresh process.
+  * **On Device (JUnit)**: If an attempt fails, the JUnit runner
+    ([`FlutterActivityTest.kt`](android/app/src/androidTest/java/com/example/android_hardware_smoke_test/FlutterActivityTest.kt))
+    recreates the Activity scenario and retries **only** on blank screenshot
+    failures (up to 3 attempts). It does **not** retry on EGL/graphics errors,
+    as recreating the activity within the same application process cannot
+    recover from process-level EGL initialization failures; these fail
+    immediately on the device to bubble up to the host runner. Standard test
+    failures (e.g., golden pixel mismatches) also fail immediately.
+
+### B. Screenshot-Level Retries (Blank Platform View Capture)
+* **Goal**: Prevents race conditions where a screenshot is taken before native platform view compositing has fully settled, resulting in a blank/transparent frame.
+* **Mechanism**:
+  * **Both Modes**: The screenshot capture loop (both native `UiAutomation` and
+    host-side `NativeDriver`) checks the cropped image. If the cropped image is
+    completely transparent or solid black, it retries the capture up to 3
+    times, sleeping 200ms between attempts.
+  * **Short-circuiting**: If an EGL/graphics error is detected in the logcat
+    during screenshot attempts, the loop is terminated early (bypassing
+    remaining screenshot retries) to fail the test immediately and bubble the
+    failure up to the host runner as quickly as possible.
diff --git a/dev/integration_tests/android_hardware_smoke_test/android/app/src/androidTest/java/com/example/android_hardware_smoke_test/FlutterActivityTest.kt b/dev/integration_tests/android_hardware_smoke_test/android/app/src/androidTest/java/com/example/android_hardware_smoke_test/FlutterActivityTest.kt
index 095c38a655488..fdb3798bf7501 100644
--- a/dev/integration_tests/android_hardware_smoke_test/android/app/src/androidTest/java/com/example/android_hardware_smoke_test/FlutterActivityTest.kt
+++ b/dev/integration_tests/android_hardware_smoke_test/android/app/src/androidTest/java/com/example/android_hardware_smoke_test/FlutterActivityTest.kt
@@ -25,6 +25,14 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
+private class BlankScreenshotException(
+    message: String
+) : IllegalStateException(message)
+
+private class EglInitializationException(
+    message: String
+) : IllegalStateException(message)
+
 @RunWith(AndroidJUnit4::class)
 class FlutterActivityTest {
     companion object {
@@ -42,6 +50,64 @@ class FlutterActivityTest {
                 FlutterEngineCache.getInstance().remove(MainActivity.CACHED_ENGINE_KEY)
             }
         }
+
+        private fun verifyNoGraphicsPipelineErrors(marker: String) {
+            val errors = getGraphicsPipelineErrors(marker)
+            if (errors.isNotEmpty()) {
+                throw EglInitializationException(
+                    "Graphics pipeline/EGL failure detected in process logcat:\n${errors.joinToString("\n")}"
+                )
+            }
+        }
+
+        private fun hasGraphicsPipelineErrors(marker: String): Boolean = getGraphicsPipelineErrors(marker).isNotEmpty()
+
+        private fun getGraphicsPipelineErrors(marker: String): List<String> {
+            val errorLogs = mutableListOf<String>()
+            try {
+                val pid = android.os.Process.myPid()
+                val instrumentation = InstrumentationRegistry.getInstrumentation()
+                val pfd = instrumentation.uiAutomation.executeShellCommand("logcat -d --pid=$pid *:W")
+                android.os.ParcelFileDescriptor.AutoCloseInputStream(pfd).bufferedReader().use { reader ->
+                    var line: String?
+                    var seenMarker = false
+                    while (reader.readLine().also { line = it } != null) {
+                        val currentLine = line ?: continue
+                        if (currentLine.contains(marker)) {
+                            seenMarker = true
+                        }
+                        if (seenMarker) {
+                            if (currentLine.contains("libEGL") ||
+                                currentLine.contains("HWUI") ||
+                                currentLine.contains("EGL_")
+                            ) {
+                                errorLogs.add(currentLine)
+                            }
+                        }
+                    }
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to self-inspect logcat: ${e.message}")
+            }
+            return errorLogs
+        }
+
+        private fun isBitmapBlank(bitmap: Bitmap): Boolean {
+            val width = bitmap.width
+            val height = bitmap.height
+            val pixels = IntArray(width * height)
+            bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
+            val firstPixel = pixels[0]
+            if (firstPixel != android.graphics.Color.TRANSPARENT && firstPixel != android.graphics.Color.BLACK) {
+                return false
+            }
+            for (pixel in pixels) {
+                if (pixel != firstPixel) {
+                    return false
+                }
+            }
+            return true
+        }
     }
 
     @get:Rule val rule = ActivityScenarioRule(MainActivity::class.java)
@@ -57,13 +123,58 @@ class FlutterActivityTest {
      * @param testName The descriptive identifier of the test case to render and compare.
      */
     private fun templateTest(testName: String) {
-        Log.d(TAG, "Starting $testName")
-        val future = CompletableFuture<String>()
+        val maxAttempts = 3
+        var lastException: Throwable? = null
+
+        for (currentAttempt in 1..maxAttempts) {
+            val marker = "START_${testName}_attempt${currentAttempt}_${System.currentTimeMillis()}"
+            Log.i(TAG, marker)
+            Log.d(TAG, "Starting $testName (attempt $currentAttempt/$maxAttempts)")
+
+            try {
+                runAttempt(testName, marker)
+                return
+            } catch (e: Throwable) {
+                lastException = e
+                Log.w(TAG, "Attempt $currentAttempt failed: ${e.message}")
+
+                if (e is org.junit.AssumptionViolatedException) {
+                    throw e
+                }
+                if (!isBlankScreenshotException(e)) {
+                    throw RuntimeException(
+                        "Test '$testName' failed on attempt $currentAttempt with a non-retryable error: ${e.message}",
+                        e
+                    )
+                }
+
+                if (currentAttempt < maxAttempts) {
+                    Log.i(TAG, "Recreating activity for next attempt...")
+                    rule.scenario.recreate()
+                }
+            }
+        }
+
+        throw RuntimeException(
+            "Test '$testName' failed to capture a valid screenshot after $maxAttempts attempts.",
+            lastException
+        )
+    }
+
+    private fun isBlankScreenshotException(e: Throwable?): Boolean {
+        if (e == null) return false
+        if (e is BlankScreenshotException) return true
+        return isBlankScreenshotException(e.cause)
+    }
 
+    private fun runAttempt(
+        testName: String,
+        marker: String
+    ) {
+        val future = CompletableFuture<String>()
         rule.scenario.onActivity { activity ->
             // Confirm screen is not locked by checking activity has lifecycle state RESUMED
             assertEquals(Lifecycle.State.RESUMED, activity.lifecycle.currentState)
-
             try {
                 val isPlatformView = testName.startsWith(Constants.PLATFORM_VIEW_PREFIX)
                 val message =
@@ -73,7 +184,6 @@ class FlutterActivityTest {
                     }
 
                 Log.d(TAG, "Sending '$message' on message channel")
-
                 activity.messageChannel?.send(message) { reply ->
                     try {
                         val replyJson =
@@ -90,7 +200,7 @@ class FlutterActivityTest {
                             val width = replyJson.getInt(Constants.KEY_WIDTH)
                             val height = replyJson.getInt(Constants.KEY_HEIGHT)
 
-                            captureAndSendScreenshot(x, y, width, height, testName, future)
+                            captureAndSendScreenshot(x, y, width, height, testName, marker, future)
                         } else {
                             future.complete(replyMessage)
                         }
@@ -149,8 +259,13 @@ class FlutterActivityTest {
         width: Int,
         height: Int,
         testName: String,
+        marker: String,
         future: CompletableFuture<String>
     ) {
+        if (x < 0 || y < 0 || width <= 0 || height <= 0) {
+            throw IllegalArgumentException("Invalid crop bounds: x=$x, y=$y, width=$width, height=$height")
+        }
+
         // Capture the screenshot on a background thread with a short delay. We must NOT sleep or capture
         // on the Main UI Thread to avoid blocking frame rendering or causing an ANR.
         val screenshotExecutor = Executors.newSingleThreadScheduledExecutor()
@@ -158,26 +273,55 @@ class FlutterActivityTest {
             try {
                 // Capture the true screen output using UiAutomation from this privileged instrumentation runner process.
                 val instrumentation = InstrumentationRegistry.getInstrumentation()
-                val screenshot =
-                    instrumentation.uiAutomation.takeScreenshot()
-                        ?: throw IllegalStateException("UiAutomation.takeScreenshot() returned null")
-
-                if (x < 0 ||
-                    y < 0 ||
-                    width <= 0 ||
-                    height <= 0 ||
-                    x + width > screenshot.width ||
-                    y + height > screenshot.height
-                ) {
-                    throw IllegalArgumentException(
-                        "Crop bounds out of range: x=$x, y=$y, width=$width, height=$height, screenshot.width=${screenshot.width}, screenshot.height=${screenshot.height}"
-                    )
+                var cropped: Bitmap? = null
+                val maxAttempts = 3
+
+                for (attempt in 1..maxAttempts) {
+                    val screenshot = instrumentation.uiAutomation.takeScreenshot()
+                    if (screenshot == null) {
+                        Log.w(TAG, "UiAutomation.takeScreenshot() returned null (attempt $attempt/$maxAttempts)")
+                    } else {
+                        if (x + width > screenshot.width || y + height > screenshot.height) {
+                            screenshot.recycle()
+                            throw IllegalArgumentException(
+                                "Crop bounds out of screen range: x=$x, y=$y, width=$width, height=$height, screenshot.width=${screenshot.width}, screenshot.height=${screenshot.height}"
+                            )
+                        }
+
+                        // Crop the full-screen screenshot to the exact widget bounds.
+                        val candidate = Bitmap.createBitmap(screenshot, x, y, width, height)
+                        if (candidate != screenshot) {
+                            screenshot.recycle()
+                        }
+
+                        if (!isBitmapBlank(candidate)) {
+                            cropped = candidate
+                            break
+                        }
+
+                        Log.w(TAG, "Captured screenshot is blank/empty (attempt $attempt/$maxAttempts)")
+                        candidate.recycle()
+                    }
+
+                    // If EGL/graphics pipeline has failed, further retries in this process are futile.
+                    // Break early to trigger activity re-creation.
+                    if (hasGraphicsPipelineErrors(marker)) {
+                        Log.w(TAG, "Graphics pipeline/EGL error detected during screenshot. Short-circuiting retries.")
+                        break
+                    }
+
+                    if (attempt < maxAttempts) {
+                        Thread.sleep(200)
+                    }
                 }
 
-                // Crop the full-screen screenshot to the exact widget bounds.
-                val cropped = Bitmap.createBitmap(screenshot, x, y, width, height)
-                if (cropped != screenshot) {
-                    screenshot.recycle()
+                // Verify logcat first to prioritize EGL diagnostics over generic blank screenshot errors.
+                verifyNoGraphicsPipelineErrors(marker)
+
+                if (cropped == null) {
+                    throw BlankScreenshotException(
+                        "Captured screenshot is blank/empty after $maxAttempts attempts."
+                    )
                 }
 
                 val stream = ByteArrayOutputStream()
diff --git a/dev/integration_tests/android_hardware_smoke_test/lib/constants.dart b/dev/integration_tests/android_hardware_smoke_test/lib/constants.dart
index 2713717fb5324..ef09f62a0a168 100644
--- a/dev/integration_tests/android_hardware_smoke_test/lib/constants.dart
+++ b/dev/integration_tests/android_hardware_smoke_test/lib/constants.dart
@@ -7,7 +7,8 @@
 // =============================================================================
 
 /// The MethodChannel name used for query and control of native platform capabilities.
-const nativeSupportChannelName = 'com.example.android_hardware_smoke_test/native_support';
+const nativeSupportChannelName =
+    'com.example.android_hardware_smoke_test/native_support';
 
 /// The MethodChannel method name used to query the active graphics rendering backend.
 const methodImpellerBackend = 'impeller_backend';
@@ -121,8 +122,16 @@ const platformViewPrefix = 'platformView';
 const kPlatformViewTextureLayerTest = '${platformViewPrefix}TextureLayerTest';
 
 /// Scenario name for embedding a native platform view using Hybrid Composition.
-const kPlatformViewHybridCompositionTest = '${platformViewPrefix}HybridCompositionTest';
+const kPlatformViewHybridCompositionTest =
+    '${platformViewPrefix}HybridCompositionTest';
 
 /// Scenario name for embedding a native platform view using Hybrid Composition++.
 const kPlatformViewHybridCompositionPlusPlusTest =
     '${platformViewPrefix}HybridCompositionPlusPlusTest';
+
+// =============================================================================
+// 3. Error Substrings
+// =============================================================================
+
+/// Substring used to identify blank/empty screenshot errors in exceptions.
+const String errorBlankScreenshot = 'blank/empty';
diff --git a/dev/integration_tests/android_hardware_smoke_test/lib/main.dart b/dev/integration_tests/android_hardware_smoke_test/lib/main.dart
index 79266b1a0fc97..3d81c8fccb411 100644
--- a/dev/integration_tests/android_hardware_smoke_test/lib/main.dart
+++ b/dev/integration_tests/android_hardware_smoke_test/lib/main.dart
@@ -35,9 +35,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter android hardware smoke test',
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
-      ),
+      theme: ThemeData(colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple)),
       home: MyWidget(imageLoader: imageLoader),
     );
   }
@@ -56,10 +54,7 @@ class MyWidget extends StatefulWidget {
 
 class _MyState extends State<MyWidget> {
   static const _nativeChannel = MethodChannel(nativeSupportChannelName);
-  static const _testChannel = BasicMessageChannel<Object?>(
-    testChannelName,
-    JSONMessageCodec(),
-  );
+  static const _testChannel = BasicMessageChannel<Object?>(testChannelName, JSONMessageCodec());
 
   String _message = 'Waiting for message...';
   late Future<String?> _goldenVariantFuture;
@@ -90,9 +85,7 @@ class _MyState extends State<MyWidget> {
         goldenVariantValue,
       );
 
-      return <String, Object?>{
-        keyMessage: failureMessage ?? 'Comparison Success',
-      };
+      return <String, Object?>{keyMessage: failureMessage ?? 'Comparison Success'};
     }
 
     final testName = messageMap?[keyTestName] as String?;
@@ -102,8 +95,7 @@ class _MyState extends State<MyWidget> {
     // Widget tests pass captureScreenshot: false.
     // Image.toByteData runs async on a native thread, which results in an unresolvable deadlock in the widget test's FakeAsync zone.
     // Comparing pixels is not a responsibility of widget tests anyway, that should be reserved for the integration tests.
-    final bool captureScreenshot =
-        messageMap?[keyCaptureScreenshot] as bool? ?? true;
+    final bool captureScreenshot = messageMap?[keyCaptureScreenshot] as bool? ?? true;
 
     if (testName == kPlatformViewHybridCompositionPlusPlusTest) {
       final bool isHcpp = await HybridAndroidViewController.checkIfSupported();
@@ -135,16 +127,13 @@ class _MyState extends State<MyWidget> {
           _loadedImage = img;
         });
       } catch (e, stackTrace) {
-        return <String, Object?>{
-          keyMessage: 'Failed to load image asset: $e\n$stackTrace',
-        };
+        return <String, Object?>{keyMessage: 'Failed to load image asset: $e\n$stackTrace'};
       }
     }
 
     final completer = Completer<Map<String, Object?>>();
 
-    final bool isPlatformView =
-        testName?.startsWith(platformViewPrefix) ?? false;
+    final bool isPlatformView = testName?.startsWith(platformViewPrefix) ?? false;
     if (isPlatformView) {
       _platformViewDrawnCompleter = Completer<void>();
     } else {
@@ -180,9 +169,7 @@ class _MyState extends State<MyWidget> {
   void initState() {
     super.initState();
 
-    _goldenVariantFuture = _nativeChannel.invokeMethod<String>(
-      methodImpellerBackend,
-    );
+    _goldenVariantFuture = _nativeChannel.invokeMethod<String>(methodImpellerBackend);
     _nativeChannel.setMethodCallHandler((MethodCall call) async {
       if (call.method == 'onDraw') {
         if (_platformViewDrawnCompleter?.isCompleted == false) {
@@ -214,6 +201,7 @@ class _MyState extends State<MyWidget> {
       kPlatformViewHybridCompositionPlusPlusTest => const AndroidPlatformView(
         mode: PlatformViewMode.hybridCompositionPlusPlus,
       ),
+
       kTextTest => const TextDrawingCanvas(),
       kImageTest => ImageDrawingCanvas(image: _loadedImage),
       _ => VectorDrawingsCanvas(message: _message),
diff --git a/dev/integration_tests/android_hardware_smoke_test/test/image_utils_test.dart b/dev/integration_tests/android_hardware_smoke_test/test/image_utils_test.dart
new file mode 100644
index 0000000000000..21c13b036057d
--- /dev/null
+++ b/dev/integration_tests/android_hardware_smoke_test/test/image_utils_test.dart
@@ -0,0 +1,87 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:image/image.dart' as img;
+import '../test_driver/image_utils.dart';
+
+void main() {
+  group('isImageBlank', () {
+    test('returns true for an empty or 0-sized image', () {
+      final image = img.Image(width: 0, height: 0);
+      expect(isImageBlank(image), isTrue);
+    });
+
+    test('returns true for a fully transparent image (all zero bytes)', () {
+      final image = img.Image(
+        width: 10,
+        height: 10,
+      ); // default is transparent black (all 0s)
+      expect(isImageBlank(image), isTrue);
+    });
+
+    test('returns true for a solid opaque black image', () {
+      final image = img.Image(width: 10, height: 10);
+      for (final pixel in image) {
+        pixel.r = 0;
+        pixel.g = 0;
+        pixel.b = 0;
+        pixel.a = 255;
+      }
+      expect(isImageBlank(image), isTrue);
+    });
+
+    test('returns false for a solid opaque red image', () {
+      final image = img.Image(width: 10, height: 10);
+      for (final pixel in image) {
+        pixel.r = 255;
+        pixel.g = 0;
+        pixel.b = 0;
+        pixel.a = 255;
+      }
+      expect(isImageBlank(image), isFalse);
+    });
+
+    test('returns false for an image with drawings (one non-black pixel)', () {
+      final image = img.Image(width: 10, height: 10);
+      // set one pixel to red
+      final img.Pixel pixel = image.getPixel(5, 5);
+      pixel.r = 255;
+      pixel.g = 0;
+      pixel.b = 0;
+      pixel.a = 255;
+      expect(isImageBlank(image), isFalse);
+    });
+  });
+
+  group('cropImage', () {
+    test('crops image correctly within bounds', () {
+      final image = img.Image(width: 10, height: 10);
+      // Draw a pixel at (2, 2)
+      final img.Pixel pixel = image.getPixel(2, 2);
+      pixel.r = 255;
+      pixel.g = 0;
+      pixel.b = 0;
+      pixel.a = 255;
+
+      final img.Image cropped = cropImage(image, 1, 1, 3, 3);
+      expect(cropped.width, equals(3));
+      expect(cropped.height, equals(3));
+
+      // The drawn pixel at (2, 2) relative to parent is now at (1, 1) relative to cropped image
+      final img.Pixel croppedPixel = cropped.getPixel(1, 1);
+      expect(croppedPixel.r, equals(255));
+      expect(croppedPixel.a, equals(255));
+    });
+
+    test('throws ArgumentError for invalid crop bounds', () {
+      final image = img.Image(width: 10, height: 10);
+      expect(() => cropImage(image, -1, 0, 5, 5), throwsArgumentError);
+      expect(() => cropImage(image, 0, -1, 5, 5), throwsArgumentError);
+      expect(() => cropImage(image, 0, 0, 11, 5), throwsArgumentError);
+      expect(() => cropImage(image, 0, 0, 5, 11), throwsArgumentError);
+      expect(() => cropImage(image, 8, 8, 5, 5), throwsArgumentError);
+    });
+  });
+}
diff --git a/dev/integration_tests/android_hardware_smoke_test/test_driver/driver_test.dart b/dev/integration_tests/android_hardware_smoke_test/test_driver/driver_test.dart
index 69bfae78532e7..120777ee5170c 100644
--- a/dev/integration_tests/android_hardware_smoke_test/test_driver/driver_test.dart
+++ b/dev/integration_tests/android_hardware_smoke_test/test_driver/driver_test.dart
@@ -12,14 +12,15 @@ import 'package:android_hardware_smoke_test/constants.dart';
 import 'package:flutter_driver/flutter_driver.dart';
 import 'package:image/image.dart' as img;
 import 'package:test/test.dart';
+import 'image_utils.dart';
 
 /// Whether the current environment is LUCI.
 bool get isLuci => io.Platform.environment['LUCI_CI'] == 'True';
 
 void main() async {
-  late final FlutterDriver flutterDriver;
-  late final NativeDriver nativeDriver;
-  late final String activeGoldenVariant;
+  late FlutterDriver flutterDriver;
+  late AndroidNativeDriver nativeDriver;
+  late String activeGoldenVariant;
 
   setUpAll(() async {
     flutterDriver = await FlutterDriver.connect();
@@ -70,8 +71,6 @@ void main() async {
       return;
     }
 
-    expect(reply[keyMessage], equals('Rendered $testName'));
-
     final Uint8List imageBytes;
     final bool isPlatformView = testName.startsWith(platformViewPrefix);
     if (isPlatformView) {
@@ -80,32 +79,40 @@ void main() async {
       final w = reply[keyWidth]! as int;
       final h = reply[keyHeight]! as int;
 
-      final NativeScreenshot fullScreenshot = await nativeDriver.screenshot();
-      final Uint8List fullBytes = await fullScreenshot.readAsBytes();
+      img.Image? cropped;
+      const maxAttempts = 3;
 
-      final img.Image? decoded = img.decodePng(fullBytes);
-      if (decoded == null) {
-        throw StateError(
-          'Failed to decode full screen screenshot for $testName',
+      for (var attempt = 1; attempt <= maxAttempts; attempt++) {
+        final NativeScreenshot fullScreenshot = await nativeDriver.screenshot();
+        final Uint8List fullBytes = await fullScreenshot.readAsBytes();
+
+        final img.Image? decoded = img.decodePng(fullBytes);
+        if (decoded == null) {
+          throw StateError(
+            'Failed to decode full screen screenshot for $testName',
+          );
+        }
+
+        final img.Image candidate = cropImage(decoded, x, y, w, h);
+
+        if (!isImageBlank(candidate)) {
+          cropped = candidate;
+          break;
+        }
+
+        io.stderr.writeln(
+          'Captured screenshot is blank/empty (attempt $attempt/$maxAttempts)',
         );
+        if (attempt < maxAttempts) {
+          await Future<void>.delayed(const Duration(milliseconds: 200));
+        }
       }
-      if (x < 0 ||
-          y < 0 ||
-          w <= 0 ||
-          h <= 0 ||
-          x + w > decoded.width ||
-          y + h > decoded.height) {
+
+      if (cropped == null) {
         throw StateError(
-          'Crop bounds out of range for $testName: x=$x, y=$y, w=$w, h=$h, image.width=${decoded.width}, image.height=${decoded.height}',
+          'Captured screenshot is $errorBlankScreenshot after $maxAttempts attempts.',
         );
       }
-      final img.Image cropped = img.copyCrop(
-        decoded,
-        x: x,
-        y: y,
-        width: w,
-        height: h,
-      );
       imageBytes = Uint8List.fromList(img.encodePng(cropped));
     } else {
       final imageBase64 = reply[keyImageBytes]! as String;
@@ -113,6 +120,7 @@ void main() async {
     }
 
     // Compare the bytes to a golden file on the host filesystem using the cached variant
+
     await expectLater(
       imageBytes,
       matchesGoldenFile('goldens/$testName$activeGoldenVariant.png'),
diff --git a/dev/integration_tests/android_hardware_smoke_test/test_driver/image_utils.dart b/dev/integration_tests/android_hardware_smoke_test/test_driver/image_utils.dart
new file mode 100644
index 0000000000000..ef584271156f3
--- /dev/null
+++ b/dev/integration_tests/android_hardware_smoke_test/test_driver/image_utils.dart
@@ -0,0 +1,58 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+import 'package:image/image.dart' as img;
+
+/// Checks if the image is transparent or solid black.
+bool isImageBlank(img.Image image) {
+  if (image.width == 0 || image.height == 0) {
+    return true;
+  }
+  final img.Pixel pixel0 = image.getPixel(0, 0);
+  final num r0 = pixel0.r;
+  final num g0 = pixel0.g;
+  final num b0 = pixel0.b;
+  final num a0 = pixel0.a;
+
+  final bool isTransparentOrBlack = a0 == 0 || (r0 == 0 && g0 == 0 && b0 == 0);
+  if (!isTransparentOrBlack) {
+    return false;
+  }
+
+  // Fast path: check raw memory buffer directly to avoid pixel wrapper allocations in the loop
+  try {
+    final Uint32List pixels = image.buffer.asUint32List();
+    final int val0 = pixels[0];
+    for (var i = 1; i < pixels.length; i++) {
+      if (pixels[i] != val0) {
+        return false;
+      }
+    }
+    return true;
+  } catch (_) {
+    // Fall back to safe iterator if the buffer alignment/type is different
+    for (final pixel in image) {
+      if (pixel.r != r0 || pixel.g != g0 || pixel.b != b0 || pixel.a != a0) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+/// Validates crop bounds and crops [source] to the specified rect.
+img.Image cropImage(img.Image source, int x, int y, int width, int height) {
+  if (x < 0 ||
+      y < 0 ||
+      width <= 0 ||
+      height <= 0 ||
+      x + width > source.width ||
+      y + height > source.height) {
+    throw ArgumentError(
+      'Crop bounds out of range: x=$x, y=$y, width=$width, height=$height, source.width=${source.width}, source.height=${source.height}',
+    );
+  }
+  return img.copyCrop(source, x: x, y: y, width: width, height: height);
+}
diff --git a/dev/integration_tests/engine_integration_golden_test/README.md b/dev/integration_tests/engine_integration_golden_test/README.md
new file mode 100644
index 0000000000000..4675696f51ccf
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/README.md
@@ -0,0 +1,15 @@
+# Engine Integration Golden Test
+
+This integration test suite validates engine related rendering tests using Skia Gold.
+
+## Running Locally
+```sh
+cd dev/integration_tests/engine_integration_golden_test
+flutter test integration_test/engine_integration_golden_test.dart -d <device_id>
+```
+
+## Running via Devicelab on Windows
+```sh
+cd dev/devicelab
+dart bin/run.dart -t windows_engine_integration_golden_test
+```
diff --git a/dev/integration_tests/engine_integration_golden_test/integration_test/engine_integration_golden_test.dart b/dev/integration_tests/engine_integration_golden_test/integration_test/engine_integration_golden_test.dart
new file mode 100644
index 0000000000000..f9f3a6e9870ce
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/integration_test/engine_integration_golden_test.dart
@@ -0,0 +1,36 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_integration_golden_test/primitive_shape_main.dart'
+    as primitive_shape;
+import 'package:engine_integration_golden_test/text_main.dart' as text_main;
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  testWidgets('renders primitive shapes', (WidgetTester tester) async {
+    await tester.pumpWidget(const primitive_shape.PrimitiveShapeApp());
+    await tester.pumpAndSettle();
+
+    await expectLater(
+      find.byKey(const Key('primitive_shape_canvas')),
+      matchesGoldenFile('primitive_shape_canvas_snapshot.png'),
+    );
+  });
+
+  testWidgets('renders text', (WidgetTester tester) async {
+    await tester.pumpWidget(const text_main.TextRenderingApp());
+    await GoogleFonts.pendingFonts();
+    await tester.pumpAndSettle();
+
+    await expectLater(
+      find.byKey(const Key('text_rendering_canvas')),
+      matchesGoldenFile('text_rendering_canvas_snapshot.png'),
+    );
+  });
+}
diff --git a/dev/integration_tests/engine_integration_golden_test/integration_test/flutter_test_config.dart b/dev/integration_tests/engine_integration_golden_test/integration_test/flutter_test_config.dart
new file mode 100644
index 0000000000000..1098433c9a187
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/integration_test/flutter_test_config.dart
@@ -0,0 +1,14 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'package:flutter_goldens/flutter_goldens.dart' as flutter_goldens;
+
+/// Configures [goldenFileComparator] for the test suite using `package:flutter_goldens`.
+///
+/// On CI/LUCI, if `GOLDCTL` environment variable is present, screenshots taken with
+/// `matchesGoldenFile` will be uploaded to Skia Gold.
+Future<void> testExecutable(FutureOr<void> Function() testMain) async {
+  return flutter_goldens.testExecutable(testMain, namePrefix: 'engine_integration_golden');
+}
diff --git a/dev/integration_tests/engine_integration_golden_test/lib/primitive_shape_main.dart b/dev/integration_tests/engine_integration_golden_test/lib/primitive_shape_main.dart
new file mode 100644
index 0000000000000..b8e306cf81197
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/lib/primitive_shape_main.dart
@@ -0,0 +1,111 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+void main() {
+  runApp(const PrimitiveShapeApp());
+}
+
+class PrimitiveShapeApp extends StatelessWidget {
+  const PrimitiveShapeApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      debugShowCheckedModeBanner: false,
+      home: Scaffold(
+        body: Container(
+          key: const Key('primitive_shape_canvas'),
+          color: Colors.black,
+          width: double.infinity,
+          height: double.infinity,
+          child: CustomPaint(painter: TestPainter()),
+        ),
+      ),
+    );
+  }
+}
+
+class TestPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final filledPaint = Paint()..color = Colors.white;
+    final strokedPaint = Paint()
+      ..color = Colors.white
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 5;
+    const rect = Rect.fromLTWH(20, 20, 30.5, 15.5);
+
+    // Column 1
+    canvas.save();
+
+    // circle
+    canvas.drawCircle(const Offset(35, 25), 15.5, filledPaint);
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.drawCircle(const Offset(35, 25), 15.5, strokedPaint);
+    canvas.restore();
+
+    // oval
+    canvas.translate(0, 50);
+    canvas.drawOval(rect, filledPaint);
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.drawOval(rect, strokedPaint);
+    canvas.restore();
+
+    // rounded rect
+    canvas.translate(0, 50);
+    canvas.drawRRect(RRect.fromRectAndRadius(rect, const Radius.circular(5)), filledPaint);
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.drawRRect(RRect.fromRectAndRadius(rect, const Radius.circular(5)), strokedPaint);
+    canvas.restore();
+
+    canvas.restore();
+
+    // Column 2
+    canvas.save();
+    canvas.translate(120, 0);
+
+    // rect
+    canvas.drawRect(rect, filledPaint);
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.drawRect(rect, strokedPaint);
+    canvas.restore();
+
+    // rotated rect
+    canvas.translate(0, 50);
+    canvas.save();
+    canvas.rotate(0.3);
+    canvas.drawRect(rect, filledPaint);
+    canvas.restore();
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.rotate(0.3);
+    canvas.drawRect(rect, strokedPaint);
+    canvas.restore();
+
+    // RSuperellipse
+    canvas.translate(0, 50);
+    canvas.drawRSuperellipse(
+      RSuperellipse.fromRectAndRadius(rect, const Radius.circular(5)),
+      filledPaint,
+    );
+    canvas.save();
+    canvas.translate(50, 0);
+    canvas.drawRSuperellipse(
+      RSuperellipse.fromRectAndRadius(rect, const Radius.circular(5)),
+      strokedPaint,
+    );
+    canvas.restore();
+
+    canvas.restore();
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
diff --git a/dev/integration_tests/engine_integration_golden_test/lib/text_main.dart b/dev/integration_tests/engine_integration_golden_test/lib/text_main.dart
new file mode 100644
index 0000000000000..fef74f07fd650
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/lib/text_main.dart
@@ -0,0 +1,86 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+void main() {
+  runApp(const TextRenderingApp());
+}
+
+/// A test application that renders text with various font weights and colors
+/// to validate text rendering in integration tests.
+class TextRenderingApp extends StatelessWidget {
+  /// Creates a [TextRenderingApp].
+  const TextRenderingApp({super.key});
+
+  static const String _testText =
+      'the quick brown fox jumped over the lazy dog!.?';
+
+  Widget _buildTextSection({
+    required Color textColor,
+    required Color backgroundColor,
+  }) {
+    return Expanded(
+      child: Container(
+        color: backgroundColor,
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: <Widget>[
+            for (final FontWeight weight in <FontWeight>[
+              FontWeight.w100,
+              FontWeight.normal,
+              FontWeight.bold,
+            ])
+              Text(
+                _testText,
+                style: GoogleFonts.roboto(
+                  color: textColor,
+                  fontSize: 20.0,
+                  fontWeight: weight,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      debugShowCheckedModeBanner: false,
+      home: Scaffold(
+        body: Container(
+          key: const Key('text_rendering_canvas'),
+          color: Colors.grey[850],
+          width: double.infinity,
+          height: double.infinity,
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: <Widget>[
+              _buildTextSection(
+                textColor: Colors.white,
+                backgroundColor: Colors.black,
+              ),
+              const SizedBox(height: 16.0),
+              _buildTextSection(
+                textColor: Colors.black,
+                backgroundColor: Colors.white,
+              ),
+              const SizedBox(height: 16.0),
+              _buildTextSection(
+                textColor: Colors.green,
+                backgroundColor: Colors.black,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/dev/integration_tests/engine_integration_golden_test/pubspec.yaml b/dev/integration_tests/engine_integration_golden_test/pubspec.yaml
new file mode 100644
index 0000000000000..ea99b43d086cb
--- /dev/null
+++ b/dev/integration_tests/engine_integration_golden_test/pubspec.yaml
@@ -0,0 +1,27 @@
+name: engine_integration_golden_test
+description: Integration tests that capture rendering snapshots and upload them to Skia Gold for engine-based render tests.
+publish_to: none
+
+environment:
+  sdk: ^3.11.0-0
+
+resolution: workspace
+
+dependencies:
+  flutter:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  google_fonts: any
+  integration_test:
+    sdk: flutter
+  path: any
+
+dev_dependencies:
+  flutter_goldens:
+    sdk: flutter
+  flutter_test:
+    sdk: flutter
+  test: any
+
+# PUBSPEC CHECKSUM: 3hii4d
diff --git a/dev/integration_tests/flavors/ios/Runner/AppDelegate.h b/dev/integration_tests/flavors/ios/Runner/AppDelegate.h
index a78a945cd2ef8..d6d78a2392c2e 100644
--- a/dev/integration_tests/flavors/ios/Runner/AppDelegate.h
+++ b/dev/integration_tests/flavors/ios/Runner/AppDelegate.h
@@ -5,6 +5,6 @@
 #import <UIKit/UIKit.h>
 #import <Flutter/Flutter.h>
 
-@interface AppDelegate : FlutterAppDelegate
+@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
 
 @end
diff --git a/dev/integration_tests/flavors/ios/Runner/AppDelegate.m b/dev/integration_tests/flavors/ios/Runner/AppDelegate.m
index 7ef36e523eddf..3d0fe3f888251 100644
--- a/dev/integration_tests/flavors/ios/Runner/AppDelegate.m
+++ b/dev/integration_tests/flavors/ios/Runner/AppDelegate.m
@@ -8,16 +8,18 @@
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  [GeneratedPluginRegistrant registerWithRegistry:self];
-  // Override point for customization after application launch.
-  FlutterViewController* controller = (FlutterViewController*)self.window.rootViewController;
-  FlutterMethodChannel* flavorChannel = [FlutterMethodChannel methodChannelWithName:@"flavor" binaryMessenger:controller];
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (void)didInitializeImplicitFlutterEngine:(NSObject<FlutterImplicitEngineBridge>*)engineBridge {
+  [GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
+
+  FlutterMethodChannel* flavorChannel = [FlutterMethodChannel methodChannelWithName:@"flavor" binaryMessenger:engineBridge.applicationRegistrar.messenger];
 
   [flavorChannel setMethodCallHandler:^(FlutterMethodCall *call, FlutterResult result) {
     NSString* flavor = (NSString*)[[NSBundle mainBundle].infoDictionary valueForKey:@"Flavor"];
     result(flavor);
   }];
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
 @end
diff --git a/dev/integration_tests/flavors/ios/Runner/Info-Free.plist b/dev/integration_tests/flavors/ios/Runner/Info-Free.plist
index b6853d58c582f..881a1b229cad2 100644
--- a/dev/integration_tests/flavors/ios/Runner/Info-Free.plist
+++ b/dev/integration_tests/flavors/ios/Runner/Info-Free.plist
@@ -43,5 +43,26 @@
 	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/dev/integration_tests/flavors/ios/Runner/Info-Paid.plist b/dev/integration_tests/flavors/ios/Runner/Info-Paid.plist
index b6853d58c582f..881a1b229cad2 100644
--- a/dev/integration_tests/flavors/ios/Runner/Info-Paid.plist
+++ b/dev/integration_tests/flavors/ios/Runner/Info-Paid.plist
@@ -43,5 +43,26 @@
 	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/dev/integration_tests/new_gallery/lib/studies/rally/home.dart b/dev/integration_tests/new_gallery/lib/studies/rally/home.dart
index ba4a3306ddbb3..f4e40c55ba18b 100644
--- a/dev/integration_tests/new_gallery/lib/studies/rally/home.dart
+++ b/dev/integration_tests/new_gallery/lib/studies/rally/home.dart
@@ -221,7 +221,7 @@ class _RallyTabBar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FocusTraversalOrder(
-      order: const NumericFocusOrder(0),
+      order: const .numeric(0),
       child: TabBar(
         // Setting isScrollable to true prevents the tabs from being
         // wrapped in [Expanded] widgets, which allows for more
diff --git a/dev/integration_tests/new_gallery/lib/studies/rally/tabs/overview.dart b/dev/integration_tests/new_gallery/lib/studies/rally/tabs/overview.dart
index c811e9a09c1bb..a892df6b52dee 100644
--- a/dev/integration_tests/new_gallery/lib/studies/rally/tabs/overview.dart
+++ b/dev/integration_tests/new_gallery/lib/studies/rally/tabs/overview.dart
@@ -237,7 +237,7 @@ class _FinancialView extends StatelessWidget {
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
     return FocusTraversalOrder(
-      order: NumericFocusOrder(order!),
+      order: .numeric(order!),
       child: ColoredBox(
         color: RallyColors.cardBackground,
         child: Column(
diff --git a/dev/integration_tests/record_use_test_app/README.md b/dev/integration_tests/record_use_test_app/README.md
index d2d98f8dfa5aa..567bf4de4cceb 100644
--- a/dev/integration_tests/record_use_test_app/README.md
+++ b/dev/integration_tests/record_use_test_app/README.md
@@ -1,6 +1,6 @@
 # Record Use Test App
 
-An integration test app for testing the "Record Use" asset tree-shaking feature.
+An integration test app for testing the "Record Use" asset tree-shaking feature and icon tree shaking.
 
 ## Overview
 
@@ -17,15 +17,16 @@ The feature relies on:
 3. This app (`record_use_test_app`) calls `translate('hello')` and `translate('friend')`.
 4. During the build, the `link.dart` hook in the package receives a recording of these calls.
 5. The hook filters `translations.json` to only include the entries for "hello" and "friend", tree-shaking the unused ones.
+6. The app instantiates `IconData(0x1234)`, which `IconTreeShaker` records during build.
 
 ## Testing
 
 The integration test for this feature is located at:
-`packages/flutter_tools/test/integration.shard/isolated/record_use_test.dart`
+`packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart`
 
 To run the test:
 ```bash
-bin/cache/dart-sdk/bin/dart packages/flutter_tools/test/integration.shard/isolated/record_use_test.dart
+bin/flutter test packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart
 ```
 
 Note: The test requires `--enable-record-use` and `--enable-dart-data-assets` to be enabled in the Flutter config.
diff --git a/dev/integration_tests/record_use_test_app/lib/main.dart b/dev/integration_tests/record_use_test_app/lib/main.dart
index 81aa256e6b8ca..ebfce0d835261 100644
--- a/dev/integration_tests/record_use_test_app/lib/main.dart
+++ b/dev/integration_tests/record_use_test_app/lib/main.dart
@@ -20,9 +20,18 @@ void main() async {
   print('HELLO: $hello');
   print('FRIEND: $friend');
   print('COUNT: $count');
+  // Intentionally missing fontFamily to test that icon tree shaking detects
+  // constant IconData instances with null fontFamily.
+  const dummyIcon = IconData(0x1234);
+  print('ICON: ${dummyIcon.codePoint}');
   runApp(MyApp(hello: hello, friend: friend, count: count));
 }
 
+// In dart2js, 1 and 1.0 are identical numbers, so `isWasm` evaluates to false.
+// In dart2wasm, integer and double representations are distinct, so `isWasm`
+// evaluates to true.
+const bool isWasm = !identical(1, 1.0);
+
 class MyApp extends StatelessWidget {
   const MyApp({
     super.key,
@@ -50,6 +59,15 @@ class MyApp extends StatelessWidget {
               const SizedBox(height: 20),
               Text('Loaded translations count: $count',
                   style: const TextStyle(fontWeight: FontWeight.bold)),
+              const SizedBox(height: 20),
+              // Tests that dual-target web builds (Wasm with JS fallback) retain
+              // the union of icons used by both compilers in the shared font asset.
+              // Wasm compiles with Icons.fastfood and JS compiles with Icons.favorite.
+              const Icon(
+                isWasm ? Icons.fastfood : Icons.favorite,
+                color: Colors.blueGrey,
+                size: 30.0,
+              ),
             ],
           ),
         ),
diff --git a/dev/integration_tests/record_use_test_app/pubspec.yaml b/dev/integration_tests/record_use_test_app/pubspec.yaml
index 73384bdf77302..6a0f0f79a8621 100644
--- a/dev/integration_tests/record_use_test_app/pubspec.yaml
+++ b/dev/integration_tests/record_use_test_app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: record_use_test_app
-description: A new Flutter application project.
+description: An integration test app for testing Record Use in both link hooks and icon tree shaking.
 version: 0.0.1
 publish_to: none
 
diff --git a/dev/integration_tests/ui/ios/Runner/AppDelegate.h b/dev/integration_tests/ui/ios/Runner/AppDelegate.h
index a78a945cd2ef8..d6d78a2392c2e 100644
--- a/dev/integration_tests/ui/ios/Runner/AppDelegate.h
+++ b/dev/integration_tests/ui/ios/Runner/AppDelegate.h
@@ -5,6 +5,6 @@
 #import <UIKit/UIKit.h>
 #import <Flutter/Flutter.h>
 
-@interface AppDelegate : FlutterAppDelegate
+@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
 
 @end
diff --git a/dev/integration_tests/ui/ios/Runner/AppDelegate.m b/dev/integration_tests/ui/ios/Runner/AppDelegate.m
index d863511ed7f15..1d94e5cafc62e 100644
--- a/dev/integration_tests/ui/ios/Runner/AppDelegate.m
+++ b/dev/integration_tests/ui/ios/Runner/AppDelegate.m
@@ -7,9 +7,15 @@
 
 @implementation AppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  [GeneratedPluginRegistrant registerWithRegistry:self];
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  return [super application:application
+      didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (void)didInitializeImplicitFlutterEngine:
+    (NSObject<FlutterImplicitEngineBridge> *)engineBridge {
+  [GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
 }
 
 @end
diff --git a/dev/integration_tests/ui/ios/Runner/Info.plist b/dev/integration_tests/ui/ios/Runner/Info.plist
index 48648e5091560..504ab40b45926 100644
--- a/dev/integration_tests/ui/ios/Runner/Info.plist
+++ b/dev/integration_tests/ui/ios/Runner/Info.plist
@@ -39,6 +39,27 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
diff --git a/dev/integration_tests/ui/lib/screenshot.dart b/dev/integration_tests/ui/lib/screenshot.dart
deleted file mode 100644
index 7172185905833..0000000000000
--- a/dev/integration_tests/ui/lib/screenshot.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_driver/driver_extension.dart';
-
-/// This sample application creates a hard to render frame, causing the
-/// driver script to race the raster thread. If the driver script wins the
-/// race, it will screenshot the previous frame. If the raster thread wins
-/// it, it will screenshot the latest frame.
-void main() {
-  enableFlutterDriverExtension();
-
-  runApp(const Toggler());
-}
-
-class Toggler extends StatefulWidget {
-  const Toggler({super.key});
-
-  @override
-  State<Toggler> createState() => TogglerState();
-}
-
-class TogglerState extends State<Toggler> {
-  bool _visible = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      home: Scaffold(
-        appBar: AppBar(title: const Text('FlutterDriver test')),
-        body: Material(
-          child: Column(
-            children: <Widget>[
-              TextButton(
-                key: const ValueKey<String>('toggle'),
-                child: const Text('Toggle visibility'),
-                onPressed: () {
-                  setState(() {
-                    _visible = !_visible;
-                  });
-                },
-              ),
-              Expanded(child: ListView(children: _buildRows(_visible ? 10 : 0))),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-List<Widget> _buildRows(int count) {
-  return List<Widget>.generate(count, (int i) {
-    return Row(children: _buildCells(i / count));
-  });
-}
-
-/// Builds cells that are known to take time to render causing a delay on the
-/// raster thread.
-List<Widget> _buildCells(double epsilon) {
-  return List<Widget>.generate(15, (int i) {
-    return Expanded(
-      child: Material(
-        // A magic color that the test will be looking for on the screenshot.
-        color: const Color(0xffff0102),
-        borderRadius: BorderRadius.all(Radius.circular(i.toDouble() + epsilon)),
-        elevation: 5.0,
-        child: const SizedBox(height: 10.0, width: 10.0),
-      ),
-    );
-  });
-}
diff --git a/dev/snippets/lib/src/snippet_parser.dart b/dev/snippets/lib/src/snippet_parser.dart
index c542f1eaffe3c..145c040027e1b 100644
--- a/dev/snippets/lib/src/snippet_parser.dart
+++ b/dev/snippets/lib/src/snippet_parser.dart
@@ -286,7 +286,7 @@ class SnippetDartdocParser {
           }
           final RegExpMatch match = _filePointerRegex.firstMatch(trimmedLine)!;
           linkedFile = filesystem.file(
-            path.join(flutterRoot.absolute.path, match.namedGroup('file')),
+            path.join(flutterRoot.absolute.path, 'packages', 'flutter', match.namedGroup('file')),
           );
         } else {
           block.add(line.copyWith(text: line.text.replaceFirst(RegExp(r'\s*/// ?'), '')));
diff --git a/dev/snippets/test/snippet_parser_test.dart b/dev/snippets/test/snippet_parser_test.dart
index 287777fea32c1..d9beacd60bb86 100644
--- a/dev/snippets/test/snippet_parser_test.dart
+++ b/dev/snippets/test/snippet_parser_test.dart
@@ -264,7 +264,12 @@ File _createDartpadSourceFile(
   Directory flutterRoot, {
   bool linked = false,
 }) {
-  final File linkedFile = filesystem.file(path.join(flutterRoot.absolute.path, 'linked_file.dart'))
+  final Directory flutterPackageDir = filesystem.directory(
+    path.join(flutterRoot.absolute.path, 'packages', 'flutter'),
+  );
+  final File linkedFile = filesystem.file(
+    path.join(flutterPackageDir.absolute.path, 'linked_file.dart'),
+  )
     ..createSync(recursive: true)
     ..writeAsStringSync('''
 // Copyright
@@ -280,7 +285,7 @@ void DocumentedClassSample() {
 
   final source = linked
       ? '''
-/// ** See code in ${path.relative(linkedFile.path, from: flutterRoot.absolute.path)} **'''
+/// ** See code in ${path.relative(linkedFile.path, from: flutterPackageDir.absolute.path)} **'''
       : '''
 /// ```dart
 /// void DocumentedClassSample() {
diff --git a/dev/snippets/test/snippets_test.dart b/dev/snippets/test/snippets_test.dart
index bdfb4f92a7f34..e1c56dcc80bd1 100644
--- a/dev/snippets/test/snippets_test.dart
+++ b/dev/snippets/test/snippets_test.dart
@@ -93,7 +93,7 @@ On several lines.
 ''');
       final String examplePath = path.join(
         configuration.flutterRoot.path,
-        'examples/api/widgets/foo/foo_example.0.dart',
+        'packages/flutter/examples/api/widgets/foo/foo_example.0.dart',
       );
       final File exampleFile = memoryFileSystem.file(examplePath);
       await exampleFile.create(recursive: true);
@@ -199,7 +199,7 @@ On several lines.
 ''');
       final String examplePath = path.join(
         configuration.flutterRoot.path,
-        'examples/api/widgets/foo/foo_example.0.dart',
+        'packages/flutter/examples/api/widgets/foo/foo_example.0.dart',
       );
       final File exampleFile = memoryFileSystem.file(examplePath);
       await exampleFile.create(recursive: true);
@@ -325,7 +325,7 @@ void main() {
         platform: platform,
       );
       FlutterInformation.instance = flutterInformation;
-      var mockSnippetGenerator = MockSnippetGenerator();
+      final mockSnippetGenerator = MockSnippetGenerator();
       snippets_main.snippetGenerator = mockSnippetGenerator;
       var errorMessage = '';
       errorExit = (String message) {
@@ -369,16 +369,6 @@ void main() {
       expect(errorMessage, equals(''));
       errorMessage = '';
 
-      mockSnippetGenerator = MockSnippetGenerator();
-      snippets_main.snippetGenerator = mockSnippetGenerator;
-      snippets_main.main(<String>[
-        '--input=${input.absolute.path}',
-        '--type=snippet',
-        '--no-format-output',
-      ]);
-      expect(mockSnippetGenerator.formatOutput, equals(false));
-      errorMessage = '';
-
       input.deleteSync();
       snippets_main.main(<String>['--input=${input.absolute.path}']);
       expect(errorMessage, equals('The input file ${input.absolute.path} does not exist.'));
@@ -392,8 +382,6 @@ class MockSnippetGenerator extends SnippetGenerator {
   File? output;
   String? copyright;
   String? description;
-  late bool formatOutput;
-  late bool addSectionMarkers;
   late bool includeAssumptions;
 
   @override
@@ -402,16 +390,12 @@ class MockSnippetGenerator extends SnippetGenerator {
     File? output,
     String? copyright,
     String? description,
-    bool formatOutput = true,
-    bool addSectionMarkers = false,
     bool includeAssumptions = false,
   }) {
     this.sample = sample;
     this.output = output;
     this.copyright = copyright;
     this.description = description;
-    this.formatOutput = formatOutput;
-    this.addSectionMarkers = addSectionMarkers;
     this.includeAssumptions = includeAssumptions;
 
     return '';
diff --git a/dev/tools/examples_smoke_test.dart b/dev/tools/examples_smoke_test.dart
index b17c360b66f9f..2ef80106b25b8 100644
--- a/dev/tools/examples_smoke_test.dart
+++ b/dev/tools/examples_smoke_test.dart
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 // This test builds an integration test from the list of samples in the
-// examples/api/lib directory, and then runs it. The tests are just smoke tests,
-// designed to start up each example and run it for a couple of frames to make
-// sure it doesn't throw an exception or fail to compile.
+// packages/flutter/examples/api/lib directory, and then runs it. The tests are
+// just smoke tests, designed to start up each example and run it for a couple
+// of frames to make sure it doesn't throw an exception or fail to compile.
 
 import 'dart:async';
 import 'dart:convert';
@@ -30,7 +30,11 @@ FutureOr<dynamic> main() async {
   final Directory flutterDir = _kFilesystem.directory(
     path.absolute(path.dirname(path.dirname(path.dirname(_kPlatform.script.toFilePath())))),
   );
-  final Directory apiDir = flutterDir.childDirectory('examples').childDirectory('api');
+  final Directory apiDir = flutterDir
+    .childDirectory('packages')
+    .childDirectory('flutter')
+    .childDirectory('examples')
+    .childDirectory('api');
   final File integrationTest = await generateTest(apiDir);
   try {
     await runSmokeTests(flutterDir: flutterDir, integrationTest: integrationTest, apiDir: apiDir);
@@ -131,7 +135,7 @@ Future<File> generateTest(Directory apiDir) async {
   buffer.writeln(r'''
 
 
-import '../../../dev/manual_tests/test/mock_image_http.dart';
+import '../../../../../dev/manual_tests/test/mock_image_http.dart';
 
 void main() {
   IntegrationTestWidgetsFlutterBinding? binding;
diff --git a/docs/contributing/Style-guide-for-Flutter-repo.md b/docs/contributing/Style-guide-for-Flutter-repo.md
index 3b68d0aa59bd8..443ad613f1cde 100644
--- a/docs/contributing/Style-guide-for-Flutter-repo.md
+++ b/docs/contributing/Style-guide-for-Flutter-repo.md
@@ -596,13 +596,13 @@ By definition, if they are looking at the documentation, they are not finding it
 
 Sample code helps developers learn your API quickly. Writing sample code also helps you think through how your API is going to be used by app developers.
 
-Sample code should go in a documentation comment that typically begins with `/// {@tool dartpad}`, and ends with `/// {@end-tool}`, with the example source and corresponding tests placed in a file under [the API examples directory](https://github.com/flutter/flutter/blob/main/examples/api). This will then be checked by automated tools, and formatted for display on the API documentation web site [api.flutter.dev](https://api.flutter.dev). For details on how to write sample code, see [the API example documentation](https://github.com/flutter/flutter/blob/main/examples/api/README.md#authoring).
+Sample code should go in a documentation comment that typically begins with `/// {@tool dartpad}`, and ends with `/// {@end-tool}`, with the example source and corresponding tests placed in a file under [the API examples directory](https://github.com/flutter/flutter/blob/main/packages/flutter/examples/api). This will then be checked by automated tools, and formatted for display on the API documentation web site [api.flutter.dev](https://api.flutter.dev). For details on how to write sample code, see [the API example documentation](https://github.com/flutter/flutter/blob/main/packages/flutter/examples/api/README.md#authoring).
 
 #### Provide full application samples.
 
 Our UX research has shown that developers prefer to see examples that are in the context of an entire app. So, whenever it makes sense, provide an example that can be presented as part of an entire application instead of just a snippet that uses the `{@tool snippet}` or &#96;&#96;&#96;dart ... &#96;&#96;&#96; indicators.
 
-An application sample can be created using the `{@tool dartpad}` ... `{@end-tool}` or `{@tool sample}` ... `{@end-tool}` dartdoc indicators. See [here](https://github.com/flutter/flutter/blob/main/examples/api/README.md#authoring) for more details about writing these kinds of examples.
+An application sample can be created using the `{@tool dartpad}` ... `{@end-tool}` or `{@tool sample}` ... `{@end-tool}` dartdoc indicators. See [here](https://github.com/flutter/flutter/blob/main/packages/flutter/examples/api/README.md#authoring) for more details about writing these kinds of examples.
 
 Dartpad examples (those using the dartdoc `{@tool dartpad}` indicator) will be presented on the [API documentation website](https://api.flutter.dev) as an in-page executable and editable example. This allows developers to interact with the example right there on the page, and is the preferred form of example. Here is [one such example](https://api.flutter.dev/flutter/widgets/AnimatedSwitcher-class.html#widgets.AnimatedSwitcher.1).
 
diff --git a/docs/contributing/use-reliable-links.md b/docs/contributing/use-reliable-links.md
index 8573b10c43faa..ff4cbebea5e2e 100644
--- a/docs/contributing/use-reliable-links.md
+++ b/docs/contributing/use-reliable-links.md
@@ -7,11 +7,11 @@ sometimes known as a permalink.
 Even if you update the link in the repo if it changes or breaks,
 outdated versions might remain in older versions of tools, docs, etc.
 Sometimes the link destination itself can add an appropriate redirect,
-but sometimes it can't and other times it's destination is not the best choice.
+but sometimes it can't and other times its destination isn't the best choice.
 
 - If you're not sure if you need a more reliable link,
   check out [Situations to consider](#situations-to-consider).
-- If your destination does not already have a stable link,
+- If your destination doesn't already have a stable link,
   and you think it would benefit from one,
   follow the instructions in [Create a reliable link](#create-a-reliable-link).
 
@@ -48,9 +48,9 @@ starting with `/to/`, such as `flutter.dev/to/gesture-disambiguation`.
 
 Before creating a new tooling link,
 verify that an appropriate one doesn't exist already.
-To see what redirects exist already, check the `/to/` entries in
-[`flutter/website/firebase.json`][flutter-redirects] and
-[`dart-lang/site-www/firebase.json`][dart-redirects].
+To see what redirects exist already, check the `/to/` entries in the
+Flutter documentation website's [`firebase.json` file][flutter-redirects] and
+the Dart website's [`firebase.json` file][dart-redirects].
 
 If an appropriate tooling redirect doesn't exist already,
 create one following these steps:
@@ -101,5 +101,5 @@ create one following these steps:
 > a tooling redirect might not be necessary.
 > The same goes for links that are only needed for a short time.
 
-[flutter-redirects]: https://github.com/flutter/website/blob/main/firebase.json
+[flutter-redirects]: https://flutter.dev/to/site-redirects
 [dart-redirects]: https://github.com/dart-lang/site-www/blob/main/firebase.json
diff --git a/docs/ecosystem/release/Updating-Packages-repo-for-a-stable-release.md b/docs/ecosystem/release/Updating-Packages-repo-for-a-stable-release.md
index c2813bf88b6b7..370e5fe34f675 100644
--- a/docs/ecosystem/release/Updating-Packages-repo-for-a-stable-release.md
+++ b/docs/ecosystem/release/Updating-Packages-repo-for-a-stable-release.md
@@ -1,27 +1,47 @@
-This page describes the process of updating flutter/packages after a stable Flutter release. Hotfix releases don't require any changes, since the auto-roller will update the [pinned stable version](https://github.com/flutter/packages/blob/main/.ci/flutter_stable.version), but full stable releases (roughly once per quarter) require manual updates to the repository:
+This page describes the process of updating flutter/packages and flutter/core-packages after a stable Flutter release.
+
+# Repository Updates
+
+## flutter/packages
+
+Hotfix releases don't require any changes, since the auto-roller will update the [pinned stable version](https://github.com/flutter/packages/blob/main/.ci/flutter_stable.version), but full stable releases (roughly once per quarter) require manual updates to the repository:
 * [The stable pin](https://github.com/flutter/packages/blob/main/.ci/flutter_stable.version) needs to be updated. The autoroller will open a PR, but because it includes a separate commit for every Flutter commit since the last stable, it will overwhelm the CLA check and it will fail. Either the CLA check can be overridden (which is safe since the source repo enforces the CLA), or a new manual PR can be made that updates the hash.
-* The [Flutter Dart version mapping](https://github.com/flutter/packages/blob/b4985e25fe0763ece3cfd7af58e0e8c9b9f04fc4/script/tool/lib/src/common/core.dart#L59-L71) needs to be updated. The [Flutter SDK releases page](https://docs.flutter.dev/release/archive) is a useful reference.
+* The [Flutter Dart version mapping](https://github.com/flutter/packages/blob/3498b9d7b67143a68dc43b90951acb577e92f64e/script/tool/lib/src/common/core.dart#L70-L106) needs to be updated. The [Flutter SDK releases page](https://docs.flutter.dev/release/archive) is a useful reference.
   * In addition to adding the new release, add the last bugfix version of the previous stable, for the next step.
-* The [N-1 and N-2 legacy analysis tests](https://github.com/flutter/packages/blob/b4985e25fe0763ece3cfd7af58e0e8c9b9f04fc4/.ci.yaml#L223-L237) need to be updated. We generally use the latest bugfix versions for these tests.
-* The [minimum allowed Flutter version](https://github.com/flutter/packages/blob/b4985e25fe0763ece3cfd7af58e0e8c9b9f04fc4/.ci/targets/repo_checks.yaml#L19) for the repo needs to be updated to the N-2 version. (We generally use .0 here, not the latest hotfix, under the assumption that there are not going to be analysis-breaking changes in a hotfix.)
+* The [N-1 and N-2 legacy analysis tests](https://github.com/flutter/packages/blob/3498b9d7b67143a68dc43b90951acb577e92f64e/.ci.yaml#L290-L304) need to be updated. We generally use the latest bugfix versions for these tests.
+* The [minimum allowed Flutter version](https://github.com/flutter/packages/blob/3498b9d7b67143a68dc43b90951acb577e92f64e/.repo_tool_config.yaml#L12) for the repo needs to be updated to the N-2 version. (We generally use .0 here, not the latest hotfix, under the assumption that there are not going to be analysis-breaking changes in a hotfix.)
   * This should ideally be done in the same PR as the previous step, since that is the point at which we no longer have any coverage of the previous minimum version.
 * All packages need to be updated to that minimum version. This can be trivially done with the repo tooling. E.g.:
 
-  `dart run script/tool/bin/flutter_plugin_tools.dart update-min-sdk --flutter-min=3.7.0`
+  `dart run script/tool/bin/flutter_plugin_tools.dart update-min-sdk --flutter-min=3.44.0`
+
+  * Per [repo policy](../contributing/README.md#version), we do not version-bump these changes, so the associated `update-release-info` command should use `--version=next`. A convenient way to run the `update-release-info` command on only the necessary packages is to make the `update-min-sdk` run its own commit, then use a command like:
 
-  * Per [repo policy](../contributing/README.md#version), we do not version-bump these changes, so the associated `update-release-info` command should use `--version=next`. A convenient way to run the `update-release-info` command on only the necessary packages is to make the `update-min-sdk` run its own commit, then use `--base-branch HEAD^ --run-on-changed-packages` to target only the packages changed in that commit.
+    `dart run script/tool/bin/flutter_plugin_tools.dart update-release-info --version=next --changelog="Updates minimum supported SDK version to Flutter 3.44/Dart 3.12." --base-branch HEAD^ --run-on-changed-packages`
+
+    to target only the packages changed in that commit. Some manual cleanup will be needed to remove SDK bump lines from the previous `stable` in packages that have not released in the meantime, to avoid having multiple SDK bumps in the same changelog entry.
   * This must be done in the same PR as the previous step, or CI will fail.
 * The [release action](https://github.com/flutter/packages/blob/e7d812cefce083fa09762d25cd42303737d05b9f/.github/workflows/release.yml#L34) should be updated to use the new stable.
 
-Many of these steps can be done separately, but they can also be done in combined PRs (as few as one). As an example, 3.13 was done in two PRs: [#4370](https://github.com/flutter/packages/pull/4730) and  [#4371](https://github.com/flutter/packages/pull/4731).
+Many of these steps can be done separately, but it's often easiest to combine them into a single PR ([example](https://github.com/flutter/packages/pull/11741)).
+
+## flutter/core-packages
+
+flutter/core-packages needs the same conceptual changes as flutter/packages, but the CI configuration is different:
+* There is no single `stable` pin, nor separate tasks for N-1/N-2 testing. Instead, each GitHub Action that references a specific Dart version needs to be updated. For example:
+  * [The multi-version Dart analysis and test matrix](https://github.com/flutter/core-packages/blob/6e41b6679caec9c229e65a71169a6fee1e3e3825/.github/workflows/multi_version_tasks.yaml#L31), which should include the corresponding stable, N-1, and N-2 Dart versions for each of the Flutter versions in flutter/packages.
+  * [Dart unit tests on Windows](https://github.com/flutter/core-packages/blob/6e41b6679caec9c229e65a71169a6fee1e3e3825/.github/workflows/windows_unit_tests.yaml#L36)
+  * [The release action](https://github.com/flutter/core-packages/blob/6e41b6679caec9c229e65a71169a6fee1e3e3825/.github/workflows/release.yml#L31)
+* The repo-level tool configuration sets [a minimum Dart version](https://github.com/flutter/core-packages/blob/6e41b6679caec9c229e65a71169a6fee1e3e3825/.repo_tool_config.yaml#L14) rather than a minimum Flutter version.
+* Currently the repository tooling does not have a `--dart-min` option for `update-min-sdk`, so you will need to run `update-min-sdk` using your local copy of the repo tooling that includes the version mapping changes from the flutter/packages steps, and pass the same `--flutter-min` (which will then map to the correct Dart minimum).
 
-### Issue Updates
+# Issue Updates
 
 Sweep all [`p: waiting for stable update` issues](https://github.com/flutter/flutter/labels/p%3A%20waiting%20for%20stable%20update), and update those that are now unblocked to indicate that they can now be addressed (removing the label).
 
 For any that are about deprecated API usage, upgrade them to `P1`, and either find an owner for them or remove the owning team's `triaged-*` label, leaving a comment that the deprecated API usage needs to be removed ASAP to minimize future disruption to package clients.
   * The motivation for treating these as P1 is that many clients do not update their packages (in particular, their transitive dependencies) frequently, so the further in advance of the eventual API *removal* the publishing of an update is, the fewer clients will have build errors on future updates of Flutter.
 
-### PR Updates
+# PR Updates
 
-Similarly sweep all [`p: waiting for stable update` PRs](https://github.com/flutter/packages/labels/waiting%20for%20stable%20update) and comment and remove labels as necessary.
\ No newline at end of file
+Similarly sweep all [`p: waiting for stable update` PRs](https://github.com/flutter/packages/labels/waiting%20for%20stable%20update) and comment and remove labels as necessary.
diff --git a/docs/engine/testing/Testing-the-engine.md b/docs/engine/testing/Testing-the-engine.md
index 6715e963ef317..0bb5479588dc3 100644
--- a/docs/engine/testing/Testing-the-engine.md
+++ b/docs/engine/testing/Testing-the-engine.md
@@ -295,7 +295,7 @@ than using the real Flutter framework at `flutter/flutter`.
 The end-to-end test can be executed by running:
 
 ```sh
-testing/ios_scenario_app/run_ios_tests.sh
+engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh
 ```
 
 Additional end-to-end instrumented tests can be added to [`testing/ios_scenario_app/ios/Scenarios/ScenariosTests`](/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/).
diff --git a/docs/infra/Packages-Gardener-Rotation.md b/docs/infra/Packages-Gardener-Rotation.md
index 08cc0abb4e0f7..9c095b9451657 100644
--- a/docs/infra/Packages-Gardener-Rotation.md
+++ b/docs/infra/Packages-Gardener-Rotation.md
@@ -2,13 +2,14 @@ The packages gardener role currently makes use of several tools and communicatio
 
 ## Objective
 
-The packages gardener’s role is to eliminate impediments to engineering velocity on teams working on the [flutter/packages] repository, and to minimize the latency with which critical fixes arrive in our customers' hands. To that end, we maintain a rotation so that there is a clear owner and point of contact for flutter/packages issues, and so that engineers can plan their work around an assumption of reduced productivity during their rotation.
+The packages gardener’s role is to eliminate impediments to engineering velocity on teams working on the [flutter/packages] and [flutter/core-packages] repositories, and to minimize the latency with which critical fixes arrive in our customers' hands. To that end, we maintain a rotation so that there is a clear owner and point of contact for flutter/packages issues, and so that engineers can plan their work around an assumption of reduced productivity during their rotation.
 
 The packages gardener's core responsibilities are:
-* Keep the flutter/packages tree green to keep developers, and the release process unblocked.
+* Keep the flutter/packages and flutter/core-packages trees green to keep developers and the release process unblocked.
 * Keep the various packages rollers (see below) rolling.
 * Ensure others are informed of issues which may affect them.
 * Ensure bugs/investigations are delegated and taken care of by the right person, which may be themself.
+* Update the repositories for any stable releases (see below).
 * Update the list of known deprecations (see below).
 
 The gardener's responsibilities do not include:
@@ -16,7 +17,7 @@ The gardener's responsibilities do not include:
 * Personally investigate issues or fix bugs, unless the right person to investigate and fix is the gardener themself.
 
 As such, the gardener should use their trowel and hat to:
-* Aggressively roll back problematic changes (in all relevant repositories including [flutter/packages] and [flutter/flutter]).
+* Aggressively roll back problematic changes (in all relevant repositories including [flutter/packages], [flutter/core-packages], and [flutter/flutter]).
 * Delegate investigations/issues to the right engineer(s) on the team, and follow-up.
 * Detect infrastructure issues that cause test failures and flakiness and report to the infrastructure team.
 * Notify the [Flutter framework gardener] when a framework change causes the flutter/packages roller to fail in a way that can’t easily be fixed locally.
@@ -37,7 +38,7 @@ Please briefly describe any issues you encountered during your week of gardening
 
 Below are the tasks that should be done routinely while gardening.
 
-### Dashboard
+### flutter/packages dashboard
 Open the [packages build dashboard].
 1. If the tree is closed, identify which test shards are failing. If there are yellow boxes with an exclamation point, that means that the failed tests are automatically re-running themselves. The tree is not fully closed until there are solid red boxes or red boxes with exclamation points. You can begin investigation as soon as you notice the tree going red, but it is suggested not to begin escalation until re-runs have completed.
 1. Identify which test within the shard failed, and try to locate obvious errors or failures in the logs.
@@ -50,6 +51,11 @@ Open the [packages build dashboard].
 
 Unmute the [hackers-ecosystem channel] and [hackers-infra channel] on [Discord]. Contributors are encouraged to escalate tree closures to you. Respond there as quickly as possible.
 
+### flutter/core-packages tree status
+1. Check the [flutter/core-packages build status] (core-packages does not currently have a Flutter dashboard), which should show a green checkmark for the latest commit.
+1. If it doesn't, click the red X to see what failed, and find the relevant errors.
+1. Proceed as with flutter/packages failures above.
+
 ### Rollers
 
 Check that all of the auto-rollers are running:
@@ -63,6 +69,10 @@ If a roller's status is not `running`, contact the person who paused it and work
 
 If a roller is failing, check the recent runs to see why, and take action to ensure that the roller starts succeeding again. If the issue will take a while to resolve, pause the roller while resolving it, and include an explanation of why.
 
+### Stable release
+
+If there is a stable release (a full new release, not a hotfix release), both flutter/packages and flutter/core-packages need to be updated to ensure that they are testing the new set of `stable`, N-1, and N-2 releases. See [these instructions][update for stable release] for steps to follow.
+
 ### Deprecations
 
 Our analysis options do not flag deprecated API usage ([context][deprecation context]), but it’s important that we not leave deprecated API usage in our packages for any longer than necessary, since when the APIs are eventually removed anyone still using versions of the package predating the fix will get build errors that many developers find confusing and hard to resolve.
@@ -79,8 +89,10 @@ Once during your rotation, do a manual check for any new deprecations:
         * If it's easy to determine, include the version that the replacement API will be available in the issue description.
     * Exception: If a deprecation warning is from a package integration test that is testing a deprecated API from that package (which does not count as `deprecated_member_use_from_same_package` since the example is technically a different package), annotate it with an `ignore` instead, so it doesn’t show up in this manual check in the future.
 
+These steps should be done for both flutter/packages and flutter/core-packages.
+
 #### Consider fixing deprecated APIs
-If old deprecations have reached the point where they can be fixed without losing support for stable, considering using some of your gardening time to replace the deprecated API usage.
+If old deprecations have reached the point where they can be fixed without losing support for stable, consider using some of your gardening time to replace the deprecated API usage.
 
 ## Handling failures
 
@@ -106,7 +118,7 @@ If the commit landed within the last 24 hours:
 If the commit could not be automatically reverted:
 1. Create a revert pull request from the bad merged pull request via the "Revert" button at the bottom.
 1. Add the `revert` label to the PR to allow the bot to land it without approval.
-1. Add the original author to the as a reviewer so they are notified. If they are not a member of [flutter-hackers], also include the original pull request reviewers.
+1. Add the original author as a reviewer so they are notified. If they are not a member of [flutter-hackers], also include the original pull request reviewers.
 1. In "Related Issues" add a link to any GitHub issues that describe the failure.
 1. @ mention the author in the [hackers-ecosystem channel] with a link to the revert pull request. If they are unavailable, send an email. If they are not a [Flutter committer][flutter-hackers] and are not on Discord, escalate to the reviewers of the original pull request.
 1. As soon as analysis test passes, merge it. You do not need to wait for all presubmit tests to pass, or for an LGTM.
@@ -122,6 +134,7 @@ If you see a test failure that appears to be a flake:
 1. If the test has neither been recently introduced, nor recently changed, disable the test. The test owner will turn it back on or delete the test as part of their investigation.
 
 [flutter/packages]: https://github.com/flutter/packages
+[flutter/core-packages]: https://github.com/flutter/core-packages
 [flutter/flutter]: https://github.com/flutter/flutter
 [Flutter framework gardener]: /docs/infra/Flutter-Framework-Gardener-Rotation.md
 [Flutter issues]: https://github.com/flutter/flutter/issues
@@ -129,6 +142,7 @@ If you see a test failure that appears to be a flake:
 [deprecated api issues]: https://github.com/flutter/flutter/labels/p%3A%20deprecated%20api
 [flutter-hackers]: https://github.com/orgs/flutter/teams/flutter-hackers
 [packages build dashboard]: https://flutter-dashboard.appspot.com/#/build?repo=packages
+[flutter/core-packages build status]: https://github.com/flutter/core-packages/commits/main/
 [Discord]: https://discord.gg/BS8KZyg
 [hackers-ecosystem channel]: https://discord.com/channels/608014603317936148/608020293944082452
 [hackers-infra channel]: https://discord.com/channels/608014603317936148/608021351567065092
@@ -139,4 +153,5 @@ If you see a test failure that appears to be a flake:
 [packages-to-flutter roller]: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
 [packages gardening journal]: https://goto.google.com/flutter-packages-gardener-journal
 [flutter-stable-to-packages roller]: https://autoroll.skia.org/r/flutter-stable-packages
+[update for stable release]: /docs/ecosystem/release/Updating-Packages-repo-for-a-stable-release.md
 [On-call scheduling for Flutter]: https://docs.google.com/document/d/1i-11by4J3zvxWG3qLMm4MKfJ8DrjIJna6DPA9tBmJWc/edit#heading=h.w8bl5vic6x95
diff --git a/docs/infra/Running-Devicelab-Tests-For-PR.md b/docs/infra/Running-Devicelab-Tests-For-PR.md
index 0ad90013f34ab..93e787aa81e5c 100644
--- a/docs/infra/Running-Devicelab-Tests-For-PR.md
+++ b/docs/infra/Running-Devicelab-Tests-For-PR.md
@@ -8,40 +8,6 @@ a few times before landing. Here's how you do that.
 > [!Warning]
 > Ensure you have followed the prerequisites in [dev/bots/README.md](../../dev/bots/README.md)
 
-## Engine PRs
-
-Engine artifacts for PRs are uploaded using their _commit hash_, not their _content hash_. Failing to follow these steps will cause the tests to be run against post-submit artifacts which will **likely not exist** for your PR since the content hash is different.
-
-1. Make your changes locally and upload to a PR.
-
-2. Wait for infrastructure to build the engine artifacts for you - e.g. `Mac mac_ios_engine` and `Mac mac_host_engine` like builds.
-
-    > [!TIP]
-    > If your PR "Checks" is over ~180, the engine artifacts are built for you. Check [`engine/src/flutter/.ci.yaml`](../../engine/src/flutter/.ci.yaml)
-    > for the latest artifacts.
-
-3. Collect the following:
-
-    1. `COMMIT_HASH` for the latest version of the engine build of your PR
-    2. `PR_NUMBER`
-    3. The `PRESUBMIT_TEST` you want to run (full name, e.g. `Windows_mokey hot_mode_dev_cycle_win__benchmark`)
-
-4. From the recipes repository check out, run:
-
-    ```shell
-    led get-builder 'luci.flutter.staging:PRESUBMIT_TEST' \
-    | led edit -pa git_ref='refs/pull/PR_NUMBER/head' \
-    | led edit -pa git_url='https://github.com/flutter/flutter' \
-    | led edit -pa flutter_prebuilt_engine_version='COMMIT_HASH' \
-    | led edit -pa flutter_realm='flutter_archives_v2' \
-    | led edit-recipe-bundle \
-    | led launch
-    ```
-
-## Framework PRs
-
-For Framework PRs, the process is simpler:
-
 1. Collect the following:
 
     1. `PR_NUMBER`
diff --git a/docs/platforms/android/Migrating-Flutter-Gradle-Plugin-to-AGP-public-API.md b/docs/platforms/android/Migrating-Flutter-Gradle-Plugin-to-AGP-public-API.md
index 43a37eea10412..0b70424d1221a 100644
--- a/docs/platforms/android/Migrating-Flutter-Gradle-Plugin-to-AGP-public-API.md
+++ b/docs/platforms/android/Migrating-Flutter-Gradle-Plugin-to-AGP-public-API.md
@@ -51,8 +51,9 @@ projects. That opt-out dies with AGP 10.
 
 ## Decision records
 
-1. **Min AGP floor: out of scope.** A separate in-flight version bump owns the
-   floor; this migration builds on whatever floor is in effect at landing.
+1. **Min AGP floor: out of scope.** A separate version bump owned the
+   floor, which has now landed on `master` (PRs #176858 and #177416 bumped the
+   floor to `8.11.1`). This migration builds seamlessly on that new floor.
    Every replacement API used here was verified public in `gradle-api:8.11.1`
    (decompiled jar inspection). If implementation finds a replacement API that
    genuinely requires a higher min AGP: document which API and why no
@@ -163,15 +164,18 @@ else serializes through `FlutterPlugin.kt` / `FlutterPluginUtils.kt`.
    CI patterns) may behave differently; a runtime divergence warning is added.
 4. **Custom build types → plugins**: live-aliased instances become `initWith`
    copies; library plugins cannot receive `isDebuggable` (no public setter on
-   `LibraryBuildType`) — plugin-side `BuildConfig.DEBUG`/JNI debuggability may
-   differ for custom debuggable build types; matching preserved via
-   `matchingFallbacks`.
+   `LibraryBuildType`). **Warning:** If an app uses a custom build type (like `staging`),
+   the plugin's `BuildConfig.DEBUG` and native (C++/JNI) code may silently compile
+   in release mode instead of debug mode. Matching is preserved via `matchingFallbacks`,
+   but C++ debugging will be broken for those custom build types.
 5. **Asset merge**: flutter assets become a merged source dir instead of a
    post-merge overwrite; collisions resolve by AGP source-set priority.
 6. **Add-to-app**: the explicit `:app:merge<V>Assets.dependsOn` edge and
    host-project lookup are removed; `flutter.hostAppProjectName` becomes a
-   no-op with a deprecation warning naming a removal milestone; ordering
-   against `copyFlutterAssets<V>` task names may break.
+   no-op with a deprecation warning naming a removal milestone. Build scripts that
+   reference Flutter's `copyFlutterAssets<V>` tasks by name (e.g. `tasks.getByPath(...)`)
+   will crash with a `Task with path ... not found` error because the tasks are now
+   registered lazily.
 7. **Task realization/type**: flutter tasks become lazy `TaskProvider`s, and
    `copyFlutterAssets<V>` changes type from `org.gradle.api.tasks.Copy` to a
    custom task class — `tasks.named(..., Copy::class)` casts fail.
diff --git a/docs/platforms/android/website-page-draft.md b/docs/platforms/android/website-page-draft.md
index de89c1b5ba0c5..6963fb536a7e8 100644
--- a/docs/platforms/android/website-page-draft.md
+++ b/docs/platforms/android/website-page-draft.md
@@ -28,9 +28,9 @@ lines carrying Flutter's marker comments, and prints a message when it does.
 Opt-outs you added by hand are left alone.
 
 `android.builtInKotlin=false` is **not** affected by this change. It is owned
-by the separate built-in-Kotlin migration (tracked in <!-- TODO: link
-built-in-Kotlin tracking issue -->), which means one more (smaller)
-`gradle.properties` change later.
+by the separate built-in-Kotlin migration (tracked in
+[flutter/flutter#184836](https://github.com/flutter/flutter/issues/184836)),
+which means one more (smaller) `gradle.properties` change later.
 
 ## Migration guide
 
@@ -51,21 +51,35 @@ android {
 After (Variant API, `build.gradle` / `build.gradle.kts`):
 
 ```kotlin
+// Note: androidComponents is a top-level block, peer to android {}
 androidComponents {
     onVariants(selector().all()) { variant ->
         variant.outputs.forEach { output ->
-            // Use variant.name / output.filters and your own naming scheme.
+            // WARNING: VariantOutput in the new API does not have an outputFileName property.
+            // You cannot mutate the filename here.
         }
     }
 }
 ```
 
-For output *file* renames, prefer consuming the built APKs from
-`SingleArtifact.APK` with a task wired through
-`variant.artifacts.use(...)`, or copy/rename in a finalizer task. Flutter's
-own copy step already places APKs at
-`build/app/outputs/flutter-apk/app[-abi][-flavor]-<mode>.apk` with unchanged
-names and paths.
+For output *file* renames, you must copy or rename the built APKs using a Gradle task.
+(Note: Flutter's own copy step already places APKs at `build/app/outputs/flutter-apk/app[-abi][-flavor]-<mode>.apk` with unchanged names and paths.)
+
+Example of a simple finalizer task in `build.gradle` (Groovy):
+```groovy
+androidComponents {
+    onVariants(selector().all()) { variant ->
+        def copyTask = tasks.register("copy${variant.name.capitalize()}Apk", Copy) {
+            from(variant.artifacts.get(com.android.build.api.artifact.SingleArtifact.APK.INSTANCE))
+            into(layout.buildDirectory.dir("custom-outputs"))
+            rename { String fileName -> fileName.replace("app", "myapp") }
+        }
+        tasks.matching { it.name == "assemble${variant.name.capitalize()}" }.configureEach {
+            dependsOn(copyTask)
+        }
+    }
+}
+```
 
 ### Setting per-ABI or per-variant versionCode
 
@@ -86,7 +100,7 @@ androidComponents {
     onVariants(selector().all()) { variant ->
         variant.outputs.forEach { output ->
             val abi = output.filters.find { it.filterType == FilterConfiguration.FilterType.ABI }?.identifier
-            val base = output.versionCode.get() ?: 1
+            val base = output.versionCode.orNull ?: 1
             output.versionCode.set((abiCodes[abi] ?: 0) * 1000 + base)
         }
     }
@@ -96,7 +110,9 @@ androidComponents {
 Note: Flutter itself sets per-ABI version codes for `--split-per-abi` inside
 `onVariants`. If your CI mutates version codes in `afterEvaluate`, that runs at
 a different time than before; Flutter prints a warning when it detects a
-divergence between the DSL value and the final output value.
+divergence between the DSL value and the final output value. To verify your
+mutations worked, inspect the built APK:
+`apkanalyzer manifest print versionCode build/app/outputs/flutter-apk/app-release.apk`
 
 ### Custom build types and plugins
 
@@ -105,7 +121,9 @@ they resolve. With the new DSL these are `initWith` copies rather than live
 aliases:
 
 - Set `matchingFallbacks` on custom build types so dependent Android libraries
-  resolve, for example:
+  resolve. If a third-party plugin does not define your app's custom `staging`
+  build type, AGP needs to know to safely fall back to compiling the plugin's
+  `debug` variant rather than failing the build. For example:
 
   ```kotlin
   android {
@@ -118,10 +136,12 @@ aliases:
   }
   ```
 
-- Library (plugin) projects cannot be marked debuggable through the public
-  API, so a plugin's `BuildConfig.DEBUG` and native (JNI) debuggability can
-  differ from before for custom *debuggable* build types. Variant matching
-  still works via `matchingFallbacks`.
+- **Warning for Plugin Authors / JNI Developers:** Library (plugin) projects cannot
+  be explicitly marked debuggable through the public AGP API. If an app uses a
+  custom build type (like `staging`), the plugin's `BuildConfig.DEBUG` and native (C++/JNI)
+  code may silently compile in release mode instead of debug mode. Variant matching
+  still works via `matchingFallbacks`, but C++ debugging will be broken for those
+  custom build types.
 
 ### Add-to-app (Flutter module in a host app)
 
@@ -129,7 +149,9 @@ aliases:
   module. The dependency between your host's asset merging and Flutter's asset
   copy is expressed through the Variant API instead of an explicit
   `merge<Variant>Assets.dependsOn(...)` edge. Build scripts that reference
-  Flutter's `copyFlutterAssets<Variant>` tasks by name or type may break: the
+  Flutter's `copyFlutterAssets<Variant>` tasks by name or type will break.
+  For example, `tasks.getByPath(":flutter:copyFlutterAssetsDebug")` will crash
+  your build with a `Task with path ... not found` error because the
   tasks are now registered lazily and are no longer of type
   `org.gradle.api.tasks.Copy`.
 - `flutter.hostAppProjectName` in `gradle.properties` is now a no-op. Flutter
@@ -151,9 +173,11 @@ aliases:
 ### Flutter plugin authors
 
 - Do not read `android.applicationVariants` / `android.libraryVariants` in
-  plugin build scripts; use `androidComponents.onVariants`.
+  plugin build scripts; use `androidComponents.onVariants`. (We are tracking
+  an audit of the top 200 plugins for this legacy usage in
+  [flutter/flutter#190845](https://github.com/flutter/flutter/issues/190845)).
 - Do not assume Flutter's tasks exist at configuration time or have specific
-  types; look tasks up lazily (`tasks.named`) without a type, or better, wire
+  types; look up tasks lazily (`tasks.named`) without a type, or better, wire
   through Variant API artifacts.
 - Test your plugin's example app with AGP 9+ **without** `android.newDsl=false`.
 
@@ -173,14 +197,9 @@ If you cannot migrate immediately, add the opt-out by hand to
 android.newDsl=false
 ```
 
-**This stops working with AGP 10** (removal of the legacy APIs). Treat it as a
-short-term unblock only; hand-added opt-outs are never touched by Flutter's
-migrator.
-
-## Timeline
-
-Landed in version: TBD<br>
-In stable release: TBD
+**AGP 10 is expected to remove the legacy APIs**, meaning this opt-out will
+stop working. Treat it as a short-term unblock only; hand-added opt-outs are
+never touched by Flutter's migrator.
 
 ## References
 
diff --git a/engine/src/build/config/compiler/BUILD.gn b/engine/src/build/config/compiler/BUILD.gn
index e06cf625abe8f..0e95476b4b2f6 100644
--- a/engine/src/build/config/compiler/BUILD.gn
+++ b/engine/src/build/config/compiler/BUILD.gn
@@ -143,6 +143,11 @@ config("compiler") {
     if (is_asan) {
       cflags += [ "-fsanitize=address" ]
       ldflags += [ "-fsanitize=address" ]
+
+      # ASan is deliberately not added to swiftflags.
+      # The Swift frontend emits an ASan version-mismatch guard
+      # (__asan_version_mismatch_check_apple_clang_*) that the engine's clang
+      # ASan runtime doesn't provide, so instrumenting Swift fails to link.
     }
     if (is_hwasan && is_android && current_cpu == "arm64") {
       cflags += [ "-fsanitize=hwaddress" ]
@@ -155,6 +160,7 @@ config("compiler") {
     if (is_tsan) {
       cflags += [ "-fsanitize=thread" ]
       ldflags += [ "-fsanitize=thread" ]
+      swiftflags += [ "-sanitize=thread" ]
     }
     if (is_msan) {
       cflags += [ "-fsanitize=memory" ]
@@ -163,6 +169,10 @@ config("compiler") {
     if (is_ubsan) {
       cflags += [ "-fsanitize=undefined" ]
       ldflags += [ "-fsanitize=undefined" ]
+
+      # UBSan is deliberately not added to swiftflags. The Swift compiler
+      # accepts -sanitize=undefined but emits no UBSan instrumentation for Swift
+      # code.
     }
 
     if (use_custom_libcxx) {
@@ -435,9 +445,9 @@ config("compiler") {
     # to say that it does. Define them here instead.
     defines += [ "HAVE_SYS_UIO_H" ]
 
-    # When Android requires new flags consider also editing the flags in
-    # the following locations.
-    # Framework plugin_ffi template: packages/flutter_tools/templates/plugin_ffi/src.tmpl/CMakeLists.txt.tmpl
+    # When Android requires new flags consider also editing the flags in the
+    # following locations. Framework plugin_ffi template:
+    # packages/flutter_tools/templates/plugin_ffi/src.tmpl/CMakeLists.txt.tmpl
     # Example PR: https://github.com/flutter/flutter/pull/155508
     # Dart Lang JNI package: pkgs/jni/src/CMakeLists.txt
     # Example PR: https://github.com/dart-lang/native/pull/1615
@@ -1023,7 +1033,8 @@ config("optimize") {
   }
 
   lto_flags = []
-  if (enable_lto && (is_linux || is_ios || is_mac || is_android || is_fuchsia || is_wasm)) {
+  if (enable_lto &&
+      (is_linux || is_ios || is_mac || is_android || is_fuchsia || is_wasm)) {
     lto_flags += [ "-flto" ]
   }
 
diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index f33e21a91f065..b5406a854e765 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -219,6 +219,18 @@ targets:
       # at https://github.com/flutter/flutter/issues/152186.
       cores: "8"
 
+  - name: Linux linux_arm_host_desktop_engine
+    recipe: engine_v2/engine_v2
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      release_build: "true"
+      config_name: linux_arm_host_desktop_engine
+    drone_dimensions:
+      - os=Linux
+    dimensions:
+      cores: "8"
+
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
     timeout: 120
diff --git a/engine/src/flutter/ci/bin/format.dart b/engine/src/flutter/ci/bin/format.dart
index 062ca547d1c7f..f505df996572d 100644
--- a/engine/src/flutter/ci/bin/format.dart
+++ b/engine/src/flutter/ci/bin/format.dart
@@ -227,8 +227,65 @@ abstract class FormatChecker {
     }
   }
 
+  /// Builds a job that diffs the file at [filePath] against
+  /// [formattedContents], the formatter's output for that file.
+  ///
+  /// Because the formatted side arrives on stdin, the resulting patch header
+  /// shows `-` (stdin) as the destination file. Callers rewrite that to the
+  /// real path before applying the patch.
+  ///
+  /// `--src-prefix` and `--dst-prefix` are passed explicitly so that the patch
+  /// always uses git's default `a/` and `b/` prefix. This prevents mismatches
+  /// due for users whose git config sets up alternate prefixes.
+  ///
+  /// See: `diff.mnemonicPrefix`, `diff.noprefix`, `diff.srcPrefix`,
+  /// `diff.dstPrefix`.
+  @protected
+  WorkerJob createDiffJob(String filePath, List<int>? formattedContents) {
+    return WorkerJob(<String>[
+      'git',
+      'diff',
+      '--no-index',
+      '--no-color',
+      '--ignore-cr-at-eol',
+      '--src-prefix=a/',
+      '--dst-prefix=b/',
+      '--',
+      filePath,
+      '-',
+    ], stdinRaw: codeUnitsAsStream(formattedContents));
+  }
+
+  /// RegExp that matches the to-file line of a patch whose destination is `-`
+  /// (stdin), instead of the real path the caller should have rewritten it to.
+  ///
+  /// The trailing `\r` is optional so the line is matched whether git emits LF
+  /// or CRLF line endings.
+  static final RegExp _stdinPatchTarget = RegExp(r'^\+\+\+ b/-\r?$', multiLine: true);
+
+  /// Returns true if [patch] has a to-file line whose destination is `-`.
+  static bool _patchTargetsStdin(String patch) => _stdinPatchTarget.hasMatch(patch);
+
+  /// Applies each of [patches] to the work tree with `git apply`, and returns
+  /// whether they all applied cleanly.
+  ///
+  /// [createDiffJob] produces patches whose output path is `-` (stdin). Every
+  /// patch in [patches] is expected to have had its destination path rewritten
+  /// to the real destination path to prevent files from being written to a file
+  /// at the repository root named `-`.
   @protected
   Future<bool> applyPatch(List<String> patches) async {
+    final List<String> unrewritten = patches.where(_patchTargetsStdin).toList();
+    if (unrewritten.isNotEmpty) {
+      final bool plural = unrewritten.length > 1;
+      error(
+        '${unrewritten.length} patch${plural ? 'es' : ''} still '
+        "${plural ? 'have' : 'has'} '-' as the destination file. Patches must "
+        'have their destination path rewritten to the correct output path.',
+      );
+      unrewritten.forEach(message);
+      return false;
+    }
     final patchPool = ProcessPool(
       processRunner: _processRunner,
       printReport: namedReport('patch'),
@@ -421,18 +478,7 @@ class ClangFormatChecker extends FormatChecker {
     final diffJobs = <WorkerJob>[];
     await for (final WorkerJob completedJob in completedClangFormats) {
       if (completedJob.result.exitCode == 0) {
-        diffJobs.add(
-          WorkerJob(<String>[
-            'git',
-            'diff',
-            '--no-index',
-            '--no-color',
-            '--ignore-cr-at-eol',
-            '--',
-            completedJob.command.last,
-            '-',
-          ], stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw)),
-        );
+        diffJobs.add(createDiffJob(completedJob.command.last, completedJob.result.stdoutRaw));
       } else {
         final String formatterCommand = completedJob.command.join(' ');
         error(
@@ -619,18 +665,7 @@ class JavaFormatChecker extends FormatChecker {
     final diffJobs = <WorkerJob>[];
     await for (final WorkerJob completedJob in completedJavaFormats) {
       if (completedJob.result.exitCode == 0) {
-        diffJobs.add(
-          WorkerJob(<String>[
-            'git',
-            'diff',
-            '--no-index',
-            '--no-color',
-            '--ignore-cr-at-eol',
-            '--',
-            completedJob.command.last,
-            '-',
-          ], stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw)),
-        );
+        diffJobs.add(createDiffJob(completedJob.command.last, completedJob.result.stdoutRaw));
       } else {
         final String formatterCommand = completedJob.command.join(' ');
         error(
@@ -740,16 +775,7 @@ class GnFormatChecker extends FormatChecker {
     await for (final WorkerJob completedJob in completedJobs) {
       if (completedJob.result.exitCode == 0) {
         diffJobs.add(
-          WorkerJob(<String>[
-            'git',
-            'diff',
-            '--no-index',
-            '--no-color',
-            '--ignore-cr-at-eol',
-            '--',
-            completedJob.name.split(' ').last,
-            '-',
-          ], stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw)),
+          createDiffJob(completedJob.name.split(' ').last, completedJob.result.stdoutRaw),
         );
       } else {
         final String formatterCommand = completedJob.command.join(' ');
@@ -868,18 +894,7 @@ class DartFormatChecker extends FormatChecker {
           // The formatter had a problem formatting the file.
           errorJobs.add(completedJob);
         } else if (completedJob.result.exitCode == 1) {
-          diffJobs.add(
-            WorkerJob(<String>[
-              'git',
-              'diff',
-              '--no-index',
-              '--no-color',
-              '--ignore-cr-at-eol',
-              '--',
-              completedJob.command.last,
-              '-',
-            ], stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw)),
-          );
+          diffJobs.add(createDiffJob(completedJob.command.last, completedJob.result.stdoutRaw));
         }
       }
       final diffPool = ProcessPool(processRunner: _processRunner, printReport: namedReport('diff'));
diff --git a/engine/src/flutter/ci/builders/linux_android_debug_engine.json b/engine/src/flutter/ci/builders/linux_android_debug_engine.json
index f0632b4578a57..55e4e4bc90a6e 100644
--- a/engine/src/flutter/ci/builders/linux_android_debug_engine.json
+++ b/engine/src/flutter/ci/builders/linux_android_debug_engine.json
@@ -105,50 +105,6 @@
                 ]
             }
         },
-        {
-            "archives": [
-                {
-                    "name": "ci/android_debug_x86",
-                    "type": "gcs",
-                    "base_path": "out/ci/android_debug_x86/zip_archives/",
-                    "include_paths": [
-                        "out/ci/android_debug_x86/zip_archives/android-x86/artifacts.zip",
-                        "out/ci/android_debug_x86/zip_archives/android-x86/android-x86-embedder.zip",
-                        "out/ci/android_debug_x86/zip_archives/android-x86/impeller_sdk.zip",
-                        "out/ci/android_debug_x86/zip_archives/android-x86/symbols.zip",
-                        "out/ci/android_debug_x86/zip_archives/download.flutter.io"
-                    ],
-                    "realm": "production"
-                }
-            ],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_variables": {
-                "use_rbe": true
-            },
-            "gn": [
-                "--target-dir",
-                "ci/android_debug_x86",
-                "--android",
-                "--android-cpu=x86",
-                "--no-lto",
-                "--rbe",
-                "--no-goma"
-            ],
-            "name": "ci/android_debug_x86",
-            "description": "Produces debug mode artifacts to target x86 Android from a Linux host.",
-            "ninja": {
-                "config": "ci/android_debug_x86",
-                "targets": [
-                    "flutter",
-                    "flutter/shell/platform/android:abi_jars",
-                    "flutter/shell/platform/embedder:embedder-archive",
-                    "flutter/impeller/toolkit/interop:sdk"
-                ]
-            }
-        },
         {
             "archives": [
                 {
diff --git a/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json
new file mode 100644
index 0000000000000..0bd5dd58eb474
--- /dev/null
+++ b/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json
@@ -0,0 +1,144 @@
+{
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
+    "luci_flags": {
+      "upload_content_hash": true
+    },
+    "builds": [
+        {
+            "archives": [
+                {
+                    "name": "ci/linux_debug_arm64_desktop",
+                    "base_path": "out/ci/linux_debug_arm64_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/ci/linux_debug_arm64_desktop/zip_archives/linux-arm64-debug/linux-arm64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_jdk": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "ci/linux_debug_arm64_desktop",
+                "--target-os=linux",
+                "--linux-cpu=arm64"
+            ],
+            "name": "ci/linux_debug_arm64_desktop",
+            "description": "Produces debug mode artifacts to target arm64 Linux from a Linux host with fontconfig enabled.",
+            "ninja": {
+                "config": "ci/linux_debug_arm64_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "name": "ci/linux_profile_arm64_desktop",
+                    "base_path": "out/ci/linux_profile_arm64_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/ci/linux_profile_arm64_desktop/zip_archives/linux-arm64-profile/linux-arm64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_jdk": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "profile",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "ci/linux_profile_arm64_desktop",
+                "--target-os=linux",
+                "--linux-cpu=arm64"
+            ],
+            "name": "ci/linux_profile_arm64_desktop",
+            "description": "Produces profile mode artifacts to target arm64 Linux from a Linux host with fontconfig enabled.",
+            "ninja": {
+                "config": "ci/linux_profile_arm64_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "name": "ci/linux_release_arm64_desktop",
+                    "base_path": "out/ci/linux_release_arm64_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/ci/linux_release_arm64_desktop/zip_archives/linux-arm64-release/linux-arm64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_jdk": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "release",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "ci/linux_release_arm64_desktop",
+                "--target-os=linux",
+                "--linux-cpu=arm64"
+            ],
+            "name": "ci/linux_release_arm64_desktop",
+            "description": "Produces release mode artifacts to target arm64 Linux from a Linux host with fontconfig enabled.",
+            "ninja": {
+                "config": "ci/linux_release_arm64_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        }
+    ]
+}
diff --git a/engine/src/flutter/ci/builders/linux_arm_host_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_engine.json
index 7574304bec748..30c551b2858d3 100644
--- a/engine/src/flutter/ci/builders/linux_arm_host_engine.json
+++ b/engine/src/flutter/ci/builders/linux_arm_host_engine.json
@@ -11,48 +11,6 @@
       "upload_content_hash": true
     },
     "builds": [
-        {
-            "archives": [
-                {
-                    "name": "ci/linux_profile_arm64",
-                    "type": "gcs",
-                    "base_path": "out/ci/linux_profile_arm64/zip_archives/",
-                    "include_paths": [
-                        "out/ci/linux_profile_arm64/zip_archives/linux-arm64-profile/linux-arm64-flutter-gtk.zip"
-                    ],
-                    "realm": "production"
-                }
-            ],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false,
-                "use_rbe": true
-            },
-            "gn": [
-                "--target-dir",
-                "ci/linux_profile_arm64",
-                "--runtime-mode",
-                "profile",
-                "--target-os=linux",
-                "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk",
-                "--no-lto",
-                "--rbe",
-                "--no-goma"
-            ],
-            "name": "ci/linux_profile_arm64",
-            "description": "Produces profile mode artifacts to target arm64 Linux from a Linux host.",
-            "ninja": {
-                "config": "ci/linux_profile_arm64",
-                "targets": [
-                    "flutter/shell/platform/linux:flutter_gtk"
-                ]
-            }
-        },
         {
             "archives": [
                 {
@@ -64,7 +22,6 @@
                         "out/ci/linux_debug_arm64/zip_archives/linux-arm64/impeller_sdk.zip",
                         "out/ci/linux_debug_arm64/zip_archives/linux-arm64/linux-arm64-embedder.zip",
                         "out/ci/linux_debug_arm64/zip_archives/linux-arm64/font-subset.zip",
-                        "out/ci/linux_debug_arm64/zip_archives/linux-arm64-debug/linux-arm64-flutter-gtk.zip",
                         "out/ci/linux_debug_arm64/zip_archives/dart-sdk-linux-arm64.zip"
                     ],
                     "realm": "production"
@@ -99,53 +56,10 @@
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
                     "flutter/tools/font_subset",
-                    "flutter/shell/platform/linux:flutter_gtk",
                     "flutter/impeller/toolkit/interop:sdk",
                     "flutter/build/archives:embedder"
                 ]
             }
-        },
-        {
-            "archives": [
-                {
-                    "name": "ci/linux_release_arm64",
-                    "type": "gcs",
-                    "base_path": "out/ci/linux_release_arm64/zip_archives/",
-                    "include_paths": [
-                        "out/ci/linux_release_arm64/zip_archives/linux-arm64-release/linux-arm64-flutter-gtk.zip"
-                    ],
-                    "realm": "production"
-                }
-            ],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false,
-                "use_rbe": true
-            },
-            "gn": [
-                "--target-dir",
-                "ci/linux_release_arm64",
-                "--runtime-mode",
-                "release",
-                "--target-os=linux",
-                "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk",
-                "--no-lto",
-                "--rbe",
-                "--no-goma"
-            ],
-            "name": "ci/linux_release_arm64",
-            "description": "Produces release mode artifacts to target arm64 Linux from a Linux host.",
-            "ninja": {
-                "config": "ci/linux_release_arm64",
-                "targets": [
-                    "flutter/shell/platform/linux:flutter_gtk"
-                ]
-            }
         }
     ]
 }
diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json b/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
index 1718ca9f8985b..81120ceb46c4b 100644
--- a/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
+++ b/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
@@ -14,7 +14,7 @@
     {
       "drone_dimensions": [
         "device_type=none",
-        "os=Mac-14|Mac-15",
+        "os=Mac-15.7",
         "cpu=arm64"
       ],
       "gclient_variables": {
@@ -56,14 +56,14 @@
       },
       "properties": {
         "$flutter/osx_sdk": {
-          "sdk_version": "16c5032a"
+          "sdk_version": "17c52"
         }
       }
     },
     {
       "drone_dimensions": [
         "device_type=none",
-        "os=Mac-14|Mac-15",
+        "os=Mac-15.7",
         "cpu=arm64"
       ],
       "gclient_variables": {
@@ -107,14 +107,14 @@
       },
       "properties": {
         "$flutter/osx_sdk": {
-          "sdk_version": "16c5032a"
+          "sdk_version": "17c52"
         }
       }
     },
     {
       "drone_dimensions": [
         "device_type=none",
-        "os=Mac-14|Mac-15",
+        "os=Mac-15.7",
         "cpu=arm64"
       ],
       "gclient_variables": {
@@ -156,14 +156,14 @@
       },
       "properties": {
         "$flutter/osx_sdk": {
-          "sdk_version": "16c5032a"
+          "sdk_version": "17c52"
         }
       }
     },
     {
       "drone_dimensions": [
         "device_type=none",
-        "os=Mac-14|Mac-15",
+        "os=Mac-15.7",
         "cpu=arm64"
       ],
       "gclient_variables": {
@@ -205,7 +205,7 @@
       },
       "properties": {
         "$flutter/osx_sdk": {
-          "sdk_version": "16c5032a"
+          "sdk_version": "17c52"
         }
       }
     }
diff --git a/engine/src/flutter/ci/test/format_test.dart b/engine/src/flutter/ci/test/format_test.dart
index 311ee4d56ba8b..fcfdba14263bf 100644
--- a/engine/src/flutter/ci/test/format_test.dart
+++ b/engine/src/flutter/ci/test/format_test.dart
@@ -163,6 +163,52 @@ void main() {
     }
   });
 
+  // The formatter diffs each file against the formatter's output on stdin
+  // (`-`). That causes `git diff` to list a to-file of `-` as well.
+  //
+  // The following settings change the path prefixes git emits in its diffs.
+  // Verify that formatting handles users with these settings.
+  for (final gitSetting in <String>['diff.mnemonicPrefix', 'diff.noprefix']) {
+    test('Can fix C++ formatting errors with $gitSetting set', () {
+      final fixture = TestFileFixture(target.FormatCheck.clang);
+      // git apply resolves paths against the top of the work tree, so a patch
+      // that still targets '-' writes it there rather than under repoDir.
+      final String gitRoot =
+          (io.Process.runSync('git', <String>[
+                    'rev-parse',
+                    '--show-toplevel',
+                  ], workingDirectory: repoDir.path).stdout
+                  as String)
+              .trim();
+      final strayFile = io.File(path.join(gitRoot, '-'));
+      try {
+        fixture.gitAdd();
+        final io.ProcessResult result = io.Process.runSync(
+          formatterPath,
+          <String>['--check', 'clang', '--fix'],
+          workingDirectory: repoDir.path,
+          environment: <String, String>{
+            'GIT_CONFIG_COUNT': '1',
+            'GIT_CONFIG_KEY_0': gitSetting,
+            'GIT_CONFIG_VALUE_0': 'true',
+          },
+        );
+
+        expect(result.exitCode, equals(0), reason: 'Formatter failed: ${result.stderr}');
+        expect(strayFile.existsSync(), isFalse);
+        final Iterable<FileContentPair> files = fixture.getFileContents();
+        for (final pair in files) {
+          expect(pair.original, equals(pair.formatted));
+        }
+      } finally {
+        if (strayFile.existsSync()) {
+          strayFile.deleteSync();
+        }
+        fixture.gitRemove();
+      }
+    });
+  }
+
   test('Can fix Dart formatting errors', () {
     final fixture = TestFileFixture(target.FormatCheck.dart);
     try {
diff --git a/engine/src/flutter/display_list/benchmarking/dl_benchmarks.cc b/engine/src/flutter/display_list/benchmarking/dl_benchmarks.cc
index 4068314510af8..4b4883aa7b44a 100644
--- a/engine/src/flutter/display_list/benchmarking/dl_benchmarks.cc
+++ b/engine/src/flutter/display_list/benchmarking/dl_benchmarks.cc
@@ -159,6 +159,7 @@ constexpr size_t kRRectsToDraw = 5000;
 constexpr size_t kRSEsToDraw = 5000;
 constexpr size_t kDRRectsToDraw = 2000;
 constexpr size_t kArcSweepSetsToDraw = 1000;
+constexpr size_t kPathsToDraw = 2000;
 constexpr size_t kImagesToDraw = 500;
 constexpr size_t kFixedCanvasSize = 1024;
 
@@ -940,6 +941,98 @@ void BM_DrawPath(benchmark::State& state,
                           "DrawPath-" + label);
 }
 
+void BM_DrawPathPrimitives(benchmark::State& state,
+                           BackendType backend_type,
+                           unsigned attributes,
+                           PathVerb type) {
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
+  DisplayListBuilder builder;
+  DlPaint paint = GetPaintForRun(attributes);
+
+  CheckAttributes(attributes, state, DisplayListOpFlags::kDrawPathFlags);
+
+  size_t length = state.range(0);
+  surface_provider->InitializeSurface(length * 2, length * 2);
+  auto surface = surface_provider->GetPrimarySurface();
+  surface->Clear(DlColor::kTransparent());
+  surface->FlushSubmitCpuSync();
+
+  DlPathBuilder path_builder;
+  DlPoint center = DlPoint(length / 2.0f, length / 2.0f);
+  float radius = length / 2.0f;
+
+  switch (type) {
+    case PathVerb::kLine:
+      GetLinesPath(path_builder, 10, center, radius);
+      break;
+    case PathVerb::kQuad:
+      GetQuadsPath(path_builder, 10, center, radius);
+      break;
+    case PathVerb::kConic:
+      GetConicsPath(path_builder, 10, center, radius);
+      break;
+    case PathVerb::kCubic:
+      GetCubicsPath(path_builder, 10, center, radius);
+      break;
+  }
+  DlPath path = path_builder.TakePath();
+
+  const DlPoint delta(0.5f, 0.5f);
+  RectAnimator animator(DlRect::MakeWH(length, length), delta, surface);
+
+  state.counters["DrawCallCount"] = kPathsToDraw;
+  for (size_t i = 0; i < kPathsToDraw; i++) {
+    builder.Save();
+    builder.Translate(animator.GetPoint().x, animator.GetPoint().y);
+    builder.DrawPath(path, paint);
+    builder.Restore();
+    animator.Animate();
+  }
+
+  auto display_list = builder.Build();
+
+  // Prime any path conversions
+  surface->RenderDisplayList(display_list);
+  surface->FlushSubmitCpuSync();
+
+  // We only want to time the actual rasterization.
+  size_t items_processed = 0;
+  for ([[maybe_unused]] auto _ : state) {
+    surface->RenderDisplayList(display_list);
+    items_processed += kPathsToDraw;
+    surface->FlushSubmitCpuSync();
+  }
+  state.SetItemsProcessed(items_processed);
+
+  std::string label = VerbToString(type);
+  SaveSnapshotIfNecessary(surface_provider, surface, state,
+                          "DrawPathPrimitives-" + label);
+}
+
+void BM_DrawPathLine(benchmark::State& state,
+                     BackendType backend_type,
+                     unsigned attributes) {
+  BM_DrawPathPrimitives(state, backend_type, attributes, PathVerb::kLine);
+}
+
+void BM_DrawPathQuad(benchmark::State& state,
+                     BackendType backend_type,
+                     unsigned attributes) {
+  BM_DrawPathPrimitives(state, backend_type, attributes, PathVerb::kQuad);
+}
+
+void BM_DrawPathConic(benchmark::State& state,
+                      BackendType backend_type,
+                      unsigned attributes) {
+  BM_DrawPathPrimitives(state, backend_type, attributes, PathVerb::kConic);
+}
+
+void BM_DrawPathCubic(benchmark::State& state,
+                      BackendType backend_type,
+                      unsigned attributes) {
+  BM_DrawPathPrimitives(state, backend_type, attributes, PathVerb::kCubic);
+}
+
 // Returns a set of vertices that describe a circle that has a
 // radius of `radius` and outer vertex count of approximately
 // `vertex_count`. The final number of vertices will differ as we
@@ -1676,6 +1769,12 @@ constexpr int kFilledShadow10Primitive =
   DRAW_BENCHMARK_SHADOW_PRIMITIVE(BACKEND, TYPE, FilledShadow5)              \
   DRAW_BENCHMARK_SHADOW_PRIMITIVE(BACKEND, TYPE, FilledShadow10)             \
 
+#define DRAW_BENCHMARK_PRIMITIVES_PATH(BACKEND)                              \
+  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, PathLine)                          \
+  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, PathQuad)                          \
+  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, PathConic)                         \
+  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, PathCubic)
+
 #define DRAW_BENCHMARK_PRIMITIVE_SUITE(BACKEND)                              \
   BENCHMARK_OVERHEAD(SyncOverhead, BACKEND)                                  \
   BENCHMARK_OVERHEAD(EmptyDisplayList, BACKEND)                              \
@@ -1687,7 +1786,8 @@ constexpr int kFilledShadow10Primitive =
   DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, SimpleRRect)                       \
   DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, ComplexRRect)                      \
   DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, SimpleRSE)                         \
-  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, ComplexRSE)
+  DRAW_BENCHMARK_PRIMITIVES_TYPE(BACKEND, ComplexRSE)                        \
+  DRAW_BENCHMARK_PRIMITIVES_PATH(BACKEND)
 
 // clang-format on
 
diff --git a/engine/src/flutter/flow/layers/clip_path_layer.cc b/engine/src/flutter/flow/layers/clip_path_layer.cc
index dd578ccd7bf20..d8e232424088b 100644
--- a/engine/src/flutter/flow/layers/clip_path_layer.cc
+++ b/engine/src/flutter/flow/layers/clip_path_layer.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/layers/clip_path_layer.h"
+#include "flutter/display_list/geometry/dl_geometry_types.h"
 
 namespace flutter {
 
@@ -33,7 +34,20 @@ void ClipPathLayer::ApplyClip(LayerStateStack::MutatorContext& mutator) const {
 
 void ClipPathLayer::PushClipToEmbeddedNativeViewMutatorStack(
     ExternalViewEmbedder* view_embedder) const {
-  view_embedder->PushClipPathToVisitedPlatformViews(clip_shape());
+  DlRect rect;
+  if (clip_shape().IsRect(&rect)) {
+    view_embedder->PushClipRectToVisitedPlatformViews(rect);
+  } else if (clip_shape().IsOval(&rect)) {
+    view_embedder->PushClipRRectToVisitedPlatformViews(
+        DlRoundRect::MakeOval(rect));
+  } else {
+    DlRoundRect rrect;
+    if (clip_shape().IsRoundRect(&rrect)) {
+      view_embedder->PushClipRRectToVisitedPlatformViews(rrect);
+    } else {
+      view_embedder->PushClipPathToVisitedPlatformViews(clip_shape());
+    }
+  }
 }
 
 }  // namespace flutter
diff --git a/engine/src/flutter/flow/layers/clip_path_layer_unittests.cc b/engine/src/flutter/flow/layers/clip_path_layer_unittests.cc
index 275b0fad89a47..9013c36918421 100644
--- a/engine/src/flutter/flow/layers/clip_path_layer_unittests.cc
+++ b/engine/src/flutter/flow/layers/clip_path_layer_unittests.cc
@@ -707,6 +707,49 @@ TEST_F(ClipPathLayerTest, EmptyClipDoesNotCullPlatformView) {
   EXPECT_EQ(embedder.painted_views(), std::vector<int64_t>({view_id}));
 }
 
+// Prerolls a ClipPathLayer with a platform view child and returns the clips
+// that the layer pushed to the view embedder.
+static std::vector<Mutator> PushedClipsForPath(PrerollContext* context,
+                                               const DlPath& clip_path) {
+  auto platform_view = std::make_shared<PlatformViewLayer>(
+      DlPoint(0.0f, 0.0f), DlSize(8.0f, 8.0f), 42);
+  auto clip = std::make_shared<ClipPathLayer>(clip_path, Clip::kHardEdge);
+  clip->Add(platform_view);
+
+  MockViewEmbedder embedder;
+  context->view_embedder = &embedder;
+  clip->Preroll(context);
+  context->view_embedder = nullptr;
+  return embedder.pushed_clips();
+}
+
+TEST_F(ClipPathLayerTest, RectPathPushesClipRectToEmbedder) {
+  const DlRect rect = DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f);
+  EXPECT_EQ(PushedClipsForPath(preroll_context(), DlPath::MakeRect(rect)),
+            std::vector({Mutator(rect)}));
+}
+
+TEST_F(ClipPathLayerTest, OvalPathPushesClipRRectToEmbedder) {
+  const DlRect bounds = DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f);
+  EXPECT_EQ(PushedClipsForPath(preroll_context(), DlPath::MakeOval(bounds)),
+            std::vector({Mutator(DlRoundRect::MakeOval(bounds))}));
+}
+
+TEST_F(ClipPathLayerTest, RoundRectPathPushesClipRRectToEmbedder) {
+  const DlRoundRect rrect = DlRoundRect::MakeRectXY(
+      DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f), 3.0f, 3.0f);
+  EXPECT_EQ(PushedClipsForPath(preroll_context(), DlPath::MakeRoundRect(rrect)),
+            std::vector({Mutator(rrect)}));
+}
+
+TEST_F(ClipPathLayerTest, ComplexPathPushesClipPathToEmbedder) {
+  const DlRect bounds = DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f);
+  const DlPath path =
+      DlPath::MakeRect(bounds) + DlPath::MakeRect(bounds.Expand(-1.0f, -1.0f));
+  EXPECT_EQ(PushedClipsForPath(preroll_context(), path),
+            std::vector({Mutator(path)}));
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/engine/src/flutter/flow/layers/clip_rect_layer_unittests.cc b/engine/src/flutter/flow/layers/clip_rect_layer_unittests.cc
index 8162dc484f68b..f2ff8f77dadbf 100644
--- a/engine/src/flutter/flow/layers/clip_rect_layer_unittests.cc
+++ b/engine/src/flutter/flow/layers/clip_rect_layer_unittests.cc
@@ -545,6 +545,21 @@ TEST_F(ClipRectLayerTest, EmptyClipDoesNotCullPlatformView) {
   EXPECT_EQ(embedder.painted_views(), std::vector<int64_t>({view_id}));
 }
 
+TEST_F(ClipRectLayerTest, PushesClipRectToEmbedder) {
+  auto platform_view = std::make_shared<PlatformViewLayer>(
+      DlPoint(0.0f, 0.0f), DlSize(8.0f, 8.0f), 42);
+  const DlRect clip_rect = DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f);
+  auto clip = std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
+  clip->Add(platform_view);
+
+  MockViewEmbedder embedder;
+  preroll_context()->view_embedder = &embedder;
+  clip->Preroll(preroll_context());
+  preroll_context()->view_embedder = nullptr;
+
+  EXPECT_EQ(embedder.pushed_clips(), std::vector({Mutator(clip_rect)}));
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/engine/src/flutter/flow/layers/clip_rrect_layer_unittests.cc b/engine/src/flutter/flow/layers/clip_rrect_layer_unittests.cc
index 69630c7adac32..525b55d4b5154 100644
--- a/engine/src/flutter/flow/layers/clip_rrect_layer_unittests.cc
+++ b/engine/src/flutter/flow/layers/clip_rrect_layer_unittests.cc
@@ -638,6 +638,22 @@ TEST_F(ClipRRectLayerTest, EmptyClipDoesNotCullPlatformView) {
   EXPECT_EQ(embedder.painted_views(), std::vector<int64_t>({view_id}));
 }
 
+TEST_F(ClipRRectLayerTest, PushesClipRRectToEmbedder) {
+  auto platform_view = std::make_shared<PlatformViewLayer>(
+      DlPoint(0.0f, 0.0f), DlSize(8.0f, 8.0f), 42);
+  const DlRoundRect clip_rrect = DlRoundRect::MakeRectXY(
+      DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f), 3.0f, 3.0f);
+  auto clip = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kHardEdge);
+  clip->Add(platform_view);
+
+  MockViewEmbedder embedder;
+  preroll_context()->view_embedder = &embedder;
+  clip->Preroll(preroll_context());
+  preroll_context()->view_embedder = nullptr;
+
+  EXPECT_EQ(embedder.pushed_clips(), std::vector({Mutator(clip_rrect)}));
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/engine/src/flutter/flow/layers/clip_rsuperellipse_layer_unittests.cc b/engine/src/flutter/flow/layers/clip_rsuperellipse_layer_unittests.cc
index 8a2bf4a88753a..8fb71c6dad954 100644
--- a/engine/src/flutter/flow/layers/clip_rsuperellipse_layer_unittests.cc
+++ b/engine/src/flutter/flow/layers/clip_rsuperellipse_layer_unittests.cc
@@ -622,6 +622,23 @@ TEST_F(ClipRSuperellipseLayerTest, EmptyClipDoesNotCullPlatformView) {
   EXPECT_EQ(embedder.painted_views(), std::vector<int64_t>({view_id}));
 }
 
+TEST_F(ClipRSuperellipseLayerTest, PushesClipRSuperellipseToEmbedder) {
+  auto platform_view = std::make_shared<PlatformViewLayer>(
+      DlPoint(0.0f, 0.0f), DlSize(8.0f, 8.0f), 42);
+  const DlRoundSuperellipse clip_rse = DlRoundSuperellipse::MakeRectXY(
+      DlRect::MakeLTRB(2.0f, 2.0f, 12.0f, 12.0f), 3.0f, 3.0f);
+  auto clip =
+      std::make_shared<ClipRSuperellipseLayer>(clip_rse, Clip::kHardEdge);
+  clip->Add(platform_view);
+
+  MockViewEmbedder embedder;
+  preroll_context()->view_embedder = &embedder;
+  clip->Preroll(preroll_context());
+  preroll_context()->view_embedder = nullptr;
+
+  EXPECT_EQ(embedder.pushed_clips(), std::vector({Mutator(clip_rse)}));
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/engine/src/flutter/flow/testing/mock_embedder.cc b/engine/src/flutter/flow/testing/mock_embedder.cc
index 0fd228080e74d..cff261a72b49b 100644
--- a/engine/src/flutter/flow/testing/mock_embedder.cc
+++ b/engine/src/flutter/flow/testing/mock_embedder.cc
@@ -47,5 +47,29 @@ DlCanvas* MockViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
   return canvas;
 }
 
+// |ExternalViewEmbedder|
+void MockViewEmbedder::PushClipRectToVisitedPlatformViews(
+    const DlRect& clip_rect) {
+  pushed_clips_.emplace_back(clip_rect);
+}
+
+// |ExternalViewEmbedder|
+void MockViewEmbedder::PushClipRRectToVisitedPlatformViews(
+    const DlRoundRect& clip_rrect) {
+  pushed_clips_.emplace_back(clip_rrect);
+}
+
+// |ExternalViewEmbedder|
+void MockViewEmbedder::PushClipRSuperellipseToVisitedPlatformViews(
+    const DlRoundSuperellipse& clip_rse) {
+  pushed_clips_.emplace_back(clip_rse);
+}
+
+// |ExternalViewEmbedder|
+void MockViewEmbedder::PushClipPathToVisitedPlatformViews(
+    const DlPath& clip_path) {
+  pushed_clips_.emplace_back(clip_path);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/flow/testing/mock_embedder.h b/engine/src/flutter/flow/testing/mock_embedder.h
index fd2ac11d6f664..b0ce74de74326 100644
--- a/engine/src/flutter/flow/testing/mock_embedder.h
+++ b/engine/src/flutter/flow/testing/mock_embedder.h
@@ -41,13 +41,29 @@ class MockViewEmbedder : public ExternalViewEmbedder {
   // |ExternalViewEmbedder|
   DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
+  // |ExternalViewEmbedder|
+  void PushClipRectToVisitedPlatformViews(const DlRect& clip_rect) override;
+
+  // |ExternalViewEmbedder|
+  void PushClipRRectToVisitedPlatformViews(
+      const DlRoundRect& clip_rrect) override;
+
+  // |ExternalViewEmbedder|
+  void PushClipRSuperellipseToVisitedPlatformViews(
+      const DlRoundSuperellipse& clip_rse) override;
+
+  // |ExternalViewEmbedder|
+  void PushClipPathToVisitedPlatformViews(const DlPath& clip_path) override;
+
   std::vector<int64_t> prerolled_views() const { return prerolled_views_; }
   std::vector<int64_t> painted_views() const { return painted_views_; }
+  std::vector<Mutator> pushed_clips() const { return pushed_clips_; }
 
  private:
   std::deque<DlCanvas*> contexts_;
   std::vector<int64_t> prerolled_views_;
   std::vector<int64_t> painted_views_;
+  std::vector<Mutator> pushed_clips_;
 };
 
 }  // namespace testing
diff --git a/engine/src/flutter/flow/view_slicer.cc b/engine/src/flutter/flow/view_slicer.cc
index 02e0665274dc9..22a2c10081c5b 100644
--- a/engine/src/flutter/flow/view_slicer.cc
+++ b/engine/src/flutter/flow/view_slicer.cc
@@ -15,8 +15,7 @@ std::unordered_map<int64_t, DlRect> SliceViews(
     const std::vector<int64_t>& composition_order,
     const std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>&
         slices,
-    const std::unordered_map<int64_t, DlRect>& view_rects,
-    const std::unordered_set<int64_t>& views_with_underlay_preserved) {
+    const std::unordered_map<int64_t, DlRect>& view_rects) {
   std::unordered_map<int64_t, DlRect> overlay_layers;
 
   auto current_frame_view_count = composition_order.size();
@@ -111,17 +110,9 @@ std::unordered_map<int64_t, DlRect> SliceViews(
     if (!full_joined_rect.IsEmpty()) {
       overlay_layers.insert({view_id, full_joined_rect});
 
-      // If overlay has a non-rect clip, we need to preserve the underlay in
-      // that area to show correctly after overlay is clipped behind the
-      // platform view
-      const bool preserve_underlay =
-          views_with_underlay_preserved.find(view_id) !=
-          views_with_underlay_preserved.end();
-      if (!preserve_underlay) {
-        // Clip the background canvas, so it doesn't contain any of the pixels
-        // drawn on the overlay layer.
-        background_canvas->ClipRect(full_joined_rect, DlClipOp::kDifference);
-      }
+      // Clip the background canvas, so it doesn't contain any of the pixels
+      // drawn on the overlay layer.
+      background_canvas->ClipRect(full_joined_rect, DlClipOp::kDifference);
     }
     slice->render_into(background_canvas);
   }
diff --git a/engine/src/flutter/flow/view_slicer.h b/engine/src/flutter/flow/view_slicer.h
index db0b270dd56c1..dcdb2e945bc06 100644
--- a/engine/src/flutter/flow/view_slicer.h
+++ b/engine/src/flutter/flow/view_slicer.h
@@ -6,7 +6,6 @@
 #define FLUTTER_FLOW_VIEW_SLICER_H_
 
 #include <unordered_map>
-#include <unordered_set>
 #include "display_list/dl_canvas.h"
 #include "flow/embedded_views.h"
 
@@ -14,15 +13,12 @@ namespace flutter {
 
 /// @brief Compute the required overlay layers and clip the view slices
 ///        according to the size and position of the platform views.
-/// @param views_with_underlay_preserved The platform view IDs for which we
-///        should not subtract the overlap from the background canvas.
 std::unordered_map<int64_t, DlRect> SliceViews(
     DlCanvas* background_canvas,
     const std::vector<int64_t>& composition_order,
     const std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>&
         slices,
-    const std::unordered_map<int64_t, DlRect>& view_rects,
-    const std::unordered_set<int64_t>& views_with_underlay_preserved);
+    const std::unordered_map<int64_t, DlRect>& view_rects);
 
 }  // namespace flutter
 
diff --git a/engine/src/flutter/flow/view_slicer_unittests.cc b/engine/src/flutter/flow/view_slicer_unittests.cc
index 27c6a171b9afb..22313cae14a91 100644
--- a/engine/src/flutter/flow/view_slicer_unittests.cc
+++ b/engine/src/flutter/flow/view_slicer_unittests.cc
@@ -12,15 +12,6 @@ namespace flutter {
 namespace testing {
 
 namespace {
-bool ContainsClipDifferenceRect(const sk_sp<DisplayList>& display_list) {
-  for (DlIndex i = 0; i < display_list->op_count(); i++) {
-    if (display_list->GetOpType(i) == DisplayListOpType::kClipDifferenceRect) {
-      return true;
-    }
-  }
-  return false;
-}
-
 void AddSliceOfSize(
     std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>& slices,
     int64_t id,
@@ -43,7 +34,7 @@ TEST(ViewSlicerTest, CanSlicerNonOverlappingViews) {
       {1, DlRect::MakeLTRB(50, 50, 60, 60)}};
 
   auto computed_overlays =
-      SliceViews(&builder, composition_order, slices, view_rects, {});
+      SliceViews(&builder, composition_order, slices, view_rects);
 
   EXPECT_TRUE(computed_overlays.empty());
 }
@@ -59,7 +50,7 @@ TEST(ViewSlicerTest, IgnoresFractionalOverlaps) {
       {1, DlRect::MakeLTRB(50.5, 50.5, 100, 100)}};
 
   auto computed_overlays =
-      SliceViews(&builder, composition_order, slices, view_rects, {});
+      SliceViews(&builder, composition_order, slices, view_rects);
 
   EXPECT_TRUE(computed_overlays.empty());
 }
@@ -75,7 +66,7 @@ TEST(ViewSlicerTest, ComputesOverlapWith1PV) {
       {1, DlRect::MakeLTRB(0, 0, 100, 100)}};
 
   auto computed_overlays =
-      SliceViews(&builder, composition_order, slices, view_rects, {});
+      SliceViews(&builder, composition_order, slices, view_rects);
 
   EXPECT_EQ(computed_overlays.size(), 1u);
   auto overlay = computed_overlays.find(1);
@@ -98,7 +89,7 @@ TEST(ViewSlicerTest, ComputesOverlapWith2PV) {
   };
 
   auto computed_overlays =
-      SliceViews(&builder, composition_order, slices, view_rects, {});
+      SliceViews(&builder, composition_order, slices, view_rects);
 
   EXPECT_EQ(computed_overlays.size(), 2u);
 
@@ -132,7 +123,7 @@ TEST(ViewSlicerTest, OverlappingTwoPVs) {
   };
 
   auto computed_overlays =
-      SliceViews(&builder, composition_order, slices, view_rects, {});
+      SliceViews(&builder, composition_order, slices, view_rects);
 
   EXPECT_EQ(computed_overlays.size(), 1u);
 
@@ -143,33 +134,5 @@ TEST(ViewSlicerTest, OverlappingTwoPVs) {
   EXPECT_EQ(overlay->second, DlRect::MakeLTRB(0, 0, 100, 100));
 }
 
-TEST(ViewSlicerTest, PreservesUnderlayForSelectedViews) {
-  std::vector<int64_t> composition_order = {1};
-  std::unordered_map<int64_t, DlRect> view_rects = {
-      {1, DlRect::MakeLTRB(0, 0, 100, 100)}};
-
-  std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>
-      baseline_slices;
-  AddSliceOfSize(baseline_slices, 1, DlRect::MakeLTRB(0, 0, 50, 50));
-  DisplayListBuilder baseline_builder(DlRect::MakeLTRB(0, 0, 100, 100));
-  auto baseline_overlays = SliceViews(&baseline_builder, composition_order,
-                                      baseline_slices, view_rects, {});
-  EXPECT_EQ(baseline_overlays.size(), 1u);
-  auto baseline_dl = baseline_builder.Build();
-  EXPECT_TRUE(ContainsClipDifferenceRect(baseline_dl));
-
-  std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>
-      preserve_slices;
-  AddSliceOfSize(preserve_slices, 1, DlRect::MakeLTRB(0, 0, 50, 50));
-  std::unordered_set<int64_t> views_with_underlay_preserved = {1};
-  DisplayListBuilder preserve_builder(DlRect::MakeLTRB(0, 0, 100, 100));
-  auto preserve_overlays =
-      SliceViews(&preserve_builder, composition_order, preserve_slices,
-                 view_rects, views_with_underlay_preserved);
-  EXPECT_EQ(preserve_overlays.size(), 1u);
-  auto preserve_dl = preserve_builder.Build();
-  EXPECT_FALSE(ContainsClipDifferenceRect(preserve_dl));
-}
-
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/impeller/README.md b/engine/src/flutter/impeller/README.md
index 28e70196b1ab5..2053f1d4c2ef6 100644
--- a/engine/src/flutter/impeller/README.md
+++ b/engine/src/flutter/impeller/README.md
@@ -171,6 +171,40 @@ flowchart TD
 Impeller is available under the `--enable-impeller` flag on iOS, Android, and
 macOS Desktop. This flag can be specified to `flutter run`.
 
+### Availability Matrix
+
+> [!NOTE]
+> This assumes availability in stable releases. The Embedder API statuses are tricky.
+
+| Releases | iOS | Android | Embedder API (Metal) | Embedder API (Vulkan) | Embedder API (OpenGL) | macOS | Windows | Linux | Web |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| **main** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | ✅ | ✅ | ✅ | 🚫 |
+| **3.47** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | ✅ | ✅ | ✅ | 🚫 |
+| **3.44** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.41** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.38** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.35** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.32** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.29** | ⭐ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.27** | ✅ | ✅ | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.24** | ✅ | 🧪 | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.22** | ✅ | 🧪 | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.19** | ✅ | 🧪 | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.16** | ✅ | 🧪 | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.13** | ✅ | 🚫 | 🧪 | 🚧 | 🚧 | 🧪 | 🚧 | 🚧 | 🚫 |
+| **3.10** | ✅ | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 |
+| **3.70** | 🧪 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 |
+| **3.30** | 🧪 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 |
+| **3.00** | 🧪 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 |
+| **2.10** | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 | 🚫 |
+
+#### Key
+- **⭐ Exclusive** — Only Impeller is available.
+- **✅ Default** — Impeller is the default option, Skia is available.
+- **🧪 Preview** — Can use Impeller with flags/manifest options. But, Skia is the default with no action.
+- **🚧 Experimental** — Skia is the default. Impeller may or may not work. The team is not actively working on this and doesn't recommend using it.
+- **🚫 Unavailable** — Only Skia is available.
+
 If the application needs to be launched with Impeller enabled without using the
 Flutter tool, follow the platform specific steps below.
 
@@ -210,15 +244,37 @@ to your `AndroidManifest.xml` file under the `<application>` tag:
     android:value="opengles" />
 ```
 
-### macOS Desktop
+### macOS
 
-Impeller is in preview on macOS Desktop.
+Impeller is the **default** on macOS.
 
-To your `Info.plist` file, add under the top-level `<dict>` tag:
+To explicitly opt out of using Impeller, add the following to your `Info.plist` file under the top-level `<dict>` tag:
 
 ```xml
   <key>FLTEnableImpeller</key>
-  <true/>
+  <false/>
+```
+
+### Linux
+
+Impeller is the **default** on Linux.
+
+To disable Impeller on Linux when deploying your app, add the following setup to
+your project in `linux/runner/my_application.cc`.
+
+```c
+fl_dart_project_set_enable_impeller(project, FALSE);
+```
+
+### Windows
+
+Impeller is the **default** on Windows.
+
+To disable Impeller on Windows when deploying your app, add the following setup to
+your project in `windows\runner\main.cpp`.
+
+```c++
+project.set_impeller_switch(flutter::ImpellerSwitch::Disabled);
 ```
 
 ### Custom Embedders
@@ -263,4 +319,5 @@ examples, are available](toolkit/interop/README.md).
 * [Android CPU Profiling](/docs/engine/impeller/docs/android_cpu_profile.md)
 * [Android Rendering Backend Selection](/docs/engine/impeller/docs/android.md)
 * [Using Impeller as a Standalone Rendering Library (with OpenGL ES)](/docs/engine/impeller/docs/standalone_gles.md)
+* [Impeller Availability Matrix](#availability-matrix)
 * [Glossary](/docs/engine/impeller/docs/glossary.md)
diff --git a/engine/src/flutter/impeller/compiler/switches.cc b/engine/src/flutter/impeller/compiler/switches.cc
index 13369bc783659..ca845b57cd195 100644
--- a/engine/src/flutter/impeller/compiler/switches.cc
+++ b/engine/src/flutter/impeller/compiler/switches.cc
@@ -239,7 +239,7 @@ Switches::Switches(const fml::CommandLine& command_line)
     }
 
     auto dir = std::make_shared<fml::UniqueFD>(fml::OpenDirectoryReadOnly(
-        *working_directory, include_dir_absolute.string().c_str()));
+        *working_directory, Utf8FromPath(include_dir_absolute).c_str()));
     if (!dir || !dir->is_valid()) {
       continue;
     }
diff --git a/engine/src/flutter/impeller/core/shader_types.h b/engine/src/flutter/impeller/core/shader_types.h
index f765c8801bc6f..de954bbb6ccaa 100644
--- a/engine/src/flutter/impeller/core/shader_types.h
+++ b/engine/src/flutter/impeller/core/shader_types.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <optional>
 #include <string_view>
 #include <vector>
@@ -130,6 +131,17 @@ struct ShaderMetadata {
   std::vector<ShaderStructMemberMetadata> members;
 };
 
+/// @brief The `ext_res_0` / `texture_index` stamped on a resource slot whose
+///        backing the shader compiler dead-code-eliminated.
+///
+/// SPIRV-Cross returns `~0u` from `get_automatic_msl_resource_binding` for a
+/// resource dropped from the compiled Metal shader, so a slot carrying this
+/// value has no argument-table index. It must be skipped, never bound: Metal's
+/// `setFragment/VertexTexture:atIndex:` has no bounds check and crashes on an
+/// out-of-range index. The GLES backend already skips optimized-out bindings.
+inline constexpr uint32_t kOptimizedOutBinding =
+    std::numeric_limits<uint32_t>::max();
+
 /// @brief Metadata required to bind a buffer.
 ///
 /// OpenGL binding requires the usage of the separate shader metadata struct.
diff --git a/engine/src/flutter/impeller/display_list/BUILD.gn b/engine/src/flutter/impeller/display_list/BUILD.gn
index d3aa29b7c3b1c..0afb865f3d1cb 100644
--- a/engine/src/flutter/impeller/display_list/BUILD.gn
+++ b/engine/src/flutter/impeller/display_list/BUILD.gn
@@ -57,6 +57,8 @@ impeller_component("display_list") {
     "//flutter/skia",
   ]
 
+  deps = [ "//third_party/abseil-cpp/absl/hash" ]
+
   if (impeller_supports_rendering) {
     public_deps += [ "//flutter/impeller/runtime_stage" ]
   }
diff --git a/engine/src/flutter/impeller/display_list/aiks_dl_text_unittests.cc b/engine/src/flutter/impeller/display_list/aiks_dl_text_unittests.cc
index 548c525f5fb04..b1ffc2a17fee1 100644
--- a/engine/src/flutter/impeller/display_list/aiks_dl_text_unittests.cc
+++ b/engine/src/flutter/impeller/display_list/aiks_dl_text_unittests.cc
@@ -44,12 +44,14 @@ struct TextRenderOptions {
   bool is_subpixel = false;
 };
 
-bool RenderTextInCanvasSkia(const std::shared_ptr<Context>& context,
-                            DisplayListBuilder& canvas,
-                            const std::string& text,
-                            const std::string_view& font_fixture,
-                            const TextRenderOptions& options = {},
-                            const std::optional<SkFont>& font = std::nullopt) {
+bool RenderTextInCanvasSkia(
+    const std::shared_ptr<Context>& context,
+    DisplayListBuilder& canvas,
+    const std::string& text,
+    const std::string_view& font_fixture,
+    const TextRenderOptions& options = {},
+    const std::optional<SkFont>& font = std::nullopt,
+    std::map<std::string, sk_sp<SkTypeface>>* typeface_cache = nullptr) {
   // Draw the baseline.
   DlPaint paint;
   paint.setColor(DlColor::kAqua().withAlpha(255 * 0.25));
@@ -65,13 +67,29 @@ bool RenderTextInCanvasSkia(const std::shared_ptr<Context>& context,
   SkFont selected_font;
   if (!font.has_value()) {
     auto c_font_fixture = std::string(font_fixture);
-    auto mapping =
-        flutter::testing::OpenFixtureAsSkData(c_font_fixture.c_str());
-    if (!mapping) {
-      return false;
+    sk_sp<SkTypeface> typeface;
+    if (typeface_cache) {
+      auto it = typeface_cache->find(c_font_fixture);
+      if (it != typeface_cache->end()) {
+        typeface = it->second;
+      }
+    }
+    if (!typeface) {
+      auto mapping =
+          flutter::testing::OpenFixtureAsSkData(c_font_fixture.c_str());
+      if (!mapping) {
+        return false;
+      }
+      sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+      typeface = font_mgr->makeFromData(mapping);
+      if (!typeface) {
+        return false;
+      }
+      if (typeface_cache) {
+        (*typeface_cache)[c_font_fixture] = typeface;
+      }
     }
-    sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
-    selected_font = SkFont(font_mgr->makeFromData(mapping), options.font_size);
+    selected_font = SkFont(typeface, options.font_size);
     if (options.is_subpixel) {
       selected_font.setSubpixel(true);
     }
@@ -867,7 +885,8 @@ TEST_P(AiksTest, MultipleTextWithShadowCache) {
 
   for (auto i = 0; i < 5; i++) {
     ASSERT_TRUE(RenderTextInCanvasSkia(
-        GetContext(), builder, "Hello World", kFontFixture,
+        GetContext(), builder,
+        (std::string("Hello World ") + std::to_string(i)).c_str(), kFontFixture,
         TextRenderOptions{
             .color = DlColor::kBlue(),
             .filter = DlBlurMaskFilter::Make(DlBlurStyle::kNormal, 4)}));
@@ -875,14 +894,146 @@ TEST_P(AiksTest, MultipleTextWithShadowCache) {
 
   DisplayListToTexture(builder.Build(), {400, 400}, aiks_context);
 
-  // Text should be cached. Each text gets its own entry as we don't analyze the
-  // strings.
+  // Each distinct text gets its own cache entry.
   EXPECT_EQ(aiks_context.GetContentContext()
                 .GetTextShadowCache()
                 .GetCacheSizeForTesting(),
             5u);
 }
 
+TEST_P(AiksTest, DuplicateTextWithShadowCache) {
+  DisplayListBuilder builder;
+  builder.Scale(GetContentScale().x, GetContentScale().y);
+  DlPaint paint;
+  paint.setColor(DlColor::ARGB(1, 0.1, 0.1, 0.1));
+  builder.DrawPaint(paint);
+
+  AiksContext aiks_context(GetContext(),
+                           std::make_shared<TypographerContextSkia>());
+  // Cache empty
+  EXPECT_EQ(aiks_context.GetContentContext()
+                .GetTextShadowCache()
+                .GetCacheSizeForTesting(),
+            0u);
+
+  std::map<std::string, sk_sp<SkTypeface>> typeface_cache;
+  for (auto i = 0; i < 5; i++) {
+    ASSERT_TRUE(RenderTextInCanvasSkia(
+        GetContext(), builder, "Hello World", kFontFixture,
+        TextRenderOptions{
+            .color = DlColor::kBlue(),
+            .filter = DlBlurMaskFilter::Make(DlBlurStyle::kNormal, 4)},
+        std::nullopt, &typeface_cache));
+  }
+
+  DisplayListToTexture(builder.Build(), {400, 400}, aiks_context);
+
+  // Duplicate text frames with identical layout share the single cache entry.
+  EXPECT_EQ(aiks_context.GetContentContext()
+                .GetTextShadowCache()
+                .GetCacheSizeForTesting(),
+            1u);
+}
+
+TEST_P(AiksTest, TextShadowCacheKeyCollisionSafety) {
+  SkFont font = flutter::testing::CreateTestFontOfSize(12);
+
+  Font impeller_font(
+      MakeTextFrameFromTextBlobSkia(SkTextBlob::MakeFromString("Text A", font))
+          ->GetFont());
+
+  TextFrameFingerprint fp1{
+      .run_count = 1,
+      .total_glyph_count = 6,
+      .first_glyph_id = 10,
+      .last_glyph_id = 20,
+      .full_hash = 12345,
+  };
+
+  TextFrameFingerprint fp2{
+      .run_count = 1,
+      .total_glyph_count = 6,
+      .first_glyph_id = 10,
+      .last_glyph_id = 21,  // Different last glyph ID
+      .full_hash = 12345,   // Simulated hash collision on full_hash!
+  };
+
+  // Construct two keys with the exact same identifier & full_hash (simulating a
+  // hash collision) but with different fingerprints (e.g. different
+  // last_glyph_id).
+  TextShadowCache::TextShadowCacheKey key1(
+      /*p_max_basis=*/1.0f,
+      /*p_is_single_glyph=*/false,
+      /*p_font=*/impeller_font,
+      /*p_sigma=*/Sigma{4.0f},
+      /*p_color=*/Color::Blue(),
+      /*p_fingerprint=*/fp1);
+
+  TextShadowCache::TextShadowCacheKey key2(
+      /*p_max_basis=*/1.0f,
+      /*p_is_single_glyph=*/false,
+      /*p_font=*/impeller_font,
+      /*p_sigma=*/Sigma{4.0f},
+      /*p_color=*/Color::Blue(),
+      /*p_fingerprint=*/fp2);
+
+  TextShadowCache::TextShadowCacheKey::Equal equal;
+  // Key comparison must fail because fingerprints differ despite identical
+  // hash.
+  EXPECT_FALSE(equal(key1, key2));
+
+  TextShadowCache::TextShadowCacheKey key3(
+      /*p_max_basis=*/1.0f,
+      /*p_is_single_glyph=*/false,
+      /*p_font=*/impeller_font,
+      /*p_sigma=*/Sigma{4.0f},
+      /*p_color=*/Color::Blue(),
+      /*p_fingerprint=*/fp1);
+
+  // Key comparison must succeed for identical fingerprints.
+  EXPECT_TRUE(equal(key1, key3));
+}
+
+TEST_P(AiksTest, SingleGlyphTextShadowCache) {
+  DisplayListBuilder builder;
+  builder.Scale(GetContentScale().x, GetContentScale().y);
+  DlPaint paint;
+  paint.setColor(DlColor::ARGB(1, 0.1, 0.1, 0.1));
+  builder.DrawPaint(paint);
+
+  AiksContext aiks_context(GetContext(),
+                           std::make_shared<TypographerContextSkia>());
+  EXPECT_EQ(aiks_context.GetContentContext()
+                .GetTextShadowCache()
+                .GetCacheSizeForTesting(),
+            0u);
+
+  SkFont font = flutter::testing::CreateTestFontOfSize(12);
+  TextRenderOptions options{
+      .color = DlColor::kBlue(),
+      .filter = DlBlurMaskFilter::Make(DlBlurStyle::kNormal, 4)};
+
+  // Draw single glyph "A".
+  ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), builder, "A", kFontFixture,
+                                     options, font));
+
+  // Draw single glyph "B" (different glyph ID, identical font/color/sigma).
+  ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), builder, "B", kFontFixture,
+                                     options, font));
+
+  // Draw single glyph "A" again (duplicate glyph ID).
+  ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), builder, "A", kFontFixture,
+                                     options, font));
+
+  DisplayListToTexture(builder.Build(), {400, 400}, aiks_context);
+
+  // Single glyphs "A" and "B" get distinct entries; duplicate "A" reuses "A".
+  EXPECT_EQ(aiks_context.GetContentContext()
+                .GetTextShadowCache()
+                .GetCacheSizeForTesting(),
+            2u);
+}
+
 TEST_P(AiksTest, MultipleColorWithShadowCache) {
   DisplayListBuilder builder;
   builder.Scale(GetContentScale().x, GetContentScale().y);
diff --git a/engine/src/flutter/impeller/display_list/canvas.cc b/engine/src/flutter/impeller/display_list/canvas.cc
index 02b6dd130c8dc..6f4c4bc3c872c 100644
--- a/engine/src/flutter/impeller/display_list/canvas.cc
+++ b/engine/src/flutter/impeller/display_list/canvas.cc
@@ -65,11 +65,53 @@
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/vector.h"
 #include "impeller/renderer/command_buffer.h"
+#include "third_party/abseil-cpp/absl/hash/hash.h"
 
 namespace impeller {
 
 namespace {
 
+uint32_t PackGlyphId(const Glyph& glyph) {
+  return (static_cast<uint32_t>(glyph.type) << 16) | glyph.index;
+}
+
+TextFrameFingerprint ComputeTextFrameFingerprint(const TextFrame& text_frame) {
+  TextFrameFingerprint fp;
+  const std::vector<TextRun>& runs = text_frame.GetRuns();
+  fp.run_count = runs.size();
+
+  size_t hash = absl::HashOf(text_frame.HasColor(),
+                             text_frame.GetEnableGammaCorrection());
+
+  for (const TextRun& run : runs) {
+    hash = absl::HashOf(hash, run.GetFont().GetHash());
+    const std::vector<TextRun::GlyphPosition>& glyphs = run.GetGlyphPositions();
+    fp.total_glyph_count += glyphs.size();
+
+    for (const TextRun::GlyphPosition& glyph_pos : glyphs) {
+      hash = absl::HashOf(hash, static_cast<uint32_t>(glyph_pos.glyph.type),
+                          glyph_pos.glyph.index, glyph_pos.position.x,
+                          glyph_pos.position.y);
+    }
+  }
+
+  if (!runs.empty()) {
+    const std::vector<TextRun::GlyphPosition>& first_glyphs =
+        runs.front().GetGlyphPositions();
+    if (!first_glyphs.empty()) {
+      fp.first_glyph_id = PackGlyphId(first_glyphs.front().glyph);
+    }
+    const std::vector<TextRun::GlyphPosition>& last_glyphs =
+        runs.back().GetGlyphPositions();
+    if (!last_glyphs.empty()) {
+      fp.last_glyph_id = PackGlyphId(last_glyphs.back().glyph);
+    }
+  }
+
+  fp.full_hash = hash;
+  return fp;
+}
+
 constexpr Scalar kAntialiasPadding = 1.0f;
 
 bool IsPipelineBlendOrMatrixFilter(const flutter::DlColorFilter* filter) {
@@ -2101,16 +2143,17 @@ bool Canvas::AttemptBlurredTextOptimization(
           /*is_solid_color=*/true, GetCurrentTransform());
 
   std::optional<Glyph> maybe_glyph = text_frame->AsSingleGlyph();
-  int64_t identifier = maybe_glyph.has_value()
-                           ? maybe_glyph.value().index
-                           : reinterpret_cast<int64_t>(text_frame.get());
+  TextFrameFingerprint fingerprint =
+      maybe_glyph.has_value()
+          ? TextFrameFingerprint{.full_hash = PackGlyphId(maybe_glyph.value())}
+          : ComputeTextFrameFingerprint(*text_frame);
   TextShadowCache::TextShadowCacheKey cache_key(
       /*p_max_basis=*/entity.GetTransform().GetMaxBasisLengthXY(),
-      /*p_identifier=*/identifier,
       /*p_is_single_glyph=*/maybe_glyph.has_value(),
       /*p_font=*/text_frame->GetFont(),
       /*p_sigma=*/paint.mask_blur_descriptor->sigma,
-      /*p_color=*/paint.color);
+      /*p_color=*/paint.color,
+      /*p_fingerprint=*/fingerprint);
 
   std::optional<Entity> result = renderer_.GetTextShadowCache().Lookup(
       renderer_, entity, filter, cache_key);
diff --git a/engine/src/flutter/impeller/entity/BUILD.gn b/engine/src/flutter/impeller/entity/BUILD.gn
index 2c2cbcd8dcdf9..d9a0a5d36f718 100644
--- a/engine/src/flutter/impeller/entity/BUILD.gn
+++ b/engine/src/flutter/impeller/entity/BUILD.gn
@@ -262,6 +262,7 @@ impeller_component("entity") {
     "../typographer",
     "//flutter/display_list",
     "//third_party/abseil-cpp/absl/container:flat_hash_map",
+    "//third_party/abseil-cpp/absl/hash",
   ]
 
   deps = [ "//flutter/fml" ]
diff --git a/engine/src/flutter/impeller/entity/contents/text_contents.cc b/engine/src/flutter/impeller/entity/contents/text_contents.cc
index 1161af16d4c38..5c46309c60aab 100644
--- a/engine/src/flutter/impeller/entity/contents/text_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/text_contents.cc
@@ -20,13 +20,11 @@
 namespace impeller {
 namespace {
 
-// TODO(gaaclarke): Investigate if this is still needed for Windows.
-// On Linux we use FreeType to rasterize glyphs. FreeType does not perform
-// gamma correction itself during rasterization. Because we render in linear
-// space, light text on a dark background would look too thin without
-// correction. To compensate, we calculate a contrast/gamma correction
-// factor based on the text color's luminance, which is used in the shader
-// to adjust the glyph's coverage.
+// On Linux we use FreeType and on Windows we use DirectWrite/GDI to rasterize
+// glyphs. Because we render in linear space, light text on a dark background
+// would look too thin without correction. To compensate, we calculate a
+// contrast/gamma correction factor based on the text color's luminance, which
+// is used in the shader to adjust the glyph's coverage.
 constexpr bool kPlatformGammaCorrectionDefault =
 #if FML_OS_LINUX || FML_OS_WIN
     true;
@@ -34,6 +32,19 @@ constexpr bool kPlatformGammaCorrectionDefault =
     false;
 #endif
 
+// The contrast/gamma exponent applied in the shader ranges from 1.0 for black
+// text to 1.0 + kMaxGammaCorrection for white text. This interpolates the
+// exponent based on the text color's luminance. On Linux, 1.2 equates to a
+// maximum 2.2 sRGB gamma. On Windows, DirectWrite and GDI employ higher base
+// gamma and contrast enhancement, so 1.6 is used to match Skia's perceived
+// visual weight and edge sharpness.
+constexpr Scalar kMaxGammaCorrection =
+#if FML_OS_WIN
+    1.6f;
+#else
+    1.2f;
+#endif
+
 Point SizeToPoint(Size size) {
   return Point(size.width, size.height);
 }
@@ -285,10 +296,6 @@ bool TextContents::Render(const ContentContext& renderer,
     // Calculate relative luminance using Rec. 709 luma coefficients.
     Scalar luma =
         color.red * 0.2126f + color.green * 0.7152f + color.blue * 0.0722f;
-    // The contrast/gamma exponent applied in the shader ranges from 1.0 for
-    // black text to 2.2 (standard sRGB gamma) for white text. This interpolates
-    // the exponent based on the text color's luminance.
-    constexpr Scalar kMaxGammaCorrection = 1.2f;
     frag_info.text_contrast = 1.0f + luma * kMaxGammaCorrection;
   } else {
     frag_info.text_contrast = 1.0f;
diff --git a/engine/src/flutter/impeller/entity/contents/text_shadow_cache.cc b/engine/src/flutter/impeller/entity/contents/text_shadow_cache.cc
index 593a4effedcf3..16fd7e6561bbe 100644
--- a/engine/src/flutter/impeller/entity/contents/text_shadow_cache.cc
+++ b/engine/src/flutter/impeller/entity/contents/text_shadow_cache.cc
@@ -15,19 +15,20 @@ namespace impeller {
 // Rounds sigma values for gaussian blur to nearest decimal.
 static constexpr int32_t kMaxSigmaDenominator = 10;
 
-TextShadowCache::TextShadowCacheKey::TextShadowCacheKey(Scalar p_max_basis,
-                                                        int64_t p_identifier,
-                                                        bool p_is_single_glyph,
-                                                        const Font& p_font,
-                                                        Sigma p_sigma,
-                                                        Color p_color)
+TextShadowCache::TextShadowCacheKey::TextShadowCacheKey(
+    Scalar p_max_basis,
+    bool p_is_single_glyph,
+    const Font& p_font,
+    Sigma p_sigma,
+    Color p_color,
+    TextFrameFingerprint p_fingerprint)
     : max_basis(p_max_basis),
-      identifier(p_identifier),
       is_single_glyph(p_is_single_glyph),
       font(p_font),
       rounded_sigma(Rational(std::round(p_sigma.sigma * kMaxSigmaDenominator),
                              kMaxSigmaDenominator)),
-      color(p_color) {}
+      color(p_color),
+      fingerprint(p_fingerprint) {}
 
 void TextShadowCache::MarkFrameStart() {
   for (auto& entry : entries_) {
diff --git a/engine/src/flutter/impeller/entity/contents/text_shadow_cache.h b/engine/src/flutter/impeller/entity/contents/text_shadow_cache.h
index 82028bd4f9684..d7a1f1983a192 100644
--- a/engine/src/flutter/impeller/entity/contents/text_shadow_cache.h
+++ b/engine/src/flutter/impeller/entity/contents/text_shadow_cache.h
@@ -11,10 +11,45 @@
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/sigma.h"
+#include "impeller/typographer/text_frame.h"
 #include "third_party/abseil-cpp/absl/container/flat_hash_map.h"
+#include "third_party/abseil-cpp/absl/hash/hash.h"
 
 namespace impeller {
 
+/// @brief A multi-attribute fingerprint for a text frame to ensure
+///        statistically impossible key collisions without holding a pointer.
+///
+///        Combines run count, total glyph count, first/last glyph IDs, and a
+///        64-bit content hash across all glyph positions and font metrics.
+///
+///        Napkin Math on Collision Probability:
+///        1. For a 64-bit hash (2^64 ~ 1.84e19 space) and N = 1,000 active text
+///           frames in a session, the Birthday Paradox collision probability
+///           for the 64-bit hash alone is:
+///             P_hash = N^2 / (2 * 2^64) = 10^6 / 3.68e19 ~ 2.7e-14
+///        2. For two non-identical text frames to collide under this key, they
+///           must ALSO independently match:
+///             - Run count (P_runs)
+///             - Total glyph count (P_len)
+///             - First glyph ID (P_first ~ 1/500)
+///             - Last glyph ID (P_last ~ 1/500)
+///        3. Multiplying these joint constraints:
+///             P_joint = P_hash * P_first * P_last * ... << 10^-20
+///
+///        This makes false-positive cache hits statistically impossible across
+///        all devices running Flutter, while avoiding heap pointers or map
+///        lookup array traversals.
+struct TextFrameFingerprint {
+  uint32_t run_count = 0;
+  uint32_t total_glyph_count = 0;
+  uint32_t first_glyph_id = 0;
+  uint32_t last_glyph_id = 0;
+  size_t full_hash = 0;
+
+  bool operator==(const TextFrameFingerprint& o) const = default;
+};
+
 /// @brief A cache for blurred text that re-uses these across frames.
 ///
 /// Text shadows are generally stable, but expensive to compute as we use a
@@ -37,25 +72,24 @@ class TextShadowCache {
   /// @brief A key to look up cached glyph textures.
   struct TextShadowCacheKey {
     Scalar max_basis;
-    int64_t identifier;
     bool is_single_glyph;
     Font font;
     Rational rounded_sigma;
     Color color;
+    TextFrameFingerprint fingerprint;
 
     TextShadowCacheKey(Scalar p_max_basis,
-                       int64_t p_identifier,
                        bool p_is_single_glyph,
                        const Font& p_font,
                        Sigma p_sigma,
-                       Color p_color);
+                       Color p_color,
+                       TextFrameFingerprint p_fingerprint = {});
 
     struct Hash {
       std::size_t operator()(const TextShadowCacheKey& key) const {
-        return fml::HashCombine(key.max_basis, key.identifier,
-                                key.is_single_glyph, key.font.GetHash(),
-                                key.rounded_sigma.GetHash(),
-                                key.color.ToARGB());
+        return absl::HashOf(key.max_basis, key.is_single_glyph,
+                            key.font.GetHash(), key.rounded_sigma.GetHash(),
+                            key.color.ToARGB(), key.fingerprint.full_hash);
       }
     };
 
@@ -63,10 +97,10 @@ class TextShadowCache {
       constexpr bool operator()(const TextShadowCacheKey& lhs,
                                 const TextShadowCacheKey& rhs) const {
         return lhs.max_basis == rhs.max_basis &&
-               lhs.identifier == rhs.identifier &&
                lhs.is_single_glyph == rhs.is_single_glyph &&
                lhs.font.IsEqual(rhs.font) &&
-               lhs.rounded_sigma == rhs.rounded_sigma && lhs.color == rhs.color;
+               lhs.rounded_sigma == rhs.rounded_sigma &&
+               lhs.color == rhs.color && lhs.fingerprint == rhs.fingerprint;
       }
     };
   };
diff --git a/engine/src/flutter/impeller/entity/shaders/uber_sdf.frag b/engine/src/flutter/impeller/entity/shaders/uber_sdf.frag
index d291dfc4a3980..97a5f5b715928 100644
--- a/engine/src/flutter/impeller/entity/shaders/uber_sdf.frag
+++ b/engine/src/flutter/impeller/entity/shaders/uber_sdf.frag
@@ -176,14 +176,16 @@ float roundRectPixelSize(vec2 p) {
   vec2 corner_center = frag_info.size - radius;
   vec2 q = abs(p) - corner_center;
 
+  float pixel_size;
   // If in the rounded corner arc, blend X and Y pixel sizes along the normal.
   if (q.x > 0.0 && q.y > 0.0) {
-    return length(normalize(q) * device_pixel_size);
+    pixel_size = length(normalize(q) * device_pixel_size);
+  } else {
+    // Otherwise, we are closer to a straight edge. Get pixel size in the
+    // direction perpendicular to the closer edge.
+    pixel_size = (q.x > q.y) ? device_pixel_size.x : device_pixel_size.y;
   }
-
-  // Otherwise, we are closer to a straight edge. Get pixel size in the
-  // direction perpendicular to the closer edge.
-  return (q.x > q.y) ? device_pixel_size.x : device_pixel_size.y;
+  return pixel_size;
 }
 
 float pixelSize(float sdf) {
@@ -195,26 +197,30 @@ float pixelSize(float sdf) {
 // Returns vec2(sdf, pixel_size).
 vec2 filledSDF(vec2 p) {
   float sdf;
+  float pixel_size;
   if (frag_info.type < 0.5) {  // Circle
     sdf = distanceFromCircle(p, frag_info.size.x);
+    pixel_size = pixelSize(sdf);
   } else if (frag_info.type < 1.5) {  // Rect
     sdf = distanceFromRect(p, frag_info.size);
     // Rect has its own separate logic for calculating pixel size.
-    return vec2(sdf, rectPixelSize(p));
+    pixel_size = rectPixelSize(p);
   } else if (frag_info.type < 2.5) {  // Oval
     sdf = distanceFromOval(p, frag_info.size);
+    pixel_size = pixelSize(sdf);
   } else if (frag_info.type < 3.5) {  // Rounded Rect
-    // RoundRect has its own separate logic for calculating pixel size.
     sdf = distanceFromRoundedRect(p, frag_info.size, frag_info.radii);
-    return vec2(sdf, roundRectPixelSize(p));
+    // RoundRect has its own separate logic for calculating pixel size.
+    pixel_size = roundRectPixelSize(p);
   } else {  // Symmetric Rounded Superellipse
     sdf = distanceFromRoundedSuperellipse(
         p, frag_info.superellipse_degree, frag_info.superellipse_semi_axis,
         frag_info.radii.xy, frag_info.angle_span, frag_info.circle_center_top,
         frag_info.circle_center_right, frag_info.octant_offset_c,
         frag_info.superellipse_scale);
+    pixel_size = pixelSize(sdf);
   }
-  return vec2(sdf, pixelSize(sdf));
+  return vec2(sdf, pixel_size);
 }
 
 // Evaluates the stroked SDF for the shape selected by frag_info.type.
@@ -226,23 +232,31 @@ vec2 strokedSDF(vec2 p) {
 
   float half_stroke = max(frag_info.stroke_width, base_pixel_size) * 0.5;
 
-  if (frag_info.type >= 0.5 && frag_info.type < 1.5) {  // Rect
-
-    if (frag_info.stroke_join < 0.5) {  // Miter
-      float outer = distanceFromRect(p, frag_info.size + half_stroke);
-      float inner = base_sdf + half_stroke;
-      float sdf = max(outer, -inner);
-      return vec2(sdf, pixelSize(sdf));
-    } else if (frag_info.stroke_join < 1.5) {  // Bevel
-      float outer =
-          distanceFromChamferRect(p, frag_info.size + half_stroke, half_stroke);
-      float inner = base_sdf + half_stroke;
-      float sdf = max(outer, -inner);
-      return vec2(sdf, pixelSize(sdf));
-    }
+  float sdf;
+  float pixel_size;
+  if (frag_info.type >= 0.5 && frag_info.type < 1.5 &&
+      frag_info.stroke_join < 0.5) {
+    // Rect with Miter join
+    float outer = distanceFromRect(p, frag_info.size + half_stroke);
+    float inner = base_sdf + half_stroke;
+    sdf = max(outer, -inner);
+    pixel_size = pixelSize(sdf);
+  } else if (frag_info.type >= 0.5 && frag_info.type < 1.5 &&
+             frag_info.stroke_join >= 0.5 && frag_info.stroke_join < 1.5) {
+    // Rect with Bevel join
+    float outer =
+        distanceFromChamferRect(p, frag_info.size + half_stroke, half_stroke);
+    float inner = base_sdf + half_stroke;
+    sdf = max(outer, -inner);
+    pixel_size = pixelSize(sdf);
+  } else {
+    // All other shapes
+    vec2 sdf_and_pixel_size =
+        SDFStroke(base_sdf, base_pixel_size, frag_info.stroke_width);
+    sdf = sdf_and_pixel_size.x;
+    pixel_size = sdf_and_pixel_size.y;
   }
-
-  return SDFStroke(base_sdf, base_pixel_size, frag_info.stroke_width);
+  return vec2(sdf, pixel_size);
 }
 
 // Converts linear coverage alpha to perceptual alpha.
diff --git a/engine/src/flutter/impeller/fixtures/flutter_gpu_optimized_out_sampler.frag b/engine/src/flutter/impeller/fixtures/flutter_gpu_optimized_out_sampler.frag
new file mode 100644
index 0000000000000..d44e9f4b992ba
--- /dev/null
+++ b/engine/src/flutter/impeller/fixtures/flutter_gpu_optimized_out_sampler.frag
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// `tex` is sampled then overwritten, so the compiler drops it. Backs the test
+// for binding an optimized-out sampler.
+uniform sampler2D tex;
+
+in vec4 v_color;
+out vec4 frag_color;
+
+void main() {
+  frag_color = texture(tex, v_color.xy);
+  frag_color = v_color;
+}
diff --git a/engine/src/flutter/impeller/renderer/BUILD.gn b/engine/src/flutter/impeller/renderer/BUILD.gn
index 73fb979e07c13..6855eb145744b 100644
--- a/engine/src/flutter/impeller/renderer/BUILD.gn
+++ b/engine/src/flutter/impeller/renderer/BUILD.gn
@@ -39,6 +39,8 @@ impeller_component("renderer") {
     "command.h",
     "command_buffer.cc",
     "command_buffer.h",
+    "command_buffer_scheduling_receipt.cc",
+    "command_buffer_scheduling_receipt.h",
     "command_queue.cc",
     "command_queue.h",
     "compute_pass.cc",
@@ -108,6 +110,8 @@ template("renderer_unittests_component") {
   predefined_sources = [
     "blit_pass_unittests.cc",
     "capabilities_unittests.cc",
+    "command_buffer_scheduling_receipt_unittests.cc",
+    "command_queue_unittests.cc",
     "device_buffer_unittests.cc",
     "pipeline_compile_queue_unittests.cc",
     "pipeline_descriptor_unittests.cc",
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc
index 2055e5164edd7..b5a6fad371a2a 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc
+++ b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc
@@ -493,6 +493,7 @@ std::optional<size_t> BufferBindingsGLES::BindTextures(
     ShaderStage stage,
     size_t unit_start_index) {
   size_t active_index = unit_start_index;
+  size_t stage_texture_count = 0;
   for (auto i = 0u; i < texture_range.length; i++) {
     const TextureAndSampler& data = bound_textures[texture_range.offset + i];
     if (data.stage != stage) {
@@ -513,11 +514,21 @@ std::optional<size_t> BufferBindingsGLES::BindTextures(
     //--------------------------------------------------------------------------
     /// Set the active texture unit.
     ///
-    if (active_index >= gl.GetCapabilities()->GetMaxTextureUnits(stage)) {
+    /// Units are a combined resource; the per-stage limits cap only how many
+    /// samplers one stage references, not the unit indices they bind to.
+    ///
+    stage_texture_count++;
+    if (stage_texture_count > gl.GetCapabilities()->GetMaxTextureUnits(stage)) {
       VALIDATION_LOG << "Texture units specified exceed the capabilities for "
                         "this shader stage.";
       return std::nullopt;
     }
+    if (active_index >=
+        gl.GetCapabilities()->max_combined_texture_image_units) {
+      VALIDATION_LOG << "Texture units specified exceed the combined texture "
+                        "unit limit.";
+      return std::nullopt;
+    }
     gl.ActiveTexture(GL_TEXTURE0 + active_index);
 
     //--------------------------------------------------------------------------
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
index 12cef0328bc1b..c00b55e9c17be 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
+++ b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
@@ -21,6 +21,10 @@ FML_TEST_CLASS(BufferBindingsGLESTest, BindUniformData);
 FML_TEST_CLASS(BufferBindingsGLESTest, BindArrayData);
 FML_TEST_CLASS(BufferBindingsGLESTest, BindUniformDataVerticesAndMatrices);
 FML_TEST_CLASS(BufferBindingsGLESTest, BindUniformFailsWithoutFloatType);
+FML_TEST_CLASS(BufferBindingsGLESTest,
+               BindsTexturesAcrossThePerStageUnitBoundary);
+FML_TEST_CLASS(BufferBindingsGLESTest, RejectsTexturesBeyondThePerStageLimit);
+FML_TEST_CLASS(BufferBindingsGLESTest, RejectsTexturesBeyondTheCombinedLimit);
 }  // namespace testing
 
 //------------------------------------------------------------------------------
@@ -66,6 +70,12 @@ class BufferBindingsGLES {
                   BindUniformDataVerticesAndMatrices);
   FML_FRIEND_TEST(testing::BufferBindingsGLESTest,
                   BindUniformFailsWithoutFloatType);
+  FML_FRIEND_TEST(testing::BufferBindingsGLESTest,
+                  BindsTexturesAcrossThePerStageUnitBoundary);
+  FML_FRIEND_TEST(testing::BufferBindingsGLESTest,
+                  RejectsTexturesBeyondThePerStageLimit);
+  FML_FRIEND_TEST(testing::BufferBindingsGLESTest,
+                  RejectsTexturesBeyondTheCombinedLimit);
   //----------------------------------------------------------------------------
   /// @brief      The arguments to glVertexAttribPointer.
   ///
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles_unittests.cc b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles_unittests.cc
index 9bae5b1beb717..494fc8d72e780 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles_unittests.cc
+++ b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles_unittests.cc
@@ -5,11 +5,14 @@
 #include "flutter/testing/testing.h"  // IWYU pragma: keep
 #include "gtest/gtest.h"
 #include "impeller/core/shader_types.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/buffer_bindings_gles.h"
 #include "impeller/renderer/backend/gles/device_buffer_gles.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
+#include "impeller/renderer/backend/gles/sampler_library_gles.h"
 #include "impeller/renderer/backend/gles/test/mock_gles.h"
+#include "impeller/renderer/backend/gles/texture_gles.h"
 #include "impeller/renderer/command.h"
 
 namespace impeller {
@@ -19,6 +22,7 @@ const GLint kBlockDataSize = 16;
 }
 
 using ::testing::_;
+using ::testing::NiceMock;
 
 TEST(BufferBindingsGLESTest, ToVertexAttribTypeSupportedFormats) {
   EXPECT_EQ(ToVertexAttribType(VertexAttributeFormat::kFloat32x3),
@@ -361,5 +365,138 @@ TEST(BufferBindingsGLESTest,
                              /*expected_bound_size=*/32);
 }
 
+namespace {
+
+// Owns the reactor, sampler, and metadata behind a set of texture bindings.
+struct BoundTexturesFixture {
+  std::shared_ptr<ReactorGLES> reactor;
+  std::shared_ptr<TestWorker> worker;
+  std::unique_ptr<SamplerLibrary> sampler_library;
+  raw_ptr<const Sampler> sampler;
+  std::vector<std::unique_ptr<ShaderMetadata>> metadata;
+  std::vector<TextureAndSampler> bound_textures;
+  absl::flat_hash_map<std::string, GLint> uniform_bindings;
+
+  explicit BoundTexturesFixture(std::unique_ptr<ProcTableGLES> proc_table) {
+    reactor = std::make_shared<ReactorGLES>(std::move(proc_table));
+    worker = std::make_shared<TestWorker>();
+    reactor->AddWorker(worker);
+    sampler_library = std::make_unique<SamplerLibraryGLES>(
+        /*supports_decal_sampler_address_mode=*/false);
+    sampler = sampler_library->GetSampler({});
+  }
+
+  void AddTextures(ShaderStage stage, size_t count) {
+    for (size_t i = 0; i < count; i++) {
+      TextureDescriptor desc;
+      desc.storage_mode = StorageMode::kDevicePrivate;
+      desc.type = TextureType::kTexture2D;
+      desc.format = PixelFormat::kR8G8B8A8UNormInt;
+      desc.size = {1, 1};
+      desc.mip_count = 1u;
+      desc.usage = TextureUsage::kShaderRead;
+      auto texture = std::make_shared<TextureGLES>(reactor, desc);
+      const std::string name = "tex" + std::to_string(metadata.size());
+      const std::string key = "TEX" + std::to_string(metadata.size());
+      uniform_bindings[key] = static_cast<GLint>(100 + metadata.size());
+      auto meta = std::make_unique<ShaderMetadata>();
+      meta->name = name;
+      TextureAndSampler data = {};
+      data.stage = stage;
+      data.texture = TextureResource(meta.get(), std::move(texture));
+      data.sampler = sampler;
+      metadata.push_back(std::move(meta));
+      bound_textures.push_back(std::move(data));
+    }
+  }
+};
+
+// Capabilities of a minimum-spec ES3 driver (16 per stage, 32 combined).
+std::unique_ptr<NiceMock<MockGLESImpl>> MakeSixteenUnitMockImpl() {
+  auto impl = std::make_unique<NiceMock<MockGLESImpl>>();
+  EXPECT_CALL(*impl, GetIntegerv(_, _))
+      .WillRepeatedly([](GLenum name, GLint* value) {
+        switch (name) {
+          case GL_MAX_TEXTURE_IMAGE_UNITS:
+          case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
+            *value = 16;
+            break;
+          case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
+            *value = 32;
+            break;
+          default:
+            break;
+        }
+      });
+  return impl;
+}
+
+}  // namespace
+
+// One vertex texture pushes the last of 16 fragment samplers onto unit 16,
+// which must bind on a 16-per-stage driver since units are combined in GL.
+TEST(BufferBindingsGLESTest, BindsTexturesAcrossThePerStageUnitBoundary) {
+  std::shared_ptr<MockGLES> mock_gl = MockGLES::Init(MakeSixteenUnitMockImpl());
+  BoundTexturesFixture fixture(
+      std::make_unique<ProcTableGLES>(kMockResolverGLES));
+  fixture.AddTextures(ShaderStage::kVertex, 1);
+  fixture.AddTextures(ShaderStage::kFragment, 16);
+  ASSERT_TRUE(fixture.reactor->React());
+
+  BufferBindingsGLES bindings;
+  bindings.SetUniformBindings(std::move(fixture.uniform_bindings));
+  std::vector<BufferResource> bound_buffers;
+  EXPECT_TRUE(bindings.BindUniformData(
+      fixture.reactor->GetProcTable(), fixture.bound_textures, bound_buffers,
+      Range{0, fixture.bound_textures.size()}, Range{0, 0}));
+}
+
+// More samplers in one stage than its limit is still rejected.
+TEST(BufferBindingsGLESTest, RejectsTexturesBeyondThePerStageLimit) {
+  std::shared_ptr<MockGLES> mock_gl = MockGLES::Init(MakeSixteenUnitMockImpl());
+  BoundTexturesFixture fixture(
+      std::make_unique<ProcTableGLES>(kMockResolverGLES));
+  fixture.AddTextures(ShaderStage::kFragment, 17);
+  ASSERT_TRUE(fixture.reactor->React());
+
+  BufferBindingsGLES bindings;
+  bindings.SetUniformBindings(std::move(fixture.uniform_bindings));
+  std::vector<BufferResource> bound_buffers;
+  EXPECT_FALSE(bindings.BindUniformData(
+      fixture.reactor->GetProcTable(), fixture.bound_textures, bound_buffers,
+      Range{0, fixture.bound_textures.size()}, Range{0, 0}));
+}
+
+// Units past the combined limit are rejected even when each stage is within
+// its per-stage limit.
+TEST(BufferBindingsGLESTest, RejectsTexturesBeyondTheCombinedLimit) {
+  auto impl = std::make_unique<NiceMock<MockGLESImpl>>();
+  EXPECT_CALL(*impl, GetIntegerv(_, _))
+      .WillRepeatedly([](GLenum name, GLint* value) {
+        switch (name) {
+          case GL_MAX_TEXTURE_IMAGE_UNITS:
+          case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
+          case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
+            *value = 8;
+            break;
+          default:
+            break;
+        }
+      });
+  std::shared_ptr<MockGLES> mock_gl = MockGLES::Init(std::move(impl));
+  BoundTexturesFixture fixture(
+      std::make_unique<ProcTableGLES>(kMockResolverGLES));
+  fixture.AddTextures(ShaderStage::kVertex, 8);
+  fixture.AddTextures(ShaderStage::kFragment, 8);
+  ASSERT_TRUE(fixture.reactor->React());
+
+  BufferBindingsGLES bindings;
+  bindings.SetUniformBindings(std::move(fixture.uniform_bindings));
+  std::vector<BufferResource> bound_buffers;
+  EXPECT_FALSE(bindings.BindUniformData(
+      fixture.reactor->GetProcTable(), fixture.bound_textures, bound_buffers,
+      Range{0, fixture.bound_textures.size()}, Range{0, 0}));
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.cc
index 80f874c42d00f..d70adeb9a7ad9 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.cc
+++ b/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.cc
@@ -71,8 +71,7 @@ bool CommandBufferGLES::IsValid() const {
 }
 
 // |CommandBuffer|
-bool CommandBufferGLES::OnSubmitCommands(bool block_on_schedule,
-                                         CompletionCallback callback) {
+bool CommandBufferGLES::OnSubmitCommands(CompletionCallback callback) {
   // The reactor consumes commands on the GL thread and GL synchronizes
   // buffer reuse implicitly, so submissions are tracked at reactor
   // consumption granularity rather than GPU completion.
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.h
index 5178d74ce161a..c7baea2d7bf15 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.h
+++ b/engine/src/flutter/impeller/renderer/backend/gles/command_buffer_gles.h
@@ -32,8 +32,7 @@ class CommandBufferGLES final : public CommandBuffer {
   bool IsValid() const override;
 
   // |CommandBuffer|
-  bool OnSubmitCommands(bool block_on_schedule,
-                        CompletionCallback callback) override;
+  bool OnSubmitCommands(CompletionCallback callback) override;
 
   // |CommandBuffer|
   void OnWaitUntilCompleted() override;
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/test/mock_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/test/mock_gles.cc
index f4d48151f1537..dbd70248c3940 100644
--- a/engine/src/flutter/impeller/renderer/backend/gles/test/mock_gles.cc
+++ b/engine/src/flutter/impeller/renderer/backend/gles/test/mock_gles.cc
@@ -98,7 +98,9 @@ void mockGetIntegerv(GLenum name, int* value) {
       *value = g_extensions.size();
     } break;
     case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
+      // Minimum default; a registered mock may overwrite it.
       *value = 8;
+      CallMockMethod(&IMockGLESImpl::GetIntegerv, name, value);
       break;
     case GL_MAX_LABEL_LENGTH_KHR:
       *value = 64;
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/BUILD.gn b/engine/src/flutter/impeller/renderer/backend/metal/BUILD.gn
index 9103010bd1d60..df824afa51da3 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/BUILD.gn
+++ b/engine/src/flutter/impeller/renderer/backend/metal/BUILD.gn
@@ -28,6 +28,8 @@ impeller_component("metal") {
     "gpu_tracer_mtl.mm",
     "pass_bindings_cache_mtl.h",
     "pass_bindings_cache_mtl.mm",
+    "pending_image_upload_schedule_tracker.cc",
+    "pending_image_upload_schedule_tracker.h",
     "pipeline_library_mtl.h",
     "pipeline_library_mtl.mm",
     "pipeline_mtl.h",
@@ -57,6 +59,7 @@ impeller_component("metal") {
   public_deps = [
     "../../:renderer",
     "//flutter/fml",
+    "//third_party/abseil-cpp/absl/container:flat_hash_map",
   ]
 
   frameworks = [
@@ -71,6 +74,7 @@ impeller_component("metal_unittests") {
   sources = [
     "allocator_mtl_unittests.mm",
     "context_mtl_unittests.mm",
+    "pending_image_upload_schedule_tracker_unittests.cc",
     "swapchain_transients_mtl_unittests.mm",
     "texture_mtl_unittests.mm",
   ]
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.h b/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.h
index b43e919d4a05b..5ef30af907ede 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.h
+++ b/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.h
@@ -34,8 +34,11 @@ class CommandBufferMTL final : public CommandBuffer {
   bool IsValid() const override;
 
   // |CommandBuffer|
-  bool OnSubmitCommands(bool block_on_schedule,
-                        CompletionCallback callback) override;
+  bool OnSubmitCommands(CompletionCallback callback) override;
+
+  // |CommandBuffer|
+  SubmitResult OnSubmitCommandsWithReceipt(
+      CompletionCallback callback) override;
 
   // |CommandBuffer|
   void OnWaitUntilCompleted() override;
@@ -52,6 +55,9 @@ class CommandBufferMTL final : public CommandBuffer {
   // |CommandBuffer|
   std::shared_ptr<ComputePass> OnCreateComputePass() override;
 
+  SubmitResult SubmitCommandsInternal(bool create_scheduling_receipt,
+                                      CompletionCallback callback);
+
   CommandBufferMTL(const CommandBufferMTL&) = delete;
 
   CommandBufferMTL& operator=(const CommandBufferMTL&) = delete;
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm b/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm
index 62f5a7a8ed154..90ad7e5216beb 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm
+++ b/engine/src/flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm
@@ -162,11 +162,24 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
   return CommandBufferMTL::Status::kError;
 }
 
-bool CommandBufferMTL::OnSubmitCommands(bool block_on_schedule,
-                                        CompletionCallback callback) {
+bool CommandBufferMTL::OnSubmitCommands(CompletionCallback callback) {
+  return SubmitCommandsInternal(/*create_scheduling_receipt=*/false,
+                                std::move(callback))
+      .submitted;
+}
+
+CommandBuffer::SubmitResult CommandBufferMTL::OnSubmitCommandsWithReceipt(
+    CompletionCallback callback) {
+  return SubmitCommandsInternal(/*create_scheduling_receipt=*/true,
+                                std::move(callback));
+}
+
+CommandBuffer::SubmitResult CommandBufferMTL::SubmitCommandsInternal(
+    bool create_scheduling_receipt,
+    CompletionCallback callback) {
   auto context = context_.lock();
   if (!context) {
-    return false;
+    return SubmitResult(false);
   }
 #ifdef IMPELLER_DEBUG
   ContextMTL::Cast(*context).GetGPUTracer()->RecordCmdBuffer(buffer_);
@@ -176,28 +189,42 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
   std::shared_ptr<GpuSubmissionTracker> tracker =
       ContextMTL::Cast(*context).GetMutableSubmissionTracker();
   uint64_t submission_id = tracker->RecordSubmission();
+
+  std::shared_ptr<CommandBufferSchedulingReceiptState> scheduling_receipt;
+  if (create_scheduling_receipt) {
+    scheduling_receipt =
+        std::make_shared<CommandBufferSchedulingReceiptState>();
+    // The native buffer retains its handlers, but the receipt state retains
+    // neither the buffer nor the context. This keeps the state alive until a
+    // terminal notification without creating a retain cycle.
+    [buffer_ addScheduledHandler:^(id<MTLCommandBuffer> buffer) {
+      scheduling_receipt->MarkScheduled();
+    }];
+  }
+
   [buffer_ addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
     tracker->RecordCompletion(submission_id);
+    if (scheduling_receipt) {
+      scheduling_receipt->MarkTerminal();
+    }
   }];
 
   if (callback) {
+    // The block copies the callback to keep it alive until completion.
+    CompletionCallback callback_for_block = std::move(callback);
     [buffer_
         addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
           [[maybe_unused]] auto result =
               LogMTLCommandBufferErrorIfPresent(buffer);
           FML_DCHECK(result)
               << "Must not have errors during command buffer submission.";
-          callback(ToCommitResult(buffer.status));
+          callback_for_block(ToCommitResult(buffer.status));
         }];
   }
 
   [buffer_ commit];
-  if (block_on_schedule) {
-    [buffer_ waitUntilScheduled];
-  }
-
   buffer_ = nil;
-  return true;
+  return SubmitResult(true, std::move(scheduling_receipt));
 }
 
 void CommandBufferMTL::OnWaitUntilCompleted() {}
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.h b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.h
index 594a8c8eec969..b533c2b156512 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.h
+++ b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.h
@@ -18,6 +18,7 @@
 #include "impeller/renderer/backend/metal/allocator_mtl.h"
 #include "impeller/renderer/backend/metal/command_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/gpu_tracer_mtl.h"
+#include "impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h"
 #include "impeller/renderer/backend/metal/pipeline_library_mtl.h"
 #include "impeller/renderer/backend/metal/shader_library_mtl.h"
 #include "impeller/renderer/capabilities.h"
@@ -154,6 +155,10 @@ class ContextMTL final : public Context,
   void StoreTaskForGPU(const fml::closure& task,
                        const fml::closure& failure) override;
 
+  // |Context|
+  void TrackPendingImageUpload(
+      const std::shared_ptr<CommandBufferSchedulingReceipt>& receipt) override;
+
   // visible for testing.
   void FlushTasksAwaitingGPU();
 
@@ -189,6 +194,8 @@ class ContextMTL final : public Context,
   Mutex tasks_awaiting_gpu_mutex_;
   std::deque<PendingTasks> tasks_awaiting_gpu_
       IPLR_GUARDED_BY(tasks_awaiting_gpu_mutex_);
+  /// Tracks image uploads that have not reached a scheduled or terminal state.
+  PendingImageUploadScheduleTracker pending_image_uploads_;
   std::unique_ptr<SyncSwitchObserver> sync_switch_observer_;
   std::shared_ptr<CommandQueue> command_queue_ip_;
 #ifdef IMPELLER_DEBUG
@@ -207,6 +214,9 @@ class ContextMTL final : public Context,
   std::shared_ptr<CommandBuffer> CreateCommandBufferInQueue(
       id<MTLCommandQueue> queue) const;
 
+  /// Waits for pending image uploads to become scheduled or terminal.
+  void DrainPendingImageUploads();
+
   ContextMTL(const ContextMTL&) = delete;
 
   ContextMTL& operator=(const ContextMTL&) = delete;
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm
index c271d7c83da96..29c7379c1d11b 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm
+++ b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl.mm
@@ -12,6 +12,7 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/synchronization/sync_switch.h"
+#include "flutter/fml/trace_event.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/runtime_types.h"
 #include "impeller/core/sampler_descriptor.h"
@@ -458,6 +459,22 @@ new ContextMTL(flags, device, command_queue,
   }
 }
 
+void ContextMTL::TrackPendingImageUpload(
+    const std::shared_ptr<CommandBufferSchedulingReceipt>& receipt) {
+  pending_image_uploads_.Track(receipt);
+}
+
+void ContextMTL::DrainPendingImageUploads() {
+  const size_t pending_count = pending_image_uploads_.GetPendingCount();
+  if (pending_count == 0u) {
+    return;
+  }
+  const std::string pending_count_string = std::to_string(pending_count);
+  TRACE_EVENT1("impeller", "ImpellerMetalImageUploadScheduleDrain",
+               "PendingCount", pending_count_string.c_str());
+  pending_image_uploads_.WaitUntilScheduled();
+}
+
 void ContextMTL::FlushTasksAwaitingGPU() {
   std::deque<PendingTasks> tasks_awaiting_gpu;
   {
@@ -505,7 +522,9 @@ new ContextMTL(flags, device, command_queue,
     : parent_(parent) {}
 
 void ContextMTL::SyncSwitchObserver::OnSyncSwitchUpdate(bool new_is_disabled) {
-  if (!new_is_disabled) {
+  if (new_is_disabled) {
+    parent_.DrainPendingImageUploads();
+  } else {
     parent_.FlushTasksAwaitingGPU();
   }
 }
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl_unittests.mm b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl_unittests.mm
index cb3ee72e599f7..444b65aa07aa5 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/context_mtl_unittests.mm
+++ b/engine/src/flutter/impeller/renderer/backend/metal/context_mtl_unittests.mm
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/fml/synchronization/count_down_latch.h"
+#include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/testing/testing.h"
 #include "impeller/core/device_buffer_descriptor.h"
 #include "impeller/core/formats.h"
@@ -14,6 +16,7 @@
 #include "impeller/renderer/capabilities.h"
 
 #include <QuartzCore/CAMetalLayer.h>
+#include <atomic>
 #include <memory>
 #include <thread>
 
@@ -22,6 +25,49 @@
 namespace impeller {
 namespace testing {
 
+namespace {
+
+/// A test receipt whose wait blocks until it is marked scheduled or terminal.
+class BlockingSchedulingReceipt final : public CommandBufferSchedulingReceipt {
+ public:
+  explicit BlockingSchedulingReceipt(
+      fml::CountDownLatch* any_wait_started = nullptr)
+      : any_wait_started_(any_wait_started) {}
+
+  void WaitUntilScheduled() override {
+    wait_count_++;
+    if (any_wait_started_) {
+      any_wait_started_->CountDown();
+    }
+    wait_started_.Signal();
+    state_.WaitUntilScheduled();
+  }
+
+  bool IsScheduledOrTerminal() const override {
+    return state_.IsScheduledOrTerminal();
+  }
+
+  void AddScheduledOrTerminalCallback(fml::closure callback) override {
+    state_.AddScheduledOrTerminalCallback(std::move(callback));
+  }
+
+  void MarkScheduled() { state_.MarkScheduled(); }
+
+  void MarkTerminal() { state_.MarkTerminal(); }
+
+  void WaitForWaitCall() { wait_started_.Wait(); }
+
+  size_t GetWaitCount() const { return wait_count_; }
+
+ private:
+  fml::CountDownLatch* const any_wait_started_;
+  CommandBufferSchedulingReceiptState state_;
+  std::atomic_size_t wait_count_ = 0u;
+  fml::ManualResetWaitableEvent wait_started_;
+};
+
+}  // namespace
+
 using ContextMTLTest = PlaygroundTest;
 INSTANTIATE_METAL_PLAYGROUND_SUITE(ContextMTLTest);
 
@@ -60,5 +106,119 @@
   EXPECT_EQ(failed, 0);
 }
 
+TEST_P(ContextMTLTest, SubmissionReturnsSchedulingReceipt) {
+  const std::shared_ptr<Context>& context = GetContext();
+  std::shared_ptr<CommandBuffer> command_buffer =
+      context->CreateCommandBuffer();
+  ASSERT_NE(command_buffer, nullptr);
+  std::atomic<CommandBuffer::Status> completion_status =
+      CommandBuffer::Status::kPending;
+  fml::ManualResetWaitableEvent completed;
+
+  CommandQueue::SubmitResult result =
+      context->GetCommandQueue()->SubmitWithReceipt(
+          command_buffer, [&](CommandBuffer::Status status) {
+            completion_status = status;
+            completed.Signal();
+          });
+
+  ASSERT_TRUE(result.status.ok());
+  ASSERT_NE(result.scheduling_receipt, nullptr);
+  fml::ManualResetWaitableEvent satisfied;
+  result.scheduling_receipt->AddScheduledOrTerminalCallback(
+      [&]() { satisfied.Signal(); });
+  EXPECT_FALSE(satisfied.WaitWithTimeout(fml::TimeDelta::FromSeconds(5.0)));
+  result.scheduling_receipt->WaitUntilScheduled();
+  EXPECT_FALSE(completed.WaitWithTimeout(fml::TimeDelta::FromSeconds(5.0)));
+  EXPECT_EQ(completion_status.load(), CommandBuffer::Status::kCompleted);
+}
+
+TEST_P(ContextMTLTest, GpuDisableWaitsForAllPendingImageUploads) {
+  auto& context_mtl = ContextMTL::Cast(*GetContext());
+  fml::CountDownLatch any_wait_started(1u);
+  auto scheduled_receipt =
+      std::make_shared<BlockingSchedulingReceipt>(&any_wait_started);
+  auto terminal_receipt =
+      std::make_shared<BlockingSchedulingReceipt>(&any_wait_started);
+  context_mtl.TrackPendingImageUpload(scheduled_receipt);
+  context_mtl.TrackPendingImageUpload(terminal_receipt);
+  EXPECT_EQ(scheduled_receipt->GetWaitCount(), 0u);
+  EXPECT_EQ(terminal_receipt->GetWaitCount(), 0u);
+
+  fml::ManualResetWaitableEvent transition_started;
+  fml::ManualResetWaitableEvent transition_returned;
+  std::thread disable_thread([&]() {
+    transition_started.Signal();
+    SetGPUDisabled(/*disabled=*/true);
+    transition_returned.Signal();
+  });
+  transition_started.Wait();
+  any_wait_started.Wait();
+
+  EXPECT_FALSE(transition_returned.IsSignaledForTest());
+  // The tracker snapshots both receipts before its first wait. Satisfying them
+  // through both terminal paths verifies that the transition drains the full
+  // snapshot even when the receipts finish out of order.
+  terminal_receipt->MarkTerminal();
+  scheduled_receipt->MarkScheduled();
+
+  disable_thread.join();
+  EXPECT_TRUE(transition_returned.IsSignaledForTest());
+  EXPECT_EQ(scheduled_receipt->GetWaitCount(), 1u);
+  EXPECT_EQ(terminal_receipt->GetWaitCount(), 1u);
+}
+
+TEST_P(ContextMTLTest, DisableCannotMissReceiptRegistration) {
+  auto& context_mtl = ContextMTL::Cast(*GetContext());
+  const std::shared_ptr<const fml::SyncSwitch> gpu_disabled_switch =
+      context_mtl.GetIsGpuDisabledSyncSwitch();
+  auto receipt = std::make_shared<BlockingSchedulingReceipt>();
+  fml::ManualResetWaitableEvent upload_handler_entered;
+  fml::ManualResetWaitableEvent allow_registration;
+  fml::ManualResetWaitableEvent disable_started;
+  fml::ManualResetWaitableEvent disable_returned;
+
+  std::thread upload_thread([&]() {
+    gpu_disabled_switch->Execute(fml::SyncSwitch::Handlers().SetIfFalse([&]() {
+      upload_handler_entered.Signal();
+      allow_registration.Wait();
+      context_mtl.TrackPendingImageUpload(receipt);
+    }));
+  });
+  upload_handler_entered.Wait();
+
+  std::thread disable_thread([&]() {
+    disable_started.Signal();
+    SetGPUDisabled(/*disabled=*/true);
+    disable_returned.Signal();
+  });
+  disable_started.Wait();
+
+  // SetSwitch cannot acquire its unique lock while the enabled upload handler
+  // holds the shared lock, so it cannot notify the observer before this
+  // registration completes.
+  EXPECT_FALSE(disable_returned.IsSignaledForTest());
+  allow_registration.Signal();
+  upload_thread.join();
+  receipt->WaitForWaitCall();
+  EXPECT_FALSE(disable_returned.IsSignaledForTest());
+
+  receipt->MarkTerminal();
+  disable_thread.join();
+  EXPECT_TRUE(disable_returned.IsSignaledForTest());
+  EXPECT_EQ(receipt->GetWaitCount(), 1u);
+}
+
+TEST_P(ContextMTLTest, RepeatedGpuDisableDoesNotWaitOnSatisfiedReceipt) {
+  auto& context_mtl = ContextMTL::Cast(*GetContext());
+  auto receipt = std::make_shared<BlockingSchedulingReceipt>();
+  receipt->MarkScheduled();
+  context_mtl.TrackPendingImageUpload(receipt);
+
+  SetGPUDisabled(/*disabled=*/true);
+  SetGPUDisabled(/*disabled=*/true);
+  EXPECT_EQ(receipt->GetWaitCount(), 0u);
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm b/engine/src/flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
index 295967784ebaf..8539e602137bb 100644
--- a/engine/src/flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
+++ b/engine/src/flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
@@ -32,6 +32,12 @@
                                      uint64_t index,
                                      uint64_t offset,
                                      id<MTLBuffer> buffer) {
+  if (index == kOptimizedOutBinding) {
+    // The shader compiler dead-code-eliminated this resource, so it has no
+    // argument-table slot. Skip the bind rather than forward an out-of-range
+    // index to Metal, which has no bounds check and would crash.
+    return true;
+  }
   auto& buffers_map = buffers_[stage];
   auto found = buffers_map.find(index);
   if (found != buffers_map.end() && found->second.buffer == buffer) {
@@ -75,6 +81,10 @@
 bool PassBindingsCacheMTL::SetTexture(ShaderStage stage,
                                       uint64_t index,
                                       id<MTLTexture> texture) {
+  if (index == kOptimizedOutBinding) {
+    // See SetBuffer: a dead-code-eliminated sampler has no argument-table slot.
+    return true;
+  }
   auto& texture_map = textures_[stage];
   auto found = texture_map.find(index);
   if (found != texture_map.end() && found->second == texture) {
@@ -99,6 +109,10 @@
 bool PassBindingsCacheMTL::SetSampler(ShaderStage stage,
                                       uint64_t index,
                                       id<MTLSamplerState> sampler) {
+  if (index == kOptimizedOutBinding) {
+    // See SetBuffer: a dead-code-eliminated sampler has no argument-table slot.
+    return true;
+  }
   auto& sampler_map = samplers_[stage];
   auto found = sampler_map.find(index);
   if (found != sampler_map.end() && found->second == sampler) {
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.cc b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.cc
new file mode 100644
index 0000000000000..5c0e9878ba893
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.cc
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h"
+
+#include <vector>
+
+#include "flutter/fml/trace_event.h"
+
+namespace impeller {
+
+PendingImageUploadScheduleTracker::PendingImageUploadScheduleTracker()
+    : state_(std::make_shared<State>()) {}
+
+PendingImageUploadScheduleTracker::~PendingImageUploadScheduleTracker() =
+    default;
+
+void PendingImageUploadScheduleTracker::Track(
+    std::shared_ptr<CommandBufferSchedulingReceipt> receipt) {
+  if (!receipt || receipt->IsScheduledOrTerminal()) {
+    return;
+  }
+
+  ReceiptID receipt_id;
+  {
+    Lock lock(state_->mutex);
+    receipt_id = state_->next_id++;
+    state_->pending.emplace(receipt_id, receipt);
+  }
+
+  receipt->AddScheduledOrTerminalCallback(
+      [weak_state = std::weak_ptr<State>(state_), receipt_id]() {
+        const std::shared_ptr<State> state = weak_state.lock();
+        if (!state) {
+          return;
+        }
+        Lock lock(state->mutex);
+        state->pending.erase(receipt_id);
+      });
+}
+
+void PendingImageUploadScheduleTracker::WaitUntilScheduled() const {
+  std::vector<std::shared_ptr<CommandBufferSchedulingReceipt>> receipts;
+  {
+    Lock lock(state_->mutex);
+    receipts.reserve(state_->pending.size());
+    for (const auto& entry : state_->pending) {
+      receipts.push_back(entry.second);
+    }
+  }
+
+  for (const auto& receipt : receipts) {
+    TRACE_EVENT0("impeller", "ImpellerMetalImageUploadScheduleWait");
+    receipt->WaitUntilScheduled();
+  }
+}
+
+size_t PendingImageUploadScheduleTracker::GetPendingCount() const {
+  Lock lock(state_->mutex);
+  return state_->pending.size();
+}
+
+}  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h
new file mode 100644
index 0000000000000..bb6f7e589bcf1
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PENDING_IMAGE_UPLOAD_SCHEDULE_TRACKER_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PENDING_IMAGE_UPLOAD_SCHEDULE_TRACKER_H_
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include "impeller/base/thread.h"
+#include "impeller/renderer/command_buffer_scheduling_receipt.h"
+#include "third_party/abseil-cpp/absl/container/flat_hash_map.h"
+
+namespace impeller {
+
+/// Tracks image-upload command buffers until they are scheduled or terminal.
+///
+/// The tracker is thread-safe. Waiting snapshots the pending receipts and does
+/// not hold the tracker mutex while blocking.
+class PendingImageUploadScheduleTracker {
+ public:
+  PendingImageUploadScheduleTracker();
+
+  ~PendingImageUploadScheduleTracker();
+
+  void Track(std::shared_ptr<CommandBufferSchedulingReceipt> receipt);
+
+  void WaitUntilScheduled() const;
+
+  size_t GetPendingCount() const;
+
+ private:
+  using ReceiptID = uint64_t;
+
+  struct State {
+    Mutex mutex;
+    ReceiptID next_id IPLR_GUARDED_BY(mutex) = 1u;
+    absl::flat_hash_map<ReceiptID,
+                        std::shared_ptr<CommandBufferSchedulingReceipt>>
+        pending IPLR_GUARDED_BY(mutex);
+  };
+
+  std::shared_ptr<State> state_;
+
+  PendingImageUploadScheduleTracker(const PendingImageUploadScheduleTracker&) =
+      delete;
+
+  PendingImageUploadScheduleTracker& operator=(
+      const PendingImageUploadScheduleTracker&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PENDING_IMAGE_UPLOAD_SCHEDULE_TRACKER_H_
diff --git a/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker_unittests.cc b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker_unittests.cc
new file mode 100644
index 0000000000000..1a1ff43fe19c4
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/backend/metal/pending_image_upload_schedule_tracker_unittests.cc
@@ -0,0 +1,161 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/pending_image_upload_schedule_tracker.h"
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/testing/testing.h"
+
+namespace impeller {
+namespace testing {
+namespace {
+
+class TestSchedulingReceipt final : public CommandBufferSchedulingReceipt {
+ public:
+  /// When `satisfy_when_waited` is true, waiting satisfies the receipt before
+  /// blocking.
+  explicit TestSchedulingReceipt(bool satisfy_when_waited = false)
+      : satisfy_when_waited_(satisfy_when_waited) {}
+
+  void WaitUntilScheduled() override {
+    wait_count_++;
+    wait_started_.Signal();
+    if (satisfy_when_waited_) {
+      Satisfy();
+    }
+    satisfied_event_.Wait();
+  }
+
+  bool IsScheduledOrTerminal() const override {
+    std::scoped_lock lock(mutex_);
+    return satisfied_;
+  }
+
+  void AddScheduledOrTerminalCallback(fml::closure callback) override {
+    fml::closure callback_to_invoke;
+    if (callback) {
+      {
+        std::scoped_lock lock(mutex_);
+        if (satisfied_) {
+          callback_to_invoke = std::move(callback);
+        } else {
+          callbacks_.push_back(std::move(callback));
+        }
+      }
+    }
+    if (callback_to_invoke) {
+      callback_to_invoke();
+    }
+  }
+
+  void Satisfy() {
+    std::vector<fml::closure> callbacks;
+    {
+      std::scoped_lock lock(mutex_);
+      if (satisfied_) {
+        return;
+      }
+      satisfied_ = true;
+      callbacks.swap(callbacks_);
+    }
+    satisfied_event_.Signal();
+    for (const auto& callback : callbacks) {
+      callback();
+    }
+  }
+
+  void WaitForWaitCall() { wait_started_.Wait(); }
+
+  size_t GetWaitCount() const { return wait_count_; }
+
+ private:
+  const bool satisfy_when_waited_;
+  mutable std::mutex mutex_;
+  bool satisfied_ = false;
+  std::vector<fml::closure> callbacks_;
+  fml::ManualResetWaitableEvent wait_started_;
+  fml::ManualResetWaitableEvent satisfied_event_;
+  std::atomic_size_t wait_count_ = 0u;
+};
+
+}  // namespace
+
+TEST(PendingImageUploadScheduleTrackerTest, TrackDoesNotWait) {
+  PendingImageUploadScheduleTracker tracker;
+  auto receipt = std::make_shared<TestSchedulingReceipt>();
+
+  tracker.Track(receipt);
+
+  EXPECT_EQ(receipt->GetWaitCount(), 0u);
+  EXPECT_EQ(tracker.GetPendingCount(), 1u);
+  receipt->Satisfy();
+  EXPECT_EQ(tracker.GetPendingCount(), 0u);
+}
+
+TEST(PendingImageUploadScheduleTrackerTest, SatisfiedBeforeTrackIsNotRetained) {
+  PendingImageUploadScheduleTracker tracker;
+  auto receipt = std::make_shared<TestSchedulingReceipt>();
+  receipt->Satisfy();
+
+  tracker.Track(receipt);
+
+  EXPECT_EQ(tracker.GetPendingCount(), 0u);
+  EXPECT_EQ(receipt->GetWaitCount(), 0u);
+}
+
+TEST(PendingImageUploadScheduleTrackerTest, WaitsForAllReceipts) {
+  PendingImageUploadScheduleTracker tracker;
+  auto first = std::make_shared<TestSchedulingReceipt>();
+  auto second = std::make_shared<TestSchedulingReceipt>();
+  tracker.Track(first);
+  tracker.Track(second);
+
+  second->Satisfy();
+  fml::ManualResetWaitableEvent drain_returned;
+  std::thread drain([&]() {
+    tracker.WaitUntilScheduled();
+    drain_returned.Signal();
+  });
+  first->WaitForWaitCall();
+
+  EXPECT_FALSE(drain_returned.IsSignaledForTest());
+  first->Satisfy();
+
+  drain.join();
+  EXPECT_EQ(tracker.GetPendingCount(), 0u);
+  EXPECT_EQ(first->GetWaitCount(), 1u);
+}
+
+TEST(PendingImageUploadScheduleTrackerTest, DoesNotWaitWhileHoldingMutex) {
+  PendingImageUploadScheduleTracker tracker;
+  auto receipt = std::make_shared<TestSchedulingReceipt>(
+      /*satisfy_when_waited=*/true);
+  tracker.Track(receipt);
+
+  tracker.WaitUntilScheduled();
+
+  EXPECT_EQ(tracker.GetPendingCount(), 0u);
+  EXPECT_EQ(receipt->GetWaitCount(), 1u);
+}
+
+TEST(PendingImageUploadScheduleTrackerTest,
+     CallbackIsSafeAfterTrackerDestruction) {
+  auto receipt = std::make_shared<TestSchedulingReceipt>();
+  {
+    PendingImageUploadScheduleTracker tracker;
+    tracker.Track(receipt);
+    EXPECT_EQ(tracker.GetPendingCount(), 1u);
+  }
+
+  receipt->Satisfy();
+  EXPECT_TRUE(receipt->IsScheduledOrTerminal());
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc
index 2820d6e7042e2..b2a72a37bcb3a 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc
@@ -456,6 +456,15 @@ CapabilitiesVK::GetEnabledDeviceFeatures(
     // `max_anisotropy` greater than 1 may only be created when this feature
     // is enabled.
     required.samplerAnisotropy = supported.samplerAnisotropy;
+
+    // Enable block-compressed texture format support when available.
+    // These core Vulkan 1.0 features must be explicitly requested at device
+    // creation; otherwise the capability read-back in SetPhysicalDevice
+    // (which reads from enabled_features) will always report false.
+    // See: https://github.com/flutter/flutter/issues/189107
+    required.textureCompressionETC2 = supported.textureCompressionETC2;
+    required.textureCompressionASTC_LDR = supported.textureCompressionASTC_LDR;
+    required.textureCompressionBC = supported.textureCompressionBC;
   }
   // VK_KHR_sampler_ycbcr_conversion features.
   if (IsExtensionInList(
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc
index cc6ff148ab5bb..885aa58757acc 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc
@@ -41,8 +41,7 @@ bool CommandBufferVK::IsValid() const {
   return true;
 }
 
-bool CommandBufferVK::OnSubmitCommands(bool block_on_schedule,
-                                       CompletionCallback callback) {
+bool CommandBufferVK::OnSubmitCommands(CompletionCallback callback) {
   FML_UNREACHABLE()
 }
 
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h b/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h
index fdf77db0a0f00..0e1b20a3ec11b 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h
@@ -95,8 +95,7 @@ class CommandBufferVK final
   bool IsValid() const override;
 
   // |CommandBuffer|
-  bool OnSubmitCommands(bool block_on_schedule,
-                        CompletionCallback callback) override;
+  bool OnSubmitCommands(CompletionCallback callback) override;
 
   // |CommandBuffer|
   void OnWaitUntilCompleted() override;
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc
index 6219c41c0082e..2cafe2e38fcdb 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc
@@ -22,8 +22,7 @@ CommandQueueVK::~CommandQueueVK() = default;
 
 fml::Status CommandQueueVK::Submit(
     const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
-    const CompletionCallback& completion_callback,
-    bool block_on_schedule) {
+    const CompletionCallback& completion_callback) {
   if (buffers.empty()) {
     return fml::Status(fml::StatusCode::kInvalidArgument,
                        "No command buffers provided.");
@@ -104,4 +103,12 @@ fml::Status CommandQueueVK::Submit(
   return fml::Status();
 }
 
+CommandQueue::SubmitResult CommandQueueVK::SubmitWithReceipt(
+    const std::shared_ptr<CommandBuffer>& buffer,
+    const CompletionCallback& completion_callback) {
+  return {
+      .status = Submit({buffer}, completion_callback),
+  };
+}
+
 }  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.h b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.h
index 20450c2a4b816..d7e4188ff54f9 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.h
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk.h
@@ -17,9 +17,13 @@ class CommandQueueVK : public CommandQueue {
 
   ~CommandQueueVK() override;
 
-  fml::Status Submit(const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
-                     const CompletionCallback& completion_callback = {},
-                     bool block_on_schedule = false) override;
+  fml::Status Submit(
+      const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+      const CompletionCallback& completion_callback = {}) override;
+
+  SubmitResult SubmitWithReceipt(
+      const std::shared_ptr<CommandBuffer>& buffer,
+      const CompletionCallback& completion_callback = {}) override;
 
  private:
   std::weak_ptr<ContextVK> context_;
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk_unittests.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk_unittests.cc
index 622f6bb976f3c..8e39424cb9fbc 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk_unittests.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/command_queue_vk_unittests.cc
@@ -24,6 +24,20 @@ TEST(CommandQueueVKTest, QueueSubmit) {
             called->end());
 }
 
+TEST(CommandQueueVKTest, SubmitWithReceiptUsesVulkanQueue) {
+  const auto context = MockVulkanContextBuilder().Build();
+  auto buffer = context->CreateCommandBuffer();
+
+  CommandQueue::SubmitResult result =
+      context->GetCommandQueue()->SubmitWithReceipt(buffer);
+
+  EXPECT_TRUE(result.status.ok());
+  EXPECT_EQ(result.scheduling_receipt, nullptr);
+  const auto called = GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_NE(std::find(called->begin(), called->end(), "vkQueueSubmit"),
+            called->end());
+}
+
 TEST(CommandQueueVKTest, SubmitAfterFenceWaiterTerminated) {
   const auto context = MockVulkanContextBuilder().Build();
   auto buffer = context->CreateCommandBuffer();
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc
index 61c0d2bee16d5..cee7e429dcbe8 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc
@@ -208,6 +208,24 @@ TEST(CapabilitiesVKTest, ContextInitializesWithNoStencilFormat) {
             PixelFormat::kD32FloatS8UInt);
 }
 
+// Regression test for https://github.com/flutter/flutter/issues/189107.
+// The core Vulkan 1.0 block-compression features (ETC2, ASTC LDR, BC) must be
+// explicitly requested in GetEnabledDeviceFeatures so the read-back in
+// SetPhysicalDevice reports real support. The mock device advertises all three
+// as supported, so a device that enables them correctly must report them here.
+TEST(CapabilitiesVKTest, ReportsBlockCompressedTextureSupport) {
+  const std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+  ASSERT_NE(context, nullptr);
+  const CapabilitiesVK* capabilities_vk =
+      reinterpret_cast<const CapabilitiesVK*>(context->GetCapabilities().get());
+  EXPECT_TRUE(capabilities_vk->SupportsTextureCompression(
+      CompressedTextureFamily::kETC2));
+  EXPECT_TRUE(capabilities_vk->SupportsTextureCompression(
+      CompressedTextureFamily::kASTC));
+  EXPECT_TRUE(capabilities_vk->SupportsTextureCompression(
+      CompressedTextureFamily::kBC));
+}
+
 // Impeller's 2D renderer relies on hardware support for a combined
 // depth-stencil format (widely supported). So fail initialization if a suitable
 // one couldn't be found. That way we have an opportunity to fallback to
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
index 118bb30674103..6a628d764e5a2 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
@@ -35,7 +35,8 @@ DebugReportVK::DebugReportVK(const CapabilitiesVK& caps,
     return;
   }
 
-  messenger_ = std::move(messenger.value);
+  messenger_ = std::make_unique<vk::UniqueDebugUtilsMessengerEXT>(
+      std::move(messenger.value));
   is_valid_ = true;
 }
 
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.h b/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.h
index e3a247bb6008d..4b8b9b91f2506 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.h
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/debug_report_vk.h
@@ -20,7 +20,7 @@ class DebugReportVK {
   bool IsValid() const;
 
  private:
-  vk::UniqueDebugUtilsMessengerEXT messenger_;
+  std::unique_ptr<vk::UniqueDebugUtilsMessengerEXT> messenger_;
   bool is_valid_ = false;
 
   enum class Result {
diff --git a/engine/src/flutter/impeller/renderer/backend/vulkan/test/mock_vulkan.cc b/engine/src/flutter/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
index faeeb92749242..b47df094d3a15 100644
--- a/engine/src/flutter/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
+++ b/engine/src/flutter/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
@@ -323,6 +323,15 @@ void vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
 
 void vkGetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
                                   VkPhysicalDeviceFeatures2* pFeatures) {
+  // Advertise the core block-compressed texture features so tests can exercise
+  // the GetEnabledDeviceFeatures -> SetPhysicalDevice plumbing that gates
+  // CapabilitiesVK::SupportsTextureCompression. Without this the mock reports
+  // these core Vulkan 1.0 features as VK_FALSE and the capability is always
+  // false regardless of the enable path.
+  pFeatures->features.textureCompressionETC2 = VK_TRUE;
+  pFeatures->features.textureCompressionASTC_LDR = VK_TRUE;
+  pFeatures->features.textureCompressionBC = VK_TRUE;
+
   // Advertise the features the mock supports by walking the pNext chain.
   auto* next = reinterpret_cast<VkBaseOutStructure*>(pFeatures->pNext);
   while (next != nullptr) {
diff --git a/engine/src/flutter/impeller/renderer/command_buffer.cc b/engine/src/flutter/impeller/renderer/command_buffer.cc
index f6cf95908b72d..c20ce1523b34e 100644
--- a/engine/src/flutter/impeller/renderer/command_buffer.cc
+++ b/engine/src/flutter/impeller/renderer/command_buffer.cc
@@ -15,8 +15,7 @@ CommandBuffer::CommandBuffer(std::weak_ptr<const Context> context)
 
 CommandBuffer::~CommandBuffer() = default;
 
-bool CommandBuffer::SubmitCommands(bool block_on_schedule,
-                                   const CompletionCallback& callback) {
+bool CommandBuffer::SubmitCommands(const CompletionCallback& callback) {
   if (!IsValid()) {
     // Already committed or was never valid. Either way, this is caller error.
     if (callback) {
@@ -24,11 +23,23 @@ bool CommandBuffer::SubmitCommands(bool block_on_schedule,
     }
     return false;
   }
-  return OnSubmitCommands(block_on_schedule, callback);
+  return OnSubmitCommands(callback);
 }
 
-bool CommandBuffer::SubmitCommands(bool block_on_schedule) {
-  return SubmitCommands(block_on_schedule, nullptr);
+CommandBuffer::SubmitResult CommandBuffer::SubmitCommandsWithReceipt(
+    const CompletionCallback& callback) {
+  if (!IsValid()) {
+    if (callback) {
+      callback(Status::kError);
+    }
+    return SubmitResult(false);
+  }
+  return OnSubmitCommandsWithReceipt(callback);
+}
+
+CommandBuffer::SubmitResult CommandBuffer::OnSubmitCommandsWithReceipt(
+    CompletionCallback callback) {
+  return SubmitResult(OnSubmitCommands(std::move(callback)));
 }
 
 void CommandBuffer::WaitUntilCompleted() {
diff --git a/engine/src/flutter/impeller/renderer/command_buffer.h b/engine/src/flutter/impeller/renderer/command_buffer.h
index 90701495f9701..847104e1b487f 100644
--- a/engine/src/flutter/impeller/renderer/command_buffer.h
+++ b/engine/src/flutter/impeller/renderer/command_buffer.h
@@ -7,8 +7,10 @@
 
 #include <functional>
 #include <memory>
+#include <utility>
 
 #include "impeller/renderer/blit_pass.h"
+#include "impeller/renderer/command_buffer_scheduling_receipt.h"
 #include "impeller/renderer/compute_pass.h"
 
 namespace impeller {
@@ -46,6 +48,17 @@ class CommandBuffer {
   friend class testing::CommandBufferMock;
 
  public:
+  struct SubmitResult {
+    explicit SubmitResult(bool submitted,
+                          std::shared_ptr<CommandBufferSchedulingReceipt>
+                              scheduling_receipt = nullptr)
+        : submitted(submitted),
+          scheduling_receipt(std::move(scheduling_receipt)) {}
+
+    bool submitted;
+    std::shared_ptr<CommandBufferSchedulingReceipt> scheduling_receipt;
+  };
+
   enum class Status {
     kPending,
     kError,
@@ -110,8 +123,13 @@ class CommandBuffer {
   /// @brief Submit the command buffer to the GPU for execution.
   ///
   /// See also: [SubmitCommands].
-  [[nodiscard]] virtual bool OnSubmitCommands(bool block_on_schedule,
-                                              CompletionCallback callback) = 0;
+  [[nodiscard]] virtual bool OnSubmitCommands(CompletionCallback callback) = 0;
+
+  /// Submit without blocking on GPU scheduling and return a scheduling receipt
+  /// when the backend supports one. Backends without scheduling receipts use
+  /// the default implementation, which returns a null receipt.
+  [[nodiscard]] virtual SubmitResult OnSubmitCommandsWithReceipt(
+      CompletionCallback callback);
 
   virtual void OnWaitUntilCompleted() = 0;
 
@@ -128,15 +146,12 @@ class CommandBuffer {
   ///             performed immediately on the calling thread.
   ///
   ///             A command buffer may only be committed once.
-  /// @param[in]  block_on_schedule  If true, this function will not return
-  ///             until the command buffer has been scheduled. This only impacts
-  ///             the Metal backend.
   /// @param[in]  callback  The completion callback.
   ///
-  [[nodiscard]] bool SubmitCommands(bool block_on_schedule,
-                                    const CompletionCallback& callback);
+  [[nodiscard]] bool SubmitCommands(const CompletionCallback& callback);
 
-  [[nodiscard]] bool SubmitCommands(bool block_on_schedule);
+  [[nodiscard]] SubmitResult SubmitCommandsWithReceipt(
+      const CompletionCallback& callback);
 
   CommandBuffer(const CommandBuffer&) = delete;
 
diff --git a/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.cc b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.cc
new file mode 100644
index 0000000000000..7ce9eef2c8788
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.cc
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/command_buffer_scheduling_receipt.h"
+
+namespace impeller {
+
+CommandBufferSchedulingReceipt::~CommandBufferSchedulingReceipt() = default;
+
+CommandBufferSchedulingReceiptState::CommandBufferSchedulingReceiptState() =
+    default;
+
+CommandBufferSchedulingReceiptState::~CommandBufferSchedulingReceiptState() =
+    default;
+
+void CommandBufferSchedulingReceiptState::WaitUntilScheduled() {
+  Lock lock(mutex_);
+  condition_.Wait(mutex_, [this]() IPLR_REQUIRES(mutex_) {
+    return state_ != State::kPending;
+  });
+}
+
+bool CommandBufferSchedulingReceiptState::IsScheduledOrTerminal() const {
+  Lock lock(mutex_);
+  return state_ != State::kPending;
+}
+
+void CommandBufferSchedulingReceiptState::AddScheduledOrTerminalCallback(
+    fml::closure callback) {
+  fml::closure callback_to_invoke;
+  if (callback) {
+    {
+      Lock lock(mutex_);
+      if (state_ == State::kPending) {
+        callbacks_.push_back(std::move(callback));
+      } else {
+        callback_to_invoke = std::move(callback);
+      }
+    }
+  }
+  if (callback_to_invoke) {
+    callback_to_invoke();
+  }
+}
+
+void CommandBufferSchedulingReceiptState::MarkScheduled() {
+  MarkSatisfied(State::kScheduled);
+}
+
+void CommandBufferSchedulingReceiptState::MarkTerminal() {
+  MarkSatisfied(State::kTerminal);
+}
+
+void CommandBufferSchedulingReceiptState::MarkSatisfied(State state) {
+  std::vector<fml::closure> callbacks;
+  {
+    Lock lock(mutex_);
+    if (state_ != State::kPending) {
+      return;
+    }
+    state_ = state;
+    callbacks.swap(callbacks_);
+  }
+  condition_.NotifyAll();
+  for (const auto& callback : callbacks) {
+    callback();
+  }
+}
+
+}  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.h b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.h
new file mode 100644
index 0000000000000..99c7ddb2627c4
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt.h
@@ -0,0 +1,83 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_SCHEDULING_RECEIPT_H_
+#define FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_SCHEDULING_RECEIPT_H_
+
+#include <vector>
+
+#include "flutter/fml/closure.h"
+#include "impeller/base/thread.h"
+
+namespace impeller {
+
+/// A thread-safe receipt for the scheduling state of a submitted command
+/// buffer.
+///
+/// A terminal command buffer has completed or failed and therefore cannot
+/// begin executing GPU work later. Waiting is safe from multiple threads and
+/// returns once either the scheduled or terminal state is reached.
+/// Receipts do not expose which state was reached because the iOS lifecycle
+/// barrier only needs to know that one of them has occurred.
+class CommandBufferSchedulingReceipt {
+ public:
+  virtual ~CommandBufferSchedulingReceipt();
+
+  virtual void WaitUntilScheduled() = 0;
+
+  virtual bool IsScheduledOrTerminal() const = 0;
+
+  /// Registers a callback that is invoked once the receipt is scheduled or
+  /// terminal. If it is already satisfied, the callback is invoked before this
+  /// method returns.
+  virtual void AddScheduledOrTerminalCallback(fml::closure callback) = 0;
+};
+
+/// The shared scheduling state used by renderer backends to produce a receipt.
+class CommandBufferSchedulingReceiptState final
+    : public CommandBufferSchedulingReceipt {
+ public:
+  CommandBufferSchedulingReceiptState();
+
+  ~CommandBufferSchedulingReceiptState() override;
+
+  // |CommandBufferSchedulingReceipt|
+  void WaitUntilScheduled() override;
+
+  // |CommandBufferSchedulingReceipt|
+  bool IsScheduledOrTerminal() const override;
+
+  // |CommandBufferSchedulingReceipt|
+  void AddScheduledOrTerminalCallback(fml::closure callback) override;
+
+  /// Called by a backend when the submitted command buffer is scheduled.
+  void MarkScheduled();
+
+  /// Called by a backend when the submitted command buffer completes or fails.
+  void MarkTerminal();
+
+ private:
+  enum class State {
+    kPending,
+    kScheduled,
+    kTerminal,
+  };
+
+  void MarkSatisfied(State state);
+
+  mutable Mutex mutex_;
+  ConditionVariable condition_;
+  State state_ IPLR_GUARDED_BY(mutex_) = State::kPending;
+  std::vector<fml::closure> callbacks_ IPLR_GUARDED_BY(mutex_);
+
+  CommandBufferSchedulingReceiptState(
+      const CommandBufferSchedulingReceiptState&) = delete;
+
+  CommandBufferSchedulingReceiptState& operator=(
+      const CommandBufferSchedulingReceiptState&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_SCHEDULING_RECEIPT_H_
diff --git a/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt_unittests.cc b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt_unittests.cc
new file mode 100644
index 0000000000000..9ced702d78eec
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/command_buffer_scheduling_receipt_unittests.cc
@@ -0,0 +1,80 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/command_buffer_scheduling_receipt.h"
+
+#include <atomic>
+#include <thread>
+
+#include "flutter/fml/synchronization/count_down_latch.h"
+#include "flutter/testing/testing.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(CommandBufferSchedulingReceiptTest, ScheduledWakesAllWaiters) {
+  auto receipt = std::make_shared<CommandBufferSchedulingReceiptState>();
+  fml::CountDownLatch waiters_started(2u);
+  std::atomic_size_t waiters_finished = 0u;
+  auto wait = [&]() {
+    waiters_started.CountDown();
+    receipt->WaitUntilScheduled();
+    waiters_finished++;
+  };
+
+  std::thread first(wait);
+  std::thread second(wait);
+  waiters_started.Wait();
+
+  EXPECT_FALSE(receipt->IsScheduledOrTerminal());
+  receipt->MarkScheduled();
+
+  first.join();
+  second.join();
+  EXPECT_EQ(waiters_finished, 2u);
+  EXPECT_TRUE(receipt->IsScheduledOrTerminal());
+}
+
+TEST(CommandBufferSchedulingReceiptTest, TerminalWakesWaiter) {
+  auto receipt = std::make_shared<CommandBufferSchedulingReceiptState>();
+  fml::CountDownLatch waiter_started(1u);
+  std::thread waiter([&]() {
+    waiter_started.CountDown();
+    receipt->WaitUntilScheduled();
+  });
+  waiter_started.Wait();
+
+  receipt->MarkTerminal();
+
+  waiter.join();
+  EXPECT_TRUE(receipt->IsScheduledOrTerminal());
+}
+
+TEST(CommandBufferSchedulingReceiptTest, NotificationsAreIdempotent) {
+  auto receipt = std::make_shared<CommandBufferSchedulingReceiptState>();
+  std::atomic_size_t callbacks = 0u;
+  receipt->AddScheduledOrTerminalCallback([&]() { callbacks++; });
+
+  receipt->MarkScheduled();
+  receipt->MarkScheduled();
+  receipt->MarkTerminal();
+
+  EXPECT_EQ(callbacks, 1u);
+  receipt->WaitUntilScheduled();
+}
+
+TEST(CommandBufferSchedulingReceiptTest,
+     CallbackForSatisfiedReceiptRunsImmediately) {
+  auto receipt = std::make_shared<CommandBufferSchedulingReceiptState>();
+  receipt->MarkTerminal();
+
+  bool callback_ran = false;
+  receipt->AddScheduledOrTerminalCallback([&]() { callback_ran = true; });
+
+  EXPECT_TRUE(callback_ran);
+  receipt->WaitUntilScheduled();
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/command_queue.cc b/engine/src/flutter/impeller/renderer/command_queue.cc
index 02c9300564f3e..319e03de9d9c0 100644
--- a/engine/src/flutter/impeller/renderer/command_queue.cc
+++ b/engine/src/flutter/impeller/renderer/command_queue.cc
@@ -13,8 +13,7 @@ CommandQueue::~CommandQueue() = default;
 
 fml::Status CommandQueue::Submit(
     const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
-    const CompletionCallback& completion_callback,
-    bool block_on_schedule) {
+    const CompletionCallback& completion_callback) {
   if (buffers.empty()) {
     if (completion_callback) {
       completion_callback(CommandBuffer::Status::kError);
@@ -23,7 +22,7 @@ fml::Status CommandQueue::Submit(
                        "No command buffers provided.");
   }
   for (const std::shared_ptr<CommandBuffer>& buffer : buffers) {
-    if (!buffer->SubmitCommands(block_on_schedule, completion_callback)) {
+    if (!buffer->SubmitCommands(completion_callback)) {
       return fml::Status(fml::StatusCode::kCancelled,
                          "Failed to submit command buffer.");
     }
@@ -31,4 +30,21 @@ fml::Status CommandQueue::Submit(
   return fml::Status();
 }
 
+CommandQueue::SubmitResult CommandQueue::SubmitWithReceipt(
+    const std::shared_ptr<CommandBuffer>& buffer,
+    const CompletionCallback& completion_callback) {
+  CommandBuffer::SubmitResult result =
+      buffer->SubmitCommandsWithReceipt(completion_callback);
+  if (!result.submitted) {
+    return {
+        .status = fml::Status(fml::StatusCode::kCancelled,
+                              "Failed to submit command buffer."),
+    };
+  }
+  return {
+      .status = fml::Status(),
+      .scheduling_receipt = std::move(result.scheduling_receipt),
+  };
+}
+
 }  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/command_queue.h b/engine/src/flutter/impeller/renderer/command_queue.h
index 2abd7f11d9e09..6ae3da5ffa26d 100644
--- a/engine/src/flutter/impeller/renderer/command_queue.h
+++ b/engine/src/flutter/impeller/renderer/command_queue.h
@@ -18,6 +18,11 @@ class CommandQueue {
  public:
   using CompletionCallback = std::function<void(CommandBuffer::Status)>;
 
+  struct SubmitResult {
+    fml::Status status;
+    std::shared_ptr<CommandBufferSchedulingReceipt> scheduling_receipt;
+  };
+
   CommandQueue();
 
   virtual ~CommandQueue();
@@ -35,14 +40,16 @@ class CommandQueue {
   ///        Only the Metal and Vulkan backends can give a status beyond
   ///        successful encoding. This callback may be called more than once and
   ///        potentially on a different thread.
-  ///
-  ///        If [block_on_schedule] is true, this function will not return until
-  ///        the command buffer has been scheduled. This only impacts the Metal
-  ///        backend.
   virtual fml::Status Submit(
       const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
-      const CompletionCallback& completion_callback = {},
-      bool block_on_schedule = false);
+      const CompletionCallback& completion_callback = {});
+
+  /// Submit one command buffer without blocking on GPU scheduling and return a
+  /// scheduling receipt when supported by the backend. A successful submission
+  /// may have a null receipt when no lifecycle scheduling barrier is needed.
+  virtual SubmitResult SubmitWithReceipt(
+      const std::shared_ptr<CommandBuffer>& buffer,
+      const CompletionCallback& completion_callback = {});
 
  private:
   CommandQueue(const CommandQueue&) = delete;
diff --git a/engine/src/flutter/impeller/renderer/command_queue_unittests.cc b/engine/src/flutter/impeller/renderer/command_queue_unittests.cc
new file mode 100644
index 0000000000000..5bcab30c18020
--- /dev/null
+++ b/engine/src/flutter/impeller/renderer/command_queue_unittests.cc
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/command_queue.h"
+
+#include "flutter/testing/testing.h"
+#include "impeller/renderer/testing/mocks.h"
+
+namespace impeller {
+namespace testing {
+
+using ::testing::_;
+using ::testing::Return;
+
+TEST(CommandQueueTest, BackendWithoutSchedulingReceiptReturnsNullReceipt) {
+  auto command_buffer =
+      std::make_shared<MockCommandBuffer>(std::weak_ptr<const Context>{});
+  EXPECT_CALL(*command_buffer, IsValid()).WillOnce(Return(true));
+  EXPECT_CALL(*command_buffer, OnSubmitCommands(_)).WillOnce(Return(true));
+
+  CommandQueue queue;
+  CommandQueue::SubmitResult result = queue.SubmitWithReceipt(command_buffer);
+
+  EXPECT_TRUE(result.status.ok());
+  EXPECT_EQ(result.scheduling_receipt, nullptr);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/engine/src/flutter/impeller/renderer/context.h b/engine/src/flutter/impeller/renderer/context.h
index 20a0defba9071..a47eab2dae39e 100644
--- a/engine/src/flutter/impeller/renderer/context.h
+++ b/engine/src/flutter/impeller/renderer/context.h
@@ -212,6 +212,14 @@ class Context {
     FML_CHECK(false && "not supported in this context");
   }
 
+  /// Tracks the scheduling receipt for an image upload submitted while GPU
+  /// access is enabled. Callers must invoke this before leaving the enabled
+  /// SyncSwitch handler that protects the submission.
+  ///
+  /// Threadsafe. Backends without a lifecycle scheduling barrier ignore it.
+  virtual void TrackPendingImageUpload(
+      const std::shared_ptr<CommandBufferSchedulingReceipt>&) {}
+
   /// Run backend specific additional setup and create common shader variants.
   ///
   /// This bootstrap is intended to improve the performance of several
diff --git a/engine/src/flutter/impeller/renderer/testing/mocks.h b/engine/src/flutter/impeller/renderer/testing/mocks.h
index 3758e539662ff..71850b83ffe17 100644
--- a/engine/src/flutter/impeller/renderer/testing/mocks.h
+++ b/engine/src/flutter/impeller/renderer/testing/mocks.h
@@ -147,7 +147,7 @@ class MockCommandBuffer : public CommandBuffer {
   MOCK_METHOD(std::shared_ptr<BlitPass>, OnCreateBlitPass, (), (override));
   MOCK_METHOD(bool,
               OnSubmitCommands,
-              (bool block_on_schedule, CompletionCallback callback),
+              (CompletionCallback callback),
               (override));
   MOCK_METHOD(void, OnWaitUntilCompleted, (), (override));
   MOCK_METHOD(void, OnWaitUntilScheduled, (), (override));
@@ -208,6 +208,11 @@ class MockImpellerContext : public Context {
               (),
               (const, override));
 
+  MOCK_METHOD(void,
+              TrackPendingImageUpload,
+              (const std::shared_ptr<CommandBufferSchedulingReceipt>& receipt),
+              (override));
+
   MOCK_METHOD(RuntimeStageBackend,
               GetRuntimeStageBackend,
               (),
@@ -273,8 +278,12 @@ class MockCommandQueue : public CommandQueue {
   MOCK_METHOD(fml::Status,
               Submit,
               (const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
-               const CompletionCallback& cb,
-               bool block_on_schedule),
+               const CompletionCallback& cb),
+              (override));
+  MOCK_METHOD(SubmitResult,
+              SubmitWithReceipt,
+              (const std::shared_ptr<CommandBuffer>& buffer,
+               const CompletionCallback& cb),
               (override));
 };
 
diff --git a/engine/src/flutter/impeller/tessellator/tessellator.cc b/engine/src/flutter/impeller/tessellator/tessellator.cc
index 619639bcf9822..50bf2f41e5863 100644
--- a/engine/src/flutter/impeller/tessellator/tessellator.cc
+++ b/engine/src/flutter/impeller/tessellator/tessellator.cc
@@ -506,20 +506,24 @@ EllipticalVertexGenerator Tessellator::StrokedCircle(
     const Point& center,
     Scalar radius,
     Scalar half_width) {
-  if (half_width > 0) {
-    auto divisions = ComputeQuadrantDivisions(
-        view_transform.GetMaxBasisLengthXY() * radius + half_width);
-    return EllipticalVertexGenerator(Tessellator::GenerateStrokedCircle,
-                                     GetTrigsForDivisions(divisions),
-                                     PrimitiveType::kTriangleStrip, 8,
-                                     {
-                                         .reference_centers = {center, center},
-                                         .radii = {radius, radius},
-                                         .half_width = half_width,
-                                     });
-  } else {
+  if (half_width <= 0) {
     return FilledCircle(view_transform, center, radius);
   }
+  if (half_width >= radius) {
+    // Identical to a filled circle whose radius reaches the outer edge of the
+    // stroke.
+    return FilledCircle(view_transform, center, radius + half_width);
+  }
+  auto divisions = ComputeQuadrantDivisions(
+      view_transform.GetMaxBasisLengthXY() * (radius + half_width));
+  return EllipticalVertexGenerator(Tessellator::GenerateStrokedCircle,
+                                   GetTrigsForDivisions(divisions),
+                                   PrimitiveType::kTriangleStrip, 8,
+                                   {
+                                       .reference_centers = {center, center},
+                                       .radii = {radius, radius},
+                                       .half_width = half_width,
+                                   });
 }
 
 ArcVertexGenerator ArcVertexGenerator::MakeFilled(
@@ -858,7 +862,12 @@ void Tessellator::GenerateStrokedArc(
     const TessellatedVertexProc& proc) {
   Point center = oval_bounds.GetCenter();
   Size base_radii = oval_bounds.GetSize() * 0.5f;
+
+  // A stroke width wider than the radii would cross the center and
+  // self-intersect. Clamp inner edge to center.
   Size inner_radii = base_radii - Size(half_width, half_width);
+  inner_radii = inner_radii.Max(Size(0.0f, 0.0f));
+
   Size outer_radii = base_radii + Size(half_width, half_width);
 
   // Starting cap
diff --git a/engine/src/flutter/impeller/tessellator/tessellator_unittests.cc b/engine/src/flutter/impeller/tessellator/tessellator_unittests.cc
index ae2443eb2663f..0ad5ebb2a8840 100644
--- a/engine/src/flutter/impeller/tessellator/tessellator_unittests.cc
+++ b/engine/src/flutter/impeller/tessellator/tessellator_unittests.cc
@@ -187,6 +187,32 @@ TEST(TessellatorTest, CircleVertexCounts) {
   }
 }
 
+TEST(TessellatorTest, StrokedCircleVertexCounts) {
+  Tessellator tessellator;
+
+  // The outer edge of a stroked circle sits at |radius| + |half_width|, so it
+  // must be divided at least as finely as a filled circle of that radius to be
+  // within |kCircleTolerance|.
+  auto test = [&tessellator](const Matrix& transform, Scalar radius,
+                             Scalar half_width, const std::string& label) {
+    ASSERT_LT(half_width, radius) << label;
+    auto stroked = tessellator.StrokedCircle(transform, {}, radius, half_width);
+    auto filled = tessellator.FilledCircle(transform, {}, radius + half_width);
+
+    EXPECT_GE(stroked.GetVertexCount() / 8, filled.GetVertexCount() / 4)
+        << label;
+  };
+
+  test({}, 2.0, 1.0, "small radius");
+  test({}, 100.0, 10.0, "large radius");
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), 2.0, 1.0,
+       "small radius, scaled up");
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), 100.0, 10.0,
+       "large radius, scaled up");
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), 1000.0, 10.0,
+       "large radius, scaled down");
+}
+
 TEST(TessellatorTest, FilledCircleTessellationVertices) {
   Tessellator tessellator;
 
@@ -303,6 +329,48 @@ TEST(TessellatorTest, StrokedCircleTessellationVertices) {
   test(Matrix::MakeScale({0.002, 0.002, 0.0}), {}, 1000.0, 10.0);
 }
 
+TEST(TessellatorTest, StrokedCircleWideStrokeTessellationVertices) {
+  Tessellator tessellator;
+
+  // A stroke at least as wide as the radius fills the circle. Verify it
+  // tessellates as a filled circle out to the outer edge of the stroke.
+  auto test = [&tessellator](const Matrix& transform, const Point& center,
+                             Scalar radius, Scalar half_width,
+                             const std::string& label) {
+    ASSERT_GE(half_width, radius) << label;
+    auto generator =
+        tessellator.StrokedCircle(transform, center, radius, half_width);
+    auto filled =
+        tessellator.FilledCircle(transform, center, radius + half_width);
+
+    EXPECT_EQ(generator.GetTriangleType(), filled.GetTriangleType()) << label;
+    EXPECT_EQ(generator.GetVertexCount(), filled.GetVertexCount()) << label;
+
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    auto filled_vertices = std::vector<Point>();
+    filled.GenerateVertices([&filled_vertices](const Point& p) {  //
+      filled_vertices.push_back(p);
+    });
+
+    EXPECT_EQ(vertices.size(), generator.GetVertexCount()) << label;
+    ASSERT_EQ(vertices.size(), filled_vertices.size()) << label;
+    for (size_t i = 0; i < vertices.size(); i++) {
+      EXPECT_POINT_NEAR(vertices[i], filled_vertices[i])
+          << label << ", vertex " << i;
+    }
+  };
+
+  test({}, {}, 2.0, 2.0, "half width == radius");
+  test({}, {}, 2.0, 4.0, "half width > radius");
+  test({}, {10, 10}, 2.0, 2.0, "offset center");
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {}, 2.0, 2.0, "scaled up");
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {}, 1000.0, 1000.0,
+       "scaled down");
+}
+
 TEST(TessellatorTest, FilledArcStripTessellationVertices) {
   Tessellator tessellator;
 
@@ -379,6 +447,43 @@ TEST(TessellatorTest, FilledArcStripTessellationVertices) {
        Arc(Rect::MakeXYWH(0, 0, 100, 100), Degrees(94), Degrees(322), true));
 }
 
+TEST(TessellatorTest, StrokedArcWideStrokeTessellationVertices) {
+  Tessellator tessellator;
+
+  // A stroke width wider than the radii would cross the center. Verify the
+  // inner edge stops there rather than folding through and self-intersecting.
+  auto test = [&tessellator](const Matrix& transform, const Arc& arc,
+                             Scalar half_width, const std::string& label) {
+    Scalar radius = arc.GetOvalSize().width * 0.5f;
+    ASSERT_GE(half_width, radius) << label;
+    auto generator =
+        tessellator.StrokedArc(transform, arc, Cap::kButt, half_width);
+
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), generator.GetVertexCount()) << label;
+    ASSERT_EQ(vertices.size() % 2, 0u) << label;
+
+    Point center = arc.GetOvalBounds().GetCenter();
+    for (size_t i = 0; i < vertices.size(); i += 2) {
+      EXPECT_POINT_NEAR(vertices[i], center) << label << ", inner vertex " << i;
+      EXPECT_NEAR((vertices[i + 1] - center).GetLength(), radius + half_width,
+                  kEhCloseEnough)
+          << label << ", outer vertex " << i + 1;
+    }
+  };
+
+  test({}, Arc(Rect::MakeXYWH(0, 0, 100, 100), Degrees(0), Degrees(90), false),
+       50.0, "half width == radius");
+  test({}, Arc(Rect::MakeXYWH(0, 0, 100, 100), Degrees(0), Degrees(90), false),
+       75.0, "half width > radius");
+  test({},
+       Arc(Rect::MakeXYWH(10, 20, 100, 100), Degrees(94), Degrees(322), false),
+       60.0, "offset oval, oblique sweep");
+}
+
 TEST(TessellatorTest, RoundCapLineTessellationVertices) {
   Tessellator tessellator;
 
diff --git a/engine/src/flutter/impeller/toolkit/interop/backend/vulkan/context_vk.cc b/engine/src/flutter/impeller/toolkit/interop/backend/vulkan/context_vk.cc
index c386827f24b85..aa280665d0152 100644
--- a/engine/src/flutter/impeller/toolkit/interop/backend/vulkan/context_vk.cc
+++ b/engine/src/flutter/impeller/toolkit/interop/backend/vulkan/context_vk.cc
@@ -49,7 +49,7 @@ ScopedObject<Context> ContextVK::Create(const Settings& settings) {
   impeller::ContextVK::Settings impeller_settings;
   impeller_settings.shader_libraries_data = CreateShaderLibraryMappings();
   impeller_settings.cache_directory = fml::paths::GetCachesDirectory();
-  impeller_settings.enable_validation = true;
+  impeller_settings.enable_validation = settings.enable_validation;
   sContextVKProcAddressCallback = settings.instance_proc_address_callback;
   impeller_settings.proc_address_callback = ContextVKGetInstanceProcAddress;
   impeller_settings.flags = impeller::Flags{};
diff --git a/engine/src/flutter/impeller/toolkit/interop/playground_test.cc b/engine/src/flutter/impeller/toolkit/interop/playground_test.cc
index 0462eafd49ad5..17552eda56458 100644
--- a/engine/src/flutter/impeller/toolkit/interop/playground_test.cc
+++ b/engine/src/flutter/impeller/toolkit/interop/playground_test.cc
@@ -77,13 +77,10 @@ ScopedObject<Context> PlaygroundTest::CreateContext() const {
     }
     case PlaygroundBackend::kVulkan:
       ImpellerContextVulkanSettings settings = {};
-      struct UserData {
-        Playground::VKProcAddressResolver resolver;
-      } user_data;
-      user_data.resolver = CreateVKProcAddressResolver();
-      settings.user_data = &user_data;
-      settings.enable_vulkan_validation =
-          GetSwitches().enable_vulkan_validation;
+      user_data_ = std::make_unique<UserData>();
+      user_data_->resolver = CreateVKProcAddressResolver();
+      settings.user_data = user_data_.get();
+      settings.enable_vulkan_validation = true;
       settings.proc_address_callback = [](void* instance,         //
                                           const char* proc_name,  //
                                           void* user_data         //
diff --git a/engine/src/flutter/impeller/toolkit/interop/playground_test.h b/engine/src/flutter/impeller/toolkit/interop/playground_test.h
index 07256028ce4d1..8a36557dad6d9 100644
--- a/engine/src/flutter/impeller/toolkit/interop/playground_test.h
+++ b/engine/src/flutter/impeller/toolkit/interop/playground_test.h
@@ -48,6 +48,10 @@ class PlaygroundTest : public ::impeller::PlaygroundTest {
       std::string asset_name) const;
 
  private:
+  struct UserData {
+    Playground::VKProcAddressResolver resolver;
+  };
+  mutable std::unique_ptr<UserData> user_data_;
   ScopedObject<Context> interop_context_;
 };
 
diff --git a/engine/src/flutter/impeller/tools/malioc.json b/engine/src/flutter/impeller/tools/malioc.json
index da2d4782141bc..d93c1e6ad6f2d 100644
--- a/engine/src/flutter/impeller/tools/malioc.json
+++ b/engine/src/flutter/impeller/tools/malioc.json
@@ -8629,7 +8629,7 @@
             "shortest_path_cycles": [
               0.53125,
               0.53125,
-              0.140625,
+              0.15625,
               0.5,
               0.0,
               0.25,
@@ -8640,10 +8640,10 @@
               "arith_fma"
             ],
             "total_cycles": [
-              13.375,
-              13.375,
-              4.65625,
-              12.625,
+              13.625,
+              13.625,
+              4.53125,
+              13.4375,
               0.0,
               0.25,
               0.0
@@ -8651,7 +8651,7 @@
           },
           "stack_spill_bytes": 0,
           "thread_occupancy": 100,
-          "uniform_registers_used": 44,
+          "uniform_registers_used": 46,
           "work_registers_used": 32
         }
       }
@@ -8659,7 +8659,7 @@
     "Mali-T880": {
       "core": "Mali-T880",
       "filename": "flutter/impeller/entity/gles/uber_sdf.frag.gles",
-      "has_uniform_computation": false,
+      "has_uniform_computation": true,
       "type": "Fragment",
       "variants": {
         "Main": {
@@ -8669,7 +8669,7 @@
               "arithmetic"
             ],
             "longest_path_cycles": [
-              45.209999084472656,
+              43.88999938964844,
               3.0,
               4.0
             ],
@@ -8690,13 +8690,13 @@
               "arithmetic"
             ],
             "total_cycles": [
-              102.33333587646484,
+              105.66666412353516,
               3.0,
-              16.0
+              24.0
             ]
           },
           "thread_occupancy": 100,
-          "uniform_registers_used": 5,
+          "uniform_registers_used": 7,
           "work_registers_used": 4
         }
       }
@@ -11823,7 +11823,7 @@
       "uses_late_zs_update": false,
       "variants": {
         "Main": {
-          "fp16_arithmetic": 36,
+          "fp16_arithmetic": 35,
           "has_stack_spilling": false,
           "performance": {
             "longest_path_bound_pipelines": [
@@ -11833,7 +11833,7 @@
             "longest_path_cycles": [
               4.0,
               3.387500047683716,
-              1.9249999523162842,
+              1.9375,
               4.0,
               0.0,
               0.25,
@@ -11855,7 +11855,7 @@
             "shortest_path_cycles": [
               0.5,
               0.453125,
-              0.15625,
+              0.171875,
               0.5,
               0.0,
               0.25,
@@ -11866,10 +11866,10 @@
               "arith_sfu"
             ],
             "total_cycles": [
-              12.625,
-              12.125,
-              4.800000190734863,
-              12.625,
+              13.4375,
+              12.4375,
+              4.875,
+              13.4375,
               0.0,
               0.25,
               0.0
@@ -11877,7 +11877,7 @@
           },
           "stack_spill_bytes": 0,
           "thread_occupancy": 100,
-          "uniform_registers_used": 50,
+          "uniform_registers_used": 48,
           "work_registers_used": 32
         }
       }
diff --git a/engine/src/flutter/impeller/typographer/backends/skia/typeface_skia.cc b/engine/src/flutter/impeller/typographer/backends/skia/typeface_skia.cc
index df0b88be16a5e..3d875ba1c9411 100644
--- a/engine/src/flutter/impeller/typographer/backends/skia/typeface_skia.cc
+++ b/engine/src/flutter/impeller/typographer/backends/skia/typeface_skia.cc
@@ -20,12 +20,12 @@ std::size_t TypefaceSkia::GetHash() const {
     return 0u;
   }
 
-  return reinterpret_cast<size_t>(typeface_.get());
+  return typeface_->uniqueID();
 }
 
 bool TypefaceSkia::IsEqual(const Typeface& other) const {
   auto sk_other = reinterpret_cast<const TypefaceSkia*>(&other);
-  return sk_other->typeface_ == typeface_;
+  return SkTypeface::Equal(sk_other->typeface_.get(), typeface_.get());
 }
 
 const sk_sp<SkTypeface>& TypefaceSkia::GetSkiaTypeface() const {
diff --git a/engine/src/flutter/lib/gpu/BUILD.gn b/engine/src/flutter/lib/gpu/BUILD.gn
index 50e6f07b24cc2..18a0ea4edb18e 100644
--- a/engine/src/flutter/lib/gpu/BUILD.gn
+++ b/engine/src/flutter/lib/gpu/BUILD.gn
@@ -89,6 +89,7 @@ if (enable_unittests && !is_fuchsia) {
     sources = [
       "command_buffer_unittests.cc",
       "render_pass_unittests.cc",
+      "render_pipeline_unittests.cc",
       "shader_library_unittests.cc",
     ]
 
diff --git a/engine/src/flutter/lib/gpu/command_buffer_unittests.cc b/engine/src/flutter/lib/gpu/command_buffer_unittests.cc
index dd1882f7d17ae..b5924d1257f76 100644
--- a/engine/src/flutter/lib/gpu/command_buffer_unittests.cc
+++ b/engine/src/flutter/lib/gpu/command_buffer_unittests.cc
@@ -43,14 +43,12 @@ TEST(FlutterGpuCommandBufferTest,
   EXPECT_CALL(*context, GetBackendType)
       .WillOnce(Return(impeller::Context::BackendType::kMetal));
   EXPECT_CALL(*context, GetCommandQueue).WillOnce(Return(command_queue));
-  EXPECT_CALL(*command_queue, Submit(_, _, _))
+  EXPECT_CALL(*command_queue, Submit(_, _))
       .WillOnce(DoAll(
           [](const std::vector<std::shared_ptr<impeller::CommandBuffer>>&
                  buffers,
-             const impeller::CommandQueue::CompletionCallback& callback,
-             bool block_on_schedule) {
+             const impeller::CommandQueue::CompletionCallback& callback) {
             EXPECT_EQ(buffers.size(), 1u);
-            EXPECT_FALSE(block_on_schedule);
             callback(impeller::CommandBuffer::Status::kCompleted);
           },
           Return(fml::Status())));
@@ -74,7 +72,7 @@ TEST(FlutterGpuCommandBufferTest, RejectsCompletionCallbacksAfterSubmit) {
   EXPECT_CALL(*context, GetBackendType)
       .WillOnce(Return(impeller::Context::BackendType::kMetal));
   EXPECT_CALL(*context, GetCommandQueue).WillOnce(Return(command_queue));
-  EXPECT_CALL(*command_queue, Submit(_, _, _)).WillOnce(Return(fml::Status()));
+  EXPECT_CALL(*command_queue, Submit(_, _)).WillOnce(Return(fml::Status()));
 
   EXPECT_TRUE(command_buffer.Submit());
   EXPECT_FALSE(command_buffer.AddCompletionCallback(
@@ -99,7 +97,7 @@ TEST(FlutterGpuCommandBufferTest,
   EXPECT_CALL(*context, GetBackendType)
       .WillOnce(Return(impeller::Context::BackendType::kMetal));
   EXPECT_CALL(*context, GetCommandQueue).WillOnce(Return(command_queue));
-  EXPECT_CALL(*command_queue, Submit(_, _, _))
+  EXPECT_CALL(*command_queue, Submit(_, _))
       .WillOnce(Return(fml::Status(fml::StatusCode::kInternal,
                                    "Command queue submit failed.")));
 
diff --git a/engine/src/flutter/lib/gpu/render_pass.cc b/engine/src/flutter/lib/gpu/render_pass.cc
index cbe5bbc12dd6f..7a0347923b6ce 100644
--- a/engine/src/flutter/lib/gpu/render_pass.cc
+++ b/engine/src/flutter/lib/gpu/render_pass.cc
@@ -12,6 +12,7 @@
 #include "flutter/lib/gpu/shader.h"
 #include "fml/make_copyable.h"
 #include "fml/memory/ref_ptr.h"
+#include "impeller/base/validation.h"
 #include "impeller/core/buffer_view.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/sampler_descriptor.h"
@@ -39,6 +40,7 @@ const std::shared_ptr<const impeller::Context>& RenderPass::GetContext() const {
 }
 
 impeller::RenderTarget& RenderPass::GetRenderTarget() {
+  pipeline_state_dirty_ = true;
   return render_target_;
 }
 
@@ -46,7 +48,7 @@ const impeller::RenderTarget& RenderPass::GetRenderTarget() const {
   return render_target_;
 }
 
-impeller::ColorAttachmentDescriptor& RenderPass::GetColorAttachmentDescriptor(
+impeller::ColorAttachmentDescriptor& RenderPass::ColorAttachmentDescriptorAt(
     size_t color_attachment_index) {
   auto color = color_descriptors_.find(color_attachment_index);
   if (color == color_descriptors_.end()) {
@@ -55,25 +57,43 @@ impeller::ColorAttachmentDescriptor& RenderPass::GetColorAttachmentDescriptor(
   return color->second;
 }
 
+impeller::ColorAttachmentDescriptor& RenderPass::GetColorAttachmentDescriptor(
+    size_t color_attachment_index) {
+  pipeline_state_dirty_ = true;
+  return ColorAttachmentDescriptorAt(color_attachment_index);
+}
+
 impeller::DepthAttachmentDescriptor&
 RenderPass::GetDepthAttachmentDescriptor() {
+  pipeline_state_dirty_ = true;
   return depth_desc_;
 }
 
 impeller::StencilAttachmentDescriptor&
 RenderPass::GetStencilFrontAttachmentDescriptor() {
+  pipeline_state_dirty_ = true;
   return stencil_front_desc_;
 }
 
 impeller::StencilAttachmentDescriptor&
 RenderPass::GetStencilBackAttachmentDescriptor() {
+  pipeline_state_dirty_ = true;
   return stencil_back_desc_;
 }
 
 impeller::PipelineDescriptor& RenderPass::GetPipelineDescriptor() {
+  pipeline_state_dirty_ = true;
   return pipeline_descriptor_;
 }
 
+bool RenderPass::IsPipelineStateDirtyForTesting() const {
+  return pipeline_state_dirty_;
+}
+
+void RenderPass::ClearPipelineStateDirtyForTesting() {
+  pipeline_state_dirty_ = false;
+}
+
 bool RenderPass::Begin(flutter::gpu::CommandBuffer& command_buffer) {
   render_pass_ =
       command_buffer.GetCommandBuffer()->CreateRenderPass(render_target_);
@@ -85,11 +105,53 @@ bool RenderPass::Begin(flutter::gpu::CommandBuffer& command_buffer) {
 }
 
 void RenderPass::SetPipeline(fml::RefPtr<RenderPipeline> pipeline) {
+  if (render_pipeline_.get() == pipeline.get()) {
+    return;
+  }
+  pipeline_state_dirty_ = true;
   // On debug this makes a difference, but not on release builds.
   // NOLINTNEXTLINE(performance-move-const-arg)
   render_pipeline_ = std::move(pipeline);
 }
 
+// The setters below assign through the pipeline descriptor directly rather
+// than through GetPipelineDescriptor, which would dirty the state
+// unconditionally. Callers re-send the same fixed-function state ahead of
+// most draws, and dirtying on a redundant assignment would rebuild the
+// pipeline for every one of them.
+
+void RenderPass::SetCullMode(impeller::CullMode mode) {
+  if (pipeline_descriptor_.GetCullMode() == mode) {
+    return;
+  }
+  pipeline_descriptor_.SetCullMode(mode);
+  pipeline_state_dirty_ = true;
+}
+
+void RenderPass::SetWindingOrder(impeller::WindingOrder order) {
+  if (pipeline_descriptor_.GetWindingOrder() == order) {
+    return;
+  }
+  pipeline_descriptor_.SetWindingOrder(order);
+  pipeline_state_dirty_ = true;
+}
+
+void RenderPass::SetPrimitiveType(impeller::PrimitiveType type) {
+  if (pipeline_descriptor_.GetPrimitiveType() == type) {
+    return;
+  }
+  pipeline_descriptor_.SetPrimitiveType(type);
+  pipeline_state_dirty_ = true;
+}
+
+void RenderPass::SetPolygonMode(impeller::PolygonMode mode) {
+  if (pipeline_descriptor_.GetPolygonMode() == mode) {
+    return;
+  }
+  pipeline_descriptor_.SetPolygonMode(mode);
+  pipeline_state_dirty_ = true;
+}
+
 void RenderPass::ClearBindings() {
   vertex_uniform_bindings.clear();
   vertex_texture_bindings.clear();
@@ -105,6 +167,19 @@ void RenderPass::ClearBindings() {
 
 std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>>
 RenderPass::GetOrCreatePipeline() {
+  // Consecutive draws overwhelmingly reuse the same pipeline state; skip the
+  // descriptor rebuild, hash, and pipeline-library lookup entirely until a
+  // state mutation marks it dirty. Draw rates reach tens of thousands per
+  // frame, so this path stays free of per-draw allocation and hashing. A
+  // memoized null is a build failure that was already reported for this
+  // exact state; returning it without retrying keeps a broken pipeline from
+  // re-logging on every draw.
+  if (!pipeline_state_dirty_) {
+    return memoized_pipeline_;
+  }
+  pipeline_state_dirty_ = false;
+  memoized_pipeline_ = nullptr;
+
   // Infer the pipeline layout based on the shape of the RenderTarget.
   auto pipeline_desc = pipeline_descriptor_;
 
@@ -112,7 +187,7 @@ RenderPass::GetOrCreatePipeline() {
 
   render_target_.IterateAllColorAttachments(
       [&](size_t index, const impeller::ColorAttachment& attachment) -> bool {
-        auto& color = GetColorAttachmentDescriptor(index);
+        auto& color = ColorAttachmentDescriptorAt(index);
         color.format = render_target_.GetRenderTargetPixelFormat();
         return true;
       });
@@ -146,8 +221,10 @@ RenderPass::GetOrCreatePipeline() {
 
   auto& context = *GetContext();
 
-  render_pipeline_->BindToPipelineDescriptor(*context.GetShaderLibrary(),
-                                             pipeline_desc);
+  if (!render_pipeline_->BindToPipelineDescriptor(*context.GetShaderLibrary(),
+                                                  pipeline_desc)) {
+    return nullptr;
+  }
 
   std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>> pipeline;
 
@@ -179,7 +256,14 @@ RenderPass::GetOrCreatePipeline() {
     pipeline = context.GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
   }
 
-  FML_DCHECK(pipeline) << "Couldn't resolve render pipeline";
+  if (!pipeline) {
+    VALIDATION_LOG << "Failed to build the render pipeline. The vertex and "
+                      "fragment shaders may be incompatible (for example, a "
+                      "fragment input with no matching vertex output).";
+    return nullptr;
+  }
+
+  memoized_pipeline_ = pipeline;
   return pipeline;
 }
 
@@ -195,7 +279,14 @@ bool RenderPass::Draw(size_t element_count,
     return false;
   }
 
-  render_pass_->SetPipeline(impeller::PipelineRef(GetOrCreatePipeline()));
+  auto pipeline = GetOrCreatePipeline();
+  if (!pipeline) {
+    // The failure was already validation-logged with the specifics; failing
+    // the draw surfaces a Dart exception instead of crashing on a null
+    // pipeline in the backend.
+    return false;
+  }
+  render_pass_->SetPipeline(impeller::PipelineRef(pipeline));
 
   for (const auto& [_, buffer] : vertex_uniform_bindings) {
     render_pass_->BindDynamicResource(
@@ -678,36 +769,26 @@ void InternalFlutterGpu_RenderPass_SetStencilConfig(
 void InternalFlutterGpu_RenderPass_SetCullMode(
     flutter::gpu::RenderPass* wrapper,
     int cull_mode) {
-  impeller::PipelineDescriptor& pipeline_descriptor =
-      wrapper->GetPipelineDescriptor();
-  pipeline_descriptor.SetCullMode(flutter::gpu::ToImpellerCullMode(cull_mode));
+  wrapper->SetCullMode(flutter::gpu::ToImpellerCullMode(cull_mode));
 }
 
 void InternalFlutterGpu_RenderPass_SetPrimitiveType(
     flutter::gpu::RenderPass* wrapper,
     int primitive_type) {
-  impeller::PipelineDescriptor& pipeline_descriptor =
-      wrapper->GetPipelineDescriptor();
-  pipeline_descriptor.SetPrimitiveType(
+  wrapper->SetPrimitiveType(
       flutter::gpu::ToImpellerPrimitiveType(primitive_type));
 }
 
 void InternalFlutterGpu_RenderPass_SetWindingOrder(
     flutter::gpu::RenderPass* wrapper,
     int winding_order) {
-  impeller::PipelineDescriptor& pipeline_descriptor =
-      wrapper->GetPipelineDescriptor();
-  pipeline_descriptor.SetWindingOrder(
-      flutter::gpu::ToImpellerWindingOrder(winding_order));
+  wrapper->SetWindingOrder(flutter::gpu::ToImpellerWindingOrder(winding_order));
 }
 
 void InternalFlutterGpu_RenderPass_SetPolygonMode(
     flutter::gpu::RenderPass* wrapper,
     int polygon_mode) {
-  impeller::PipelineDescriptor& pipeline_descriptor =
-      wrapper->GetPipelineDescriptor();
-  pipeline_descriptor.SetPolygonMode(
-      flutter::gpu::ToImpellerPolygonMode(polygon_mode));
+  wrapper->SetPolygonMode(flutter::gpu::ToImpellerPolygonMode(polygon_mode));
 }
 
 bool InternalFlutterGpu_RenderPass_Draw(flutter::gpu::RenderPass* wrapper,
diff --git a/engine/src/flutter/lib/gpu/render_pass.h b/engine/src/flutter/lib/gpu/render_pass.h
index ae72c0b5e6b6c..cf3914e8544bd 100644
--- a/engine/src/flutter/lib/gpu/render_pass.h
+++ b/engine/src/flutter/lib/gpu/render_pass.h
@@ -54,6 +54,18 @@ class RenderPass : public RefCountedDartWrappable<RenderPass> {
 
   void SetPipeline(fml::RefPtr<RenderPipeline> pipeline);
 
+  /// Set the face culling mode for subsequent draws.
+  void SetCullMode(impeller::CullMode mode);
+
+  /// Set the front-face winding order for subsequent draws.
+  void SetWindingOrder(impeller::WindingOrder order);
+
+  /// Set the primitive topology for subsequent draws.
+  void SetPrimitiveType(impeller::PrimitiveType type);
+
+  /// Set the polygon fill mode for subsequent draws.
+  void SetPolygonMode(impeller::PolygonMode mode);
+
   void ClearBindings();
 
   /// Append a draw to the underlying render pass. [element_count] is the
@@ -61,6 +73,14 @@ class RenderPass : public RefCountedDartWrappable<RenderPass> {
   /// [indexed] is true. [instance_count] is the number of instances to draw.
   bool Draw(size_t element_count, size_t instance_count, bool indexed);
 
+  /// Whether the next draw must rebuild its backend pipeline. Exposed for
+  /// testing the memoization's dirty tracking.
+  bool IsPipelineStateDirtyForTesting() const;
+
+  /// Clears the pipeline dirty flag without building a pipeline, so tests
+  /// can observe which mutations re-dirty it.
+  void ClearPipelineStateDirtyForTesting();
+
   struct BufferAndUniformSlot {
     impeller::ShaderUniformSlot slot;
     impeller::BufferResource view;
@@ -97,10 +117,28 @@ class RenderPass : public RefCountedDartWrappable<RenderPass> {
 
  private:
   /// Lookup an Impeller pipeline by building a descriptor based on the current
-  /// command state.
+  /// command state, or return the memoized pipeline when that state is
+  /// unchanged since the last draw. Returns null (after a validation log)
+  /// when a stage function cannot be resolved or the backend fails to build
+  /// the pipeline.
   std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>>
   GetOrCreatePipeline();
 
+  // The non-dirtying counterpart of GetColorAttachmentDescriptor, for the
+  // pipeline rebuild itself.
+  impeller::ColorAttachmentDescriptor& ColorAttachmentDescriptorAt(
+      size_t color_attachment_index);
+
+  // The result of building a pipeline for the current pipeline-affecting
+  // state, null when that build failed (memoized so a broken pipeline is
+  // reported once, not per draw). Every mutable-state accessor above marks
+  // the state dirty; consecutive draws with unchanged state reuse this
+  // directly, skipping the descriptor rebuild, hash, and pipeline-library
+  // lookup.
+  std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>>
+      memoized_pipeline_;
+  bool pipeline_state_dirty_ = true;
+
   impeller::RenderTarget render_target_;
   std::shared_ptr<impeller::RenderPass> render_pass_;
 
diff --git a/engine/src/flutter/lib/gpu/render_pass_unittests.cc b/engine/src/flutter/lib/gpu/render_pass_unittests.cc
index be4a75f4b56ea..d453bc9b63841 100644
--- a/engine/src/flutter/lib/gpu/render_pass_unittests.cc
+++ b/engine/src/flutter/lib/gpu/render_pass_unittests.cc
@@ -6,11 +6,27 @@
 
 #include "gtest/gtest.h"
 
+#include "flutter/lib/gpu/render_pipeline.h"
+#include "flutter/lib/gpu/shader.h"
 #include "fml/memory/ref_ptr.h"
 
 namespace flutter::gpu {
 namespace {
 
+fml::RefPtr<Shader> MakeShader(impeller::ShaderStage stage) {
+  return Shader::Make("library", "Entrypoint", stage,
+                      /*code_mapping=*/nullptr, /*inputs=*/{}, /*layouts=*/{},
+                      /*uniform_structs=*/{}, /*uniform_textures=*/{},
+                      /*descriptor_set_layouts=*/{});
+}
+
+fml::RefPtr<RenderPipeline> MakeRenderPipeline() {
+  auto vertex = MakeShader(impeller::ShaderStage::kVertex);
+  auto fragment = MakeShader(impeller::ShaderStage::kFragment);
+  return fml::MakeRefCounted<RenderPipeline>(vertex, fragment,
+                                             vertex->CreateVertexDescriptor());
+}
+
 // Regression test for https://github.com/flutter/flutter/issues/188712:
 // SetDepthWriteEnable must honor its argument. It previously ignored the
 // argument and always enabled depth writes, so disabling depth writes (for
@@ -26,5 +42,73 @@ TEST(FlutterGpuRenderPassTest, SetDepthWriteEnableHonorsArgument) {
   EXPECT_FALSE(render_pass->GetDepthAttachmentDescriptor().depth_write_enabled);
 }
 
+// Draws memoize the built pipeline until the pipeline-affecting state
+// changes, so every state mutation must mark the state dirty (a missed
+// mutation would silently draw with a stale pipeline).
+TEST(FlutterGpuRenderPassTest, PipelineStateMutationsMarkStateDirty) {
+  auto render_pass = fml::MakeRefCounted<RenderPass>();
+
+  // A fresh pass must build a pipeline on first draw.
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  InternalFlutterGpu_RenderPass_SetDepthWriteEnable(render_pass.get(), true);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  InternalFlutterGpu_RenderPass_SetColorBlendEnable(render_pass.get(), 0, true);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  InternalFlutterGpu_RenderPass_SetDepthCompareOperation(render_pass.get(), 0);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetCullMode(impeller::CullMode::kBackFace);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetWindingOrder(impeller::WindingOrder::kCounterClockwise);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetPrimitiveType(impeller::PrimitiveType::kTriangleStrip);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetPolygonMode(impeller::PolygonMode::kLine);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetPipeline(MakeRenderPipeline());
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+}
+
+// Callers re-send the same fixed-function state and rebind the same pipeline
+// ahead of most draws. Dirtying on those redundant assignments would rebuild
+// the pipeline for every draw and leave the memoization doing nothing.
+TEST(FlutterGpuRenderPassTest, RedundantPipelineStateAssignmentsAreIgnored) {
+  auto render_pass = fml::MakeRefCounted<RenderPass>();
+  auto pipeline = MakeRenderPipeline();
+
+  render_pass->SetCullMode(impeller::CullMode::kBackFace);
+  render_pass->SetWindingOrder(impeller::WindingOrder::kCounterClockwise);
+  render_pass->SetPrimitiveType(impeller::PrimitiveType::kTriangleStrip);
+  render_pass->SetPolygonMode(impeller::PolygonMode::kLine);
+  render_pass->SetPipeline(pipeline);
+
+  render_pass->ClearPipelineStateDirtyForTesting();
+  render_pass->SetCullMode(impeller::CullMode::kBackFace);
+  render_pass->SetWindingOrder(impeller::WindingOrder::kCounterClockwise);
+  render_pass->SetPrimitiveType(impeller::PrimitiveType::kTriangleStrip);
+  render_pass->SetPolygonMode(impeller::PolygonMode::kLine);
+  render_pass->SetPipeline(pipeline);
+  EXPECT_FALSE(render_pass->IsPipelineStateDirtyForTesting());
+
+  // A real change still dirties.
+  render_pass->SetCullMode(impeller::CullMode::kFrontFace);
+  EXPECT_TRUE(render_pass->IsPipelineStateDirtyForTesting());
+}
+
 }  // namespace
 }  // namespace flutter::gpu
diff --git a/engine/src/flutter/lib/gpu/render_pipeline.cc b/engine/src/flutter/lib/gpu/render_pipeline.cc
index 8402ea8fa5100..342a5a1d3c253 100644
--- a/engine/src/flutter/lib/gpu/render_pipeline.cc
+++ b/engine/src/flutter/lib/gpu/render_pipeline.cc
@@ -11,6 +11,7 @@
 #include <string_view>
 
 #include "flutter/lib/gpu/shader.h"
+#include "impeller/base/validation.h"
 #include "impeller/core/shader_types.h"
 #include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/vertex_descriptor.h"
@@ -43,17 +44,47 @@ RenderPipeline::RenderPipeline(
       fragment_shader_->GetDescriptorSetLayouts().size());
 }
 
-void RenderPipeline::BindToPipelineDescriptor(
+bool RenderPipeline::BindToPipelineDescriptor(
     impeller::ShaderLibrary& library,
     impeller::PipelineDescriptor& desc) {
-  desc.SetVertexDescriptor(vertex_descriptor_);
+  // A failed lookup previously flowed into `AddStageEntrypoint`, which
+  // dereferences its argument, crashing with no signal about which shader
+  // was at fault.
+  auto vertex_function = vertex_shader_->GetFunctionFromLibrary(library);
+  if (!vertex_function) {
+    VALIDATION_LOG << "Unable to resolve the vertex shader function '"
+                   << vertex_shader_->GetEntrypoint()
+                   << "' from the shader library.";
+    return false;
+  }
+  auto fragment_function = fragment_shader_->GetFunctionFromLibrary(library);
+  if (!fragment_function) {
+    VALIDATION_LOG << "Unable to resolve the fragment shader function '"
+                   << fragment_shader_->GetEntrypoint()
+                   << "' from the shader library.";
+    return false;
+  }
 
-  desc.AddStageEntrypoint(vertex_shader_->GetFunctionFromLibrary(library));
-  desc.AddStageEntrypoint(fragment_shader_->GetFunctionFromLibrary(library));
+  desc.SetVertexDescriptor(vertex_descriptor_);
+  desc.AddStageEntrypoint(std::move(vertex_function));
+  desc.AddStageEntrypoint(std::move(fragment_function));
+  return true;
 }
 
 RenderPipeline::~RenderPipeline() = default;
 
+const char* ValidateRenderPipelineShaderStages(const Shader& vertex_shader,
+                                               const Shader& fragment_shader) {
+  if (vertex_shader.GetShaderStage() != impeller::ShaderStage::kVertex) {
+    return "The shader given for the vertex stage is not a vertex shader.";
+  }
+  if (fragment_shader.GetShaderStage() != impeller::ShaderStage::kFragment) {
+    return "The shader given for the fragment stage is not a fragment "
+           "shader.";
+  }
+  return nullptr;
+}
+
 namespace {
 
 // Translation table from the Dart-side `VertexFormat` enum (encoded as the
@@ -297,6 +328,14 @@ Dart_Handle InternalFlutterGpu_RenderPipeline_Initialize(
     Dart_Handle buffer_layouts_handle,
     Dart_Handle attributes_handle,
     Dart_Handle attribute_names_handle) {
+  // Swapped or mismatched stages would otherwise only fail at first draw,
+  // deep inside backend pipeline compilation.
+  if (const char* stage_error =
+          flutter::gpu::ValidateRenderPipelineShaderStages(*vertex_shader,
+                                                           *fragment_shader)) {
+    return tonic::ToDart(stage_error);
+  }
+
   // Lazily register the shaders synchronously if they haven't been already.
   vertex_shader->RegisterSync(*gpu_context);
   fragment_shader->RegisterSync(*gpu_context);
diff --git a/engine/src/flutter/lib/gpu/render_pipeline.h b/engine/src/flutter/lib/gpu/render_pipeline.h
index a8d1e19032ee2..295574936044e 100644
--- a/engine/src/flutter/lib/gpu/render_pipeline.h
+++ b/engine/src/flutter/lib/gpu/render_pipeline.h
@@ -28,8 +28,13 @@ class RenderPipeline : public RefCountedDartWrappable<RenderPipeline> {
 
   ~RenderPipeline() override;
 
-  void BindToPipelineDescriptor(impeller::ShaderLibrary& library,
-                                impeller::PipelineDescriptor& desc);
+  /// Sets this pipeline's vertex descriptor and stage entrypoints on [desc].
+  /// Returns false (after a validation log naming the shader) when either
+  /// stage's function cannot be resolved from [library], in which case the
+  /// descriptor must not be used to build a backend pipeline.
+  [[nodiscard]] bool BindToPipelineDescriptor(
+      impeller::ShaderLibrary& library,
+      impeller::PipelineDescriptor& desc);
 
  private:
   fml::RefPtr<flutter::gpu::Shader> vertex_shader_;
@@ -49,6 +54,13 @@ class RenderPipeline : public RefCountedDartWrappable<RenderPipeline> {
   FML_DISALLOW_COPY_AND_ASSIGN(RenderPipeline);
 };
 
+/// Checks that [vertex_shader] and [fragment_shader] are actually a vertex
+/// and a fragment shader, returning an error message suitable for a Dart
+/// exception when they are not (pairing the wrong stages otherwise fails
+/// deep inside backend pipeline compilation with no useful signal).
+const char* ValidateRenderPipelineShaderStages(const Shader& vertex_shader,
+                                               const Shader& fragment_shader);
+
 }  // namespace gpu
 }  // namespace flutter
 
diff --git a/engine/src/flutter/lib/gpu/render_pipeline_unittests.cc b/engine/src/flutter/lib/gpu/render_pipeline_unittests.cc
new file mode 100644
index 0000000000000..f2b205b7607c0
--- /dev/null
+++ b/engine/src/flutter/lib/gpu/render_pipeline_unittests.cc
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/render_pipeline.h"
+
+#include "gtest/gtest.h"
+
+#include "flutter/lib/gpu/shader.h"
+
+namespace flutter::gpu {
+namespace {
+
+fml::RefPtr<Shader> MakeShader(impeller::ShaderStage stage) {
+  return Shader::Make("library", "Entrypoint", stage,
+                      /*code_mapping=*/nullptr, /*inputs=*/{}, /*layouts=*/{},
+                      /*uniform_structs=*/{}, /*uniform_textures=*/{},
+                      /*descriptor_set_layouts=*/{});
+}
+
+// Pairing shaders of the wrong stages previously constructed a pipeline that
+// only failed at first draw, deep inside backend pipeline compilation; the
+// stages must be rejected with an error at creation instead.
+TEST(FlutterGpuRenderPipelineTest, ValidatesShaderStages) {
+  auto vertex = MakeShader(impeller::ShaderStage::kVertex);
+  auto fragment = MakeShader(impeller::ShaderStage::kFragment);
+
+  EXPECT_EQ(ValidateRenderPipelineShaderStages(*vertex, *fragment), nullptr);
+
+  const char* swapped = ValidateRenderPipelineShaderStages(*fragment, *vertex);
+  ASSERT_NE(swapped, nullptr);
+  EXPECT_NE(std::string(swapped).find("vertex"), std::string::npos);
+
+  const char* two_vertex = ValidateRenderPipelineShaderStages(*vertex, *vertex);
+  ASSERT_NE(two_vertex, nullptr);
+  EXPECT_NE(std::string(two_vertex).find("fragment"), std::string::npos);
+}
+
+}  // namespace
+}  // namespace flutter::gpu
diff --git a/engine/src/flutter/lib/gpu/shader.cc b/engine/src/flutter/lib/gpu/shader.cc
index c2ff9954f501a..7923e2caa0343 100644
--- a/engine/src/flutter/lib/gpu/shader.cc
+++ b/engine/src/flutter/lib/gpu/shader.cc
@@ -170,6 +170,10 @@ impeller::ShaderStage Shader::GetShaderStage() const {
   return stage_;
 }
 
+const std::string& Shader::GetEntrypoint() const {
+  return entrypoint_;
+}
+
 const std::vector<impeller::DescriptorSetLayout>&
 Shader::GetDescriptorSetLayouts() const {
   return descriptor_set_layouts_;
diff --git a/engine/src/flutter/lib/gpu/shader.h b/engine/src/flutter/lib/gpu/shader.h
index b9429bc5f61ba..49f18966a49aa 100644
--- a/engine/src/flutter/lib/gpu/shader.h
+++ b/engine/src/flutter/lib/gpu/shader.h
@@ -85,6 +85,9 @@ class Shader : public RefCountedDartWrappable<Shader> {
 
   impeller::ShaderStage GetShaderStage() const;
 
+  /// The shader's entrypoint name, for identifying it in error messages.
+  const std::string& GetEntrypoint() const;
+
   const Shader::UniformBinding* GetUniformStruct(const std::string& name) const;
 
   const Shader::TextureBinding* GetUniformTexture(
diff --git a/engine/src/flutter/lib/gpu/shader_library.cc b/engine/src/flutter/lib/gpu/shader_library.cc
index 7960a5cf44f9e..8aeb3269a7805 100644
--- a/engine/src/flutter/lib/gpu/shader_library.cc
+++ b/engine/src/flutter/lib/gpu/shader_library.cc
@@ -242,6 +242,11 @@ static ShaderLibrary::ShaderMap ParseShaderBundle(
     std::unordered_map<std::string, Shader::UniformBinding> uniform_structs;
     if (backend_shader->uniform_structs() != nullptr) {
       for (const auto& uniform : *backend_shader->uniform_structs()) {
+        if (uniform->ext_res_0() == impeller::kOptimizedOutBinding) {
+          // A dead-code-eliminated uniform block, dropped for the same reason
+          // as the optimized-out samplers below.
+          continue;
+        }
         std::vector<impeller::ShaderStructMemberMetadata> members;
         if (uniform->fields() != nullptr) {
           for (const auto& struct_member : *uniform->fields()) {
@@ -293,6 +298,12 @@ static ShaderLibrary::ShaderMap ParseShaderBundle(
     std::unordered_map<std::string, Shader::TextureBinding> uniform_textures;
     if (backend_shader->uniform_textures() != nullptr) {
       for (const auto& uniform : *backend_shader->uniform_textures()) {
+        if (uniform->ext_res_0() == impeller::kOptimizedOutBinding) {
+          // The shader compiler dead-code-eliminated this sampler. Reflection
+          // still lists it but stamps the out-of-range binding sentinel, so
+          // drop it here rather than register a binding that cannot be bound.
+          continue;
+        }
         Shader::TextureBinding texture_binding;
         texture_binding.slot = impeller::SampledImageSlot{
             .name = uniform->name()->c_str(),
@@ -438,6 +449,15 @@ fml::RefPtr<Shader> ShaderLibrary::GetShader(const std::string& shader_name,
   return shader;
 }
 
+fml::RefPtr<Shader> ShaderLibrary::FindShaderForTesting(
+    const std::string& shader_name) const {
+  auto it = shaders_.find(shader_name);
+  if (it == shaders_.end()) {
+    return nullptr;
+  }
+  return it->second;
+}
+
 ShaderLibrary::ShaderLibrary(std::shared_ptr<fml::Mapping> payload,
                              ShaderMap shaders,
                              std::string library_id)
diff --git a/engine/src/flutter/lib/gpu/shader_library.h b/engine/src/flutter/lib/gpu/shader_library.h
index 8c69fcba904ce..05f72cd6ee939 100644
--- a/engine/src/flutter/lib/gpu/shader_library.h
+++ b/engine/src/flutter/lib/gpu/shader_library.h
@@ -62,6 +62,12 @@ class ShaderLibrary : public RefCountedDartWrappable<ShaderLibrary> {
   fml::RefPtr<Shader> GetShader(const std::string& shader_name,
                                 Dart_Handle shader_wrapper);
 
+  // Looks up a registered shader by name without creating a Dart wrapper, for
+  // tests and tooling that run without a UI isolate. Production code uses
+  // `GetShader`.
+  fml::RefPtr<Shader> FindShaderForTesting(
+      const std::string& shader_name) const;
+
   const std::string& GetLibraryId() const { return library_id_; }
 
   ~ShaderLibrary() override;
diff --git a/engine/src/flutter/lib/gpu/shader_library_unittests.cc b/engine/src/flutter/lib/gpu/shader_library_unittests.cc
index ddb72fa9009dd..75d9486ca7ed8 100644
--- a/engine/src/flutter/lib/gpu/shader_library_unittests.cc
+++ b/engine/src/flutter/lib/gpu/shader_library_unittests.cc
@@ -6,10 +6,14 @@
 
 #include <cstdint>
 #include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
+#include "flutter/lib/gpu/shader.h"
 #include "fml/mapping.h"
 #include "gtest/gtest.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/context.h"
 // Pulls in flatbuffers/flatbuffers.h (FlatBufferBuilder, Verifier) and the
 // generated impeller::fb::shaderbundle:: symbols.
@@ -162,6 +166,85 @@ TEST(FlutterGpuShaderLibraryTest,
   EXPECT_FALSE(library);
 }
 
+// Serializes a single-fragment-shader bundle (Metal desktop variant) carrying
+// the given reflected textures and uniform structs, each as a
+// (name, ext_res_0) pair. A texture/struct whose ext_res_0 is the optimized-out
+// sentinel stands in for a resource the shader compiler dead-code-eliminated.
+static std::shared_ptr<std::vector<uint8_t>> BuildFragmentBundle(
+    const std::vector<std::pair<std::string, uint64_t>>& textures,
+    const std::vector<std::pair<std::string, uint64_t>>& structs) {
+  namespace fbs = impeller::fb::shaderbundle;
+
+  auto metal = std::make_unique<fbs::BackendShaderT>();
+  metal->stage = fbs::ShaderStage::kFragment;
+  metal->entrypoint = "main";
+  // The bytes are ignored at parse time (no GPU compile), but the field must be
+  // present and non-empty for the loader to build a code mapping.
+  metal->shader = {0};
+  for (const auto& [name, ext_res_0] : textures) {
+    auto texture = std::make_unique<fbs::ShaderUniformTextureT>();
+    texture->name = name;
+    texture->ext_res_0 = ext_res_0;
+    metal->uniform_textures.push_back(std::move(texture));
+  }
+  for (const auto& [name, ext_res_0] : structs) {
+    auto uniform = std::make_unique<fbs::ShaderUniformStructT>();
+    uniform->name = name;
+    uniform->ext_res_0 = ext_res_0;
+    uniform->size_in_bytes = 16;
+    metal->uniform_structs.push_back(std::move(uniform));
+  }
+
+  auto shader = std::make_unique<fbs::ShaderT>();
+  shader->name = "test";
+  shader->metal_desktop = std::move(metal);
+
+  fbs::ShaderBundleT bundle;
+  bundle.format_version =
+      static_cast<uint32_t>(fbs::ShaderBundleFormatVersion::kVersion);
+  bundle.shaders.push_back(std::move(shader));
+
+  flatbuffers::FlatBufferBuilder builder;
+  builder.Finish(fbs::ShaderBundle::Pack(builder, &bundle),
+                 fbs::ShaderBundleIdentifier());
+  return std::make_shared<std::vector<uint8_t>>(
+      builder.GetBufferPointer(),
+      builder.GetBufferPointer() + builder.GetSize());
+}
+
+// A sampler the shader compiler dead-code-eliminated is still listed in
+// reflection but carries the out-of-range binding sentinel. It must not be
+// registered as a bindable uniform texture (binding an out-of-range index
+// crashes the Metal backend), while a live sampler alongside it survives.
+TEST(FlutterGpuShaderLibraryTest, MakeFromFlatbufferSkipsOptimizedOutTexture) {
+  const uint64_t sentinel = impeller::kOptimizedOutBinding;
+  auto bundle = BuildFragmentBundle(
+      /*textures=*/{{"u_live", 0}, {"u_dced", sentinel}}, /*structs=*/{});
+  auto library = ShaderLibrary::MakeFromFlatbuffer(
+      impeller::Context::BackendType::kMetal, CreateMappingFromVector(bundle),
+      "test_bundle");
+  ASSERT_TRUE(library);
+  auto shader = library->FindShaderForTesting("test");
+  ASSERT_TRUE(shader);
+  EXPECT_NE(shader->GetUniformTexture("u_live"), nullptr);
+  EXPECT_EQ(shader->GetUniformTexture("u_dced"), nullptr);
+}
+
+// The same skip applies to a dead-code-eliminated uniform block.
+TEST(FlutterGpuShaderLibraryTest, MakeFromFlatbufferSkipsOptimizedOutStruct) {
+  const uint64_t sentinel = impeller::kOptimizedOutBinding;
+  auto bundle = BuildFragmentBundle(
+      /*textures=*/{}, /*structs=*/{{"Live", 0}, {"Dced", sentinel}});
+  auto library = ShaderLibrary::MakeFromFlatbuffer(
+      impeller::Context::BackendType::kMetal, CreateMappingFromVector(bundle),
+      "test_bundle");
+  ASSERT_TRUE(library);
+  auto shader = library->FindShaderForTesting("test");
+  ASSERT_TRUE(shader);
+  EXPECT_NE(shader->GetUniformStruct("Live"), nullptr);
+  EXPECT_EQ(shader->GetUniformStruct("Dced"), nullptr);
+}
+
 }  // namespace testing
 }  // namespace gpu
 }  // namespace flutter
diff --git a/engine/src/flutter/lib/ui/fixtures/shaders/BUILD.gn b/engine/src/flutter/lib/ui/fixtures/shaders/BUILD.gn
index e6f60718fc3b3..137ef1b01e009 100644
--- a/engine/src/flutter/lib/ui/fixtures/shaders/BUILD.gn
+++ b/engine/src/flutter/lib/ui/fixtures/shaders/BUILD.gn
@@ -62,12 +62,13 @@ if (enable_unittests) {
       "//flutter/impeller/fixtures/flutter_gpu_unlit.frag",
       "//flutter/impeller/fixtures/flutter_gpu_unlit.vert",
       "//flutter/impeller/fixtures/flutter_gpu_unlit_alt_instance.frag",
+      "//flutter/impeller/fixtures/flutter_gpu_optimized_out_sampler.frag",
       "//flutter/impeller/fixtures/flutter_gpu_texture.frag",
       "//flutter/impeller/fixtures/flutter_gpu_texture.vert",
     ]
 
     fixtures = rebase_path("//flutter/impeller/fixtures")
-    shader_bundle = "{\"InstancedFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_instanced.frag\"}, \"InstancedVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_instanced.vert\"}, \"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"UnlitFragmentAltInstance\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit_alt_instance.frag\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"
+    shader_bundle = "{\"InstancedFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_instanced.frag\"}, \"InstancedVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_instanced.vert\"}, \"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"UnlitFragmentAltInstance\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit_alt_instance.frag\"}, \"OptimizedOutSamplerFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_optimized_out_sampler.frag\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"
     shader_bundle_output = "test.shaderbundle"
   }
 
diff --git a/engine/src/flutter/lib/ui/painting/image_decoder_impeller.cc b/engine/src/flutter/lib/ui/painting/image_decoder_impeller.cc
index 18aad2cc600d6..4d15f0158196d 100644
--- a/engine/src/flutter/lib/ui/painting/image_decoder_impeller.cc
+++ b/engine/src/flutter/lib/ui/painting/image_decoder_impeller.cc
@@ -533,20 +533,30 @@ ImageDecoderImpeller::UnsafeUploadTextureToPrivate(
     result_texture = std::move(resize_texture);
   }
   blit_pass->EncodeCommands();
-  if (!context->GetCommandQueue()
-           ->Submit(
-               {command_buffer},
-               [](impeller::CommandBuffer::Status status) {
-                 if (status == impeller::CommandBuffer::Status::kError) {
-                   FML_LOG(ERROR)
-                       << "GPU Error submitting image decoding command buffer.";
-                 }
-               },
-               /*block_on_schedule=*/true)
-           .ok()) {
-    std::string decode_error("Failed to submit image decoding command buffer.");
-    FML_DLOG(ERROR) << decode_error;
-    return std::make_pair(nullptr, decode_error);
+  {
+    TRACE_EVENT0("impeller", "ImpellerImageUploadSubmit");
+    impeller::CommandQueue::SubmitResult submit_result =
+        context->GetCommandQueue()->SubmitWithReceipt(
+            command_buffer, [](impeller::CommandBuffer::Status status) {
+              if (status == impeller::CommandBuffer::Status::kError) {
+                FML_LOG(ERROR)
+                    << "GPU Error submitting image decoding command buffer.";
+              }
+            });
+    if (!submit_result.status.ok()) {
+      std::string decode_error(
+          "Failed to submit image decoding command buffer.");
+      FML_DLOG(ERROR) << decode_error;
+      return std::make_pair(nullptr, decode_error);
+    }
+
+    if (submit_result.scheduling_receipt) {
+      // UploadTextureToPrivate calls this method while holding the shared side
+      // of the GPU SyncSwitch. Registering before returning ensures that a
+      // concurrent disable transition cannot pass the switch's unique lock and
+      // miss a committed upload.
+      context->TrackPendingImageUpload(submit_result.scheduling_receipt);
+    }
   }
 
   // Flush the pending command buffer to ensure that its output becomes visible
@@ -586,9 +596,8 @@ void ImageDecoderImpeller::UploadTextureToPrivate(
           .SetIfFalse([&result, context, buffer, image_info, resize_info] {
             sk_sp<DlImage> image;
             std::string decode_error;
-            std::tie(image, decode_error) = std::tie(image, decode_error) =
-                UnsafeUploadTextureToPrivate(context, buffer, image_info,
-                                             resize_info);
+            std::tie(image, decode_error) = UnsafeUploadTextureToPrivate(
+                context, buffer, image_info, resize_info);
             result(image, decode_error);
           })
           .SetIfTrue([&result, context, buffer, image_info, resize_info] {
diff --git a/engine/src/flutter/lib/ui/painting/image_decoder_no_gl_unittests.cc b/engine/src/flutter/lib/ui/painting/image_decoder_no_gl_unittests.cc
index 8f8f56a6dc601..c4d9139ce2aee 100644
--- a/engine/src/flutter/lib/ui/painting/image_decoder_no_gl_unittests.cc
+++ b/engine/src/flutter/lib/ui/painting/image_decoder_no_gl_unittests.cc
@@ -7,6 +7,12 @@
 
 #include "flutter/fml/endianness.h"
 #include "impeller/renderer/capabilities.h"
+
+#if IMPELLER_SUPPORTS_RENDERING
+#include "impeller/renderer/command_buffer_scheduling_receipt.h"
+#include "impeller/renderer/testing/mocks.h"
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
 #include "include/core/SkColorType.h"
 #include "third_party/skia/include/codec/SkPngDecoder.h"
 
@@ -77,6 +83,76 @@ float DecodeBGR10(uint32_t x) {
   return (x * slope) + intercept;
 }
 
+TEST(ImageDecoderNoGLTest, ImpellerUploadTracksSchedulingReceipt) {
+#if !IMPELLER_SUPPORTS_RENDERING
+  GTEST_SKIP() << "Test only supported with Impeller rendering.";
+#else
+  using ::impeller::testing::MockBlitPass;
+  using ::impeller::testing::MockCommandBuffer;
+  using ::impeller::testing::MockCommandQueue;
+  using ::impeller::testing::MockImpellerContext;
+  using ::testing::_;
+  using ::testing::Return;
+
+  auto context = std::make_shared<MockImpellerContext>();
+  auto allocator = std::make_shared<impeller::TestImpellerAllocator>();
+  auto command_buffer = std::make_shared<MockCommandBuffer>(context);
+  const std::shared_ptr<impeller::CommandBuffer> submitted_command_buffer =
+      command_buffer;
+  auto blit_pass = std::make_shared<MockBlitPass>();
+  auto command_queue = std::make_shared<MockCommandQueue>();
+  std::shared_ptr<impeller::CommandBufferSchedulingReceipt> receipt =
+      std::make_shared<impeller::CommandBufferSchedulingReceiptState>();
+
+  EXPECT_CALL(*context, GetBackendType)
+      .WillOnce(Return(impeller::Context::BackendType::kMetal));
+  EXPECT_CALL(*context, GetResourceAllocator).WillOnce(Return(allocator));
+  EXPECT_CALL(*context, CreateCommandBuffer).WillOnce(Return(command_buffer));
+  EXPECT_CALL(*context, GetCommandQueue).WillOnce(Return(command_queue));
+  EXPECT_CALL(*context, TrackPendingImageUpload(receipt));
+  EXPECT_CALL(*command_buffer, SetLabel(_));
+  EXPECT_CALL(*command_buffer, OnCreateBlitPass).WillOnce(Return(blit_pass));
+  EXPECT_CALL(*command_buffer, OnWaitUntilCompleted);
+  EXPECT_CALL(*blit_pass, IsValid).WillOnce(Return(true));
+  EXPECT_CALL(*blit_pass, OnSetLabel(_)).Times(2);
+  EXPECT_CALL(*blit_pass, OnCopyBufferToTextureCommand(_, _, _, _, _, _, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*blit_pass, EncodeCommands).WillOnce(Return(true));
+  EXPECT_CALL(*command_queue, SubmitWithReceipt(submitted_command_buffer, _))
+      .WillOnce([receipt](const std::shared_ptr<impeller::CommandBuffer>&,
+                          const impeller::CommandQueue::CompletionCallback&) {
+        return impeller::CommandQueue::SubmitResult{
+            .status = fml::Status(),
+            .scheduling_receipt = receipt,
+        };
+      });
+
+  impeller::DeviceBufferDescriptor buffer_descriptor;
+  buffer_descriptor.size = 4u;
+  auto buffer =
+      std::make_shared<impeller::TestImpellerDeviceBuffer>(buffer_descriptor);
+  auto gpu_disabled_switch = std::make_shared<fml::SyncSwitch>(false);
+  sk_sp<DlImage> image;
+  std::string decode_error;
+  bool callback_called = false;
+
+  ImageDecoderImpeller::UploadTextureToPrivate(
+      [&](const sk_sp<DlImage>& result, const std::string& error) {
+        image = result;
+        decode_error = error;
+        callback_called = true;
+      },
+      context, buffer,
+      {.size = impeller::ISize(1, 1),
+       .format = impeller::PixelFormat::kR8G8B8A8UNormInt},
+      std::nullopt, gpu_disabled_switch);
+
+  EXPECT_TRUE(callback_called);
+  EXPECT_NE(image, nullptr);
+  EXPECT_TRUE(decode_error.empty());
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
 TEST(ImageDecoderNoGLTest, ImpellerWideGamutDisplayP3) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "Fuchsia can't load the test fixtures.";
diff --git a/engine/src/flutter/lib/ui/painting/image_encoding_unittests.cc b/engine/src/flutter/lib/ui/painting/image_encoding_unittests.cc
index 97e5b814aa961..07eb0cb1d0ab4 100644
--- a/engine/src/flutter/lib/ui/painting/image_encoding_unittests.cc
+++ b/engine/src/flutter/lib/ui/painting/image_encoding_unittests.cc
@@ -214,7 +214,7 @@ std::shared_ptr<impeller::Context> MakeConvertDlImageToSkImageContext(
   EXPECT_CALL(*context, GetResourceAllocator).WillRepeatedly(Return(allocator));
   EXPECT_CALL(*context, CreateCommandBuffer).WillOnce(Return(command_buffer));
   EXPECT_CALL(*device_buffer, OnGetContents).WillOnce(Return(buffer.data()));
-  EXPECT_CALL(*command_queue, Submit(_, _, _))
+  EXPECT_CALL(*command_queue, Submit(_, _))
       .WillRepeatedly(
           DoAll(InvokeArgument<1>(impeller::CommandBuffer::Status::kCompleted),
                 Return(fml::Status())));
diff --git a/engine/src/flutter/lib/web_ui/dev/chrome.dart b/engine/src/flutter/lib/web_ui/dev/chrome.dart
index fe800f00cec56..b40b284c9554d 100644
--- a/engine/src/flutter/lib/web_ui/dev/chrome.dart
+++ b/engine/src/flutter/lib/web_ui/dev/chrome.dart
@@ -19,6 +19,16 @@ import 'common.dart';
 import 'environment.dart';
 import 'package_lock.dart';
 
+/// Flags passed to Chrome to disable GCM (Google Cloud Messaging) and MCS
+/// (Mobile Connection Server) background network registration calls and
+/// prevent deprecation error logs.
+const kGcmDisabledFlags = <String>[
+  '--disable-features=GCM',
+  '--gcm-checkin-url=http://127.0.0.1',
+  '--gcm-registration-url=http://127.0.0.1',
+  '--gcm-mcs-endpoint=127.0.0.1:0',
+];
+
 /// Provides an environment for desktop Chrome.
 class ChromeEnvironment implements BrowserEnvironment {
   ChromeEnvironment({required bool useDwarf, required List<String> flags})
@@ -104,6 +114,11 @@ class Chrome extends Browser {
             // DWARF debugging requires a Chrome extension.
             '--disable-extensions',
           '--disable-popup-blocking',
+          '--disable-background-networking',
+          '--disable-sync',
+          '--disable-client-side-phishing-detection',
+          '--disable-notifications',
+          ...kGcmDisabledFlags,
           // Indicates that the browser is in "browse without sign-in" (Guest session) mode.
           '--bwsi',
           '--no-first-run',
@@ -180,6 +195,11 @@ class Chrome extends Browser {
       final Process addExtension = await Process.start(installation.executable, <String>[
         '--user-data-dir=${baselineUserDirectory.path}',
         'https://goo.gle/wasm-debugging-extension',
+        '--disable-background-networking',
+        '--disable-sync',
+        '--disable-client-side-phishing-detection',
+        '--disable-notifications',
+        ...kGcmDisabledFlags,
         '--bwsi',
         '--no-first-run',
         '--no-default-browser-check',
@@ -289,6 +309,25 @@ class Chrome extends Browser {
 ///     Inconsistency detected by ld.so: ../elf/dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!
 const String _kGlibcError = 'Inconsistency detected by ld.so';
 
+/// Filters out non-fatal D-Bus connection error messages emitted by Chromium.
+///
+/// Headless Linux Chrome attempts to query Linux D-Bus desktop services (such as
+/// system theme, desktop notifications, and keyrings) when `DBUS_SESSION_BUS_ADDRESS`
+/// is missing or disabled. Chromium logs non-fatal fallback notices to stderr via
+/// `LOG(ERROR)` in `dbus/bus.cc` (see
+/// https://chromium.googlesource.com/chromium/src/+/refs/heads/main/dbus/bus.cc#405)
+/// and `dbus/object_proxy.cc`.
+///
+/// We filter out these benign D-Bus lines to prevent stderr log noise in CI,
+/// following the industry standard pattern used by open source projects to filter
+/// E2E test logs (e.g. https://github.com/kitelev/exocortex/blob/4290cdade669034e5f71c892fb3e1908c5a2fe12/packages/obsidian-plugin/docker-entrypoint-e2e.sh#L48-L49).
+bool _isDbusError(String line) {
+  return line.contains('ERROR:dbus/bus.cc') ||
+      line.contains('ERROR:dbus/object_proxy.cc') ||
+      line.contains('Failed to connect to the bus') ||
+      line.contains('org.freedesktop.DBus');
+}
+
 Future<Process> _spawnChromiumProcess(String executable, List<String> args) async {
   // Keep attempting to launch the browser until one of:
   // - Chrome launched successfully, in which case we just return from the loop.
@@ -306,6 +345,7 @@ Future<Process> _spawnChromiumProcess(String executable, List<String> args) asyn
     await process.stderr
         .transform(utf8.decoder)
         .transform(const LineSplitter())
+        .where((String line) => !_isDbusError(line))
         .map((String line) {
           print('[CHROME STDERR]:$line');
           if (line.contains(_kGlibcError)) {
diff --git a/engine/src/flutter/lib/web_ui/docs/FALLBACK_FONT_SERVICE.md b/engine/src/flutter/lib/web_ui/docs/FALLBACK_FONT_SERVICE.md
deleted file mode 100644
index 681abbdc55d6c..0000000000000
--- a/engine/src/flutter/lib/web_ui/docs/FALLBACK_FONT_SERVICE.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# FallbackFontService Design Document
-
-## Section 0: The Problem Statement
-
-In Flutter Web applications, text rendering depends on the fonts provided by the developer in the application's asset bundle. When a piece of text contains characters (such as CJK scripts, emojis, or rare symbols) that are not covered by any of the fonts included in the asset bundle, the engine invokes an automatic "font fallback" system. This system identifies the missing characters and attempts to download the appropriate "Noto" fonts from a CDN (typically Google Fonts) to ensure the text is legible.
-
-Currently, this fallback system has a critical reliability flaw: **It does not gracefully handle network or server failures.**
-
-If a required fallback font fails to download—whether due to a 404 error, a broken CDN link, or a transient network interruption—the engine enters an **infinite loop**. Because it does not track these failures effectively, it continuously attempts to download the same failing font. Each attempt notifies the application that "fonts have changed," triggering a UI relayout. This relayout rediscovers that the characters are still missing and restarts the download attempt immediately.
-
-For the end-user and the business, this results in:
-1.  **System Instability:** The infinite loop consumes excessive CPU and battery power, causing the web application to become laggy, hot, or unresponsive.
-2.  **Network Abuse:** The application spams font servers with thousands of redundant requests, which can lead to rate-limiting, increased infrastructure costs, and a poor reputation for the app's network behavior.
-3.  **Broken Aesthetics:** Users are left with "tofu" (empty boxes), and the engine fails to provide a "best-effort" recovery—such as attempting a secondary fallback font that might actually be reachable.
-4.  **Operational Noise:** Browser consoles are flooded with identical error logs, making it nearly impossible for developers to debug other issues or maintain a production-grade application.
-
-We need a solution that makes the font fallback system **autonomous and resilient**, ensuring it can recover from transient errors, find alternative fonts when primary ones fail, and—above all—terminate its attempts once it has exhausted all viable options.
-
-## Section 1: The Technical Implementation Plan
-
-To solve this problem, we are rebuilding the font fallback system as a dedicated, smart background service called the **FallbackFontService**. This service will act like a "concierge" for missing characters: instead of the rendering engine frantically trying to manage downloads on its own, it will simply hand a list of missing characters to this service and trust it to handle the rest.
-
-The plan consists of four major components working together:
-
-### 1. The "Request Queue" (Skia-Driven Discovery)
-Currently, the engine manually checks every string of text to see if it *might* need a fallback font based on its own records. We will replace this manual check with a more direct approach: we will ask the underlying graphics engine (**Skia**) for the truth. During the "layout" phase (when the app calculates exactly where text should go), we will call a specific function to get the exact list of characters that the current fonts—including any fallback fonts already loaded—could not handle. These "unresolved" characters are added to a global "Unprocessed" list in the service. By letting Skia be the source of truth, we ensure the service only acts when a character is genuinely missing from the screen.
-
-### 2. The Autonomous Manager (FallbackFontService)
-The service manages its own state independently of the main application's UI cycle, using an event-driven "convergence" model. When new characters arrive in the "Unprocessed" list, the service:
-*   **Filters out duplicates:** It ignores characters it is already trying to download or that it has already failed to find.
-*   **Picks the best fonts:** It uses "greedy" logic to find the smallest number of fonts that cover the most missing characters.
-*   **Consults the Fallback Data:** The service uses a mapping of characters to fonts stored in `lib/src/engine/font_fallback_data.dart`. This is a large, generated file that encodes exactly which Noto fonts provide glyphs for which Unicode ranges.
-*   **Manages downloads:** It handles the actual HTTP requests, ensuring we don't overwhelm the user's connection by limiting how many fonts download at once.
-
-### 3. The Smart Retry & Recovery System
-This is the "brain" of the fix. If a font fails to download, the service doesn't just give up or loop forever. 
-*   **Transient Errors:** If the network blips, it waits 1 second and tries again (up to 3 times).
-*   **Permanent Failures:** If a font is simply not there (a 404 error) or fails all retries, the service marks that font as "Permanently Unavailable."
-*   **Self-Healing:** The service then immediately re-evaluates the missing characters. Because it knows which fonts are broken, it will automatically look for the "next best" font to cover those characters. If no other fonts exist, it marks those characters as "Unsupported" and stops trying. This is what finally breaks the infinite loop.
-*   **Global Kill Switch:** To protect against systemic misconfigurations (e.g., a broken `fontFallbackBaseUrl`), the service tracks total permanent failures. If 10 fonts fail permanently and zero have succeeded, the service declares itself "broken" and stops all future attempts for the session.
-*   **Per-Component Cap:** To prevent a single character from triggering hundreds of requests (e.g., a common character covered by many fonts), the service limits the number of candidate fonts it will attempt for any single Unicode component to 5. If all 5 fail, the component is marked as unsupported.
-
-### 4. The Feedback Loop
-The service only talks back to the Flutter framework when it actually succeeds. When a font is successfully downloaded and registered, the service tells the framework: *"I have new fonts; please redraw the screen."* If a font fails and no replacement can be found, the service stays silent. The user will see a placeholder (like an empty box), but the app will remain stable and the network will go quiet.
-
-### Ecosystem Fit
-This feature sits deep within the "Web Engine" layer of Flutter. It bridges the gap between the high-level Flutter framework and the low-level browser environment. By moving this logic into a centralized service, we make the engine more efficient for all Flutter Web developers, providing a "fire and forget" system that handles the complexities of global typography and unreliable networks automatically.
-
-## Section 2: Alternatives Considered
-
-During the design process, we explored several other approaches but ultimately ruled them out in favor of the more robust `FallbackFontService` model.
-
-### 1. Immediate "Best-Effort" Replacement
-We considered a strategy where, if the primary font (Font A) failed even once, the service would immediately start downloading the secondary font (Font B). 
-*   **Why we ruled it out:** This was deemed too aggressive and wasteful of the user's bandwidth. In many cases, a single network blip is temporary. By jumping to Font B immediately, we risked downloading multiple large fonts for the same set of characters, potentially causing "layout jitter" where text changes its appearance multiple times as different fonts arrive. We decided it was better to give the primary font a fair chance to succeed through retries before looking for a substitute.
-
-### 2. Dependency on the Framework for Retries
-One early thought was to keep the current model where the framework's "re-layout" signal drives the retry logic. In this model, we would simply stop the loop by marking a font as failed.
-*   **Why we ruled it out:** This kept the engine in a "passive" state. If we failed to download any fonts in a batch and didn't notify the framework, the engine would essentially "fall asleep" and never try to find a replacement for those missing characters until some other unrelated UI change happened. We realized the engine needs to be **proactive**—it should be able to say, "Font A failed; let me immediately see if Font B can help," without needing the framework to ask it to try again.
-
-### 3. Filtering characters before enqueuing them
-We discussed filtering out characters that were already covered by "pending" downloads before they even entered the service's queue.
-*   **Why we ruled it out:** This created a dangerous "memory loss" problem. If we filtered out a character because Font A was *supposed* to cover it, and then Font A failed to download, the service would have no record that the character still needed covering. By keeping all missing characters in the "Unprocessed" list until they are truly resolved or exhausted, we ensure that no requirement is ever forgotten, regardless of how many individual fonts fail.
-
-### 4. Maintaining a manual "Shadow Cache" of fonts
-We considered having the service maintain its own comprehensive list of every character covered by every font it has ever seen to avoid talking to Skia so often.
-*   **Why we ruled it out:** This added unnecessary complexity and the risk of the service getting "out of sync" with the actual graphics engine. Since Skia is the ultimate authority on what it can and cannot render, it is much simpler and more accurate to ask it for the "unresolved" list directly during layout. This eliminates the need for the service to try and mirror Skia's complex internal font-matching logic.
-
-## Section 3: Detailed Implementation Plan
-
-This section outlines the surgical changes required to implement the `FallbackFontService` architecture. The goal is to centralize fallback logic, utilize Skia’s internal layout state, and implement a resilient retry/recovery loop.
-
-### 1. New Core Infrastructure
-
-*   **File: `lib/src/engine/font_fallback_service.dart` (New File)**
-    *   **Rationale:** To house the `FallbackFontService` class. This centralizes the `_unprocessedCodePoints`, `_pendingFonts`, and `_permanentlyUnavailableFonts` state. It will contain the "Event-Driven Convergence" logic, the stateless greedy algorithm, and the smart fetcher.
-*   **File: `lib/src/engine/noto_font.dart` (Refactor)**
-    *   **Rationale:** To make the `NotoFont` data class stateless, removing any internal tracking that would interfere with the `FallbackFontService` greedy selection algorithm.
-*   **File: `lib/src/engine/font_fallbacks.dart` (Major Refactor)**
-    *   **Rationale:** We will refactor the existing `FontFallbackManager` and `_FallbackFontDownloadQueue` logic into the new service. The `NotoFont` and `FallbackFontComponent` classes must be made stateless (removing `coverCount` and `coverComponents`) to allow the greedy algorithm to run safely and predictably during autonomous re-evaluations.
-
-### 2. Renderer Interface Updates
-
-*   **File: `lib/src/engine/canvaskit/canvaskit_api.dart`**
-    *   **Rationale:** Add the missing JS-Interop binding for `getUnresolvedCodepoints()` to the `SkParagraph` extension type. 
-    *   **Technical Detail:** The underlying JS/WASM method on the `SkParagraph` object takes **no arguments** and returns a `JSArray<JSNumber>` representing the Unicode code points.
-    *   **Usage:** This is the "source of truth" required to move away from string-based discovery.
-*   **File: `lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart`**
-    *   **Rationale:** Ensure the FFI binding `paragraphGetUnresolvedCodePoints` is correctly exposed and documented for use in the unified fallback path.
-*   **File: `lib/src/engine/font_fallbacks.dart` (Interface change)**
-    *   **Rationale:** Update the `FallbackFontRegistry` abstract class. Change `loadFallbackFont(String name, String url)` to `Future<bool> loadFallbackFont(String name, Uint8List bytes)`. The return value indicates whether the renderer successfully registered the font. This shifts HTTP responsibility to the `FallbackFontService` and allows it to track registration failures.
-
-### 3. Renderer Implementation Updates
-
-*   **File: `lib/src/engine/canvaskit/fonts.dart` (`SkiaFontCollection`)**
-*   **File: `lib/src/engine/skwasm/skwasm_impl/font_collection.dart` (`SkwasmFontCollection`)**
-    *   **Rationale:** Both font collections now implement the unified `FlutterFontCollection` interface, which mandates the presence of a `FontFallbackManager` and a `FallbackFontRegistry`.
-    *   **Architecture:** Each collection now owns its respective registry implementation (`SkiaFallbackRegistry` and `SkwasmFallbackRegistry`) and initializes a `FontFallbackManager` to bridge the gap between the `FallbackFontService` and the renderer-specific font stack.
-    *   **State Management:** 
-        *   `SkiaFontCollection` was updated to maintain a `registeredFallbackFonts` list, and its `_registerWithFontProvider()` method now rebuilds the Skia font provider by combining both asset fonts and dynamically loaded fallback fonts.
-        *   `SkwasmFontCollection` now utilizes `setDefaultFontFamilies()` to synchronize the renderer's default font stack with the global fallback list managed by the service.
-    *   **Lifecycle:** Added `debugResetFallbackFonts()` to both implementations to ensure clean state during unit and golden testing, allowing the `FallbackFontService` to be reset independently of the main font stack.
-
-*   **File: `lib/src/engine/canvaskit/fonts.dart` (`SkiaFallbackRegistry`)**
-*   **File: `lib/src/engine/skwasm/skwasm_impl/font_collection.dart` (`SkwasmFallbackRegistry`)**
-    *   **Rationale:** These new registry classes implement the `FallbackFontRegistry` interface, providing the concrete logic for injecting font bytes into the respective WASM heaps and triggering the necessary font-provider updates.
-    *   **Technical Detail:** 
-        *   `loadFallbackFont(name, bytes)` handles the creation of a typeface from raw bytes.
-        *   `updateFallbackFontFamilies(families)` triggers the renderer-specific logic to update the font-matching order (e.g., rebuilding the `TypefaceFontProvider` in Skia or updating the default text style in Skwasm).
-*   **File: `lib/src/engine/canvaskit/text.dart` (`CkParagraph.layout`)**
-*   **File: `lib/src/engine/skwasm/skwasm_impl/paragraph.dart` (`SkwasmParagraph.layout`)**
-    *   **Rationale:** Update the `layout()` method in both renderers to call `getUnresolvedCodepoints()` from Skia. If unresolved characters are found, they will call `FallbackFontService.instance.addMissingCodePoints(list)`. This unified the discovery mechanism for both backends.
-    *   **Optimization:** Added a `_hasCheckedForMissingCodePoints` flag to both paragraph implementations to ensure that we only query Skia once per paragraph life-cycle, avoiding redundant work during repeated layouts.
-*   **File: `lib/src/engine/canvaskit/text.dart` (`CkParagraphBuilder.addText`)**
-    *   **Rationale:** Remove the call to `ensureFontsSupportText()`. This eliminates the expensive string-based check during paragraph building, significantly improving performance for text-heavy applications.
-
-### 4. Cleanup and Performance
-
-*   **File: `lib/src/engine/font_change_util.dart`**
-    *   **Rationale:** Verify the debouncing logic in `sendFontChangeMessage()`. We will rely on this to ensure that if multiple fonts in a batch succeed, we only trigger a single framework relayout per animation frame.
-*   **File: `lib/src/engine/dom.dart`**
-    *   **Rationale:** Ensure `httpFetch` is robustly exposed for the `FallbackFontService` to use for its "sophisticated" fetching (checking `response.ok` for 404s).
-
-### 5. Testing and Validation
-
-*   **File: `test/engine/font_fallback_service_test.dart` (New File)**
-    *   **Rationale:** Create a suite of unit tests for the new service. These will mock network failures, 404s, and successful downloads to verify that the "True Missing" logic correctly falls back to alternative fonts and eventually terminates the retry loop.
-*   **File: `test/ui/fallback_fonts_golden_test.dart`**
-    *   **Rationale:** Update existing golden tests to use the new `waitForIdle()` definition and ensure that "Permanent Failures" correctly render as tofu without causing infinite test timeouts.
-*   **File: `lib/src/engine/configuration.dart`**
-    *   **Rationale:** Add a new configuration flag (e.g., `debugSkipFontRetryDelay`) to allow tests to run without waiting for the 1-second backoff timer.
diff --git a/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING.md b/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING.md
deleted file mode 100644
index e938141218fd2..0000000000000
--- a/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Image Decoding in Flutter Web
-
-## Overview
-
-The image decoding system in the Flutter Web engine is designed to provide high-performance, memory-efficient image loading and rendering across a wide variety of browsers. Its primary purpose is to bridge the gap between Flutter's `dart:ui` API and the various image decoding capabilities provided by modern web browsers.
-
-### Implementation Sketch
-
-The system is built on a pluggable architecture that adapts to the active rendering backend (**CanvasKit** or **Skwasm**) and the capabilities of the host browser.
-
-1.  **Backend Abstraction**: The `Renderer` class serves as the entry point. It delegates image codec instantiation to backend-specific implementations, ensuring that the resulting `ui.Image` objects (e.g., `CkImage` or `SkwasmImage`) are compatible with the current rendering pipeline.
-2.  **Multi-Path Decoding**:
-    *   **WebCodecs (`ImageDecoder` API)**: The primary, high-performance path. It uses hardware-accelerated decoding to produce `VideoFrame` objects, supporting both static and animated images.
-    *   **HTML `<img>` Element**: A robust fallback for static images. It utilizes the browser's native `HTMLImageElement.decode()` API to decode images asynchronously.
-    *   **WASM-based Decoders**: Fallback decoders implemented in WebAssembly (e.g., Skia's built-in codecs) are used for animated images when the `ImageDecoder` API is not available.
-3.  **Source Preservation**: `ui.Image` implementations often maintain a reference to their original browser-native source (like an `ImageBitmap` or `HTMLImageElement`). This allows for efficient pixel read-back and avoids slow GPU-to-CPU memory transfers.
-4.  **Transformation and Optimization**:
-    *   **Resizing Codecs**: Images can be resized immediately after decoding to minimize memory usage.
-    *   **Iterative Downscaling**: To maintain high visual quality, the engine performs multi-step downscaling for large scale factors, bypassing limitations in browser-side mipmap generation.
-
-## Entrypoints
-
-The Flutter framework interacts with the web engine through a set of APIs defined in `dart:ui`. These APIs are the starting point for any image loading operation.
-
-### Codec Instantiation
-
-The most common way images are loaded is by creating a `ui.Codec`, which manages the decoding and frame-by-frame access of an image.
-
-*   **`instantiateImageCodec(Uint8List list, ...)`**: The primary entrypoint for decoding encoded image bytes (JPEG, PNG, GIF, etc.).
-*   **`instantiateImageCodecFromBuffer(ImmutableBuffer buffer, ...)`**: Similar to the above, but uses an `ImmutableBuffer` for memory efficiency.
-*   **`instantiateImageCodecWithSize(ImmutableBuffer buffer, ...)`**: Allows the framework to request a specific target size during the decoding process.
-*   **`ImageDescriptor.instantiateCodec(...)`**: Decodes an image based on a descriptor that provides metadata like width, height, and pixel format.
-
-On the framework side, these are typically invoked by an `ImageProvider` (like `NetworkImage` or `AssetImage`) during the image resolution process.
-
-### Direct Decoding
-
-For simpler use cases or raw pixel data, the following APIs are used:
-
-*   **`decodeImageFromList(Uint8List list, ...)`**: A convenience wrapper that decodes an image and returns a single `ui.Image` via a callback.
-*   **`decodeImageFromPixels(Uint8List pixels, ...)`**: Creates a `ui.Image` directly from a buffer of raw pixel data.
-
-### Rendering Entrypoints
-
-Once an image is decoded into a `ui.Image` object, it is displayed using the `Canvas` API:
-
-*   **`Canvas.drawImage(ui.Image image, Offset p, Paint paint)`**: Draws the entire image at a specific point.
-*   **`Canvas.drawImageRect(ui.Image image, Rect src, Rect dst, Paint paint)`**: Draws a sub-region of the image into a target rectangle on the canvas. This is where the engine's **Iterative Downscaling** logic is often triggered if the destination rectangle is significantly smaller than the source.
-
-## Memory Management
-
-Memory management for images in Flutter Web is a multi-layered process involving the Dart VM, the browser's JavaScript/DOM environment, and the WebAssembly (WASM) heap used by the renderers.
-
-### Reference Counting and Disposal
-
-Because the rendering backends (CanvasKit and Skwasm) store image data in a private WASM heap, the Dart garbage collector cannot automatically reclaim that memory.
-
-*   **`CountedRef`**: The engine uses a reference-counting mechanism (`CkCountedRef` in CanvasKit) to track how many Dart-side proxies are pointing to a single WASM-side image object.
-*   **Explicit Disposal**: It is critical that the Flutter framework calls `image.dispose()` when an image is no longer needed. This decrements the reference count and, when it reaches zero, triggers the actual deletion of the object from the WASM heap.
-
-### Preservation of Original Image Source
-
-In addition to the WASM-side representation, the engine typically retains a reference to the **original browser-native source** (e.g., an `HTMLImageElement`, `ImageBitmap`, or `VideoFrame`).
-
-*   **Workaround for CanvasKit Bug**: This is primarily done to work around a bug in CanvasKit where calling `readPixels` on a texture-backed `SkImage` can fail and return entirely black pixels. By keeping the DOM source, the engine can reliably extract pixel data for `toByteData()`.
-*   **Ref-Counting of the Source**: The `ImageSource` object itself is ref-counted separately from the WASM handle. When a `ui.Image` is cloned, the new instance increments the `refCount` on the same `ImageSource`. This ensures that the browser-native resource (like an `ImageBitmap`) is only closed/released when all clones that depend on it have been disposed.
-
-### Lazy Texture Uploads
-
-The CanvasKit backend makes extensive use of Skia's **Lazy Images** (e.g., `MakeLazyImageFromImageBitmap`).
-
-*   **On-Demand Upload**: Instead of immediately copying the image pixels into a GPU texture, the engine creates a "lazy" wrapper. The actual texture upload to the WebGL/WebGPU context happens at the last possible moment—right before the image is drawn to a surface.
-*   **Multi-Surface Support**: This lazy behavior is what enables the **`MultiSurfaceRasterizer`** to work. Since the texture isn't tied to a specific context until draw time, it can be uploaded to different canvases or handled correctly if a WebGL context is lost and needs to be recovered.
-*   **Skwasm Note**: While Skwasm also uses texture sources, its current implementation is more tightly coupled to the active surface, and it does not yet support the `MultiSurfaceRasterizer`.
-
-### Resource Copies and Footprint
-
-At any given time, an active image might have several representations in memory:
-1.  **Encoded Bytes**: Present briefly during the initial fetch/load phase.
-2.  **Browser-Native Source**: The decoded `ImageBitmap` or `HTMLImageElement` managed by the browser.
-3.  **WASM Wrapper**: A small handle in the WASM heap representing the Skia/Skwasm image object.
-4.  **GPU Texture(s)**: One or more actual textures in GPU memory, potentially duplicated if the image is being drawn across multiple independent WebGL contexts (in `MultiSurfaceRasterizer` mode).
-
-## Relevant Files
-
-The following files constitute the core of the image decoding and rendering system in the Flutter Web engine.
-
-### Core Abstractions and Shared Logic
-
-*   **`lib/painting.dart`**: Defines the `ui.Image`, `ui.Codec`, and `ui.ImmutableBuffer` interfaces as part of the `dart:ui` library. It also contains utility methods for image decoding like `decodeImageFromList`.
-*   **`lib/src/engine/renderer.dart`**: Contains the `Renderer` base class, which defines the interface for creating image codecs and images across different backends.
-*   **`lib/src/engine/image_decoder.dart`**: Implements `BrowserImageDecoder`, the base class for decoders using the browser's `ImageDecoder` (WebCodecs) API. It also contains `ResizingCodec` and the general `scaleImageIfNeeded` logic.
-*   **`lib/src/engine/html_image_element_codec.dart`**: Provides the base `HtmlImageElementCodec` which uses an off-screen HTML `<img>` tag to decode static images asynchronously.
-
-### CanvasKit Backend (Skia-WASM)
-
-*   **`lib/src/engine/canvaskit/renderer.dart`**: Implements `CanvasKitRenderer`, delegating image operations to `skiaInstantiateImageCodec` and backend-specific image creation methods.
-*   **`lib/src/engine/canvaskit/image.dart`**: The "brain" of CanvasKit image logic. It manages the selection between WebCodecs, `<img>` tags, and Skia's own decoders. It also defines `CkImage`, which wraps a Skia `SkImage` while optionally retaining a reference to the original DOM source.
-*   **`lib/src/engine/canvaskit/canvas.dart`**: Implements the drawing commands for CanvasKit. It includes the `shouldIterativelyDownscale` check and calls into `getOrCreateDownscaledImage` to ensure high-quality rendering of large images.
-
-### Skwasm Backend (FFI-WASM)
-
-*   **`lib/src/engine/skwasm/skwasm_impl/renderer.dart`**: Implements `SkwasmRenderer`, managing the lifecycle of `SkwasmImage` objects and choosing between `SkwasmBrowserImageDecoder` and other fallback strategies.
-*   **`lib/src/engine/skwasm/skwasm_impl/codecs.dart`**: Contains Skwasm-specific implementations of the decoding paths, including `SkwasmBrowserImageDecoder` and a WASM-based `SkwasmAnimatedImageDecoder`.
-*   **`lib/src/engine/skwasm/skwasm_impl/canvas.dart`**: Implements drawing logic for the Skwasm backend, mirroring the iterative downscaling optimizations found in CanvasKit.
diff --git a/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING_THROTTLING.md b/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING_THROTTLING.md
deleted file mode 100644
index f9d903a690499..0000000000000
--- a/engine/src/flutter/lib/web_ui/docs/IMAGE_DECODING_THROTTLING.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# Image Decoding Throttling in Flutter Web
-
-## Section Zero: Business Problem Description
-
-The primary goal of this feature is to eliminate silent application crashes and rendering failures in Flutter Web applications that handle high volumes of image assets, specifically on browsers that rely on the `HTMLImageElement.decode()` API for image processing.
-
-Modern browsers that support the high-performance `ImageDecoder` (WebCodecs) API, such as Chrome, are generally robust when handling concurrent image decodes. However, for browsers where this API is unavailable—most notably **iOS Safari**—or in scenarios where the engine must fall back to using the standard HTML `<img>` element for decoding, the system is highly susceptible to resource exhaustion.
-
-When a Flutter Web app attempts to decode many large images simultaneously using this fallback path, it can overwhelm the browser's internal image subsystem. This manifests in two critical ways:
-1.  **Silent Crashes (iOS Safari):** The most severe failure mode, where the entire web page crashes or reloads without any logged errors, providing a poor user experience.
-2.  **Encoding Errors:** On other browsers, forcing many simultaneous decodes through the `HTMLImageElement` path can trigger "EncodingErrors," causing assets to fail to render entirely.
-
-Currently, the Flutter Web engine issues these decoding requests as fast as the framework demands them. By introducing a "traffic controller" specifically for the `HTMLImageElement` decoding path, we aim to:
-
-*   **Ensure Application Stability:** Prevent fatal browser crashes on mobile devices by smoothing out the resource demand and staying within the browser's concurrent processing limits.
-*   **Improve Rendering Reliability:** Ensure that every image intended for display is successfully processed, rather than failing due to browser-level synchronization or memory limits.
-*   **Optimize Memory Lifecycle:** Implement aggressive signaling to the browser to release heavy bitmap memory as soon as it is no longer needed, reducing the cumulative memory pressure that leads to these crashes.
-
-## Section One: Technical Implementation Plan
-
-The technical implementation introduces a centralized resource coordinator to manage the concurrency and memory impact of the `HTMLImageElement.decode()` execution path. By moving from an "eager" decoding model to a "throttled" model, we can prevent the browser's background decoding threads from exceeding system resource limits.
-
-### Core Components
-
-1.  **The `ImageDecodingManager` (Resource Coordinator):**
-    A centralized singleton responsible for tracking active decoding operations. It manages a FIFO (First-In-First-Out) queue and enforces two primary safety constraints:
-    *   **Concurrency Limit:** A maximum of 8 simultaneous `decode()` operations.
-    *   **Memory Footprint Limit:** A maximum cumulative estimated footprint (128MB) for all in-flight decodes.
-    *   **The "Greedy First" Rule:** To prevent deadlocks when an image exceeds the total budget (e.g., a single 200MB asset), the manager always allows the first item in the queue to proceed if no other decodes are active.
-    *   **`cancel(Request request)`:** The manager provides an explicit `cancel` method. If an image is disposed of while waiting in the queue, this method is used to remove the request and reclaim the potential slot immediately.
-    *   **Defensive Timeout:** To prevent a "hung" browser decode from permanently leaking a resource slot, a defensive timeout (e.g., 30 seconds) will be implemented. If `img.decode()` does not resolve within this window, the slot will be forcibly released to prevent a system-wide deadlock.
-
-2.  **Refactored Codec Lifecycle:**
-    The `HtmlImageElementCodec` will be updated to split the image preparation into two distinct asynchronous phases:
-    *   **Phase 1 (Sizing):** The image `src` is set, and we wait for the browser's `onload` or `onerror` event. If `onerror` fires, the process terminates with an error before requesting a slot from the manager. If `onload` fires, we obtain the `naturalWidth` and `naturalHeight` required to estimate the memory footprint (`width * height * 4`).
-    *   **Phase 2 (Throttled Decode):** The codec requests a slot from the `ImageDecodingManager`. Once granted, it executes the high-latency `img.decode()` call. A `finally` block ensures that the manager is notified to release the resource slot regardless of the outcome.
-    *   **Disposal during Queueing:** If `dispose()` is called while the codec is waiting in Phase 2, the codec must call `ImageDecodingManager.instance.cancel(request)` to remove itself from the queue and abort the process. This prevents wasting budget and avoid late-failure errors.
-
-3.  **Aggressive Resource Reclamation:**
-    To mitigate "sticky" memory in iOS Safari, we will update the `ImageSource` disposal logic. Instead of relying solely on garbage collection, we will explicitly clear the `src` attribute and revoke object URLs immediately upon disposal. This signals the browser to purge the associated bitmap from its internal cache.
-
-### System Interaction Flow
-
-When the Flutter framework requests an image via `instantiateImageCodec`, the system follows this coordinated path:
-
-1.  **Preparation:** The codec initializes the `HTMLImageElement` and waits for the metadata to load (`onload`).
-2.  **Accounting:** The codec calculates the estimated RGBA footprint and enters the `ImageDecodingManager` queue.
-3.  **Throttling:** The manager pauses the execution of the codec's `decode()` call until the active concurrency and memory usage fall within safe thresholds.
-4.  **Execution:** The browser performs the background CPU/GPU work to decompress the image data.
-5.  **Resolution:** The manager releases the reserved capacity, and the framework receives a `ui.Image` ready for rendering.
-6.  **Disposal:** When the framework disposes of the image, the engine explicitly unlinks the resource to reclaim memory.
-
-### Ecosystem Integration
-
-This change is internal to the Flutter Web engine's implementation of `dart:ui`. It specifically hardens the `HTMLImageElement` fallback path used by browsers like Safari without affecting the high-performance `ImageDecoder` (WebCodecs) path used by Chrome.
-
-## Section Two: Alternatives Considered
-
-### 1. Eliminating the `decode()` Call Entirely
-We considered removing the call to `HTMLImageElement.decode()` and simply waiting for the `onload` event.
-*   **Why it was ruled out:** Removing `decode()` forces the browser to perform image decompression synchronously on the main thread during the next frame paint. This would introduce significant "jank" (dropped frames). Furthermore, it would remove our mechanism for controlling concurrency, potentially leading to the same crashes when multiple images are drawn for the first time in a single frame.
-
-### 2. Throttling Based on Encoded File Size
-We initially discussed using the size of the encoded image bytes as the primary metric.
-*   **Why it was ruled out:** Encoded size is an unreliable proxy for actual memory pressure. A highly compressed 1MB JPEG could expand into a massive 40MB bitmap. Additionally, we cannot easily determine the file size of a URL-based image without an extra network request. Using a dimension-based estimate (`width * height * 4`) provides a more accurate and consistent measure.
-
-### 3. Automatic Dimension Sniffing via Header Parsing
-We explored the idea of "sniffing" image file headers to determine dimensions before starting the loading process.
-*   **Why it was ruled out:** Image formats have complex bytecode standards. Writing a robust, cross-format header parser adds significant complexity. Waiting for the browser’s native `onload` event is a much more reliable way to obtain accurate dimensions.
-
-### 4. Implementing a "Retry-on-Error" Strategy
-Since Chrome returns a catchable `EncodingError` when it is overwhelmed, we considered simply catching that error and retrying.
-*   **Why it was ruled out:** This approach does not work for **iOS Safari**, which simply crashes the entire process without throwing a catchable error. A proactive throttling strategy is required.
-
-## Section Three: Detailed Implementation Plan
-
-### 1. Core Logic & Coordination
-
-**File:** `lib/src/engine/image_decoding_manager.dart` (New File)
-*   **Rationale:** Central coordinator for image decoding resources.
-*   **Implementation:** Singleton `ImageDecodingManager` tracking `activeDecodesCount` and `activeDecodesBytes` with a FIFO queue and "Greedy First" logic.
-
-**File:** `lib/src/engine.dart`
-*   **Rationale:** Export the new manager.
-
-### 2. Refactoring the HTML Decoding Path
-
-**File:** `lib/src/engine/html_image_element_codec.dart`
-*   **Rationale:** Update base class for `<img>` based decoding to support the throttled two-phase process.
-*   **Implementation:** Refactor `decode()` to wait for `onload`, then wait for a manager slot, then call `img.decode()`. Update `dispose()` to clear `src`.
-
-### 3. Backend-Specific Codec Updates
-
-**File:** `lib/src/engine/canvaskit/image.dart`
-*   **Rationale:** Update CanvasKit image sources for aggressive reclamation.
-*   **Implementation:** Update `_doClose()` in `ImageElementImageSource` and `ImageBitmapImageSource` to explicitly release browser resources.
-
-**File:** `lib/src/engine/skwasm/skwasm_impl/codecs.dart`
-*   **Rationale:** Ensure Skwasm-specific codecs benefit from the new logic.
-
-### 4. Verification & Testing
-
-**File:** `test/engine/image_decoding_manager_test.dart` (New File)
-*   **Rationale:** Unit test the manager's throttling and queueing logic.
-
-**File:** `test/ui/image/html_image_element_codec_test.dart` (Existing File)
-*   **Rationale:** Verify that the codec respects concurrency limits and correctly clears resources on disposal.
-
-**File:** `test/canvaskit/image_test.dart` (Existing File)
-*   **Rationale:** Regression testing for the CanvasKit pipeline.
diff --git a/engine/src/flutter/lib/web_ui/flutter_js/src/browser_environment.js b/engine/src/flutter/lib/web_ui/flutter_js/src/browser_environment.js
index 24d5e3d8de593..99d98aa3cdcf2 100644
--- a/engine/src/flutter/lib/web_ui/flutter_js/src/browser_environment.js
+++ b/engine/src/flutter/lib/web_ui/flutter_js/src/browser_environment.js
@@ -53,13 +53,17 @@ const hasTextCluster = () => {
   return (typeof window.TextCluster !== "undefined");
 }
 
-const supportsWasmGC = () => {
-  // This attempts to instantiate a wasm module that only will validate if the
-  // final WasmGC spec is implemented in the browser.
-  //
-  // Copied from https://github.com/GoogleChromeLabs/wasm-feature-detect/blob/main/src/detectors/gc/index.js
-  const bytes = [0, 97, 115, 109, 1, 0, 0, 0, 1, 5, 1, 95, 1, 120, 0];
-  return WebAssembly.validate(new Uint8Array(bytes));
+const supportsDart2Wasm = () => {
+  // The `<app>.support.js` expression emitted by 
+  // ```
+  //   % dart compile wasm \
+  //          --extra-compiler-option=--require-js-string-builtin \
+  //          -o hello.wasm \
+  //          hello.dart
+  //   % cat hello.support.js
+  // ```
+  // It checks suport for Wasm GC, SIMD  and `js-string` builtins.
+  return (WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,1,5,1,95,1,120,0]))&&WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,1,5,1,96,0,1,123,3,2,1,0,10,10,1,8,0,65,0,253,15,253,98,11]))&&!WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,1,4,1,96,0,0,2,23,1,14,119,97,115,109,58,106,115,45,115,116,114,105,110,103,4,99,97,115,116,0,0]),{"builtins":["js-string"]}));
 }
 
 const detectWebGLVersion = () => {
@@ -88,7 +92,7 @@ export const browserEnvironment = {
   hasImageCodecs: hasImageCodecs(),
   hasChromiumBreakIterators: hasChromiumBreakIterators(),
   hasTextCluster: hasTextCluster(),
-  supportsWasmGC: supportsWasmGC(),
+  supportsDart2Wasm: supportsDart2Wasm(),
   crossOriginIsolated: window.crossOriginIsolated,
   webGLVersion: detectWebGLVersion(),
   isChromeExtension: isChromeExtension(),
diff --git a/engine/src/flutter/lib/web_ui/flutter_js/src/loader.js b/engine/src/flutter/lib/web_ui/flutter_js/src/loader.js
index 7fa689e7cb99d..b8a2fcd4a8968 100644
--- a/engine/src/flutter/lib/web_ui/flutter_js/src/loader.js
+++ b/engine/src/flutter/lib/web_ui/flutter_js/src/loader.js
@@ -10,7 +10,7 @@ import { loadCanvasKit } from './canvaskit_loader.js';
 import { loadSkwasm } from './skwasm_loader.js';
 import { getCanvaskitBaseUrl } from './utils.js';
 
-const supportsDart2Wasm = browserEnvironment.supportsWasmGC;
+const supportsDart2Wasm = browserEnvironment.supportsDart2Wasm;
 
 /**
  * The public interface of _flutter.loader. Exposes two methods:
diff --git a/engine/src/flutter/lib/web_ui/flutter_js/src/skwasm_loader.js b/engine/src/flutter/lib/web_ui/flutter_js/src/skwasm_loader.js
index 64bafe3c63b42..7beba982fbca5 100644
--- a/engine/src/flutter/lib/web_ui/flutter_js/src/skwasm_loader.js
+++ b/engine/src/flutter/lib/web_ui/flutter_js/src/skwasm_loader.js
@@ -7,6 +7,9 @@ import { resolveUrlWithSegments } from "./utils.js";
 
 export const loadSkwasm = async (deps, config, browserEnvironment, baseUrl) => {
   const needsHeavy = (!browserEnvironment.hasImageCodecs || !browserEnvironment.hasChromiumBreakIterators)
+  if (needsHeavy && config.enableWimp) {
+    console.error('Flutter Web: wimp_heavy is required but it hasn\'t been implemented yet.');
+  }
   const fileStem = needsHeavy
      ? 'skwasm_heavy'
      : (config.enableWimp ? 'wimp' : 'skwasm');
diff --git a/engine/src/flutter/lib/web_ui/flutter_js/src/types.d.ts b/engine/src/flutter/lib/web_ui/flutter_js/src/types.d.ts
index dd17c9b00d210..521a0beddc2e2 100644
--- a/engine/src/flutter/lib/web_ui/flutter_js/src/types.d.ts
+++ b/engine/src/flutter/lib/web_ui/flutter_js/src/types.d.ts
@@ -39,7 +39,7 @@ export interface BrowserEnvironment {
   browserEngine: BrowserEngine;
   hasImageCodecs: boolean;
   hasChromiumBreakIterators: boolean;
-  supportsWasmGC: boolean;
+  supportsDart2Wasm: boolean;
   crossOriginIsolated: boolean;
   webGLVersion: number;
   isChromeExtension: boolean;
diff --git a/engine/src/flutter/lib/web_ui/lib/canvas.dart b/engine/src/flutter/lib/web_ui/lib/canvas.dart
index fd1831e639c42..119236f5c185c 100644
--- a/engine/src/flutter/lib/web_ui/lib/canvas.dart
+++ b/engine/src/flutter/lib/web_ui/lib/canvas.dart
@@ -18,7 +18,7 @@ abstract class Vertices {
     List<Offset>? textureCoordinates,
     List<int>? indices,
   }) {
-    return engine.renderer.createVertices(
+    return engine.EngineVertices(
       mode,
       positions,
       textureCoordinates: textureCoordinates,
@@ -33,7 +33,7 @@ abstract class Vertices {
     Float32List? textureCoordinates,
     Uint16List? indices,
   }) {
-    return engine.renderer.createVerticesRaw(
+    return engine.EngineVertices.raw(
       mode,
       positions,
       textureCoordinates: textureCoordinates,
diff --git a/engine/src/flutter/lib/web_ui/lib/painting.dart b/engine/src/flutter/lib/web_ui/lib/painting.dart
index 94ddea19142fe..721c83b14eda0 100644
--- a/engine/src/flutter/lib/web_ui/lib/painting.dart
+++ b/engine/src/flutter/lib/web_ui/lib/painting.dart
@@ -473,24 +473,12 @@ enum BlurStyle {
   inner,
 }
 
-class MaskFilter {
-  const MaskFilter.blur(this._style, this._sigma);
+abstract class MaskFilter {
+  // ignore: no_leading_underscores_for_local_identifiers
+  const factory MaskFilter.blur(BlurStyle _style, double _sigma) = engine.EngineMaskFilter.blur;
 
-  final BlurStyle _style;
-  final double _sigma;
-  double get webOnlySigma => _sigma;
-  BlurStyle get webOnlyBlurStyle => _style;
-
-  @override
-  bool operator ==(Object other) {
-    return other is MaskFilter && other._style == _style && other._sigma == _sigma;
-  }
-
-  @override
-  int get hashCode => Object.hash(_style, _sigma);
-
-  @override
-  String toString() => 'MaskFilter.blur($_style, ${_sigma.toStringAsFixed(1)})';
+  double get webOnlySigma;
+  BlurStyle get webOnlyBlurStyle;
 }
 
 abstract class _ColorTransform {
@@ -733,7 +721,7 @@ Future<Codec> instantiateImageCodec(
   int? targetWidth,
   int? targetHeight,
   bool allowUpscaling = true,
-}) => engine.renderer.instantiateImageCodec(
+}) => engine.engineInstantiateImageCodec(
   list,
   targetWidth: targetWidth,
   targetHeight: targetHeight,
@@ -747,7 +735,7 @@ Future<Codec> instantiateImageCodecFromBuffer(
   bool allowUpscaling = true,
 }) async {
   try {
-    return await engine.renderer.instantiateImageCodec(
+    return await engine.engineInstantiateImageCodec(
       buffer._list!,
       targetWidth: targetWidth,
       targetHeight: targetHeight,
@@ -766,14 +754,14 @@ Future<Codec> instantiateImageCodecWithSize(
   FrameInfo? info;
   try {
     if (getTargetSize == null) {
-      return await engine.renderer.instantiateImageCodec(buffer._list!);
+      return await engine.engineInstantiateImageCodec(buffer._list!);
     } else {
-      codec = await engine.renderer.instantiateImageCodec(buffer._list!);
+      codec = await engine.engineInstantiateImageCodec(buffer._list!);
       info = await codec.getNextFrame();
       final int width = info.image.width;
       final int height = info.image.height;
       final TargetImageSize targetSize = getTargetSize(width, height);
-      return await engine.renderer.instantiateImageCodec(
+      return await engine.engineInstantiateImageCodec(
         buffer._list!,
         targetWidth: targetSize.width,
         targetHeight: targetSize.height,
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine.dart b/engine/src/flutter/lib/web_ui/lib/src/engine.dart
index 54823c096c99a..e7180a0b8bb1e 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine.dart
@@ -18,17 +18,19 @@ library engine;
 export 'engine/alarm_clock.dart';
 export 'engine/app_bootstrap.dart';
 export 'engine/arena.dart';
+export 'engine/backend/codec.dart';
+export 'engine/backend/filter.dart';
 export 'engine/backend/image.dart';
 export 'engine/backend/path.dart';
+export 'engine/backend/vertices.dart';
 export 'engine/browser_detection.dart';
+export 'engine/canvaskit/animated_image.dart';
 export 'engine/canvaskit/canvas.dart';
 export 'engine/canvaskit/canvaskit_api.dart';
 export 'engine/canvaskit/color_filter.dart';
 export 'engine/canvaskit/fonts.dart';
 export 'engine/canvaskit/image.dart';
 export 'engine/canvaskit/image_filter.dart';
-export 'engine/canvaskit/image_wasm_codecs.dart';
-export 'engine/canvaskit/image_web_codecs.dart';
 export 'engine/canvaskit/mask_filter.dart';
 export 'engine/canvaskit/native_memory.dart';
 export 'engine/canvaskit/painting.dart';
@@ -44,7 +46,6 @@ export 'engine/canvaskit/util.dart';
 export 'engine/canvaskit/vertices.dart';
 export 'engine/canvaskit/web_paragraph_painter.dart';
 export 'engine/clipboard.dart';
-export 'engine/color_filter.dart';
 export 'engine/compositing/canvas_provider.dart';
 export 'engine/compositing/composition.dart';
 export 'engine/compositing/display_canvas_factory.dart';
@@ -63,7 +64,6 @@ export 'engine/font_fallbacks.dart';
 export 'engine/fonts.dart';
 export 'engine/frame_service.dart';
 export 'engine/frame_timing_recorder.dart';
-export 'engine/html_image_element_codec.dart';
 export 'engine/image_decoder.dart';
 export 'engine/image_decoding_manager.dart';
 export 'engine/image_format_detector.dart';
@@ -102,10 +102,14 @@ export 'engine/plugins.dart';
 export 'engine/pointer_binding.dart';
 export 'engine/pointer_binding/event_position_helper.dart';
 export 'engine/pointer_converter.dart';
+export 'engine/primitives/codec.dart';
+export 'engine/primitives/color_filter.dart';
 export 'engine/primitives/image.dart';
 export 'engine/primitives/image_source.dart';
+export 'engine/primitives/mask_filter.dart';
 export 'engine/primitives/path.dart';
 export 'engine/primitives/path_metrics.dart';
+export 'engine/primitives/vertices.dart';
 export 'engine/profiler.dart';
 export 'engine/raw_keyboard.dart';
 export 'engine/renderer.dart';
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/backend/codec.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/codec.dart
new file mode 100644
index 0000000000000..dc9468f9212fe
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/codec.dart
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine.dart';
+
+/// Holds the decoding result for a single frame of an animated image processed
+/// by a native backend (CanvasKit or Skwasm).
+///
+/// This is a backend-agnostic equivalent of [ui.FrameInfo], containing a
+/// [BackendImage] representing the GPU texture or Skia image, and the [duration]
+/// for which this frame should be displayed.
+class BackendFrameInfo {
+  BackendFrameInfo({required this.duration, required this.image});
+
+  /// The duration this frame should be shown.
+  final Duration duration;
+
+  /// The underlying backend-specific representation of the image frame.
+  final BackendImage image;
+}
+
+/// An abstract contract defining the interface for a backend-specific, multi-frame
+/// animated image decoder (e.g., CkAnimatedImage for CanvasKit and
+/// SkwasmAnimatedImageDecoder for Skwasm).
+///
+/// The shared frontend (`EngineCodec`) is responsible for high-level codec state,
+/// while the concrete backends act as frame extractors that implement this contract.
+abstract class BackendAnimatedImage {
+  /// The total number of frames in the animated image.
+  int get frameCount;
+
+  /// The number of times this animation should repeat.
+  ///
+  /// A value of -1 indicates infinite repetition, while 0 indicates the animation
+  /// should play once (no repetitions).
+  int get repetitionCount;
+
+  /// Decodes and returns the next frame of the animation.
+  ///
+  /// When called, the implementation should extract the current frame, prepare
+  /// the decoder to advance to the next frame, and return a [BackendFrameInfo]
+  /// containing the frame's image and duration.
+  Future<BackendFrameInfo> getNextFrame();
+
+  /// Releases all native resources associated with the animated decoder.
+  void dispose();
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/backend/filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/filter.dart
new file mode 100644
index 0000000000000..35de8d7736864
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/filter.dart
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// The backend delegate for a ColorFilter.
+abstract class BackendColorFilter {
+  /// Disposes the native resources held by this filter.
+  void dispose();
+}
+
+/// The backend delegate for a MaskFilter.
+abstract class BackendMaskFilter {
+  /// Disposes the native resources held by this filter.
+  void dispose();
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/backend/image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/image.dart
index 91609c7daa971..06124659eb7d9 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/backend/image.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/image.dart
@@ -4,6 +4,12 @@
 
 /// Represents an image managed by a specific graphics backend.
 abstract class BackendImage {
+  /// The width of this image in pixels.
+  int get width;
+
+  /// The height of this image in pixels.
+  int get height;
+
   /// Disposes resources held by the backend image.
   void dispose();
 
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/backend/vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/vertices.dart
new file mode 100644
index 0000000000000..dea65ded4474e
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/backend/vertices.dart
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// The backend delegate for Vertices.
+abstract class BackendVertices {
+  /// Disposes the native resources held by this vertices object.
+  void dispose();
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/animated_image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/animated_image.dart
new file mode 100644
index 0000000000000..919cd89fbf328
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/animated_image.dart
@@ -0,0 +1,109 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Uses image codecs supplied by the CanvasKit WASM bundle.
+///
+/// See also:
+///
+///  * `image_web_codecs.dart`, which uses the `ImageDecoder` supplied by the browser.
+library animated_image;
+
+import 'dart:async';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+
+/// The CanvasKit implementation of [BackendAnimatedImage].
+///
+/// This class acts as a simple, backend-specific adapter around CanvasKit's
+/// native [SkAnimatedImage]. It delegates frame extraction and metadata queries
+/// directly to the native object, and deletes the native WebAssembly object when
+/// explicitly disposed.
+class CkAnimatedImage implements BackendAnimatedImage {
+  /// Decodes an animated image from a list of encoded bytes.
+  CkAnimatedImage.decodeFromBytes(this._bytes, this.src, {this.targetWidth, this.targetHeight}) {
+    skAnimatedImage = createSkAnimatedImage();
+  }
+
+  /// The underlying native Skia animated image object.
+  late final SkAnimatedImage skAnimatedImage;
+  final String src;
+  final Uint8List _bytes;
+  int _frameCount = 0;
+  int _repetitionCount = -1;
+
+  /// The target width requested by the user.
+  ///
+  /// Note: CanvasKit's WASM animated image decoder does not support native resizing
+  /// during decode. The shared frontend (`_SkiaEngineCodec`) will apply a canvas-based
+  /// scaling fallback if these dimensions are specified.
+  final int? targetWidth;
+
+  /// The target height requested by the user.
+  final int? targetHeight;
+
+  /// Invokes CanvasKit to instantiate the native decoder and read initial metadata.
+  SkAnimatedImage createSkAnimatedImage() {
+    final SkAnimatedImage? animatedImage = canvasKit.MakeAnimatedImageFromEncoded(_bytes);
+    if (animatedImage == null) {
+      throw ImageCodecException(
+        'Failed to decode image data.\n'
+        'Image source: $src',
+      );
+    }
+
+    _frameCount = animatedImage.getFrameCount().toInt();
+    _repetitionCount = animatedImage.getRepetitionCount().toInt();
+
+    return animatedImage;
+  }
+
+  bool _disposed = false;
+  bool get debugDisposed => _disposed;
+
+  bool _debugCheckIsNotDisposed() {
+    assert(!_disposed, 'This image has been disposed.');
+    return true;
+  }
+
+  @override
+  void dispose() {
+    assert(!_disposed, 'Cannot dispose a codec that has already been disposed.');
+    _disposed = true;
+    skAnimatedImage.delete();
+  }
+
+  @override
+  int get frameCount {
+    assert(_debugCheckIsNotDisposed());
+    return _frameCount;
+  }
+
+  @override
+  int get repetitionCount {
+    assert(_debugCheckIsNotDisposed());
+    return _repetitionCount;
+  }
+
+  @override
+  Future<BackendFrameInfo> getNextFrame() {
+    assert(_debugCheckIsNotDisposed());
+
+    // Query the display duration for the current frame.
+    final int frameDurationMs = skAnimatedImage.currentFrameDuration().toInt();
+
+    // Extract the current frame as a static SkImage and wrap it.
+    final SkImage skImage = skAnimatedImage.makeImageAtCurrentFrame();
+
+    final currentFrame = BackendFrameInfo(
+      duration: Duration(milliseconds: frameDurationMs),
+      image: CkImageDelegate(skImage),
+    );
+
+    // Advance the native decoder so the next frame is ready on the next call.
+    skAnimatedImage.decodeNextFrame();
+
+    return Future<BackendFrameInfo>.value(currentFrame);
+  }
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
index 8046e0e6bfc31..cc258211b21ed 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
@@ -308,8 +308,8 @@ class CkCanvas implements LayerCanvas {
 
   @override
   void drawVertices(ui.Vertices vertices, ui.BlendMode blendMode, ui.Paint paint) {
-    final ckVertices = vertices as CkVertices;
-    if (ckVertices.hasNoPoints) {
+    final ckVertices = (vertices as EngineVertices).delegate as CkVertices?;
+    if (ckVertices == null) {
       return;
     }
     final SkPaint skPaint = (paint as CkPaint).toSkPaint();
@@ -363,7 +363,7 @@ class CkCanvas implements LayerCanvas {
   void saveLayerWithFilter(ui.Rect? bounds, ui.Paint? paint, ui.ImageFilter filter) {
     final CkManagedSkImageFilterConvertible convertible;
     if (filter is ui.ColorFilter) {
-      convertible = createCkColorFilter(filter as EngineColorFilter)!;
+      convertible = CkColorFilterImageFilter(colorFilter: filter as EngineColorFilter);
     } else {
       convertible = filter as CkManagedSkImageFilterConvertible;
     }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
index 589536ad3baaf..e8c5cd660340e 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
@@ -7,170 +7,54 @@ import 'dart:typed_data';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-/// Owns a [SkColorFilter] and manages its lifecycle.
-///
-/// See also:
-///
-/// * [CkPaint.colorFilter], which uses a [ManagedSkColorFilter] to manage
-///   the lifecycle of its [SkColorFilter].
-class ManagedSkColorFilter {
-  ManagedSkColorFilter(CkColorFilter ckColorFilter) : colorFilter = ckColorFilter {
-    _ref = CkUniqueRef<SkColorFilter>(this, colorFilter._initRawColorFilter(), 'ColorFilter');
-  }
-
-  final CkColorFilter colorFilter;
-
-  late final CkUniqueRef<SkColorFilter> _ref;
-
-  SkColorFilter get skiaObject => _ref.nativeObject;
-
-  @override
-  int get hashCode => colorFilter.hashCode;
-
-  @override
-  bool operator ==(Object other) {
-    if (runtimeType != other.runtimeType) {
-      return false;
-    }
-    return other is ManagedSkColorFilter && other.colorFilter == colorFilter;
-  }
-
-  @override
-  String toString() => colorFilter.toString();
-}
-
 /// CanvasKit implementation of [ui.ColorFilter].
-abstract class CkColorFilter implements CkManagedSkImageFilterConvertible, LayerImageFilter {
-  const CkColorFilter();
-
-  /// Converts this color filter into an image filter.
-  ///
-  /// Passes the ownership of the returned [SkImageFilter] to the caller. It is
-  /// the caller's responsibility to manage the lifecycle of the returned value.
-  SkImageFilter initRawImageFilter() {
-    final SkColorFilter skColorFilter = _initRawColorFilter();
-    final SkImageFilter result = canvasKit.ImageFilter.MakeColorFilter(skColorFilter, null);
-
-    // The underlying SkColorFilter is now owned by the SkImageFilter, so we
-    // need to drop the reference to allow it to be collected.
-    skColorFilter.delete();
-    return result;
-  }
-
-  /// Creates a Skia object based on the properties of this color filter.
-  ///
-  /// Passes the ownership of the returned [SkColorFilter] to the caller. It is
-  /// the caller's responsibility to manage the lifecycle of the returned value.
-  SkColorFilter _initRawColorFilter();
-
-  @override
-  void withSkImageFilter(
-    SkImageFilterBorrow borrow, {
-    ui.TileMode defaultBlurTileMode = ui.TileMode.clamp,
-  }) {
-    // Since ColorFilter has a const constructor it cannot store dynamically
-    // created Skia objects. Therefore a new SkImageFilter is created every time
-    // it's used. However, once used it's no longer needed, so it's deleted
-    // immediately to free memory.
-    final SkImageFilter skImageFilter = initRawImageFilter();
-    borrow(skImageFilter);
-    skImageFilter.delete();
-  }
-
-  /// The blur ImageFilter will override this and return the necessary
-  /// value to hand to the saveLayer call. It is the only filter type that
-  /// needs to pass along a tile mode so we just return a default value of
-  /// clamp for color filters.
-  @override
-  ui.TileMode? get backdropTileMode => ui.TileMode.clamp;
-
-  @override
-  Matrix4 get transform => Matrix4.identity();
-
-  @override
-  ui.Rect filterBounds(ui.Rect input) {
-    late ui.Rect result;
-    withSkImageFilter((SkImageFilter filter) {
-      result = rectFromSkIRect(filter.getOutputBounds(toSkRect(input)));
-    }, defaultBlurTileMode: ui.TileMode.decal);
-    return result;
-  }
-
-  @override
-  String get debugShortDescription => toString();
-}
-
-/// A reusable identity transform matrix.
 ///
-/// WARNING: DO NOT MUTATE THIS MATRIX! It is a shared global singleton.
-Float32List _identityTransform = _computeIdentityTransform();
-
-Float32List _computeIdentityTransform() {
-  final result = Float32List(20);
-  const translationIndices = <int>[0, 6, 12, 18];
-  for (final i in translationIndices) {
-    result[i] = 1;
-  }
-  _identityTransform = result;
-  return result;
-}
-
-SkColorFilter createSkColorFilterFromColorAndBlendMode(ui.Color color, ui.BlendMode blendMode) {
-  final SkColorFilter? filter = canvasKit.ColorFilter.MakeBlend(
-    toSharedSkColor1(color),
-    toSkBlendMode(blendMode),
-  );
-  if (filter == null) {
-    // If CanvasKit returns null, then the ColorFilter with this combination of
-    // color and blend mode is a no-op. So just return a dummy color filter that
-    // does nothing.
-    return canvasKit.ColorFilter.MakeMatrix(_identityTransform);
-  }
-  return filter;
-}
-
-class CkBlendModeColorFilter extends CkColorFilter {
-  const CkBlendModeColorFilter(this.color, this.blendMode);
-
-  final ui.Color color;
-  final ui.BlendMode blendMode;
-
-  @override
-  SkColorFilter _initRawColorFilter() {
-    return createSkColorFilterFromColorAndBlendMode(color, blendMode);
-  }
-
-  @override
-  int get hashCode => Object.hash(color, blendMode);
-
-  @override
-  bool operator ==(Object other) {
-    if (runtimeType != other.runtimeType) {
-      return false;
+/// This class acts as a thin wrapper around a [SkColorFilter].
+/// The memory lifecycle of the underlying [SkColorFilter] is managed by the
+/// [FinalizationRegistry] associated with the shared `EngineColorFilter`.
+class CkColorFilter implements BackendColorFilter {
+  CkColorFilter(EngineColorFilter colorFilter) : skiaObject = _initSkiaObject(colorFilter);
+  CkColorFilter.fromSkColorFilter(this.skiaObject);
+
+  final SkColorFilter skiaObject;
+
+  static SkColorFilter _initSkiaObject(EngineColorFilter colorFilter) {
+    switch (colorFilter.type) {
+      case ColorFilterType.mode:
+        final ui.Color? color = colorFilter.color;
+        final ui.BlendMode? blendMode = colorFilter.blendMode;
+        if (color == null || blendMode == null) {
+          return canvasKit.ColorFilter.MakeMatrix(_identityTransform);
+        }
+        final SkColorFilter? filter = canvasKit.ColorFilter.MakeBlend(
+          toSharedSkColor1(color),
+          toSkBlendMode(blendMode),
+        );
+        return filter ?? canvasKit.ColorFilter.MakeMatrix(_identityTransform);
+      case ColorFilterType.matrix:
+        final List<double>? matrix = colorFilter.matrix;
+        if (matrix == null) {
+          return canvasKit.ColorFilter.MakeMatrix(_identityTransform);
+        }
+        return canvasKit.ColorFilter.MakeMatrix(_normalizeMatrix(matrix));
+      case ColorFilterType.linearToSrgbGamma:
+        return canvasKit.ColorFilter.MakeLinearToSRGBGamma();
+      case ColorFilterType.srgbToLinearGamma:
+        return canvasKit.ColorFilter.MakeSRGBToLinearGamma();
     }
-    return other is CkBlendModeColorFilter && other.color == color && other.blendMode == blendMode;
   }
 
-  @override
-  String toString() => 'ColorFilter.mode($color, $blendMode)';
-}
-
-class CkMatrixColorFilter extends CkColorFilter {
-  const CkMatrixColorFilter(this.matrix);
-
-  final List<double> matrix;
-
-  /// Flutter documentation says the translation column of the color matrix
-  /// is specified in unnormalized 0..255 space. CanvasKit expects the
-  /// translation values to be normalized to 0..1 space.
-  ///
-  /// See [https://api.flutter.dev/flutter/dart-ui/ColorFilter/ColorFilter.matrix.html].
-  Float32List get _normalizedMatrix {
+  static Float32List _normalizeMatrix(List<double> matrix) {
     assert(matrix.length == 20, 'Color Matrix must have 20 entries.');
     final result = Float32List(20);
     const translationIndices = <int>[4, 9, 14, 19];
     for (var i = 0; i < 20; i++) {
       if (translationIndices.contains(i)) {
+        // Flutter documentation says the translation column of the color matrix
+        // is specified in unnormalized 0..255 space. Skia expects the
+        // translation values to be normalized to 0..1 space.
+        //
+        // See [https://api.flutter.dev/flutter/dart-ui/ColorFilter/ColorFilter.matrix.html].
         result[i] = matrix[i] / 255.0;
       } else {
         result[i] = matrix[i];
@@ -180,100 +64,33 @@ class CkMatrixColorFilter extends CkColorFilter {
   }
 
   @override
-  SkColorFilter _initRawColorFilter() {
-    return canvasKit.ColorFilter.MakeMatrix(_normalizedMatrix);
-  }
-
-  @override
-  int get hashCode => Object.hashAll(matrix);
-
-  @override
-  bool operator ==(Object other) {
-    return runtimeType == other.runtimeType &&
-        other is CkMatrixColorFilter &&
-        listEquals<double>(matrix, other.matrix);
-  }
-
-  @override
-  String toString() => 'ColorFilter.matrix($matrix)';
-}
-
-class CkLinearToSrgbGammaColorFilter extends CkColorFilter {
-  const CkLinearToSrgbGammaColorFilter();
-  @override
-  SkColorFilter _initRawColorFilter() => canvasKit.ColorFilter.MakeLinearToSRGBGamma();
-
-  @override
-  bool operator ==(Object other) => runtimeType == other.runtimeType;
-
-  @override
-  int get hashCode => runtimeType.hashCode;
-
-  @override
-  String toString() => 'ColorFilter.linearToSrgbGamma()';
-}
-
-class CkSrgbToLinearGammaColorFilter extends CkColorFilter {
-  const CkSrgbToLinearGammaColorFilter();
-  @override
-  SkColorFilter _initRawColorFilter() => canvasKit.ColorFilter.MakeSRGBToLinearGamma();
-
-  @override
-  bool operator ==(Object other) => runtimeType == other.runtimeType;
-
-  @override
-  int get hashCode => runtimeType.hashCode;
-
-  @override
-  String toString() => 'ColorFilter.srgbToLinearGamma()';
-}
-
-class CkComposeColorFilter extends CkColorFilter {
-  const CkComposeColorFilter(this.outer, this.inner);
-  final ManagedSkColorFilter? outer;
-  final ManagedSkColorFilter inner;
-
-  @override
-  SkColorFilter _initRawColorFilter() =>
-      canvasKit.ColorFilter.MakeCompose(outer?.skiaObject, inner.skiaObject);
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! CkComposeColorFilter) {
-      return false;
-    }
-    final CkComposeColorFilter filter = other;
-    return filter.outer == outer && filter.inner == inner;
+  void dispose() {
+    skiaObject.delete();
   }
-
-  @override
-  int get hashCode => Object.hash(outer, inner);
-
-  @override
-  String toString() => 'ColorFilter.compose($outer, $inner)';
 }
 
-/// Convert the current [ColorFilter] to a CkColorFilter.
+/// A reusable identity transform matrix.
 ///
-/// This workaround allows ColorFilter to be const constructbile and
-/// efficiently comparable, so that widgets can check for ColorFilter equality to
-/// avoid repainting.
-CkColorFilter? createCkColorFilter(EngineColorFilter colorFilter) {
-  switch (colorFilter.type) {
-    case ColorFilterType.mode:
-      if (colorFilter.color == null || colorFilter.blendMode == null) {
-        return null;
-      }
-      return CkBlendModeColorFilter(colorFilter.color!, colorFilter.blendMode!);
-    case ColorFilterType.matrix:
-      if (colorFilter.matrix == null) {
-        return null;
-      }
-      assert(colorFilter.matrix!.length == 20, 'Color Matrix must have 20 entries.');
-      return CkMatrixColorFilter(colorFilter.matrix!);
-    case ColorFilterType.linearToSrgbGamma:
-      return const CkLinearToSrgbGammaColorFilter();
-    case ColorFilterType.srgbToLinearGamma:
-      return const CkSrgbToLinearGammaColorFilter();
-  }
-}
+/// WARNING: DO NOT MUTATE THIS MATRIX! It is a shared global singleton.
+final Float32List _identityTransform = Float32List.fromList(<double>[
+  1,
+  0,
+  0,
+  0,
+  0,
+  0,
+  1,
+  0,
+  0,
+  0,
+  0,
+  0,
+  1,
+  0,
+  0,
+  0,
+  0,
+  0,
+  1,
+  0,
+]);
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
index 8e15014e11b89..7bb24c4ea84db 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
@@ -2,430 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
-import 'dart:js_interop';
-import 'dart:math' as math;
-import 'dart:typed_data';
-
 import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
-
-/// Instantiates a [ui.Codec] backed by an `SkAnimatedImage` from Skia.
-Future<ui.Codec> skiaInstantiateImageCodec(
-  Uint8List list, [
-  int? targetWidth,
-  int? targetHeight,
-  bool allowUpscaling = true,
-]) async {
-  ui.Codec codec;
-  // ImageDecoder does not detect image type automatically. It requires us to
-  // tell it what the image type is.
-  final ImageType imageType = tryDetectImageType(list, 'encoded image bytes');
-
-  if (browserSupportsImageDecoder) {
-    codec = await CkBrowserImageDecoder.create(
-      data: list,
-      contentType: imageType.mimeType,
-      debugSource: 'encoded image bytes',
-    );
-  } else {
-    if (imageType.isAnimated) {
-      codec = CkAnimatedImage.decodeFromBytes(
-        list,
-        'encoded image bytes',
-        targetWidth: targetWidth,
-        targetHeight: targetHeight,
-      );
-    } else {
-      final DomBlob blob = createDomBlob(<ByteBuffer>[list.buffer]);
-      codec = await decodeBlobToCkImage(blob);
-    }
-  }
-  return CkResizingCodec(
-    codec,
-    targetWidth: targetWidth,
-    targetHeight: targetHeight,
-    allowUpscaling: allowUpscaling,
-  );
-}
-
-/// A resizing codec which uses an HTML <canvas> element to scale the image if
-/// it is backed by an HTML Image element.
-class CkResizingCodec extends ResizingCodec {
-  CkResizingCodec(super.delegate, {super.targetWidth, super.targetHeight, super.allowUpscaling});
-
-  @override
-  ui.Image scaleImage(
-    ui.Image image, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) {
-    final ckImage = image as EngineImage;
-    if (ckImage.imageSource == null) {
-      return scaleImageIfNeeded(
-        image,
-        targetWidth: targetWidth,
-        targetHeight: targetHeight,
-        allowUpscaling: allowUpscaling,
-      );
-    } else {
-      return _scaleImageUsingDomCanvas(
-        ckImage,
-        targetWidth: targetWidth,
-        targetHeight: targetHeight,
-        allowUpscaling: allowUpscaling,
-      );
-    }
-  }
-
-  EngineImage _scaleImageUsingDomCanvas(
-    EngineImage image, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) {
-    assert(image.imageSource != null);
-    final int width = image.width;
-    final int height = image.height;
-    // Calculate the target scaled dimensions while maintaining the aspect ratio if needed.
-    final BitmapSize? scaledSize = scaledImageSize(width, height, targetWidth, targetHeight);
-    if (scaledSize == null) {
-      return image;
-    }
-    // If upscaling is disabled and the target dimensions exceed the original size,
-    // do not perform scaling and return the original image.
-    if (!allowUpscaling && (scaledSize.width > width || scaledSize.height > height)) {
-      return image;
-    }
-
-    final int scaledWidth = scaledSize.width;
-    final int scaledHeight = scaledSize.height;
-
-    final DomOffscreenCanvas offscreenCanvas = createDomOffscreenCanvas(scaledWidth, scaledHeight);
-    final ctx = offscreenCanvas.getContext('2d')! as DomCanvasRenderingContext2D;
-    ctx.drawImage(
-      image.imageSource!.canvasImageSource,
-      0,
-      0,
-      width,
-      height,
-      0,
-      0,
-      scaledWidth,
-      scaledHeight,
-    );
-    final DomImageBitmap bitmap = offscreenCanvas.transferToImageBitmap();
-    SkImage? skImage;
-    if (CanvasKitRenderer.instance.isSoftware) {
-      skImage = canvasKit.MakeImageFromCanvasImageSource(bitmap);
-    } else {
-      skImage = canvasKit.MakeLazyImageFromImageBitmap(bitmap, true);
-    }
-
-    // Resize the canvas to 0x0 to cause the browser to eagerly reclaim its
-    // memory.
-    offscreenCanvas.width = 0;
-    offscreenCanvas.height = 0;
-
-    if (skImage == null) {
-      domWindow.console.warn('Failed to scale image.');
-      return image;
-    }
-
-    image.dispose();
-    return EngineImage(
-      CkImageDelegate(skImage),
-      skImage.width().toInt(),
-      skImage.height().toInt(),
-      imageSource: ImageBitmapImageSource(bitmap),
-    );
-  }
-}
-
-ui.Image createCkImageFromImageElement(
-  DomHTMLImageElement image,
-  int naturalWidth,
-  int naturalHeight,
-) {
-  SkImage? skImage;
-  // If software rendering is active, make the SkImage directly from the canvas source.
-  if (CanvasKitRenderer.instance.isSoftware) {
-    skImage = canvasKit.MakeImageFromCanvasImageSource(image);
-  } else {
-    // If GPU-accelerated CanvasKit is active, create a lazy image from the HTML Image Element,
-    // which uploads the texture dynamically when painted. Specify pre-multiplied alpha and sRGB.
-    skImage = canvasKit.MakeLazyImageFromTextureSourceWithInfo(
-      image,
-      SkPartialImageInfo(
-        alphaType: canvasKit.AlphaType.Premul,
-        colorType: canvasKit.ColorType.RGBA_8888,
-        colorSpace: SkColorSpaceSRGB,
-        width: naturalWidth.toDouble(),
-        height: naturalHeight.toDouble(),
-      ),
-    );
-  }
-  if (skImage == null) {
-    throw ImageCodecException('Failed to create image from Image.decode');
-  }
-
-  return EngineImage(
-    CkImageDelegate(skImage),
-    skImage.width().toInt(),
-    skImage.height().toInt(),
-    imageSource: ImageElementImageSource(image),
-  );
-}
-
-class CkImageElementCodec extends HtmlImageElementCodec {
-  CkImageElementCodec(super.src, {super.chunkCallback});
-
-  @override
-  ui.Image createImageFromHTMLImageElement(
-    DomHTMLImageElement image,
-    int naturalWidth,
-    int naturalHeight,
-  ) => createCkImageFromImageElement(image, naturalWidth, naturalHeight);
-}
-
-class CkImageBlobCodec extends HtmlBlobCodec {
-  CkImageBlobCodec(super.blob, {super.chunkCallback});
-
-  @override
-  ui.Image createImageFromHTMLImageElement(
-    DomHTMLImageElement image,
-    int naturalWidth,
-    int naturalHeight,
-  ) => createCkImageFromImageElement(image, naturalWidth, naturalHeight);
-}
-
-/// Creates and decodes an image using HtmlImageElement.
-Future<CkImageBlobCodec> decodeBlobToCkImage(DomBlob blob) async {
-  final codec = CkImageBlobCodec(blob);
-  await codec.decode();
-  return codec;
-}
-
-Future<CkImageElementCodec> decodeUrlToCkImage(String src) async {
-  final codec = CkImageElementCodec(src);
-  await codec.decode();
-  return codec;
-}
-
-void skiaDecodeImageFromPixels(
-  Uint8List pixels,
-  int width,
-  int height,
-  ui.PixelFormat format,
-  ui.ImageDecoderCallback callback, {
-  int? rowBytes,
-  int? targetWidth,
-  int? targetHeight,
-  bool allowUpscaling = true,
-}) {
-  if (targetWidth != null) {
-    assert(allowUpscaling || targetWidth <= width);
-  }
-  if (targetHeight != null) {
-    assert(allowUpscaling || targetHeight <= height);
-  }
-
-  // Run in a timer to avoid janking the current frame by moving the decoding
-  // work outside the frame event.
-  Timer.run(() {
-    final SkImage? skImage = canvasKit.MakeImage(
-      SkImageInfo(
-        width: width.toDouble(),
-        height: height.toDouble(),
-        colorType: format == ui.PixelFormat.rgba8888
-            ? canvasKit.ColorType.RGBA_8888
-            : canvasKit.ColorType.BGRA_8888,
-        alphaType: canvasKit.AlphaType.Premul,
-        colorSpace: SkColorSpaceSRGB,
-      ),
-      pixels,
-      rowBytes ?? 4 * width,
-    );
-
-    if (skImage == null) {
-      domWindow.console.warn('Failed to create image from pixels.');
-      return;
-    }
-
-    if (targetWidth != null || targetHeight != null) {
-      if (validUpscale(allowUpscaling, targetWidth, targetHeight, width, height)) {
-        return callback(scaleImage(skImage, targetWidth, targetHeight));
-      }
-    }
-    return callback(
-      EngineImage(CkImageDelegate(skImage), skImage.width().toInt(), skImage.height().toInt()),
-    );
-  });
-}
-
-// An invalid upscale happens when allowUpscaling is false AND either the given
-// targetWidth is larger than the originalWidth OR the targetHeight is larger than originalHeight.
-bool validUpscale(
-  bool allowUpscaling,
-  int? targetWidth,
-  int? targetHeight,
-  int originalWidth,
-  int originalHeight,
-) {
-  if (allowUpscaling) {
-    return true;
-  }
-  final bool targetWidthFits;
-  final bool targetHeightFits;
-  if (targetWidth != null) {
-    targetWidthFits = targetWidth <= originalWidth;
-  } else {
-    targetWidthFits = true;
-  }
-
-  if (targetHeight != null) {
-    targetHeightFits = targetHeight <= originalHeight;
-  } else {
-    targetHeightFits = true;
-  }
-  return targetWidthFits && targetHeightFits;
-}
-
-/// Creates a scaled [CkImage] from an [SkImage] by drawing the [SkImage] to a canvas.
-///
-/// This function will only be called if either a targetWidth or targetHeight is not null
-///
-/// If only one of targetWidth or  targetHeight are specified, the other
-/// dimension will be scaled according to the aspect ratio of the supplied
-/// dimension.
-///
-/// If either targetWidth or targetHeight is less than or equal to zero, it
-/// will be treated as if it is null.
-EngineImage scaleImage(SkImage image, int? targetWidth, int? targetHeight) {
-  final temporaryImage = EngineImage(
-    CkImageDelegate(image),
-    image.width().toInt(),
-    image.height().toInt(),
-  );
-  try {
-    assert(targetWidth != null || targetHeight != null);
-    final int width = temporaryImage.width;
-    final int height = temporaryImage.height;
-
-    var adjustedWidth = targetWidth;
-    var adjustedHeight = targetHeight;
-    if (adjustedWidth != null && adjustedWidth <= 0) {
-      adjustedWidth = null;
-    }
-    if (adjustedHeight != null && adjustedHeight <= 0) {
-      adjustedHeight = null;
-    }
-
-    final int finalTargetWidth =
-        adjustedWidth ??
-        (adjustedHeight != null ? (adjustedHeight * width / height).round() : width);
-    final int finalTargetHeight =
-        adjustedHeight ??
-        (adjustedWidth != null ? (adjustedWidth * height / width).round() : height);
-
-    final recorder = CkPictureRecorder();
-    final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
-
-    final paint = CkPaint();
-    canvas.drawImageRect(
-      temporaryImage,
-      ui.Rect.fromLTWH(0, 0, width.toDouble(), height.toDouble()),
-      ui.Rect.fromLTWH(0, 0, finalTargetWidth.toDouble(), finalTargetHeight.toDouble()),
-      paint,
-    );
-
-    final CkPicture picture = recorder.endRecording();
-    final ui.Image finalImage = picture.toImageSync(finalTargetWidth, finalTargetHeight);
-
-    return finalImage as EngineImage;
-  } finally {
-    temporaryImage.dispose();
-  }
-}
-
-const String _kNetworkImageMessage = 'Failed to load network image.';
-
-/// Instantiates a [ui.Codec] backed by an `SkAnimatedImage` from Skia after
-/// requesting from URI.
-Future<ui.Codec> skiaInstantiateWebImageCodec(
-  String url,
-  ui_web.ImageCodecChunkCallback? chunkCallback,
-) async {
-  final imageElementCodec = CkImageElementCodec(url, chunkCallback: chunkCallback);
-  try {
-    await imageElementCodec.decode();
-    return imageElementCodec;
-  } on ImageCodecException {
-    imageElementCodec.dispose();
-    final Uint8List list = await fetchImage(url, chunkCallback);
-    final ImageType imageType = tryDetectImageType(list, url);
-    if (browserSupportsImageDecoder) {
-      return CkBrowserImageDecoder.create(
-        data: list,
-        contentType: imageType.mimeType,
-        debugSource: url,
-      );
-    } else {
-      return CkAnimatedImage.decodeFromBytes(list, url);
-    }
-  }
-}
-
-/// Sends a request to fetch image data.
-Future<Uint8List> fetchImage(String url, ui_web.ImageCodecChunkCallback? chunkCallback) async {
-  try {
-    final HttpFetchResponse response = await httpFetch(url);
-    final int? contentLength = response.contentLength;
-
-    if (!response.hasPayload) {
-      throw ImageCodecException(
-        '$_kNetworkImageMessage\n'
-        'Image URL: $url\n'
-        'Server response code: ${response.status}',
-      );
-    }
-
-    if (chunkCallback != null && contentLength != null) {
-      return await readChunked(response.payload, contentLength, chunkCallback);
-    } else {
-      return await response.asUint8List();
-    }
-  } on HttpFetchError catch (_) {
-    throw ImageCodecException(
-      '$_kNetworkImageMessage\n'
-      'Image URL: $url\n'
-      'Trying to load an image from another domain? Find answers at:\n'
-      'https://docs.flutter.dev/development/platform-integration/web-images',
-    );
-  }
-}
-
-/// Reads the [payload] in chunks using the browser's Streams API
-///
-/// See: https://developer.mozilla.org/en-US/docs/Web/API/Streams_API
-Future<Uint8List> readChunked(
-  HttpFetchPayload payload,
-  int contentLength,
-  ui_web.ImageCodecChunkCallback chunkCallback,
-) async {
-  final result = JSUint8Array.withLength(contentLength);
-  var position = 0;
-  var cumulativeBytesLoaded = 0;
-  await payload.read((JSUint8Array chunk) {
-    cumulativeBytesLoaded += chunk.length;
-    chunkCallback(cumulativeBytesLoaded, contentLength);
-    result.set(chunk, position);
-    position += chunk.length;
-  });
-  return result.toDart;
-}
 
 /// A [BackendImage] backed by an `SkImage` from Skia.
 class CkImageDelegate implements BackendImage {
@@ -435,9 +12,11 @@ class CkImageDelegate implements BackendImage {
   final SkImage skImage;
 
   /// Returns the width of the image in pixels.
+  @override
   int get width => skImage.width().toInt();
 
   /// Returns the height of the image in pixels.
+  @override
   int get height => skImage.height().toInt();
 
   /// Releases the native memory allocated for the Skia image.
@@ -452,25 +31,3 @@ class CkImageDelegate implements BackendImage {
     return other is CkImageDelegate && other.skImage.isAliasOf(skImage);
   }
 }
-
-/// Detect the image type or throw an error if image type can't be detected.
-ImageType tryDetectImageType(Uint8List data, String debugSource) {
-  // ImageDecoder does not detect image type automatically. It requires us to
-  // tell it what the image type is.
-  final ImageType? imageType = detectImageType(data);
-
-  if (imageType == null) {
-    final String fileHeader;
-    if (data.isNotEmpty) {
-      fileHeader = '[${bytesToHexString(data.sublist(0, math.min(10, data.length)))}]';
-    } else {
-      fileHeader = 'empty';
-    }
-    throw ImageCodecException(
-      'Failed to detect image file format using the file header.\n'
-      'File header was $fileHeader.\n'
-      'Image source: $debugSource',
-    );
-  }
-  return imageType;
-}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
index 2a475a9c93fcc..8416acb5c0b20 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
@@ -47,7 +47,7 @@ abstract class CkImageFilter implements CkManagedSkImageFilterConvertible, Layer
     required double sigmaY,
     required ui.TileMode? tileMode,
   }) = _CkBlurImageFilter;
-  factory CkImageFilter.color({required CkColorFilter colorFilter}) = CkColorFilterImageFilter;
+  factory CkImageFilter.color({required EngineColorFilter colorFilter}) = CkColorFilterImageFilter;
   factory CkImageFilter.matrix({
     required Float64List matrix,
     required ui.FilterQuality filterQuality,
@@ -100,14 +100,17 @@ abstract class CkImageFilter implements CkManagedSkImageFilterConvertible, Layer
 class CkColorFilterImageFilter extends CkImageFilter {
   CkColorFilterImageFilter({required this.colorFilter}) : super._();
 
-  final CkColorFilter colorFilter;
+  final EngineColorFilter colorFilter;
 
   @override
   void withSkImageFilter(
     SkImageFilterBorrow borrow, {
     ui.TileMode defaultBlurTileMode = ui.TileMode.clamp,
   }) {
-    final SkImageFilter skImageFilter = colorFilter.initRawImageFilter();
+    final SkImageFilter skImageFilter = canvasKit.ImageFilter.MakeColorFilter(
+      (colorFilter.backendFilter as CkColorFilter).skiaObject,
+      null,
+    );
     borrow(skImageFilter);
     skImageFilter.delete();
   }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
deleted file mode 100644
index 4de3ffc1a8d01..0000000000000
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/// Uses image codecs supplied by the CanvasKit WASM bundle.
-///
-/// See also:
-///
-///  * `image_web_codecs.dart`, which uses the `ImageDecoder` supplied by the browser.
-library image_wasm_codecs;
-
-import 'dart:async';
-import 'dart:typed_data';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-/// The CanvasKit implementation of [ui.Codec].
-///
-/// Wraps `SkAnimatedImage`.
-class CkAnimatedImage implements ui.Codec {
-  /// Decodes an image from a list of encoded bytes.
-  CkAnimatedImage.decodeFromBytes(this._bytes, this.src, {this.targetWidth, this.targetHeight}) {
-    final SkAnimatedImage skAnimatedImage = createSkAnimatedImage();
-    _ref = CkUniqueRef<SkAnimatedImage>(this, skAnimatedImage, 'Codec');
-  }
-
-  late final CkUniqueRef<SkAnimatedImage> _ref;
-  final String src;
-  final Uint8List _bytes;
-  int _frameCount = 0;
-  int _repetitionCount = -1;
-
-  final int? targetWidth;
-  final int? targetHeight;
-
-  SkAnimatedImage createSkAnimatedImage() {
-    SkAnimatedImage? animatedImage = canvasKit.MakeAnimatedImageFromEncoded(_bytes);
-    if (animatedImage == null) {
-      throw ImageCodecException(
-        'Failed to decode image data.\n'
-        'Image source: $src',
-      );
-    }
-
-    if (targetWidth != null || targetHeight != null) {
-      if (animatedImage.getFrameCount() > 1) {
-        printWarning('targetWidth and targetHeight for multi-frame images not supported');
-      } else {
-        animatedImage = _resizeAnimatedImage(animatedImage, targetWidth, targetHeight);
-        if (animatedImage == null) {
-          throw ImageCodecException(
-            'Failed to decode re-sized image data.\n'
-            'Image source: $src',
-          );
-        }
-      }
-    }
-
-    _frameCount = animatedImage.getFrameCount().toInt();
-    _repetitionCount = animatedImage.getRepetitionCount().toInt();
-
-    return animatedImage;
-  }
-
-  SkAnimatedImage? _resizeAnimatedImage(
-    SkAnimatedImage animatedImage,
-    int? targetWidth,
-    int? targetHeight,
-  ) {
-    final SkImage image = animatedImage.makeImageAtCurrentFrame();
-    final EngineImage ckImage = scaleImage(image, targetWidth, targetHeight);
-    try {
-      if (ckImage.backendImage case CkImageDelegate(:final skImage)) {
-        final Uint8List? resizedBytes = skImage.encodeToBytes();
-        if (resizedBytes == null) {
-          throw ImageCodecException('Failed to re-size image');
-        }
-        final SkAnimatedImage? resizedAnimatedImage = canvasKit.MakeAnimatedImageFromEncoded(
-          resizedBytes,
-        );
-        return resizedAnimatedImage;
-      } else {
-        throw StateError('The resized image must be a CanvasKit image.');
-      }
-    } finally {
-      ckImage.dispose();
-    }
-  }
-
-  bool _disposed = false;
-  bool get debugDisposed => _disposed;
-
-  bool _debugCheckIsNotDisposed() {
-    assert(!_disposed, 'This image has been disposed.');
-    return true;
-  }
-
-  @override
-  void dispose() {
-    assert(!_disposed, 'Cannot dispose a codec that has already been disposed.');
-    _disposed = true;
-    _ref.dispose();
-  }
-
-  @override
-  int get frameCount {
-    assert(_debugCheckIsNotDisposed());
-    return _frameCount;
-  }
-
-  @override
-  int get repetitionCount {
-    assert(_debugCheckIsNotDisposed());
-    return _repetitionCount;
-  }
-
-  @override
-  Future<ui.FrameInfo> getNextFrame() {
-    assert(_debugCheckIsNotDisposed());
-    final SkAnimatedImage animatedImage = _ref.nativeObject;
-
-    // SkAnimatedImage comes pre-initialized to point to the current frame (by
-    // default the first frame, and, with some special resurrection logic in
-    // `createDefault`, to a subsequent frame if resurrection happens in the
-    // middle of animation). Flutter's `Codec` semantics is to initialize to
-    // point to "just before the first frame", i.e. the first invocation of
-    // `getNextFrame` returns the first frame. Therefore, we have to read the
-    // current Skia frame, then advance SkAnimatedImage to the next frame, and
-    // return the current frame.
-
-    final int frameDurationMs = animatedImage.currentFrameDuration().toInt();
-    final SkImage skImage = animatedImage.makeImageAtCurrentFrame();
-
-    final ui.FrameInfo currentFrame = AnimatedImageFrameInfo(
-      Duration(milliseconds: frameDurationMs),
-      EngineImage(CkImageDelegate(skImage), skImage.width().toInt(), skImage.height().toInt()),
-    );
-
-    animatedImage.decodeNextFrame();
-
-    return Future<ui.FrameInfo>.value(currentFrame);
-  }
-}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
deleted file mode 100644
index 9309d7f44beb9..0000000000000
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Uses the `ImageDecoder` class supplied by the browser.
-//
-// See also:
-//
-//  * `image_wasm_codecs.dart`, which uses codecs supplied by the CanvasKit WASM bundle.
-
-import 'dart:async';
-import 'dart:js_interop';
-import 'dart:typed_data';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-/// Image decoder backed by the browser's `ImageDecoder`.
-class CkBrowserImageDecoder extends BrowserImageDecoder {
-  CkBrowserImageDecoder._({
-    required super.contentType,
-    required super.dataSource,
-    required super.debugSource,
-  });
-
-  static Future<CkBrowserImageDecoder> create({
-    required Uint8List data,
-    required String contentType,
-    required String debugSource,
-  }) async {
-    final decoder = CkBrowserImageDecoder._(
-      contentType: contentType,
-      dataSource: data.toJS,
-      debugSource: debugSource,
-    );
-
-    // Call once to initialize the decoder and populate late fields.
-    await decoder.initialize();
-    return decoder;
-  }
-
-  @override
-  ui.Image generateImageFromVideoFrame(VideoFrame frame) {
-    SkImage? skImage;
-    if (CanvasKitRenderer.instance.isSoftware) {
-      final int width = frame.displayWidth.toInt();
-      final int height = frame.displayHeight.toInt();
-      final DomHTMLCanvasElement canvas = createDomCanvasElement(width: width, height: height);
-      final DomCanvasRenderingContext2D ctx = canvas.context2D;
-      ctx.drawImage(frame, 0, 0);
-      skImage = canvasKit.MakeImageFromCanvasImageSource(canvas);
-    } else {
-      skImage = canvasKit.MakeLazyImageFromTextureSourceWithInfo(
-        frame,
-        SkPartialImageInfo(
-          alphaType: canvasKit.AlphaType.Premul,
-          colorType: canvasKit.ColorType.RGBA_8888,
-          colorSpace: SkColorSpaceSRGB,
-          width: frame.displayWidth,
-          height: frame.displayHeight,
-        ),
-      );
-    }
-    if (skImage == null) {
-      throw ImageCodecException(
-        "Failed to create image from pixel data decoded using the browser's ImageDecoder.",
-      );
-    }
-
-    return EngineImage(
-      CkImageDelegate(skImage),
-      skImage.width().toInt(),
-      skImage.height().toInt(),
-      imageSource: VideoFrameImageSource(frame),
-    );
-  }
-}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
index d99142fa574e4..766118ac57e77 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
@@ -2,13 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:ui/ui.dart' as ui;
+import 'package:ui/src/engine.dart';
 
-import 'canvaskit_api.dart';
+class CkMaskFilter implements BackendMaskFilter {
+  CkMaskFilter(EngineMaskFilter maskFilter) {
+    _skMaskFilter = canvasKit.MaskFilter.MakeBlur(
+      toSkBlurStyle(maskFilter.webOnlyBlurStyle),
+      maskFilter.webOnlySigma,
+      true,
+    )!;
+  }
 
-/// Creates and returns a [SkMaskFilter] that applies a blur effect.
-///
-/// It is the responsibility of the caller to delete the returned Skia object.
-SkMaskFilter createBlurSkMaskFilter(ui.BlurStyle blurStyle, double sigma) {
-  return canvasKit.MaskFilter.MakeBlur(toSkBlurStyle(blurStyle), sigma, true)!;
+  late final SkMaskFilter _skMaskFilter;
+
+  SkMaskFilter get skiaObject => _skMaskFilter;
+
+  @override
+  void dispose() {
+    _skMaskFilter.delete();
+  }
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
index 48f6473581780..f0229d65e8f69 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
@@ -7,7 +7,8 @@ import 'dart:typed_data';
 import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../color_filter.dart';
+import '../primitives/color_filter.dart';
+import '../primitives/mask_filter.dart';
 import '../shader_data.dart';
 import '../vector_math.dart';
 import 'canvaskit_api.dart';
@@ -40,9 +41,22 @@ class CkPaint implements ui.Paint {
     skPaint.setColorInt(_colorValue);
     skPaint.setStrokeMiter(strokeMiterLimit);
 
-    final ManagedSkColorFilter? effectiveColorFilter = _effectiveColorFilter;
-    if (effectiveColorFilter != null) {
-      skPaint.setColorFilter(effectiveColorFilter.skiaObject);
+    final EngineColorFilter? colorFilter = _engineColorFilter;
+    SkColorFilter? composedSkColorFilter;
+    if (invertColors) {
+      final SkColorFilter invertSkColorFilter =
+          (EngineColorFilter.invert.backendFilter as CkColorFilter).skiaObject;
+      if (colorFilter != null) {
+        composedSkColorFilter = canvasKit.ColorFilter.MakeCompose(
+          invertSkColorFilter,
+          (colorFilter.backendFilter as CkColorFilter).skiaObject,
+        );
+        skPaint.setColorFilter(composedSkColorFilter);
+      } else {
+        skPaint.setColorFilter(invertSkColorFilter);
+      }
+    } else if (colorFilter != null) {
+      skPaint.setColorFilter((colorFilter.backendFilter as CkColorFilter).skiaObject);
     }
 
     final CkShader? shader = _shader;
@@ -53,13 +67,12 @@ class CkPaint implements ui.Paint {
       }
     }
 
-    final ui.MaskFilter? localMaskFilter = maskFilter;
+    final localMaskFilter = maskFilter as EngineMaskFilter?;
     if (localMaskFilter != null) {
       // CanvasKit returns `null` if the sigma is `0` or infinite.
       if (localMaskFilter.webOnlySigma.isFinite && localMaskFilter.webOnlySigma > 0) {
-        skPaint.setMaskFilter(
-          createBlurSkMaskFilter(localMaskFilter.webOnlyBlurStyle, localMaskFilter.webOnlySigma),
-        );
+        final backendFilter = localMaskFilter.backendFilter as CkMaskFilter;
+        skPaint.setMaskFilter(backendFilter.skiaObject);
       }
     }
 
@@ -70,6 +83,10 @@ class CkPaint implements ui.Paint {
       }, defaultBlurTileMode: defaultBlurTileMode);
     }
 
+    if (composedSkColorFilter != null) {
+      composedSkColorFilter.delete();
+    }
+
     return skPaint;
   }
 
@@ -105,30 +122,10 @@ class CkPaint implements ui.Paint {
   bool get invertColors => _invertColors;
   @override
   set invertColors(bool value) {
-    if (value == _invertColors) {
-      return;
-    }
-    if (!value) {
-      _effectiveColorFilter = _originalColorFilter;
-      _originalColorFilter = null;
-    } else {
-      _originalColorFilter = _effectiveColorFilter;
-      if (_effectiveColorFilter == null) {
-        _effectiveColorFilter = _invertColorFilter;
-      } else {
-        _effectiveColorFilter = ManagedSkColorFilter(
-          CkComposeColorFilter(_invertColorFilter, _effectiveColorFilter!),
-        );
-      }
-    }
     _invertColors = value;
   }
 
   bool _invertColors = false;
-  // The original color filter before we inverted colors. If we set
-  // `invertColors` back to `false`, then restore this filter rather than
-  // invert the color filter again.
-  ManagedSkColorFilter? _originalColorFilter;
 
   @override
   ui.Shader? get shader => _shader;
@@ -153,38 +150,12 @@ class CkPaint implements ui.Paint {
 
   @override
   set colorFilter(ui.ColorFilter? value) {
-    if (_engineColorFilter == value) {
-      return;
-    }
     _engineColorFilter = value as EngineColorFilter?;
-    _originalColorFilter = null;
-    if (value == null) {
-      _effectiveColorFilter = null;
-    } else {
-      final CkColorFilter ckColorFilter = createCkColorFilter(value)!;
-      _effectiveColorFilter = ManagedSkColorFilter(ckColorFilter);
-    }
-
-    if (invertColors) {
-      _originalColorFilter = _effectiveColorFilter;
-      if (_effectiveColorFilter == null) {
-        _effectiveColorFilter = _invertColorFilter;
-      } else {
-        _effectiveColorFilter = ManagedSkColorFilter(
-          CkComposeColorFilter(_invertColorFilter, _effectiveColorFilter!),
-        );
-      }
-    }
   }
 
   /// The original color filter objects passed by the framework.
   EngineColorFilter? _engineColorFilter;
 
-  /// The effective color filter.
-  ///
-  /// This is a combination of the `colorFilter` and `invertColors` properties.
-  ManagedSkColorFilter? _effectiveColorFilter;
-
   @override
   double strokeMiterLimit = 4.0;
 
@@ -197,7 +168,7 @@ class CkPaint implements ui.Paint {
     }
 
     if (value is ui.ColorFilter) {
-      _imageFilter = createCkColorFilter(value as EngineColorFilter);
+      _imageFilter = CkColorFilterImageFilter(colorFilter: value as EngineColorFilter);
     } else {
       _imageFilter = value as CkManagedSkImageFilterConvertible?;
     }
@@ -285,17 +256,6 @@ class CkPaint implements ui.Paint {
   }
 }
 
-final Float32List _invertColorMatrix = Float32List.fromList(const <double>[
-  -1.0, 0, 0, 1.0, 0, // row
-  0, -1.0, 0, 1.0, 0, // row
-  0, 0, -1.0, 1.0, 0, // row
-  1.0, 1.0, 1.0, 1.0, 0,
-]);
-
-final ManagedSkColorFilter _invertColorFilter = ManagedSkColorFilter(
-  CkMatrixColorFilter(_invertColorMatrix),
-);
-
 class CkFragmentProgram implements ui.FragmentProgram {
   CkFragmentProgram(this.name, this.effect, this.uniforms, this.floatCount, this.textureCount);
 
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
index 2739d04ce50c8..e5b7d1db09fe5 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
@@ -73,28 +73,13 @@ class CanvasKitRenderer extends Renderer {
   ui.Paint createPaint() => CkPaint();
 
   @override
-  ui.Vertices createVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  }) => CkVertices(
-    mode,
-    positions,
-    textureCoordinates: textureCoordinates,
-    colors: colors,
-    indices: indices,
-  );
-
-  @override
-  ui.Vertices createVerticesRaw(
+  BackendVertices createVertices(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
     Int32List? colors,
     Uint16List? indices,
-  }) => CkVertices.raw(
+  }) => CkVertices(
     mode,
     positions,
     textureCoordinates: textureCoordinates,
@@ -187,122 +172,116 @@ class CanvasKitRenderer extends Renderer {
     required ui.ImageFilter inner,
   }) {
     if (outer is EngineColorFilter) {
-      final CkColorFilter colorFilter = createCkColorFilter(outer)!;
-      outer = CkColorFilterImageFilter(colorFilter: colorFilter);
+      outer = CkColorFilterImageFilter(colorFilter: outer);
     }
     if (inner is EngineColorFilter) {
-      final CkColorFilter colorFilter = createCkColorFilter(inner)!;
-      inner = CkColorFilterImageFilter(colorFilter: colorFilter);
+      inner = CkColorFilterImageFilter(colorFilter: inner);
     }
     return CkImageFilter.compose(outer: outer as CkImageFilter, inner: inner as CkImageFilter);
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodec(
-    Uint8List list, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) async => skiaInstantiateImageCodec(list, targetWidth, targetHeight, allowUpscaling);
+  BackendColorFilter createColorFilter(EngineColorFilter filter) => CkColorFilter(filter);
 
   @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(
-    Uri uri, {
-    ui_web.ImageCodecChunkCallback? chunkCallback,
-  }) => skiaInstantiateWebImageCodec(uri.toString(), chunkCallback);
+  BackendMaskFilter createMaskFilter(EngineMaskFilter filter) => CkMaskFilter(filter);
 
   @override
-  ui.Image createImageFromImageBitmap(DomImageBitmap imageBitmap) {
-    SkImage? skImage;
-    // For software rendering, instantiate an SkImage immediately from the canvas source.
-    if (isSoftware) {
-      skImage = canvasKit.MakeImageFromCanvasImageSource(imageBitmap);
-    } else {
-      // For GPU-accelerated CanvasKit, create a lazy image from the ImageBitmap, which
-      // defers uploading the image texture to the WebGL context until render time.
-      skImage = canvasKit.MakeLazyImageFromImageBitmap(imageBitmap, true);
-    }
-    if (skImage == null) {
-      throw Exception('Failed to convert image bitmap to an SkImage.');
-    }
-    return EngineImage(
-      CkImageDelegate(skImage),
-      skImage.width().toInt(),
-      skImage.height().toInt(),
-      imageSource: ImageBitmapImageSource(imageBitmap),
+  BackendAnimatedImage createAnimatedImage(Uint8List bytes, {int? targetWidth, int? targetHeight}) {
+    return CkAnimatedImage.decodeFromBytes(
+      bytes,
+      'encoded image bytes',
+      targetWidth: targetWidth,
+      targetHeight: targetHeight,
     );
   }
 
   @override
-  FutureOr<ui.Image> createImageFromTextureSource(
-    JSAny object, {
-    required int width,
-    required int height,
-    required bool transferOwnership,
-  }) async {
-    if (!transferOwnership) {
-      final DomImageBitmap bitmap = await createImageBitmap(object, (
-        x: 0,
-        y: 0,
-        width: width,
-        height: height,
-      ));
-      return createImageFromImageBitmap(bitmap);
-    }
+  /// Converts a normalized [ImageSource] into a CanvasKit-specific [BackendImage].
+  ///
+  /// This method implements a highly optimized resource allocation strategy that
+  /// behaves differently depending on the active rendering mode:
+  ///
+  /// - **Software Rendering Fallback (`isSoftware`):** If the CanvasKit backend is running
+  ///    without GPU acceleration, we call `MakeImageFromCanvasImageSource`. This eagerly
+  ///    rasterizes the DOM source on the CPU and copies its pixels into a C++ WASM-allocated
+  ///    heap buffer.
+  /// - **Hardware-Accelerated WebGL Path (`!isSoftware`):** To avoid blocking the main
+  ///    thread and prevent massive GPU memory spikes, we use "lazy" texture uploads:
+  ///    - **ImageBitmap Source:** We call `MakeLazyImageFromImageBitmap`. The second argument
+  ///      (`true`) transfers ownership of the bitmap to CanvasKit, allowing CanvasKit to
+  ///      automatically close and release the browser-allocated bitmap once it has been
+  ///      successfully uploaded to a GPU texture.
+  ///    - **Other Texture Sources:** We call `MakeLazyImageFromTextureSourceWithInfo` to register
+  ///      the texture source (e.g. canvas or video frame) with WebGL.
+  ///    In both cases, the actual upload of the texture to the GPU is deferred until the
+  ///    image is drawn on the screen for the first time, ensuring smooth animations.
+  ///
+  ///    Additionally, lazy texture uploads allow a single texture source to be uploaded
+  ///    to multiple WebGL contexts. This is critical in "MultiSurfaceRasterizer" mode,
+  ///    where multiple WebGL contexts are active on-screen concurrently, and the same
+  ///    image may need to be rendered across different surfaces.
+  BackendImage createImageFromImageSource(ImageSource source) {
     SkImage? skImage;
+    final DomCanvasImageSource canvasImageSource = source.canvasImageSource;
     if (isSoftware) {
-      if (object.isA<VideoFrame>()) {
-        // If the object is a VideoFrame, we need to draw it to a canvas first to
-        // avoid a bug in CanvasKit where MakeImageFromCanvasImageSource doesn't
-        // work with VideoFrames.
-        final DomHTMLCanvasElement canvas = createDomCanvasElement(width: width, height: height);
-        final DomCanvasRenderingContext2D ctx = canvas.context2D;
-        ctx.drawImage(object as VideoFrame, 0, 0);
-        skImage = canvasKit.MakeImageFromCanvasImageSource(canvas);
+      skImage = canvasKit.MakeImageFromCanvasImageSource(canvasImageSource);
+    } else {
+      if (canvasImageSource.isA<DomImageBitmap>()) {
+        skImage = canvasKit.MakeLazyImageFromImageBitmap(canvasImageSource as DomImageBitmap, true);
       } else {
-        skImage = canvasKit.MakeImageFromCanvasImageSource(object);
+        skImage = canvasKit.MakeLazyImageFromTextureSourceWithInfo(
+          canvasImageSource,
+          SkPartialImageInfo(
+            width: source.width.toDouble(),
+            height: source.height.toDouble(),
+            alphaType: canvasKit.AlphaType.Premul,
+            colorType: canvasKit.ColorType.RGBA_8888,
+            colorSpace: SkColorSpaceSRGB,
+          ),
+        );
       }
-    } else {
-      skImage = canvasKit.MakeLazyImageFromTextureSourceWithInfo(
-        object,
-        SkPartialImageInfo(
-          width: width.toDouble(),
-          height: height.toDouble(),
-          alphaType: canvasKit.AlphaType.Premul,
-          colorType: canvasKit.ColorType.RGBA_8888,
-          colorSpace: SkColorSpaceSRGB,
-        ),
-      );
     }
-
     if (skImage == null) {
-      throw Exception('Failed to convert image bitmap to an SkImage.');
+      throw Exception('Failed to convert image source to an SkImage.');
     }
-    return EngineImage(CkImageDelegate(skImage), skImage.width().toInt(), skImage.height().toInt());
+    return CkImageDelegate(skImage);
   }
 
   @override
-  void decodeImageFromPixels(
-    Uint8List pixels,
-    int width,
-    int height,
-    ui.PixelFormat format,
-    ui.ImageDecoderCallback callback, {
+  bool get isMultiThreaded => false;
+
+  @override
+  bool get supportsResizingAnimatedImages => false;
+
+  @override
+  BackendImage decodeBackendImageFromPixels(
+    Uint8List pixels, {
+    required int width,
+    required int height,
+    required ui.PixelFormat format,
     int? rowBytes,
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) => skiaDecodeImageFromPixels(
-    pixels,
-    width,
-    height,
-    format,
-    callback,
-    rowBytes: rowBytes,
-    targetWidth: targetWidth,
-    targetHeight: targetHeight,
-    allowUpscaling: allowUpscaling,
-  );
+  }) {
+    final SkImage? skImage = canvasKit.MakeImage(
+      SkImageInfo(
+        width: width.toDouble(),
+        height: height.toDouble(),
+        colorType: format == ui.PixelFormat.rgba8888
+            ? canvasKit.ColorType.RGBA_8888
+            : canvasKit.ColorType.BGRA_8888,
+        alphaType: canvasKit.AlphaType.Premul,
+        colorSpace: SkColorSpaceSRGB,
+      ),
+      pixels,
+      rowBytes ?? 4 * width,
+    );
+
+    if (skImage == null) {
+      throw Exception('Failed to create image from pixels.');
+    }
+
+    return CkImageDelegate(skImage);
+  }
 
   @override
   ui.ImageShader createImageShader(
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
index 17457a3b6f5ce..73efd29ce2f64 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
@@ -6,53 +6,17 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
+import '../backend/vertices.dart';
 import 'canvaskit_api.dart';
-import 'native_memory.dart';
 
-class CkVertices implements ui.Vertices {
+class CkVertices implements BackendVertices {
   factory CkVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  }) {
-    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
-      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
-    }
-    if (colors != null && colors.length != positions.length) {
-      throw ArgumentError('"positions" and "colors" lengths must match.');
-    }
-    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length)) {
-      throw ArgumentError('"indices" values must be valid indices in the positions list.');
-    }
-
-    return CkVertices._(
-      toSkVertexMode(mode),
-      toFlatSkPoints(positions),
-      textureCoordinates != null ? toFlatSkPoints(textureCoordinates) : null,
-      colors != null ? toFlatColors(colors) : null,
-      indices != null ? toUint16List(indices) : null,
-    );
-  }
-
-  factory CkVertices.raw(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
     Int32List? colors,
     Uint16List? indices,
   }) {
-    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
-      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
-    }
-    if (colors != null && colors.length * 2 != positions.length) {
-      throw ArgumentError('"positions" and "colors" lengths must match.');
-    }
-    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length)) {
-      throw ArgumentError('"indices" values must be valid indices in the positions list.');
-    }
-
     Uint32List? unsignedColors;
     if (colors != null) {
       unsignedColors = colors.buffer.asUint32List(colors.offsetInBytes, colors.length);
@@ -67,44 +31,24 @@ class CkVertices implements ui.Vertices {
     );
   }
 
-  CkVertices._(this._mode, this._positions, this._textureCoordinates, this._colors, this._indices) {
-    // If [_positions] is empty, then [canvasKit.MakeVertices] will return
-    // `null`, which breaks our JS interop. So, if we see that [_positions] is
-    // empty, we do not create a [SkVertices] object and just treat this as
-    // an empty vertices. Drawing an empty Vertices object is a no-op.
-    if (_positions.isNotEmpty) {
-      final SkVertices skVertices = canvasKit.MakeVertices(
-        _mode,
-        _positions,
-        _textureCoordinates,
-        _colors,
-        _indices,
-      );
-      _ref = CkUniqueRef<SkVertices>(this, skVertices, 'Vertices');
-    } else {
-      _ref = null;
-    }
-  }
-
-  final SkVertexMode _mode;
-  final Float32List _positions;
-  final Float32List? _textureCoordinates;
-  final Uint32List? _colors;
-  final Uint16List? _indices;
-  late final CkUniqueRef<SkVertices>? _ref;
-
-  SkVertices get skiaObject => _ref!.nativeObject;
-
-  bool get hasNoPoints => _ref == null;
+  /// Creates a new `CkVertices` by calling the CanvasKit API.
+  ///
+  /// This constructor assumes that [positions] is not empty. `EngineVertices`
+  /// ensures this by checking `positions.isNotEmpty` before delegating to the backend.
+  /// If `positions` were empty, `canvasKit.MakeVertices` would return `null`,
+  /// causing JS interop errors.
+  CkVertices._(
+    SkVertexMode mode,
+    Float32List positions,
+    Float32List? textureCoordinates,
+    Uint32List? colors,
+    Uint16List? indices,
+  ) : skiaObject = canvasKit.MakeVertices(mode, positions, textureCoordinates, colors, indices);
 
-  bool _isDisposed = false;
+  final SkVertices skiaObject;
 
   @override
   void dispose() {
-    _ref?.dispose();
-    _isDisposed = true;
+    skiaObject.delete();
   }
-
-  @override
-  bool get debugDisposed => _isDisposed;
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/color_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/color_filter.dart
deleted file mode 100644
index 098785cb6bbcf..0000000000000
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/color_filter.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-enum ColorFilterType { mode, matrix, linearToSrgbGamma, srgbToLinearGamma }
-
-/// A description of a color filter to apply when drawing a shape or compositing
-/// a layer with a particular [Paint]. A color filter is a function that takes
-/// two colors, and outputs one color. When applied during compositing, it is
-/// independently applied to each pixel of the layer being drawn before the
-/// entire layer is merged with the destination.
-///
-/// Instances of this class are used with [Paint.colorFilter] on [Paint]
-/// objects.
-class EngineColorFilter implements LayerImageFilter, ui.ColorFilter {
-  /// Creates a color filter that applies the blend mode given as the second
-  /// argument. The source color is the one given as the first argument, and the
-  /// destination color is the one from the layer being composited.
-  ///
-  /// The output of this filter is then composited into the background according
-  /// to the [Paint.blendMode], using the output of this filter as the source
-  /// and the background as the destination.
-  const EngineColorFilter.mode(ui.Color this.color, ui.BlendMode this.blendMode)
-    : matrix = null,
-      type = ColorFilterType.mode;
-
-  /// Construct a color filter that transforms a color by a 5x5 matrix, where
-  /// the fifth row is implicitly added in an identity configuration.
-  ///
-  /// Every pixel's color value, represented as an `[R, G, B, A]`, is matrix
-  /// multiplied to create a new color:
-  ///
-  /// ```text
-  /// | R' |   | a00 a01 a02 a03 a04 |   | R |
-  /// | G' |   | a10 a11 a12 a13 a14 |   | G |
-  /// | B' | = | a20 a21 a22 a23 a24 | * | B |
-  /// | A' |   | a30 a31 a32 a33 a34 |   | A |
-  /// | 1  |   |  0   0   0   0   1  |   | 1 |
-  /// ```
-  ///
-  /// The matrix is in row-major order and the translation column is specified
-  /// in unnormalized, 0...255, space. For example, the identity matrix is:
-  ///
-  /// ```dart
-  /// const ColorMatrix identity = ColorFilter.matrix(<double>[
-  ///   1, 0, 0, 0, 0,
-  ///   0, 1, 0, 0, 0,
-  ///   0, 0, 1, 0, 0,
-  ///   0, 0, 0, 1, 0,
-  /// ]);
-  /// ```
-  ///
-  /// ## Examples
-  ///
-  /// An inversion color matrix:
-  ///
-  /// ```dart
-  /// const ColorFilter invert = ColorFilter.matrix(<double>[
-  ///   -1,  0,  0, 0, 255,
-  ///    0, -1,  0, 0, 255,
-  ///    0,  0, -1, 0, 255,
-  ///    0,  0,  0, 1,   0,
-  /// ]);
-  /// ```
-  ///
-  /// A sepia-toned color matrix (values based on the [Filter Effects Spec](https://www.w3.org/TR/filter-effects-1/#sepiaEquivalent)):
-  ///
-  /// ```dart
-  /// const ColorFilter sepia = ColorFilter.matrix(<double>[
-  ///   0.393, 0.769, 0.189, 0, 0,
-  ///   0.349, 0.686, 0.168, 0, 0,
-  ///   0.272, 0.534, 0.131, 0, 0,
-  ///   0,     0,     0,     1, 0,
-  /// ]);
-  /// ```
-  ///
-  /// A greyscale color filter (values based on the [Filter Effects Spec](https://www.w3.org/TR/filter-effects-1/#grayscaleEquivalent)):
-  ///
-  /// ```dart
-  /// const ColorFilter greyscale = ColorFilter.matrix(<double>[
-  ///   0.2126, 0.7152, 0.0722, 0, 0,
-  ///   0.2126, 0.7152, 0.0722, 0, 0,
-  ///   0.2126, 0.7152, 0.0722, 0, 0,
-  ///   0,      0,      0,      1, 0,
-  /// ]);
-  /// ```
-  const EngineColorFilter.matrix(List<double> this.matrix)
-    : color = null,
-      blendMode = null,
-      type = ColorFilterType.matrix;
-
-  /// Construct a color filter that applies the sRGB gamma curve to the RGB
-  /// channels.
-  const EngineColorFilter.linearToSrgbGamma()
-    : color = null,
-      blendMode = null,
-      matrix = null,
-      type = ColorFilterType.linearToSrgbGamma;
-
-  /// Creates a color filter that applies the inverse of the sRGB gamma curve
-  /// to the RGB channels.
-  const EngineColorFilter.srgbToLinearGamma()
-    : color = null,
-      blendMode = null,
-      matrix = null,
-      type = ColorFilterType.srgbToLinearGamma;
-
-  /// Creates a color filter that applies the given saturation to the RGB
-  /// channels.
-  factory EngineColorFilter.saturation(double saturation) {
-    const rLuminance = 0.2126;
-    const gLuminance = 0.7152;
-    const bLuminance = 0.0722;
-    final double invSat = 1 - saturation;
-
-    return EngineColorFilter.matrix(<double>[
-      // dart format off
-      invSat * rLuminance + saturation, invSat * gLuminance,              invSat * bLuminance,              0, 0,
-      invSat * rLuminance,              invSat * gLuminance + saturation, invSat * bLuminance,              0, 0,
-      invSat * rLuminance,              invSat * gLuminance,              invSat * bLuminance + saturation, 0, 0,
-      0,                                0,                                0,                                1, 0,
-      // dart format on
-    ]);
-  }
-
-  final ui.Color? color;
-  final ui.BlendMode? blendMode;
-  final List<double>? matrix;
-  final ColorFilterType type;
-
-  /// Color filters don't affect the image bounds
-  @override
-  ui.Rect filterBounds(ui.Rect inputBounds) => inputBounds;
-
-  @override
-  String get debugShortDescription => toString();
-
-  @override
-  String toString() {
-    return switch (type) {
-      ColorFilterType.mode => 'ColorFilter.mode($color, $blendMode)',
-      ColorFilterType.matrix => 'ColorFilter.matrix($matrix)',
-      ColorFilterType.linearToSrgbGamma => 'ColorFilter.linearToSrgbGamma()',
-      ColorFilterType.srgbToLinearGamma => 'ColorFilter.srgbToLinearGamma()',
-    };
-  }
-
-  @override
-  Matrix4? get transform => null;
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! EngineColorFilter) {
-      return false;
-    }
-    return other.type == type &&
-        other.color == color &&
-        other.blendMode == blendMode &&
-        listEquals(other.matrix, matrix);
-  }
-
-  @override
-  int get hashCode =>
-      Object.hash(type, color, blendMode, Object.hashAll(matrix ?? const <double>[]));
-}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/dom.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/dom.dart
index 489581eaaea57..113ba0b43dabf 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/dom.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/dom.dart
@@ -258,24 +258,105 @@ external DomIntl get domIntl;
 @JS('Symbol')
 external DomSymbol get domSymbol;
 
-@JS('createImageBitmap')
-external JSPromise<JSAny?> _createImageBitmap(JSAny source, [int x, int y, int width, int height]);
+extension CreateImageBitmapExtension on JSObject {
+  @JS('createImageBitmap')
+  external JSPromise<JSAny?> createImageBitmap(JSAny source);
+
+  @JS('createImageBitmap')
+  external JSPromise<JSAny?> createImageBitmapWithOptions(JSAny source, ImageBitmapOptions options);
+
+  @JS('createImageBitmap')
+  external JSPromise<JSAny?> createImageBitmapWithBounds(
+    JSAny source,
+    int x,
+    int y,
+    int width,
+    int height,
+  );
+
+  @JS('createImageBitmap')
+  external JSPromise<JSAny?> createImageBitmapWithBoundsAndOptions(
+    JSAny source,
+    int x,
+    int y,
+    int width,
+    int height,
+    ImageBitmapOptions options,
+  );
+}
+
 Future<DomImageBitmap> createImageBitmap(
-  JSAny source, [
+  JSAny source, {
   ({int x, int y, int width, int height})? bounds,
-]) {
+  ImageBitmapOptions? options,
+}) {
   if (debugThrowOnCreateImageBitmapIfDisabled && !browserSupportsCreateImageBitmap) {
     throw UnsupportedError('createImageBitmap is not supported in this browser');
   }
-  JSPromise<JSAny?> jsPromise;
+  final JSPromise<JSAny?> jsPromise;
   if (bounds != null) {
-    jsPromise = _createImageBitmap(source, bounds.x, bounds.y, bounds.width, bounds.height);
+    if (options != null) {
+      jsPromise = globalContext.createImageBitmapWithBoundsAndOptions(
+        source,
+        bounds.x,
+        bounds.y,
+        bounds.width,
+        bounds.height,
+        options,
+      );
+    } else {
+      jsPromise = globalContext.createImageBitmapWithBounds(
+        source,
+        bounds.x,
+        bounds.y,
+        bounds.width,
+        bounds.height,
+      );
+    }
   } else {
-    jsPromise = _createImageBitmap(source);
+    if (options != null) {
+      jsPromise = globalContext.createImageBitmapWithOptions(source, options);
+    } else {
+      jsPromise = globalContext.createImageBitmap(source);
+    }
   }
   return jsPromise.toDart.then((JSAny? value) => value! as DomImageBitmap);
 }
 
+@JS()
+@anonymous
+extension type ImageBitmapOptions._primary(JSObject _) implements JSObject {
+  factory ImageBitmapOptions({
+    String? imageOrientation,
+    String? premultiplyAlpha,
+    String? colorSpaceConversion,
+    int? resizeWidth,
+    int? resizeHeight,
+    String? resizeQuality,
+  }) {
+    final obj = JSObject();
+    if (imageOrientation != null) {
+      obj['imageOrientation'] = imageOrientation.toJS;
+    }
+    if (premultiplyAlpha != null) {
+      obj['premultiplyAlpha'] = premultiplyAlpha.toJS;
+    }
+    if (colorSpaceConversion != null) {
+      obj['colorSpaceConversion'] = colorSpaceConversion.toJS;
+    }
+    if (resizeWidth != null) {
+      obj['resizeWidth'] = resizeWidth.toJS;
+    }
+    if (resizeHeight != null) {
+      obj['resizeHeight'] = resizeHeight.toJS;
+    }
+    if (resizeQuality != null) {
+      obj['resizeQuality'] = resizeQuality.toJS;
+    }
+    return ImageBitmapOptions._primary(obj);
+  }
+}
+
 @JS('Navigator')
 extension type DomNavigator._(JSObject _) implements JSObject {
   external DomClipboard? get clipboard;
@@ -1264,6 +1345,10 @@ abstract class HttpFetchResponse {
   /// Returns null if "Content-Length" is missing.
   int? get contentLength;
 
+  /// Returns the value of the HTTP header with the given [name], or null if
+  /// the header is not present.
+  String? header(String name);
+
   /// Return true if this response has a [payload].
   ///
   /// Returns false if this response does not have a payload and therefore it is
@@ -1322,13 +1407,16 @@ class HttpFetchResponseImpl implements HttpFetchResponse {
 
   @override
   int? get contentLength {
-    final String? header = _domResponse.headers.get('Content-Length');
+    final String? header = this.header('Content-Length');
     if (header == null) {
       return null;
     }
     return int.tryParse(header);
   }
 
+  @override
+  String? header(String name) => _domResponse.headers.get(name);
+
   @override
   bool get hasPayload {
     final bool accepted = status >= 200 && status < 300;
@@ -1367,6 +1455,14 @@ class MockHttpFetchResponse implements HttpFetchResponse {
   @override
   final int? contentLength;
 
+  @override
+  String? header(String name) {
+    if (name.toLowerCase() == 'content-length' && contentLength != null) {
+      return contentLength.toString();
+    }
+    return null;
+  }
+
   @override
   bool get hasPayload => _payload != null;
 
@@ -1392,6 +1488,9 @@ abstract class HttpFetchPayload {
 
   /// Return the data as a string.
   Future<String> text();
+
+  /// Returns the raw DOM readable stream.
+  DomReadableStream get stream;
 }
 
 class HttpFetchPayloadImpl implements HttpFetchPayload {
@@ -1399,13 +1498,16 @@ class HttpFetchPayloadImpl implements HttpFetchPayload {
 
   final DomResponse _domResponse;
 
+  @override
+  DomReadableStream get stream => _domResponse.body;
+
   @override
   Future<void> read(HttpFetchReader<JSUint8Array> callback) async {
     final DomReadableStream stream = _domResponse.body;
-    final _DomStreamReader reader = stream._getReader();
+    final DomStreamReader reader = stream.getReader();
 
     while (true) {
-      final _DomStreamChunk chunk = await reader.read();
+      final DomStreamChunk chunk = await reader.read();
       if (chunk.done) {
         break;
       }
@@ -1460,6 +1562,9 @@ class MockHttpFetchPayload implements HttpFetchPayload {
 
   @override
   Future<String> text() async => throw AssertionError('text not supported by mock');
+
+  @override
+  DomReadableStream get stream => throw AssertionError('stream not supported by mock');
 }
 
 /// Indicates a missing HTTP payload when one was expected, such as when
@@ -1541,17 +1646,23 @@ extension type DomHeaders._(JSObject _) implements JSObject {
 
 extension type DomReadableStream._(JSObject _) implements JSObject {
   @JS('getReader')
-  external _DomStreamReader _getReader();
+  external DomStreamReader getReader();
+
+  @JS('tee')
+  external JSArray<DomReadableStream> tee();
 }
 
-extension type _DomStreamReader._(JSObject _) implements JSObject {
+extension type DomStreamReader._(JSObject _) implements JSObject {
   @JS('read')
   external JSPromise<JSAny?> _read();
-  Future<_DomStreamChunk> read() =>
-      _read().toDart.then((JSAny? value) => value! as _DomStreamChunk);
+  Future<DomStreamChunk> read() => _read().toDart.then((JSAny? value) => value! as DomStreamChunk);
+
+  @JS('cancel')
+  external JSPromise<JSAny?> _cancel();
+  Future<void> cancel() => _cancel().toDart;
 }
 
-extension type _DomStreamChunk._(JSObject _) implements JSObject {
+extension type DomStreamChunk._(JSObject _) implements JSObject {
   external JSAny? get value;
   external bool get done;
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart
deleted file mode 100644
index 57d7e5fb495d3..0000000000000
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
-
-/// The lifecycle status of an [HtmlImageElementCodec].
-enum _HtmlCodecStatus {
-  /// The codec has been created but has not yet started loading.
-  initial,
-
-  /// The codec is waiting for the browser to load the image metadata (width/height).
-  loadingMetadata,
-
-  /// The codec has loaded metadata and is now waiting for an available slot in
-  /// the [ImageDecodingManager] to begin the heavy decoding process.
-  waitingForSlot,
-
-  /// The codec has been granted a slot and is currently executing the
-  /// [HTMLImageElement.decode] operation.
-  decoding,
-
-  /// The image has been successfully loaded and decoded.
-  success,
-
-  /// An error occurred during the loading or decoding process.
-  failed,
-
-  /// The codec has been disposed and should no longer be used.
-  disposed,
-}
-
-/// Exception thrown when a codec is disposed while it is still decoding.
-class _HtmlCodecDisposedException implements Exception {
-  const _HtmlCodecDisposedException();
-
-  @override
-  String toString() => 'HtmlCodec was disposed.';
-}
-
-abstract class HtmlImageElementCodec implements ui.Codec {
-  HtmlImageElementCodec(this.src, {this.chunkCallback, this.debugSource});
-
-  final String src;
-  final ui_web.ImageCodecChunkCallback? chunkCallback;
-  final String? debugSource;
-
-  @override
-  int get frameCount => 1;
-
-  @override
-  int get repetitionCount => 0;
-
-  /// The Image() element backing this codec.
-  DomHTMLImageElement? imgElement;
-
-  /// A Future which completes when the Image element backing this codec has
-  /// been loaded and decoded.
-  Future<void>? decodeFuture;
-
-  ImageDecodingRequest? _decodingRequest;
-  _HtmlCodecStatus _status = _HtmlCodecStatus.initial;
-  Completer<void>? _loadCompleter;
-
-  /// Whether a [ui.Image] has been created and returned by [getNextFrame].
-  ///
-  /// This is used during [dispose] to determine if it is safe to clear the
-  /// `src` attribute of [imgElement]. If the image has been handed out, the
-  /// [ui.Image] might still be using the element for rendering, and clearing
-  /// the `src` could disrupt the browser's internal image state.
-  bool _imageHandedOut = false;
-
-  Future<void> decode() {
-    decodeFuture ??= _performDecode();
-    return decodeFuture!;
-  }
-
-  void _checkDisposed() {
-    if (_status == _HtmlCodecStatus.disposed) {
-      throw const _HtmlCodecDisposedException();
-    }
-  }
-
-  Future<void> _performDecode() async {
-    try {
-      _checkDisposed();
-      await _waitForMetadata();
-      await _executeThrottledDecode();
-
-      _status = _HtmlCodecStatus.success;
-      chunkCallback?.call(100, 100);
-    } on _HtmlCodecDisposedException {
-      _status = _HtmlCodecStatus.disposed;
-    } on ImageDecodingCancelledException {
-      _status = _HtmlCodecStatus.disposed;
-    } catch (e) {
-      _status = _HtmlCodecStatus.failed;
-      if (!_imageHandedOut) {
-        imgElement?.src = '';
-      }
-      rethrow;
-    } finally {
-      _cleanupDecodingSlot();
-    }
-  }
-
-  Future<void> _waitForMetadata() async {
-    _status = _HtmlCodecStatus.loadingMetadata;
-    // Currently there is no way to watch decode progress, so
-    // we add 0/100 , 100/100 progress callbacks to enable loading progress
-    // builders to create UI.
-    chunkCallback?.call(0, 100);
-
-    imgElement = createDomHTMLImageElement();
-
-    // The 'anonymous' cross-origin setting is required for CanvasKit-based
-    // rendering. Without it, the browser would "taint" the image when it's
-    // drawn to a canvas, preventing us from reading the pixels back or
-    // converting it into a texture.
-    imgElement!.crossOrigin = 'anonymous';
-
-    // We set decoding to 'async' to hint to the browser that it should perform
-    // image decompression off the main thread. This helps prevent jank
-    // during the loading process.
-    imgElement!.decoding = 'async';
-
-    _loadCompleter = Completer<void>();
-
-    // We use a local listener to ensure we can properly remove it in the
-    // finally block. This prevents potential memory leaks or multiple
-    // resolutions of the completer.
-    final DomEventListener loadListener = createDomEventListener((DomEvent event) {
-      _loadCompleter?.complete();
-    });
-    final DomEventListener errorListener = createDomEventListener((DomEvent event) {
-      _loadCompleter?.completeError(ImageCodecException('Failed to load image: $src'));
-    });
-
-    imgElement!.addEventListener('load', loadListener);
-    imgElement!.addEventListener('error', errorListener);
-
-    // Setting the src attribute triggers the browser's image loading process.
-    imgElement!.src = src;
-
-    try {
-      await _loadCompleter!.future;
-    } finally {
-      // It's critical to remove the listeners to avoid leaks, as the
-      // HTMLImageElement might persist if it's cached by the browser or
-      // referenced elsewhere.
-      imgElement!.removeEventListener('load', loadListener);
-      imgElement!.removeEventListener('error', errorListener);
-      _loadCompleter = null;
-    }
-    _checkDisposed();
-  }
-
-  Future<void> _executeThrottledDecode() async {
-    _status = _HtmlCodecStatus.waitingForSlot;
-    final int width = imgElement!.naturalWidth.toInt();
-    final int height = imgElement!.naturalHeight.toInt();
-
-    _decodingRequest = ImageDecodingManager.instance.requestDecodingSlot(width, height);
-    await _decodingRequest!.future;
-    _checkDisposed();
-
-    _status = _HtmlCodecStatus.decoding;
-    // We use a timeout to prevent the decoder from hanging indefinitely and
-    // blocking the queue.
-    try {
-      await imgElement!.decode().timeout(const Duration(seconds: 30));
-    } on TimeoutException {
-      throw ImageCodecException('Timed out decoding image: $src');
-    } catch (e) {
-      throw ImageCodecException('Failed to decode image: $src. Error: $e');
-    }
-    _checkDisposed();
-  }
-
-  void _cleanupDecodingSlot() {
-    if (_decodingRequest != null) {
-      ImageDecodingManager.instance.releaseDecodingSlot(_decodingRequest!);
-      _decodingRequest = null;
-    }
-  }
-
-  @override
-  Future<ui.FrameInfo> getNextFrame() async {
-    await decode();
-    if (_status == _HtmlCodecStatus.disposed) {
-      throw StateError('Codec has been disposed');
-    }
-    int naturalWidth = imgElement!.naturalWidth.toInt();
-    int naturalHeight = imgElement!.naturalHeight.toInt();
-
-    // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=700533.
-    //
-    // In some versions of Firefox, certain image formats (like SVG or
-    // very large JPEGs) may report a natural size of 0x0 even after the
-    // 'load' event has fired if the browser hasn't fully computed the
-    // intrinsic dimensions.
-    //
-    // Since Flutter requires a non-zero size to create a [ui.Image], we fall
-    // back to a default size (300x300) to allow the image to be processed
-    // and rendered, albeit potentially at a scaled size.
-    if (naturalWidth == 0 &&
-        naturalHeight == 0 &&
-        ui_web.browser.browserEngine == ui_web.BrowserEngine.firefox) {
-      const kDefaultImageSizeFallback = 300;
-      naturalWidth = kDefaultImageSizeFallback;
-      naturalHeight = kDefaultImageSizeFallback;
-    }
-    final ui.Image image = await createImageFromHTMLImageElement(
-      imgElement!,
-      naturalWidth,
-      naturalHeight,
-    );
-    _imageHandedOut = true;
-    return SingleFrameInfo(image);
-  }
-
-  /// Creates a [ui.Image] from an [HTMLImageElement] that has been loaded.
-  FutureOr<ui.Image> createImageFromHTMLImageElement(
-    DomHTMLImageElement image,
-    int naturalWidth,
-    int naturalHeight,
-  );
-
-  @override
-  void dispose() {
-    if (_status == _HtmlCodecStatus.disposed) {
-      return;
-    }
-    final _HtmlCodecStatus oldStatus = _status;
-    _status = _HtmlCodecStatus.disposed;
-
-    if (oldStatus == _HtmlCodecStatus.loadingMetadata) {
-      _loadCompleter?.completeError(const _HtmlCodecDisposedException());
-    } else if (oldStatus == _HtmlCodecStatus.waitingForSlot) {
-      if (_decodingRequest != null) {
-        ImageDecodingManager.instance.cancel(_decodingRequest!);
-      }
-    }
-    if (!_imageHandedOut) {
-      imgElement?.src = '';
-    }
-  }
-}
-
-abstract class HtmlBlobCodec extends HtmlImageElementCodec {
-  HtmlBlobCodec(this.blob, {super.chunkCallback})
-    : super(domWindow.URL.createObjectURL(blob), debugSource: 'encoded image bytes');
-
-  final DomBlob blob;
-
-  @override
-  void dispose() {
-    super.dispose();
-    domWindow.URL.revokeObjectURL(src);
-  }
-}
-
-class SingleFrameInfo implements ui.FrameInfo {
-  SingleFrameInfo(this.image);
-
-  @override
-  Duration get duration => Duration.zero;
-
-  @override
-  final ui.Image image;
-}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/image_decoder.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/image_decoder.dart
index 35cb5e83cf77d..f5b3c1067cf9c 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/image_decoder.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/image_decoder.dart
@@ -2,14 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:js_interop';
+import 'dart:math' as math;
+import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-/// Image decoder backed by the browser's `ImageDecoder`.
-abstract class BrowserImageDecoder implements ui.Codec {
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+/// An image decoder that delegates to the browser's modern native `ImageDecoder` API.
+///
+/// This decoder is highly efficient as it offloads the decoding work (including
+/// frame extraction and progressive stream processing) to the browser's underlying
+/// image decoding subsystem, running off the main thread where possible.
+///
+/// Under the hood, it configures the native decoder to use premultiplied alpha and
+/// default color space conversion, aligning with Flutter's rendering expectations.
+class BrowserImageDecoder {
   BrowserImageDecoder({
     required this.contentType,
     required this.dataSource,
@@ -20,11 +31,8 @@ abstract class BrowserImageDecoder implements ui.Codec {
   final JSAny dataSource;
   final String debugSource;
 
-  @override
-  late int frameCount;
-
-  @override
-  late int repetitionCount;
+  int frameCount = 0;
+  int repetitionCount = 0;
 
   /// Whether this decoder has been disposed of.
   ///
@@ -32,13 +40,39 @@ abstract class BrowserImageDecoder implements ui.Codec {
   /// unusable.
   bool _isDisposed = false;
 
-  @override
+  final List<void Function()> _onDisposeCallbacks = [];
+
+  void addDisposeCallback(void Function() callback) {
+    if (_isDisposed) {
+      callback();
+    } else {
+      _onDisposeCallbacks.add(callback);
+    }
+  }
+
   void dispose() {
     _isDisposed = true;
-
-    // This releases all resources, including any currently running decoding work.
-    _cachedWebDecoder?.close();
-    _cachedWebDecoder = null;
+    final errors = <Object>[];
+    try {
+      for (final void Function() callback in _onDisposeCallbacks) {
+        try {
+          callback();
+        } catch (e) {
+          errors.add(e);
+        }
+      }
+    } finally {
+      _onDisposeCallbacks.clear();
+      _cachedWebDecoder?.close();
+      _cachedWebDecoder = null;
+
+      if (errors.isNotEmpty) {
+        printWarning(
+          'Failed to execute ${errors.length} dispose callback(s) in BrowserImageDecoder: '
+          '${errors.join(', ')}',
+        );
+      }
+    }
   }
 
   /// The index of the frame that will be decoded on the next call of [getNextFrame];
@@ -60,12 +94,18 @@ abstract class BrowserImageDecoder implements ui.Codec {
   ImageDecoder? get debugCachedWebDecoder => _cachedWebDecoder;
 
   Future<void> initialize() async {
-    _cachedWebDecoder = await _createWebDecoder();
+    final ImageDecoder webDecoder = await _createWebDecoder();
+    if (_isDisposed) {
+      webDecoder.close();
+    } else {
+      _cachedWebDecoder = webDecoder;
+    }
   }
 
   Future<ImageDecoder> _createWebDecoder() async {
+    ImageDecoder? webDecoder;
     try {
-      final webDecoder = ImageDecoder(
+      webDecoder = ImageDecoder(
         ImageDecoderOptions(
           type: contentType,
           data: dataSource,
@@ -97,6 +137,7 @@ abstract class BrowserImageDecoder implements ui.Codec {
 
       return webDecoder;
     } catch (error) {
+      webDecoder?.close();
       // TODO(srujzs): Replace this with `error.isJSAny` when we have that API
       // in `dart:js_interop`.
       // https://github.com/dart-lang/sdk/issues/56905
@@ -117,8 +158,7 @@ abstract class BrowserImageDecoder implements ui.Codec {
     }
   }
 
-  @override
-  Future<ui.FrameInfo> getNextFrame() async {
+  Future<VideoFrame> getNextFrame() async {
     if (_isDisposed) {
       throw ImageCodecException(
         'Cannot decode image. The image decoder has been disposed.\n'
@@ -145,21 +185,17 @@ abstract class BrowserImageDecoder implements ui.Codec {
         // For more details, see: https://issues.chromium.org/issues/456445108
         .decode(DecodeOptions(frameIndex: _nextFrameIndex, completeFramesOnly: false))
         .toDart;
+    if (_isDisposed) {
+      result.image.close();
+      throw ImageCodecException(
+        'Cannot decode image. The image decoder has been disposed.\n'
+        'Image source: $debugSource',
+      );
+    }
     final VideoFrame frame = result.image;
     _nextFrameIndex = (_nextFrameIndex + 1) % frameCount;
-
-    // Duration can be null if the image is not animated. However, Flutter
-    // requires a non-null value. 0 indicates that the frame is meant to be
-    // displayed indefinitely, which is fine for a static image.
-    final duration = Duration(microseconds: frame.duration?.toInt() ?? 0);
-    final ui.Image image = generateImageFromVideoFrame(frame);
-    return AnimatedImageFrameInfo(duration, image);
+    return frame;
   }
-
-  /// Creates a [ui.Image] from a [VideoFrame]. Implementers of this class
-  /// should override this method to create a [ui.Image] that is appropriate
-  /// for their associated renderer.
-  ui.Image generateImageFromVideoFrame(VideoFrame frame);
 }
 
 /// Data for a single frame of an animated image.
@@ -173,65 +209,322 @@ class AnimatedImageFrameInfo implements ui.FrameInfo {
   final ui.Image image;
 }
 
-// Wraps another codec and resizes each output image.
-class ResizingCodec implements ui.Codec {
-  ResizingCodec(this.delegate, {this.targetWidth, this.targetHeight, this.allowUpscaling = true});
+ImageType tryDetectImageType(Uint8List data, String debugSource) {
+  // ImageDecoder does not detect image type automatically. It requires us to
+  // tell it what the image type is.
+  final ImageType? imageType = detectImageType(data);
+
+  if (imageType == null) {
+    final String fileHeader;
+    if (data.isNotEmpty) {
+      fileHeader = '[${bytesToHexString(data.sublist(0, math.min(10, data.length)))}]';
+    } else {
+      fileHeader = 'empty';
+    }
+    throw ImageCodecException(
+      'Failed to detect image file format using the file header.\n'
+      'File header was $fileHeader.\n'
+      'Image source: $debugSource',
+    );
+  }
+  return imageType;
+}
 
-  final ui.Codec delegate;
-  final int? targetWidth;
-  final int? targetHeight;
-  final bool allowUpscaling;
+/// Duplicates the network response stream to enable parallel progress tracking
+/// and native image decoding.
+///
+/// In the web platform, a `ReadableStream` (like the HTTP response body) can only
+/// have a single active reader at a time. If we read the stream in Dart to track
+/// download progress (triggering [chunkCallback]), we lock the stream and prevent
+/// the browser's native `ImageDecoder` from reading and decoding it.
+///
+/// To solve this, we use `body.tee()` to duplicate the stream at the browser level
+/// into two independent, concurrent branches:
+/// 1. `progressStream`: Read chunk-by-chunk in Dart to calculate cumulative bytes loaded
+///    and invoke the progress callback.
+/// 2. `dataStream`: Passed directly to the native `BrowserImageDecoder` for streaming decode.
+///
+/// We register a cancel callback in [onDisposeCallbacks] so that if the decoder is
+/// disposed before the download completes, the progress reader is cancelled to prevent
+/// dangling resource locks.
+Future<DomReadableStream> handleProgressAndGetStream(
+  HttpFetchResponse response,
+  ui_web.ImageCodecChunkCallback? chunkCallback, [
+  List<void Function()>? onDisposeCallbacks,
+]) async {
+  if (!response.hasPayload) {
+    throw ImageCodecException('Failed to load network image.');
+  }
+  final DomReadableStream body = response.payload.stream;
+  final int? contentLength = response.contentLength;
 
-  @override
-  void dispose() => delegate.dispose();
+  if (chunkCallback == null || contentLength == null) {
+    return body;
+  }
 
-  @override
-  int get frameCount => delegate.frameCount;
+  final List<DomReadableStream> streams = body.tee().toDart.cast<DomReadableStream>();
+  final DomReadableStream progressStream = streams[0];
+  final DomReadableStream dataStream = streams[1];
 
-  @override
-  Future<ui.FrameInfo> getNextFrame() async {
-    final ui.FrameInfo frameInfo = await delegate.getNextFrame();
-    return AnimatedImageFrameInfo(
-      frameInfo.duration,
-      scaleImage(
-        frameInfo.image,
+  final DomStreamReader reader = progressStream.getReader();
+  onDisposeCallbacks?.add(() {
+    reader.cancel();
+  });
+
+  unawaited(() async {
+    try {
+      var cumulativeBytesLoaded = 0;
+      while (true) {
+        final DomStreamChunk chunk = await reader.read();
+        if (chunk.done) {
+          break;
+        }
+        final JSAny? value = chunk.value;
+        if (value != null) {
+          final array = value as JSUint8Array;
+          cumulativeBytesLoaded += array.length;
+          chunkCallback(cumulativeBytesLoaded, contentLength);
+        }
+      }
+    } catch (e) {
+      // Ignore progress stream reading errors.
+    }
+  }());
+
+  return dataStream;
+}
+
+/// Consolidates the image decoding and routing strategy for in-memory byte arrays.
+///
+/// This function implements a tiered routing strategy to select the most efficient
+/// decoding pipeline:
+///
+/// - **Modern Browser Path (`BrowserImageDecoder`):** If the browser supports the
+///    native `ImageDecoder` API, we sniff the byte header to identify the format's
+///    MIME type and delegate decoding to `BrowserImageDecoder`.
+/// - **Legacy Browser Path (`createImageBitmap`):** If the native `ImageDecoder`
+///    is unsupported (e.g. older browsers or Safari/Firefox fallback), but the image is
+///    static (non-animated) and `createImageBitmap` is available, we load the bytes
+///    as a Blob and decode/resize natively via the browser's asynchronous bitmap APIs.
+/// - **Skia Fallback (`BackendAnimatedImage`):** If the browser APIs are unsupported or
+///    disabled in tests, we route the raw bytes to the active backend renderer
+///    (CanvasKit or Skwasm) to be decoded using Skia's C++ WASM or FFI image codecs.
+///    *Note:* We aim to compile Skia without built-in image decoders where possible to
+///    minimize the WebAssembly bundle size. Therefore, we prioritize native browser
+///    decoders and only route to the Skia/Skwasm backend when necessary.
+Future<ui.Codec> engineInstantiateImageCodec(
+  Uint8List list, {
+  int? targetWidth,
+  int? targetHeight,
+  bool allowUpscaling = true,
+}) async {
+  final ImageType imageType = tryDetectImageType(list, 'encoded image bytes');
+
+  if (browserSupportsImageDecoder) {
+    final decoder = BrowserImageDecoder(
+      contentType: imageType.mimeType,
+      dataSource: list.toJS,
+      debugSource: 'encoded image bytes',
+    );
+    try {
+      await decoder.initialize();
+    } catch (e) {
+      decoder.dispose();
+      rethrow;
+    }
+    return EngineCodec.browser(
+      decoder,
+      targetWidth: targetWidth,
+      targetHeight: targetHeight,
+      allowUpscaling: allowUpscaling,
+    );
+  } else {
+    if (!imageType.isAnimated && browserSupportsCreateImageBitmap) {
+      final DomBlob blob = createDomBlob(<ByteBuffer>[list.buffer]);
+      final DomImageBitmap originalBitmap = await createImageBitmap(blob);
+      final int originalWidth = originalBitmap.width;
+      final int originalHeight = originalBitmap.height;
+      final BitmapSize? scaledSize = scaledImageSize(
+        originalWidth,
+        originalHeight,
+        targetWidth,
+        targetHeight,
+      );
+
+      final int destWidth = scaledSize?.width ?? originalWidth;
+      final int destHeight = scaledSize?.height ?? originalHeight;
+
+      var bitmap = originalBitmap;
+      if (scaledSize != null) {
+        if (allowUpscaling || (destWidth <= originalWidth && destHeight <= originalHeight)) {
+          bitmap = await scaleImageSource(
+            originalBitmap,
+            originalWidth,
+            originalHeight,
+            destWidth,
+            destHeight,
+          );
+          originalBitmap.close();
+        }
+      }
+
+      final ImageSource source = ImageBitmapImageSource(bitmap);
+      return EngineCodec.staticImage(
+        source,
         targetWidth: targetWidth,
         targetHeight: targetHeight,
         allowUpscaling: allowUpscaling,
-      ),
+      );
+    } else {
+      final BackendAnimatedImage backendAnimated = renderer.createAnimatedImage(
+        list,
+        targetWidth: targetWidth,
+        targetHeight: targetHeight,
+      );
+      return EngineCodec.skia(
+        backendAnimated,
+        targetWidth: targetWidth,
+        targetHeight: targetHeight,
+        allowUpscaling: allowUpscaling,
+      );
+    }
+  }
+}
+
+const Set<String> _knownImageMimeTypes = <String>{
+  'image/png',
+  'image/jpeg',
+  'image/jpg',
+  'image/gif',
+  'image/webp',
+  'image/bmp',
+  'image/x-icon',
+  'image/vnd.microsoft.icon',
+  'image/apng',
+  'image/avif',
+};
+
+/// Parses and cleans the HTTP Content-Type header, returning the MIME type without parameters.
+///
+/// Returns null if [contentTypeHeader] is null.
+String? parseMimeType(String? contentTypeHeader) {
+  if (contentTypeHeader == null) {
+    return null;
+  }
+  final int semicolonIndex = contentTypeHeader.indexOf(';');
+  if (semicolonIndex != -1) {
+    return contentTypeHeader.substring(0, semicolonIndex).trim().toLowerCase();
+  }
+  return contentTypeHeader.trim().toLowerCase();
+}
+
+/// Consolidates the progressive network image decoding and routing strategy.
+///
+/// This function implements the tiered network routing strategy designed to maximize
+/// streaming performance and minimize memory overhead:
+///
+/// - **Streaming Decode (Fast Path):** We inspect the HTTP `Content-Type` header
+///    from the response. If it is a known static or animated image format, and the
+///    browser supports `ImageDecoder`, we stream the response body directly to the
+///    native decoder without waiting for the full download. If a progress [chunkCallback]
+///    is provided, we use `handleProgressAndGetStream` (`ReadableStream.tee()`) to
+///    concurrently track progress and stream decode.
+/// - **Buffered Decode (Fallback Path):** If the `Content-Type` header is missing,
+///    generic (e.g. `application/octet-stream`), or if the browser lacks native
+///    `ImageDecoder` support:
+///    - We download the entire response as an `arrayBuffer`.
+///    - We sniff the binary headers to detect the image format.
+///    - We then fall back to the tiered in-memory routing strategy (using the browser's
+///      `ImageDecoder` with the buffer, `createImageBitmap`, or Skia C++/WASM decoders).
+Future<ui.Codec> engineInstantiateImageCodecFromUrl(
+  Uri uri, {
+  ui_web.ImageCodecChunkCallback? chunkCallback,
+}) async {
+  final url = uri.toString();
+  final HttpFetchResponse response;
+  try {
+    response = await httpFetch(url);
+  } catch (e) {
+    throw ImageCodecException('Failed to load network image: $e');
+  }
+
+  if (response.status < 200 || response.status >= 300) {
+    throw ImageCodecException(
+      'Failed to load network image.\n'
+      'Image URL: $url\n'
+      'Server response code: ${response.status}',
     );
   }
 
-  ui.Image scaleImage(
-    ui.Image image, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) => scaleImageIfNeeded(
-    image,
-    targetWidth: targetWidth,
-    targetHeight: targetHeight,
-    allowUpscaling: allowUpscaling,
-  );
+  final String? cleanContentType = parseMimeType(response.header('Content-Type'));
+  final bool isKnownImageMimeType =
+      cleanContentType != null && _knownImageMimeTypes.contains(cleanContentType);
 
-  @override
-  int get repetitionCount => delegate.repetitionCount;
+  if (browserSupportsImageDecoder && isKnownImageMimeType) {
+    final List<void Function()> onDisposeCallbacks = [];
+    final DomReadableStream stream = await handleProgressAndGetStream(
+      response,
+      chunkCallback,
+      onDisposeCallbacks,
+    );
+    final decoder = BrowserImageDecoder(
+      contentType: cleanContentType,
+      dataSource: stream,
+      debugSource: url,
+    );
+    onDisposeCallbacks.forEach(decoder.addDisposeCallback);
+    try {
+      await decoder.initialize();
+    } catch (e) {
+      decoder.dispose();
+      rethrow;
+    }
+    return EngineCodec.browser(decoder);
+  } else {
+    final ByteBuffer buffer = await response.payload.asByteBuffer();
+    final Uint8List list = buffer.asUint8List();
+    final ImageType imageType = tryDetectImageType(list, url);
+
+    if (chunkCallback != null) {
+      chunkCallback(list.length, list.length);
+    }
+
+    if (browserSupportsImageDecoder) {
+      final decoder = BrowserImageDecoder(
+        contentType: imageType.mimeType,
+        dataSource: list.toJS,
+        debugSource: url,
+      );
+      try {
+        await decoder.initialize();
+      } catch (e) {
+        decoder.dispose();
+        rethrow;
+      }
+      return EngineCodec.browser(decoder);
+    } else if (!imageType.isAnimated && browserSupportsCreateImageBitmap) {
+      final DomBlob blob = createDomBlob(<ByteBuffer>[buffer]);
+      final DomImageBitmap bitmap = await createImageBitmap(blob);
+      final ImageSource source = ImageBitmapImageSource(bitmap);
+      return EngineCodec.staticImage(source);
+    } else {
+      final BackendAnimatedImage backendAnimated = renderer.createAnimatedImage(list);
+      return EngineCodec.skia(backendAnimated);
+    }
+  }
 }
 
 BitmapSize? scaledImageSize(int width, int height, int? targetWidth, int? targetHeight) {
   if (targetWidth == width && targetHeight == height) {
-    // Not scaled
     return null;
   }
   if (targetWidth == null) {
     if (targetHeight == null || targetHeight == height) {
-      // Not scaled.
       return null;
     }
     targetWidth = (width * targetHeight / height).round();
   } else if (targetHeight == null) {
     if (targetWidth == width) {
-      // Not scaled.
       return null;
     }
     targetHeight = (height * targetWidth / width).round();
@@ -239,6 +532,16 @@ BitmapSize? scaledImageSize(int width, int height, int? targetWidth, int? target
   return BitmapSize(targetWidth, targetHeight);
 }
 
+/// Performs a fallback image scaling operation on the frontend using a canvas.
+///
+/// This is used as a fallback when the native backend decoder (specifically
+/// CanvasKit's WASM animated image decoder) does not support resizing/scaling during
+/// the decode phase.
+///
+/// It draws the original [image] onto a temporary [ui.Canvas] at the [scaledSize]
+/// using [ui.PictureRecorder], and compiles the recording into a new scaled [ui.Image]
+/// via `toImageSync`. The original full-size [image] is eagerly disposed of immediately
+/// after to prevent memory spikes.
 ui.Image scaleImageIfNeeded(
   ui.Image image, {
   int? targetWidth,
@@ -277,8 +580,6 @@ ui.Image scaleImageIfNeeded(
   return finalImage;
 }
 
-/// Thrown when the web engine fails to decode an image, either due to a
-/// network issue, corrupted image contents, or missing codec.
 class ImageCodecException implements Exception {
   ImageCodecException(this._message);
 
@@ -287,3 +588,20 @@ class ImageCodecException implements Exception {
   @override
   String toString() => 'ImageCodecException: $_message';
 }
+
+Future<DomImageBitmap> scaleImageSource(
+  DomCanvasImageSource source,
+  int originalWidth,
+  int originalHeight,
+  int destWidth,
+  int destHeight,
+) async {
+  return createImageBitmap(
+    source,
+    options: ImageBitmapOptions(
+      resizeWidth: destWidth,
+      resizeHeight: destHeight,
+      resizeQuality: 'high',
+    ),
+  );
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart
index 434418c6184eb..96b929fbe1cdd 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart
@@ -60,13 +60,10 @@ class MouseCursor {
 
   void activateSystemCursor(String? kind) {
     final String cssValue = _mapKindToCssValue(kind);
-    // TODO(mdebbar): This should be set on the element, not the body. In order
-    //                to do that, we need the framework to send us the view ID.
-    //                https://github.com/flutter/flutter/issues/140226
     if (cssValue == _kDefaultCursor) {
-      domDocument.body!.style.removeProperty('cursor');
+      element.style.removeProperty('cursor');
     } else {
-      domDocument.body!.style.cursor = cssValue;
+      element.style.cursor = cssValue;
     }
   }
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
index bfc15058b57c3..c33ed63787c41 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
@@ -58,6 +58,33 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
 
   final Arena frameArena = Arena();
 
+  /// The number of renders requested by the first frame that have not settled
+  /// yet.
+  ///
+  /// A multi-view app renders one scene per view, so the first frame is not
+  /// settled until all of them are. A render whose scene is superseded by a
+  /// newer one counts as settled, because the view will display the newer scene
+  /// instead.
+  int _pendingFirstFrameRenders = 0;
+
+  /// Whether the first frame is still being built, and can therefore still
+  /// request renders.
+  ///
+  /// This is false for the rest of the app's lifetime once the first frame ends,
+  /// so renders requested by later frames are not counted, even while the first
+  /// frame's own renders are still in flight.
+  bool _isBuildingFirstFrame = true;
+
+  /// Completes once every render the first frame requested has settled, and is
+  /// then set to null to stop tracking renders for the rest of the app's
+  /// lifetime.
+  ///
+  /// The framework reports its first frame from a post-frame callback, while web
+  /// renderers may still be rasterizing that frame asynchronously. The browser
+  /// event waits on this so it is not sent while the first frame is still
+  /// rasterizing.
+  Completer<void>? _firstFrameCompleter = Completer<void>();
+
   /// The [EnginePlatformDispatcher] singleton.
   static EnginePlatformDispatcher get instance => _instance;
   static final EnginePlatformDispatcher _instance = EnginePlatformDispatcher();
@@ -274,6 +301,13 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     invoke(_onDrawFrame, _onDrawFrameZone);
     _viewsRenderedInCurrentFrame = null;
     frameArena.collect();
+    if (_isBuildingFirstFrame) {
+      // The first frame has requested every render it is ever going to request.
+      // A frame that rendered nothing is still a first frame, so there may be
+      // nothing left to wait for.
+      _isBuildingFirstFrame = false;
+      _completeFirstFrameIfRendered();
+    }
   }
 
   /// A callback that is invoked when pointer data is available.
@@ -563,7 +597,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
 
       // Dispatched by the bindings to delay service worker initialization.
       case 'flutter/service_worker':
-        domWindow.dispatchEvent(createDomEvent('Event', 'flutter-first-frame'));
+        unawaited(_dispatchFirstFrameEventAfterRender());
         return;
 
       case 'flutter/textinput':
@@ -589,10 +623,10 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         final arguments = decoded.arguments as Map<dynamic, dynamic>;
         switch (decoded.method) {
           case 'activateSystemCursor':
-            // TODO(mdebbar): Once the framework starts sending us a viewId, we
-            //                should use it to grab the correct view.
-            //                https://github.com/flutter/flutter/issues/140226
-            views.firstOrNull?.mouseCursor.activateSystemCursor(arguments.tryString('kind'));
+            final String? kind = arguments.tryString('kind');
+            for (final EngineFlutterView view in views) {
+              view.mouseCursor.activateSystemCursor(kind);
+            }
         }
         return;
 
@@ -756,8 +790,44 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     // view hasn't been rendered already in this scope.
     final bool shouldRender = _viewsRenderedInCurrentFrame?.add(target) ?? false;
     if (shouldRender) {
-      await renderer.renderScene(scene, target);
+      final Future<void> sceneRender = renderer.renderScene(scene, target);
+      // The first frame ends while this render is still in flight, so remember
+      // whether it belongs to it instead of asking again below.
+      final bool isFirstFrameRender = _isBuildingFirstFrame;
+      if (isFirstFrameRender) {
+        _pendingFirstFrameRenders++;
+      }
+      try {
+        await sceneRender;
+      } finally {
+        if (isFirstFrameRender) {
+          _pendingFirstFrameRenders--;
+          _completeFirstFrameIfRendered();
+        }
+      }
+    }
+  }
+
+  /// Completes [_firstFrameCompleter] once the first frame is done building and
+  /// every render it requested has settled.
+  ///
+  /// A render that failed counts as settled: [render] reports the failure to
+  /// its caller, and withholding the browser event would leave an app that hides
+  /// its loading screen on that event stuck on it forever.
+  void _completeFirstFrameIfRendered() {
+    if (_isBuildingFirstFrame || _pendingFirstFrameRenders > 0) {
+      return;
     }
+    _firstFrameCompleter?.complete();
+    // Null it out to completely disable tracking for all future frames.
+    _firstFrameCompleter = null;
+  }
+
+  Future<void> _dispatchFirstFrameEventAfterRender() async {
+    await _firstFrameCompleter?.future;
+    domWindow.requestAnimationFrame((_) {
+      domWindow.dispatchEvent(createDomEvent('Event', 'flutter-first-frame'));
+    });
   }
 
   @override
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_views/embedder.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_views/embedder.dart
index dddbb02efac5e..80ba7d30a11e8 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_views/embedder.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_views/embedder.dart
@@ -517,6 +517,10 @@ class PlatformViewEmbedder {
       canvas.displayCanvas!.setIsOverlay(needsOverlayPositioning);
     }
 
+    // Platform views which were disposed while they were still being
+    // composited. They are left out of the DOM.
+    final missingViewIds = <int>{};
+
     // At this point, the DOM contains the static elements and the elements from
     // the previous composition which need to move. We iterate over the static
     // elements and insert the elements which come before them into the DOM.
@@ -524,16 +528,27 @@ class PlatformViewEmbedder {
     var nextCompositionIndex = 0;
     while (staticElementIndex < staticElements.length) {
       final int staticElementIndexInActiveComposition = staticElements[staticElementIndex];
-      final DomElement staticDomElement = _getElement(
+      final DomElement? staticDomElement = _getElement(
         _activeComposition.entities[staticElementIndexInActiveComposition],
       );
+      if (staticDomElement == null) {
+        // This view is not in the DOM, so it can't position other elements.
+        // Use the next static element instead.
+        staticElementIndex++;
+        continue;
+      }
       // Go through next composition elements until we reach the static element.
       while (indexMap[nextCompositionIndex] != staticElementIndexInActiveComposition) {
         final CompositionEntity nextEntity = composition.entities[nextCompositionIndex];
         if (nextEntity is CompositionCanvas) {
           updateCompositionCanvasWithDisplay(nextEntity, nextCompositionIndex);
         }
-        sceneHost.insertBefore(_getElement(nextEntity), staticDomElement);
+        final DomElement? nextDomElement = _getElement(nextEntity);
+        if (nextDomElement != null) {
+          sceneHost.insertBefore(nextDomElement, staticDomElement);
+        } else if (nextEntity is CompositionPlatformView) {
+          missingViewIds.add(nextEntity.viewId);
+        }
         nextCompositionIndex++;
       }
       if (composition.entities[nextCompositionIndex] is CompositionCanvas) {
@@ -554,15 +569,35 @@ class PlatformViewEmbedder {
       if (nextEntity is CompositionCanvas) {
         updateCompositionCanvasWithDisplay(nextEntity, nextCompositionIndex);
       }
-      sceneHost.append(_getElement(nextEntity));
+      final DomElement? nextDomElement = _getElement(nextEntity);
+      if (nextDomElement != null) {
+        sceneHost.append(nextDomElement);
+      } else if (nextEntity is CompositionPlatformView) {
+        missingViewIds.add(nextEntity.viewId);
+      }
       nextCompositionIndex++;
     }
+
+    if (missingViewIds.isNotEmpty) {
+      // Drop the skipped views, so the next frame doesn't expect them to be
+      // in the DOM.
+      composition.entities.removeWhere(
+        (CompositionEntity entity) =>
+            entity is CompositionPlatformView && missingViewIds.contains(entity.viewId),
+      );
+      printWarning(
+        'Cannot render platform views: ${missingViewIds.join(', ')}. '
+        'These views were disposed while they were being composited.',
+      );
+    }
   }
 
-  DomElement _getElement(CompositionEntity entity) {
+  /// Returns the DOM element for [entity], or null if the platform view no
+  /// longer has a clip chain because it was disposed.
+  DomElement? _getElement(CompositionEntity entity) {
     return switch (entity) {
       CompositionCanvas() => entity.displayCanvas!.hostElement,
-      CompositionPlatformView() => _viewClipChains[entity.viewId]!.root,
+      CompositionPlatformView() => _viewClipChains[entity.viewId]?.root,
     };
   }
 
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/codec.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/codec.dart
new file mode 100644
index 0000000000000..6127edba5998e
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/codec.dart
@@ -0,0 +1,351 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// An engine implementation of the [ui.Codec] interface.
+///
+/// This codec delegates to a concrete sub-codec depending on how the image
+/// source is loaded (e.g. browser image decoder, static image, or a Skia/Skwasm backend animated image).
+abstract class EngineCodec implements ui.Codec {
+  /// Creates an [EngineCodec] that uses a browser-provided [BrowserImageDecoder]
+  /// to decode frames.
+  ///
+  /// This is the preferred path for web browsers supporting the modern native
+  /// `ImageDecoder` API, allowing highly efficient progressive and animated
+  /// decoding offloaded to the browser.
+  factory EngineCodec.browser(
+    BrowserImageDecoder decoder, {
+    int? targetWidth,
+    int? targetHeight,
+    bool allowUpscaling,
+  }) = _BrowserEngineCodec;
+
+  /// Creates an [EngineCodec] for a single static [ImageSource].
+  ///
+  /// Used for static images that have already been decoded or represent a static
+  /// DOM asset (like an `HTMLImageElement` or `ImageBitmap`), bypassing multi-frame
+  /// animation machinery.
+  factory EngineCodec.staticImage(
+    ImageSource source, {
+    int? targetWidth,
+    int? targetHeight,
+    bool allowUpscaling,
+  }) = _StaticEngineCodec;
+
+  /// Creates an [EngineCodec] that wraps a Skia/Skwasm [BackendAnimatedImage].
+  ///
+  /// Used for animated formats (like GIF or WebP) or unsupported formats where
+  /// native browser decoders are unavailable, falling back to C++ Skia or WASM
+  /// C++ decoding.
+  factory EngineCodec.skia(
+    BackendAnimatedImage backendAnimatedImage, {
+    int? targetWidth,
+    int? targetHeight,
+    bool allowUpscaling,
+  }) = _SkiaEngineCodec;
+
+  /// Protected constructor for subclasses.
+  EngineCodec._();
+}
+
+/// An [EngineCodec] that decodes frames using the browser's [BrowserImageDecoder].
+///
+/// This class orchestrates a multi-step asynchronous pipeline that decodes frames
+/// using the browser's native `ImageDecoder` and resizes them natively on the CPU
+/// using `createImageBitmap` if target dimensions are requested.
+class _BrowserEngineCodec extends EngineCodec {
+  _BrowserEngineCodec(
+    BrowserImageDecoder browserDecoder, {
+    this.targetWidth,
+    this.targetHeight,
+    this.allowUpscaling = true,
+  }) : super._() {
+    _ref = UniqueRef<BrowserImageDecoder>(
+      this,
+      browserDecoder,
+      'BrowserCodec',
+      onDispose: (BrowserImageDecoder decoder) => decoder.dispose(),
+    );
+  }
+
+  late final UniqueRef<BrowserImageDecoder> _ref;
+  final int? targetWidth;
+  final int? targetHeight;
+  final bool allowUpscaling;
+  bool _disposed = false;
+
+  @override
+  int get frameCount => _ref.nativeObject.frameCount;
+
+  @override
+  int get repetitionCount => _ref.nativeObject.repetitionCount;
+
+  @override
+  void dispose() {
+    _disposed = true;
+    _ref.dispose();
+  }
+
+  @override
+  Future<ui.FrameInfo> getNextFrame() async {
+    if (_disposed) {
+      throw StateError('Cannot call getNextFrame() after dispose()');
+    }
+    try {
+      // Decode the next raw frame from the browser decoder.
+      // This is an asynchronous operation, during which the codec could be disposed.
+      final VideoFrame frame = await _ref.nativeObject.getNextFrame();
+
+      // Async Safety Check: If the codec was disposed while awaiting the frame decode,
+      // we MUST close the native VideoFrame immediately. Failing to do so would
+      // leak the underlying browser-allocated GPU/system memory.
+      if (_disposed) {
+        frame.close();
+        throw StateError('Codec disposed during getNextFrame()');
+      }
+      final duration = Duration(microseconds: frame.duration?.toInt() ?? 0);
+
+      final int originalWidth = frame.displayWidth.toInt();
+      final int originalHeight = frame.displayHeight.toInt();
+      BitmapSize? scaledSize = scaledImageSize(
+        originalWidth,
+        originalHeight,
+        targetWidth,
+        targetHeight,
+      );
+      if (scaledSize != null &&
+          !allowUpscaling &&
+          (scaledSize.width > originalWidth || scaledSize.height > originalHeight)) {
+        scaledSize = null;
+      }
+
+      final int destWidth = scaledSize?.width ?? originalWidth;
+      final int destHeight = scaledSize?.height ?? originalHeight;
+
+      final ui.Image image;
+      if (scaledSize != null) {
+        // Scale the frame natively.
+        // We use the browser's high-performance native scale API which creates a
+        // scaled ImageBitmap directly. This is asynchronous and yields the thread.
+        final DomImageBitmap bitmap;
+        try {
+          bitmap = await scaleImageSource(
+            frame,
+            originalWidth,
+            originalHeight,
+            destWidth,
+            destHeight,
+          );
+        } finally {
+          frame.close();
+        }
+
+        // Async Safety Check: Check if disposed during the scale operation.
+        // If so, close the newly created scaled bitmap to prevent leaks.
+        if (_disposed) {
+          bitmap.close();
+          throw StateError('Codec disposed during getNextFrame()');
+        }
+
+        // Upload the scaled bitmap to the GPU.
+        try {
+          image = await renderer.createImageFromTextureSource(
+            bitmap,
+            width: destWidth,
+            height: destHeight,
+            transferOwnership: true,
+          );
+        } catch (e) {
+          bitmap.close();
+          rethrow;
+        }
+      } else {
+        // Upload the original unscaled frame directly to the GPU.
+        try {
+          image = await renderer.createImageFromTextureSource(
+            frame,
+            width: destWidth,
+            height: destHeight,
+            transferOwnership: true,
+          );
+        } catch (e) {
+          frame.close();
+          rethrow;
+        }
+      }
+
+      // Async Safety Check: Check if disposed during the GPU texture upload.
+      // If so, dispose of the wrapped image.
+      if (_disposed) {
+        image.dispose();
+        throw StateError('Codec disposed during getNextFrame()');
+      }
+      return AnimatedImageFrameInfo(duration, image);
+    } catch (e) {
+      if (_disposed) {
+        throw StateError('Codec disposed during getNextFrame()');
+      }
+      rethrow;
+    }
+  }
+}
+
+/// An [EngineCodec] that wraps a single static [ImageSource].
+///
+/// This codec is optimized for static images. Since static images do not animate,
+/// [frameCount] is always 1, and the single frame is resolved synchronously
+/// by querying the backend factory.
+class _StaticEngineCodec extends EngineCodec {
+  _StaticEngineCodec(
+    this._staticImageSource, {
+    this.targetWidth,
+    this.targetHeight,
+    this.allowUpscaling = true,
+  }) : super._() {
+    // Retain the underlying image source to increment its reference count.
+    // This guarantees that the native image data (such as an ImageBitmap) remains
+    // alive in memory as long as this codec exists.
+    _staticImageSource.retain();
+  }
+
+  final ImageSource _staticImageSource;
+  final int? targetWidth;
+  final int? targetHeight;
+  final bool allowUpscaling;
+  bool _disposed = false;
+
+  @override
+  int get frameCount => 1;
+
+  @override
+  int get repetitionCount => 0;
+
+  @override
+  void dispose() {
+    _disposed = true;
+    // Release our reference to the image source. If the reference count drops to 0,
+    // the native resources (like the ImageBitmap) will be closed and freed.
+    _staticImageSource.release();
+  }
+
+  @override
+  Future<ui.FrameInfo> getNextFrame() {
+    if (_disposed) {
+      return Future<ui.FrameInfo>.error(StateError('Cannot call getNextFrame() after dispose()'));
+    }
+    // Synchronously instruct the backend renderer to convert the normalized
+    // DOM asset into a backend-specific representation (e.g., uploading to a GPU texture).
+    final BackendImage backendImage = renderer.createImageFromImageSource(_staticImageSource);
+    final ui.Image image = EngineImage(
+      backendImage,
+      _staticImageSource.width,
+      _staticImageSource.height,
+      imageSource: _staticImageSource,
+    );
+    return Future<ui.FrameInfo>.value(AnimatedImageFrameInfo(Duration.zero, image));
+  }
+}
+
+/// An [EngineCodec] that wraps a Skia/Skwasm [BackendAnimatedImage].
+///
+/// This codec is used when the browser's native `ImageDecoder` is unavailable,
+/// routing decoding work through WASM Skia (CanvasKit) or C++ FFI (Skwasm).
+///
+/// Resizing animated images differs fundamentally between backends:
+/// 1. Skwasm supports native C++ resizing (via `SkAndroidCodec` scaling) during
+///    decoding, so no frontend scaling is required.
+/// 2. CanvasKit's WASM animated image decoder does not support native scaling.
+///    Therefore, it decodes frames at their original size, and the frontend must
+///    perform an expensive frame-by-frame resize fallback using `scaleImageIfNeeded`
+///    (drawing onto a canvas via `ui.PictureRecorder`).
+class _SkiaEngineCodec extends EngineCodec {
+  _SkiaEngineCodec(
+    BackendAnimatedImage backendAnimatedImage, {
+    this.targetWidth,
+    this.targetHeight,
+    this.allowUpscaling = true,
+  }) : super._() {
+    _ref = UniqueRef<BackendAnimatedImage>(
+      this,
+      backendAnimatedImage,
+      'SkiaCodec',
+      onDispose: (BackendAnimatedImage image) => image.dispose(),
+    );
+    if ((targetWidth != null || targetHeight != null) &&
+        _ref.nativeObject.frameCount > 1 &&
+        !renderer.supportsResizingAnimatedImages) {
+      printWarning(
+        'targetWidth and targetHeight for multi-frame images are not natively supported by the current renderer. '
+        'Scaling will fall back to expensive frame-by-frame canvas drawing.',
+      );
+    }
+  }
+
+  late final UniqueRef<BackendAnimatedImage> _ref;
+  final int? targetWidth;
+  final int? targetHeight;
+  final bool allowUpscaling;
+  bool _disposed = false;
+
+  @override
+  int get frameCount => _ref.nativeObject.frameCount;
+
+  @override
+  int get repetitionCount => _ref.nativeObject.repetitionCount;
+
+  @override
+  void dispose() {
+    _disposed = true;
+    _ref.dispose();
+  }
+
+  @override
+  Future<ui.FrameInfo> getNextFrame() async {
+    if (_disposed) {
+      throw StateError('Cannot call getNextFrame() after dispose()');
+    }
+    try {
+      // Extract the next frame from the native backend.
+      final BackendFrameInfo backendFrame = await _ref.nativeObject.getNextFrame();
+
+      // Async Safety Check: If the codec was disposed while the backend was
+      // decoding the frame, we must dispose of the backend image immediately
+      // to prevent native memory leaks.
+      if (_disposed) {
+        backendFrame.image.dispose();
+        throw StateError('Codec disposed during getNextFrame()');
+      }
+      ui.Image image = EngineImage(
+        backendFrame.image,
+        backendFrame.image.width,
+        backendFrame.image.height,
+      );
+
+      // Apply the frontend canvas-scaling fallback if the backend does not support
+      // native resizing of animated images on decode.
+      if (targetWidth != null || targetHeight != null) {
+        try {
+          image = scaleImageIfNeeded(
+            image,
+            targetWidth: targetWidth,
+            targetHeight: targetHeight,
+            allowUpscaling: allowUpscaling,
+          );
+        } catch (e) {
+          image.dispose();
+          rethrow;
+        }
+      }
+      return AnimatedImageFrameInfo(backendFrame.duration, image);
+    } catch (e) {
+      if (_disposed) {
+        throw StateError('Codec disposed during getNextFrame()');
+      }
+      rethrow;
+    }
+  }
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/color_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/color_filter.dart
new file mode 100644
index 0000000000000..c2639576a85f5
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/color_filter.dart
@@ -0,0 +1,114 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+enum ColorFilterType { mode, matrix, linearToSrgbGamma, srgbToLinearGamma }
+
+final Expando<BackendColorFilter> _backendColorFilters = Expando<BackendColorFilter>();
+
+final Finalizer _colorFilterFinalizer = NativeMemoryFinalizer((Object filter) {
+  (filter as BackendColorFilter).dispose();
+});
+
+/// A description of a color filter to apply when drawing a shape or compositing
+/// a layer with a particular [Paint].
+class EngineColorFilter implements LayerImageFilter, ui.ColorFilter {
+  const EngineColorFilter.mode(ui.Color this.color, ui.BlendMode this.blendMode)
+    : matrix = null,
+      type = ColorFilterType.mode;
+
+  const EngineColorFilter.matrix(List<double> this.matrix)
+    : color = null,
+      blendMode = null,
+      type = ColorFilterType.matrix;
+
+  const EngineColorFilter.linearToSrgbGamma()
+    : color = null,
+      blendMode = null,
+      matrix = null,
+      type = ColorFilterType.linearToSrgbGamma;
+
+  const EngineColorFilter.srgbToLinearGamma()
+    : color = null,
+      blendMode = null,
+      matrix = null,
+      type = ColorFilterType.srgbToLinearGamma;
+
+  factory EngineColorFilter.saturation(double saturation) {
+    const rLuminance = 0.2126;
+    const gLuminance = 0.7152;
+    const bLuminance = 0.0722;
+    final double invSat = 1 - saturation;
+
+    return EngineColorFilter.matrix(<double>[
+      // dart format off
+      invSat * rLuminance + saturation, invSat * gLuminance,              invSat * bLuminance,              0, 0,
+      invSat * rLuminance,              invSat * gLuminance + saturation, invSat * bLuminance,              0, 0,
+      invSat * rLuminance,              invSat * gLuminance,              invSat * bLuminance + saturation, 0, 0,
+      0,                                0,                                0,                                1, 0,
+      // dart format on
+    ]);
+  }
+
+  static const EngineColorFilter invert = EngineColorFilter.matrix(<double>[
+    // dart format off
+    -1.0,  0.0,  0.0, 1.0, 0.0,
+     0.0, -1.0,  0.0, 1.0, 0.0,
+     0.0,  0.0, -1.0, 1.0, 0.0,
+     1.0,  1.0,  1.0, 1.0, 0.0,
+    // dart format on
+  ]);
+
+  final ui.Color? color;
+  final ui.BlendMode? blendMode;
+  final List<double>? matrix;
+  final ColorFilterType type;
+
+  /// The backend implementation of this color filter.
+  BackendColorFilter get backendFilter {
+    BackendColorFilter? filter = _backendColorFilters[this];
+    if (filter == null) {
+      filter = renderer.createColorFilter(this);
+      _backendColorFilters[this] = filter;
+      _colorFilterFinalizer.attach(this, filter, detach: filter);
+    }
+    return filter;
+  }
+
+  @override
+  ui.Rect filterBounds(ui.Rect inputBounds) => inputBounds;
+
+  @override
+  String get debugShortDescription => toString();
+
+  @override
+  String toString() {
+    return switch (type) {
+      ColorFilterType.mode => 'ColorFilter.mode($color, $blendMode)',
+      ColorFilterType.matrix => 'ColorFilter.matrix($matrix)',
+      ColorFilterType.linearToSrgbGamma => 'ColorFilter.linearToSrgbGamma()',
+      ColorFilterType.srgbToLinearGamma => 'ColorFilter.srgbToLinearGamma()',
+    };
+  }
+
+  @override
+  Matrix4? get transform => null;
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! EngineColorFilter) {
+      return false;
+    }
+    return other.type == type &&
+        other.color == color &&
+        other.blendMode == blendMode &&
+        listEquals(other.matrix, matrix);
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(type, color, blendMode, Object.hashAll(matrix ?? const <double>[]));
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image.dart
index 65dbcc9edb369..910364251cf98 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image.dart
@@ -187,6 +187,8 @@ class EngineImage implements ui.Image, StackTraceDebugger {
               formatStr == 'BGRX') {
             return await readPixelsFromVideoFrame(videoFrame, format);
           }
+        case final CanvasImageSourceWrapper s:
+          return await readPixelsFromDomImageSource(s.canvasImageSource, format, s.width, s.height);
         case null:
           break;
       }
@@ -218,7 +220,7 @@ class EngineImage implements ui.Image, StackTraceDebugger {
           rawData.lengthInBytes,
         );
         final DomImageData imageData = createDomImageData(
-          clampedBytes,
+          clampedBytes.toJS,
           cloneImage.width,
           cloneImage.height,
         );
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image_source.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image_source.dart
index 16366256e0af1..35120e2877da7 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image_source.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/image_source.dart
@@ -340,3 +340,24 @@ Future<Uint8List> encodeDomImageSourceAsPng(
   canvas.height = 0;
   return base64.decode(pngBase64);
 }
+
+/// An [ImageSource] implementation wrapping a generic [DomCanvasImageSource]
+/// (such as an HTMLCanvasElement, OffscreenCanvas, SVGImageElement, or HTMLVideoElement)
+/// that does not require manual resource cleanup.
+class CanvasImageSourceWrapper extends ImageSource {
+  CanvasImageSourceWrapper(this.canvasImageSource, this.width, this.height);
+
+  @override
+  final DomCanvasImageSource canvasImageSource;
+
+  @override
+  final int width;
+
+  @override
+  final int height;
+
+  @override
+  void _doClose() {
+    // Generic canvas image sources do not require manual resource disposal.
+  }
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/mask_filter.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/mask_filter.dart
new file mode 100644
index 0000000000000..f3420a3da0885
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/mask_filter.dart
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+final Expando<BackendMaskFilter> _backendMaskFilters = Expando<BackendMaskFilter>();
+
+final Finalizer _maskFilterFinalizer = NativeMemoryFinalizer((Object filter) {
+  (filter as BackendMaskFilter).dispose();
+});
+
+/// A filter that modifies the alpha channel of a shape as it is drawn.
+class EngineMaskFilter implements ui.MaskFilter {
+  const EngineMaskFilter.blur(this._style, this._sigma);
+
+  final ui.BlurStyle _style;
+  final double _sigma;
+
+  @override
+  double get webOnlySigma => _sigma;
+  @override
+  ui.BlurStyle get webOnlyBlurStyle => _style;
+
+  /// The backend implementation of this mask filter.
+  BackendMaskFilter get backendFilter {
+    BackendMaskFilter? filter = _backendMaskFilters[this];
+    if (filter == null) {
+      filter = renderer.createMaskFilter(this);
+      _backendMaskFilters[this] = filter;
+      _maskFilterFinalizer.attach(this, filter, detach: filter);
+    }
+    return filter;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is EngineMaskFilter && other._style == _style && other._sigma == _sigma;
+  }
+
+  @override
+  int get hashCode => Object.hash(_style, _sigma);
+
+  @override
+  String toString() => 'MaskFilter.blur($_style, ${_sigma.toStringAsFixed(1)})';
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/vertices.dart
new file mode 100644
index 0000000000000..ed2f7e14ba75b
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/primitives/vertices.dart
@@ -0,0 +1,146 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:ui/ui.dart' as ui;
+
+import '../backend/vertices.dart';
+import '../native_memory.dart';
+import '../renderer.dart';
+
+/// The engine-side implementation of [ui.Vertices].
+///
+/// This class acts as a shared frontend for all backends, handling the conversion
+/// from standard lists to typed arrays and managing the native memory lifecycle
+/// of the [BackendVertices] delegate.
+class EngineVertices implements ui.Vertices {
+  /// Creates a new [EngineVertices] from generic lists.
+  factory EngineVertices(
+    ui.VertexMode mode,
+    List<ui.Offset> positions, {
+    List<ui.Offset>? textureCoordinates,
+    List<ui.Color>? colors,
+    List<int>? indices,
+  }) {
+    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
+      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
+    }
+    if (colors != null && colors.length != positions.length) {
+      throw ArgumentError('"positions" and "colors" lengths must match.');
+    }
+    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length)) {
+      throw ArgumentError('"indices" values must be valid indices in the positions list.');
+    }
+
+    final int len = positions.length;
+    final flatPositions = Float32List(len * 2);
+    for (var i = 0; i < len; i++) {
+      flatPositions[2 * i] = positions[i].dx;
+      flatPositions[2 * i + 1] = positions[i].dy;
+    }
+
+    Float32List? flatTextureCoordinates;
+    if (textureCoordinates != null) {
+      flatTextureCoordinates = Float32List(len * 2);
+      for (var i = 0; i < len; i++) {
+        flatTextureCoordinates[2 * i] = textureCoordinates[i].dx;
+        flatTextureCoordinates[2 * i + 1] = textureCoordinates[i].dy;
+      }
+    }
+
+    Int32List? flatColors;
+    if (colors != null) {
+      flatColors = Int32List(len);
+      for (var i = 0; i < len; i++) {
+        flatColors[i] = colors[i].value;
+      }
+    }
+
+    final Uint16List? flatIndices = indices != null ? Uint16List.fromList(indices) : null;
+
+    return EngineVertices.raw(
+      mode,
+      flatPositions,
+      textureCoordinates: flatTextureCoordinates,
+      colors: flatColors,
+      indices: flatIndices,
+    );
+  }
+
+  /// Creates a new [EngineVertices] from typed arrays.
+  factory EngineVertices.raw(
+    ui.VertexMode mode,
+    Float32List positions, {
+    Float32List? textureCoordinates,
+    Int32List? colors,
+    Uint16List? indices,
+  }) {
+    if (positions.length % 2 != 0) {
+      throw ArgumentError('"positions" length must be even.');
+    }
+    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
+      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
+    }
+    if (colors != null && colors.length * 2 != positions.length) {
+      throw ArgumentError('"positions" and "colors" lengths must match.');
+    }
+    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length ~/ 2)) {
+      throw ArgumentError('"indices" values must be valid indices in the positions list.');
+    }
+
+    BackendVertices? delegate;
+    if (positions.isNotEmpty) {
+      delegate = renderer.createVertices(
+        mode,
+        positions,
+        textureCoordinates: textureCoordinates,
+        colors: colors,
+        indices: indices,
+      );
+    }
+
+    return EngineVertices._(delegate);
+  }
+
+  EngineVertices._(this._delegate) {
+    if (_delegate != null) {
+      _ref = UniqueRef<BackendVertices>(
+        this,
+        _delegate,
+        'Vertices',
+        onDispose: (BackendVertices v) => v.dispose(),
+      );
+    } else {
+      _ref = null;
+    }
+  }
+
+  /// The backend delegate that manages the native resources.
+  ///
+  /// This will be null if the `positions` list provided during construction was empty.
+  BackendVertices? get delegate {
+    if (_isDisposed) {
+      throw StateError('Attempted to use a disposed Vertices.');
+    }
+    return _delegate;
+  }
+
+  final BackendVertices? _delegate;
+
+  late final UniqueRef<BackendVertices>? _ref;
+  bool _isDisposed = false;
+
+  @override
+  void dispose() {
+    if (_isDisposed) {
+      return;
+    }
+    _ref?.dispose();
+    _isDisposed = true;
+  }
+
+  @override
+  bool get debugDisposed => _isDisposed;
+}
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/renderer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/renderer.dart
index 7993eb6140987..0fc96e1447887 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/renderer.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/renderer.dart
@@ -99,14 +99,7 @@ abstract class Renderer {
 
   ui.Paint createPaint();
 
-  ui.Vertices createVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  });
-  ui.Vertices createVerticesRaw(
+  BackendVertices createVertices(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
@@ -171,25 +164,117 @@ abstract class Renderer {
     required ui.ImageFilter inner,
   });
 
+  BackendColorFilter createColorFilter(EngineColorFilter filter);
+  BackendMaskFilter createMaskFilter(EngineMaskFilter filter);
+
+  bool get isMultiThreaded;
+
+  /// Whether this renderer natively supports resizing/scaling animated images during decoding.
+  bool get supportsResizingAnimatedImages;
+
+  BackendAnimatedImage createAnimatedImage(Uint8List bytes, {int? targetWidth, int? targetHeight});
+
+  BackendImage createImageFromImageSource(ImageSource source);
+
+  ui.Image createImageFromImageBitmap(DomImageBitmap imageBitmap) {
+    final int width = imageBitmap.width;
+    final int height = imageBitmap.height;
+    final ImageSource source = ImageBitmapImageSource(imageBitmap);
+    final BackendImage backendImage = createImageFromImageSource(source);
+    return EngineImage(backendImage, width, height, imageSource: source);
+  }
+
+  /// Creates a unified [ui.Image] from a raw browser texture source (such as a
+  /// [VideoFrame], [DomImageBitmap], [DomHTMLImageElement], or [DomHTMLCanvasElement]).
+  ///
+  /// This method is a crucial bridge between the browser's DOM environment and
+  /// the engine's rendering backends, particularly when managing multi-threaded
+  /// environments (like Skwasm running in a Web Worker):
+  ///
+  /// - **Thread-Safety & Transferability:** In multi-threaded mode, DOM elements
+  ///    (like `HTMLImageElement` or `HTMLCanvasElement`) cannot be transferred
+  ///    across thread boundaries to a Web Worker. Only "transferable" objects
+  ///    (like `ImageBitmap` and `VideoFrame`) are thread-safe. If the renderer is
+  ///    multi-threaded and the source is non-transferable, we must clone it.
+  /// - **Cloning Heuristic:** We use the browser's native `createImageBitmap` to
+  ///    asynchronously capture a snapshot of the source as a transferable `ImageBitmap`.
+  ///    Cloning is also triggered if [transferOwnership] is false, ensuring the caller's
+  ///    original object remains unaffected by our internal disposal lifecycle.
+  /// - **Ownership Transfer:** If we had to clone the object but the caller requested
+  ///    ownership transfer (`transferOwnership` is true), we eagerly close the original
+  ///    source (if it is closeable like a `VideoFrame` or `ImageBitmap`) to avoid leaking
+  ///    it, as we are now responsible for the cloned copy instead.
+  FutureOr<ui.Image> createImageFromTextureSource(
+    JSAny object, {
+    required int width,
+    required int height,
+    required bool transferOwnership,
+  }) async {
+    var textureSource = object;
+    final originalTextureSource = object;
+    final bool needsClone = !transferOwnership || (isMultiThreaded && !_isTransferable(object));
+    if (needsClone) {
+      textureSource = (await createImageBitmap(
+        object,
+        bounds: (x: 0, y: 0, width: width, height: height),
+      )).toJSAnyShallow;
+      if (transferOwnership) {
+        if (originalTextureSource.isA<VideoFrame>()) {
+          (originalTextureSource as VideoFrame).close();
+        } else if (originalTextureSource.isA<DomImageBitmap>()) {
+          (originalTextureSource as DomImageBitmap).close();
+        }
+      }
+    }
+
+    final ImageSource imageSource;
+    if (textureSource.isA<DomImageBitmap>()) {
+      imageSource = ImageBitmapImageSource(textureSource as DomImageBitmap);
+    } else if (textureSource.isA<VideoFrame>()) {
+      imageSource = VideoFrameImageSource(textureSource as VideoFrame);
+    } else if (textureSource.isA<DomHTMLImageElement>()) {
+      imageSource = ImageElementImageSource(textureSource as DomHTMLImageElement);
+    } else {
+      imageSource = CanvasImageSourceWrapper(textureSource as DomCanvasImageSource, width, height);
+    }
+
+    final BackendImage backendImage;
+    try {
+      backendImage = createImageFromImageSource(imageSource);
+    } catch (e) {
+      imageSource.close();
+      rethrow;
+    }
+
+    return EngineImage(backendImage, width, height, imageSource: imageSource);
+  }
+
+  bool _isTransferable(JSAny object) =>
+      object.isA<DomImageBitmap>() || object.isA<VideoFrame>() || object.isA<DomOffscreenCanvas>();
+
   Future<ui.Codec> instantiateImageCodec(
     Uint8List list, {
     int? targetWidth,
     int? targetHeight,
     bool allowUpscaling = true,
-  });
+  }) => engineInstantiateImageCodec(
+    list,
+    targetWidth: targetWidth,
+    targetHeight: targetHeight,
+    allowUpscaling: allowUpscaling,
+  );
 
   Future<ui.Codec> instantiateImageCodecFromUrl(
     Uri uri, {
     ui_web.ImageCodecChunkCallback? chunkCallback,
-  });
-
-  FutureOr<ui.Image> createImageFromImageBitmap(DomImageBitmap imageSource);
+  }) => engineInstantiateImageCodecFromUrl(uri, chunkCallback: chunkCallback);
 
-  FutureOr<ui.Image> createImageFromTextureSource(
-    JSAny object, {
+  FutureOr<BackendImage> decodeBackendImageFromPixels(
+    Uint8List pixels, {
     required int width,
     required int height,
-    required bool transferOwnership,
+    required ui.PixelFormat format,
+    int? rowBytes,
   });
 
   void decodeImageFromPixels(
@@ -202,7 +287,35 @@ abstract class Renderer {
     int? targetWidth,
     int? targetHeight,
     bool allowUpscaling = true,
-  });
+  }) {
+    Timer.run(() async {
+      final BackendImage backendImage = await decodeBackendImageFromPixels(
+        pixels,
+        width: width,
+        height: height,
+        format: format,
+        rowBytes: rowBytes,
+      );
+      final ui.Image image = EngineImage(backendImage, width, height);
+      if (targetWidth != null || targetHeight != null) {
+        final ui.Image scaledImage;
+        try {
+          scaledImage = scaleImageIfNeeded(
+            image,
+            targetWidth: targetWidth,
+            targetHeight: targetHeight,
+            allowUpscaling: allowUpscaling,
+          );
+        } catch (e) {
+          image.dispose();
+          rethrow;
+        }
+        callback(scaledImage);
+      } else {
+        callback(image);
+      }
+    });
+  }
 
   ui.ImageShader createImageShader(
     ui.Image image,
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
index 0f778ec3d8c1f..97ddb9ab9fd9b 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
@@ -323,8 +323,12 @@ class SkwasmCanvas implements LayerCanvas {
 
   @override
   void drawVertices(ui.Vertices vertices, ui.BlendMode blendMode, ui.Paint paint) {
+    final skwasmVertices = (vertices as EngineVertices).delegate as SkwasmVertices?;
+    if (skwasmVertices == null) {
+      return;
+    }
     final PaintHandle paintHandle = (paint as SkwasmPaint).toRawPaint();
-    canvasDrawVertices(_handle, (vertices as SkwasmVertices).handle, blendMode.index, paintHandle);
+    canvasDrawVertices(_handle, skwasmVertices.handle, blendMode.index, paintHandle);
     paintDispose(paintHandle);
   }
 
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
index 274d4b3554fa9..04618d9b55753 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
@@ -9,72 +9,46 @@ import 'dart:typed_data';
 
 import 'package:ui/src/engine.dart';
 import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
-import 'package:ui/ui.dart' as ui;
 
-class SkwasmBrowserImageDecoder extends BrowserImageDecoder {
-  SkwasmBrowserImageDecoder({
-    required super.contentType,
-    required super.dataSource,
-    required super.debugSource,
-  });
-
-  @override
-  ui.Image generateImageFromVideoFrame(VideoFrame frame) {
-    final int width = frame.displayWidth.toInt();
-    final int height = frame.displayHeight.toInt();
-
-    final surface = renderer.pictureToImageSurface as SkwasmSurface;
-
-    final ImageHandle handle = imageCreateFromTextureSource(frame, width, height, surface.handle);
-
-    return EngineImage(
-      SkwasmImage(handle),
-      width,
-      height,
-      imageSource: VideoFrameImageSource(frame),
-    );
-  }
-}
-
-class SkwasmDomImageDecoder extends HtmlBlobCodec {
-  SkwasmDomImageDecoder(super.blob, [this.width, this.height]);
-
-  final int? width;
-  final int? height;
-
-  @override
-  FutureOr<ui.Image> createImageFromHTMLImageElement(
-    DomHTMLImageElement image,
-    int naturalWidth,
-    int naturalHeight,
-  ) {
-    return renderer.createImageFromTextureSource(
-      image,
-      width: width ?? naturalWidth,
-      height: height ?? naturalHeight,
-      transferOwnership: false,
-    );
-  }
-}
-
-class SkwasmAnimatedImageDecoder implements ui.Codec {
+/// The Skwasm-specific implementation of the [BackendAnimatedImage] contract.
+///
+/// This class acts as a thin bridge to the C++ Skia animated image codecs compiled
+/// into the WebAssembly module, interacting via Dart's FFI (`dart:ffi`).
+class SkwasmAnimatedImageDecoder implements BackendAnimatedImage {
+  /// Allocates native memory and instantiates a native C++ animated image decoder.
   factory SkwasmAnimatedImageDecoder(Uint8List imageData, [int? width, int? height]) {
+    // Allocate a native SkData buffer on the WASM heap.
     final SkDataHandle data = skDataCreate(imageData.length);
     try {
+      // Obtain the raw virtual memory address of the allocated buffer.
       final int dataAddress = skDataGetPointer(data).cast<Int8>().address;
 
+      // Directly copy the Dart bytes into the WASM memory buffer.
+      // We wrap the WASM module's memory buffer in a JSUint8Array view and use
+      // the high-speed `.set()` method to copy the Dart Uint8List. This bypasses
+      // standard serialization/deserialization overhead.
       final wasmMemory = JSUint8Array(skwasmInstance.wasmMemory.buffer);
       wasmMemory.set(imageData.toJS, dataAddress);
 
+      // Create the native animated image decoder.
+      // If target width and height are provided, the native C++ decoder (SkAndroidCodec)
+      // will scale the frames natively on decode, saving CPU/GPU memory.
       final AnimatedImageHandle handle = animatedImageCreate(data, width ?? 0, height ?? 0);
+      if (handle == nullptr) {
+        throw ImageCodecException('Failed to create Skwasm animated image from bytes.');
+      }
       return SkwasmAnimatedImageDecoder._(handle);
     } finally {
+      // Clean up the temporary SkData buffer.
+      // The native animated image decoder has already retained a reference to the
+      // data, so we must dispose of our local handle to prevent memory leaks.
       skDataDispose(data);
     }
   }
 
   SkwasmAnimatedImageDecoder._(this.handle);
 
+  /// The raw FFI pointer to the underlying C++ SkAnimatedImage.
   AnimatedImageHandle handle;
 
   @override
@@ -96,20 +70,22 @@ class SkwasmAnimatedImageDecoder implements ui.Codec {
   }
 
   @override
-  Future<ui.FrameInfo> getNextFrame() async {
+  Future<BackendFrameInfo> getNextFrame() {
+    // Get the duration of the current frame prior to advancing.
     final duration = Duration(
       milliseconds: animatedImageGetCurrentFrameDurationMilliseconds(handle),
     );
 
+    // Extract a native handle to the current frame's SkImage.
     final ImageHandle frameHandle = animatedImageGetCurrentFrame(handle);
+    final backendImage = SkwasmImage(frameHandle);
 
-    final image = EngineImage(
-      SkwasmImage(frameHandle),
-      imageGetWidth(frameHandle),
-      imageGetHeight(frameHandle),
-    );
+    // Advance the native decoder to the next frame. The next call to
+    // animatedImageGetCurrentFrame will yield the next frame.
+    animatedImageDecodeNextFrame(handle);
 
-    final ui.FrameInfo frameInfo = AnimatedImageFrameInfo(duration, image);
-    return frameInfo;
+    return Future<BackendFrameInfo>.value(
+      BackendFrameInfo(duration: duration, image: backendImage),
+    );
   }
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
index 193e325817247..d11b5d911f9dd 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
@@ -37,7 +37,7 @@ abstract class SkwasmImageFilter implements LayerImageFilter {
   factory SkwasmImageFilter.fromUiFilter(ui.ImageFilter filter) {
     if (filter is ui.ColorFilter) {
       return SkwasmImageFilter.fromColorFilter(
-        SkwasmColorFilter.fromEngineColorFilter(filter as EngineColorFilter),
+        (filter as EngineColorFilter).backendFilter as SkwasmColorFilter,
       );
     } else {
       return filter as SkwasmImageFilter;
@@ -230,7 +230,7 @@ class SkwasmMatrixFilter extends SkwasmImageFilter {
 }
 
 class SkwasmColorImageFilter extends SkwasmImageFilter {
-  const SkwasmColorImageFilter(this.filter);
+  SkwasmColorImageFilter(this.filter);
 
   final SkwasmColorFilter filter;
 
@@ -238,12 +238,12 @@ class SkwasmColorImageFilter extends SkwasmImageFilter {
   T withRawImageFilter<T>(
     ImageFilterHandleBorrow<T> borrow, {
     ui.TileMode defaultBlurTileMode = ui.TileMode.clamp,
-  }) => filter.withRawColorFilter((colorFilterHandle) {
-    final ImageFilterHandle rawImageFilter = imageFilterCreateFromColorFilter(colorFilterHandle);
+  }) {
+    final ImageFilterHandle rawImageFilter = imageFilterCreateFromColorFilter(filter.handle);
     final T result = borrow(rawImageFilter);
     imageFilterDispose(rawImageFilter);
     return result;
-  });
+  }
 
   @override
   Matrix4? get transform => null;
@@ -315,140 +315,62 @@ class SkwasmComposedImageFilter extends SkwasmImageFilter {
   String toString() => 'ImageFilter.compose(source -> $debugShortDescription -> result)';
 }
 
-typedef ColorFilterHandleBorrow<T> = T Function(ColorFilterHandle handle);
-
-abstract class SkwasmColorFilter {
-  const SkwasmColorFilter();
-
-  factory SkwasmColorFilter.fromEngineColorFilter(EngineColorFilter colorFilter) =>
-      switch (colorFilter.type) {
-        ColorFilterType.mode => SkwasmModeColorFilter(colorFilter.color!, colorFilter.blendMode!),
-        ColorFilterType.linearToSrgbGamma => const SkwasmLinearToSrgbGammaColorFilter(),
-        ColorFilterType.srgbToLinearGamma => const SkwasmSrgbToLinearGammaColorFilter(),
-        ColorFilterType.matrix => SkwasmMatrixColorFilter(colorFilter.matrix!),
-      };
-
-  /// Creates a temporary [ColorFilterHandle] and passes it to the [borrow]
-  /// function.
-  ///
-  /// The handle is deleted immediately after [borrow] returns. The [borrow]
-  /// function must not store the handle to avoid dangling pointer bugs.
-  T withRawColorFilter<T>(ColorFilterHandleBorrow<T> borrow);
-}
-
-class SkwasmModeColorFilter extends SkwasmColorFilter {
-  const SkwasmModeColorFilter(this.color, this.blendMode);
-
-  final ui.Color color;
-  final ui.BlendMode blendMode;
-
-  @override
-  T withRawColorFilter<T>(ColorFilterHandleBorrow<T> borrow) {
-    final ColorFilterHandle rawColorFilter = colorFilterCreateMode(color.value, blendMode.index);
-    final T result = borrow(rawColorFilter);
-    colorFilterDispose(rawColorFilter);
-    return result;
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (runtimeType != other.runtimeType) {
-      return false;
+/// Skwasm implementation of [ui.ColorFilter].
+///
+/// This class acts as a thin wrapper around a [ColorFilterHandle].
+/// The memory lifecycle of the underlying native object is managed by the
+/// [FinalizationRegistry] associated with the shared `EngineColorFilter`.
+class SkwasmColorFilter implements BackendColorFilter {
+  SkwasmColorFilter(EngineColorFilter colorFilter) : handle = _initHandle(colorFilter);
+
+  final ColorFilterHandle handle;
+
+  static ColorFilterHandle _initHandle(EngineColorFilter colorFilter) {
+    switch (colorFilter.type) {
+      case ColorFilterType.mode:
+        final ui.Color? color = colorFilter.color;
+        final ui.BlendMode? blendMode = colorFilter.blendMode;
+        if (color == null || blendMode == null) {
+          throw StateError('ColorFilter.mode must have a color and blend mode.');
+        }
+        return colorFilterCreateMode(color.value, blendMode.index);
+      case ColorFilterType.linearToSrgbGamma:
+        return colorFilterCreateLinearToSRGBGamma();
+      case ColorFilterType.srgbToLinearGamma:
+        return colorFilterCreateSRGBToLinearGamma();
+      case ColorFilterType.matrix:
+        final List<double>? matrix = colorFilter.matrix;
+        if (matrix == null) {
+          throw StateError('ColorFilter.matrix must have a matrix.');
+        }
+        return withStackScope((scope) {
+          final Pointer<Float> rawMatrix = scope.convertDoublesToNative(matrix);
+          const translationIndices = <int>[4, 9, 14, 19];
+          for (final i in translationIndices) {
+            // Flutter documentation says the translation column of the color matrix
+            // is specified in unnormalized 0..255 space. Skia expects the
+            // translation values to be normalized to 0..1 space.
+            rawMatrix[i] /= 255.0;
+          }
+          return colorFilterCreateMatrix(rawMatrix);
+        });
     }
-    return other is SkwasmModeColorFilter && other.color == color && other.blendMode == blendMode;
   }
 
   @override
-  int get hashCode => Object.hash(color, blendMode);
-
-  @override
-  String toString() => 'ColorFilter.mode($color, $blendMode)';
-}
-
-class SkwasmLinearToSrgbGammaColorFilter extends SkwasmColorFilter {
-  const SkwasmLinearToSrgbGammaColorFilter();
-
-  /// This filter does not need to be deleted, because the same instance can
-  /// reused everywhere (it's not configurable).
-  static final ColorFilterHandle _rawColorFilter = colorFilterCreateLinearToSRGBGamma();
-
-  @override
-  T withRawColorFilter<T>(ColorFilterHandleBorrow<T> borrow) => borrow(_rawColorFilter);
-
-  @override
-  bool operator ==(Object other) => runtimeType == other.runtimeType;
-
-  @override
-  int get hashCode => runtimeType.hashCode;
-
-  @override
-  String toString() => 'ColorFilter.linearToSrgbGamma()';
-}
-
-class SkwasmSrgbToLinearGammaColorFilter extends SkwasmColorFilter {
-  const SkwasmSrgbToLinearGammaColorFilter();
-
-  /// This filter does not need to be deleted, because the same instance can
-  /// reused everywhere (it's not configurable).
-  static final ColorFilterHandle _rawColorFilter = colorFilterCreateSRGBToLinearGamma();
-
-  @override
-  T withRawColorFilter<T>(ColorFilterHandleBorrow<T> borrow) => borrow(_rawColorFilter);
-
-  @override
-  bool operator ==(Object other) => runtimeType == other.runtimeType;
-
-  @override
-  int get hashCode => runtimeType.hashCode;
-
-  @override
-  String toString() => 'ColorFilter.srgbToLinearGamma()';
+  void dispose() {
+    colorFilterDispose(handle);
+  }
 }
 
-class SkwasmMatrixColorFilter extends SkwasmColorFilter {
-  const SkwasmMatrixColorFilter(this.matrix);
-
-  final List<double> matrix;
-
-  @override
-  T withRawColorFilter<T>(ColorFilterHandleBorrow<T> borrow) => withStackScope((scope) {
-    assert(matrix.length == 20);
-    final Pointer<Float> rawMatrix = scope.convertDoublesToNative(matrix);
+class SkwasmMaskFilter implements BackendMaskFilter {
+  SkwasmMaskFilter(EngineMaskFilter maskFilter)
+    : handle = maskFilterCreateBlur(maskFilter.webOnlyBlurStyle.index, maskFilter.webOnlySigma);
 
-    /// Flutter documentation says the translation column of the color matrix
-    /// is specified in unnormalized 0..255 space. Skia expects the
-    /// translation values to be normalized to 0..1 space.
-    ///
-    /// See [https://api.flutter.dev/flutter/dart-ui/ColorFilter/ColorFilter.matrix.html].
-    for (final i in <int>[4, 9, 14, 19]) {
-      rawMatrix[i] /= 255.0;
-    }
-    final ColorFilterHandle rawColorFilter = colorFilterCreateMatrix(rawMatrix);
-    final T result = borrow(rawColorFilter);
-    colorFilterDispose(rawColorFilter);
-    return result;
-  });
+  final MaskFilterHandle handle;
 
   @override
-  bool operator ==(Object other) {
-    if (runtimeType != other.runtimeType) {
-      return false;
-    }
-    return other is SkwasmMatrixColorFilter && listEquals<double>(matrix, other.matrix);
+  void dispose() {
+    maskFilterDispose(handle);
   }
-
-  @override
-  int get hashCode => Object.hashAll(matrix);
-
-  @override
-  String toString() => 'ColorFilter.matrix($matrix)';
-}
-
-class SkwasmMaskFilter extends SkwasmObjectWrapper<RawMaskFilter> {
-  SkwasmMaskFilter._(MaskFilterHandle handle)
-    : super(handle, (MaskFilterHandle h) => maskFilterDispose(h), 'MaskFilter');
-
-  factory SkwasmMaskFilter.fromUiMaskFilter(ui.MaskFilter maskFilter) => SkwasmMaskFilter._(
-    maskFilterCreateBlur(maskFilter.webOnlyBlurStyle.index, maskFilter.webOnlySigma),
-  );
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
index 59a9e06283a73..66a9dae08e0d5 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
@@ -25,8 +25,10 @@ class SkwasmImage implements BackendImage {
     imageDispose(handle);
   }
 
+  @override
   int get width => imageGetWidth(handle);
 
+  @override
   int get height => imageGetHeight(handle);
 
   @override
@@ -42,7 +44,7 @@ class SkwasmImage implements BackendImage {
 /// The [width] and [height] are the dimensions of the image.
 /// The [format] specifies the layout of color channels in the buffer.
 /// The optional [rowBytes] defines the step length between two scan lines.
-EngineImage createSkwasmImageFromPixels(
+SkwasmImage createSkwasmImageFromPixels(
   Uint8List pixels,
   int width,
   int height,
@@ -67,7 +69,7 @@ EngineImage createSkwasmImageFromPixels(
       format.index,
       rowBytes ?? 4 * width,
     );
-    return EngineImage(SkwasmImage(imageHandle), width, height);
+    return SkwasmImage(imageHandle);
   } finally {
     skDataDispose(dataHandle);
   }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
index 38ed5e5ddde3a..2eda0ce42391e 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
@@ -29,11 +29,8 @@ class SkwasmPaint implements ui.Paint {
 
     final EngineColorFilter? localColorFilter = _colorFilter;
     if (localColorFilter != null) {
-      SkwasmColorFilter.fromEngineColorFilter(localColorFilter).withRawColorFilter((
-        nativeFilterHandle,
-      ) {
-        paintSetColorFilter(rawPaint, nativeFilterHandle);
-      });
+      final backendFilter = localColorFilter.backendFilter as SkwasmColorFilter;
+      paintSetColorFilter(rawPaint, backendFilter.handle);
     }
 
     final ShaderHandle? shaderHandle = _shader?.handle;
@@ -41,11 +38,10 @@ class SkwasmPaint implements ui.Paint {
       paintSetShader(rawPaint, shaderHandle);
     }
 
-    final ui.MaskFilter? localMaskFilter = maskFilter;
+    final localMaskFilter = maskFilter as EngineMaskFilter?;
     if (localMaskFilter != null) {
-      final nativeFilter = SkwasmMaskFilter.fromUiMaskFilter(localMaskFilter);
-      paintSetMaskFilter(rawPaint, nativeFilter.handle);
-      nativeFilter.dispose();
+      final backendFilter = localMaskFilter.backendFilter as SkwasmMaskFilter;
+      paintSetMaskFilter(rawPaint, backendFilter.handle);
     }
 
     final ui.ImageFilter? filter = imageFilter;
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
index 9da45029402d0..74f6f3828c8d8 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
@@ -14,15 +14,15 @@ enum PathDirection { clockwise, counterClockwise }
 
 enum PathArcSize { small, large }
 
-class SkwasmPath implements BackendPath, BackendPathBuilder {
-  factory SkwasmPath() {
-    return SkwasmPath.fromHandle(pathCreate());
-  }
-
-  factory SkwasmPath.from(SkwasmPath source) {
-    return SkwasmPath.fromHandle(pathCopy(source.handle));
-  }
+ui.Rect _getPathBounds(Pointer<RawPath> handle) {
+  return withStackScope((StackScope s) {
+    final Pointer<Float> rectBuffer = s.allocFloatArray(4);
+    pathGetBounds(handle, rectBuffer);
+    return s.convertRectFromNative(rectBuffer);
+  });
+}
 
+class SkwasmPath implements BackendPath {
   SkwasmPath.fromHandle(this.handle);
 
   final Pointer<RawPath> handle;
@@ -31,12 +31,62 @@ class SkwasmPath implements BackendPath, BackendPathBuilder {
   @override
   void dispose() {
     assert(!_isDisposed, 'SkwasmPath has already been disposed.');
-    pathDispose(handle);
-    _isDisposed = true;
+    if (!_isDisposed) {
+      pathDispose(handle);
+      _isDisposed = true;
+    }
+  }
+
+  bool contains(ui.Offset point) => pathContains(handle, point.dx, point.dy);
+  ui.PathFillType get fillType => ui.PathFillType.values[pathGetFillType(handle)];
+
+  @override
+  ui.Rect getBounds() => _getPathBounds(handle);
+
+  @override
+  SkwasmPathMetricIterator computeMetrics({bool forceClosed = false}) {
+    return SkwasmPathMetricIterator(this, forceClosed);
+  }
+
+  @override
+  String toSvgString() {
+    final SkStringHandle skString = pathGetSvgString(handle);
+    final Pointer<Int8> buffer = skStringGetData(skString);
+    final int length = skStringGetLength(skString);
+    final String svgString = utf8.decode(buffer.toUint8List(length));
+    skStringFree(skString);
+    return svgString;
+  }
+}
+
+class SkwasmPathBuilder implements BackendPathBuilder {
+  factory SkwasmPathBuilder() {
+    return SkwasmPathBuilder.fromHandle(pathCreate());
+  }
+
+  factory SkwasmPathBuilder.from(SkwasmPath source) {
+    return SkwasmPathBuilder.fromHandle(pathCopy(source.handle));
   }
 
+  SkwasmPathBuilder.fromHandle(this.handle);
+
+  final Pointer<RawPath> handle;
+  bool _isDisposed = false;
+
   @override
-  SkwasmPath build() => this;
+  SkwasmPath build() {
+    assert(!_isDisposed, 'SkwasmPathBuilder has been disposed.');
+    return SkwasmPath.fromHandle(pathCopy(handle));
+  }
+
+  @override
+  void dispose() {
+    assert(!_isDisposed, 'SkwasmPathBuilder has already been disposed.');
+    if (!_isDisposed) {
+      pathDispose(handle);
+      _isDisposed = true;
+    }
+  }
 
   @override
   ui.PathFillType get fillType => ui.PathFillType.values[pathGetFillType(handle)];
@@ -231,43 +281,25 @@ class SkwasmPath implements BackendPath, BackendPathBuilder {
   }
 
   @override
-  ui.Rect getBounds() {
-    return withStackScope((StackScope s) {
-      final Pointer<Float> rectBuffer = s.allocFloatArray(4);
-      pathGetBounds(handle, rectBuffer);
-      return s.convertRectFromNative(rectBuffer);
-    });
-  }
-
-  static SkwasmPath combine(ui.PathOperation operation, SkwasmPath path1, SkwasmPath path2) =>
-      SkwasmPath.fromHandle(pathCombine(operation.index, path1.handle, path2.handle));
+  ui.Rect getBounds() => _getPathBounds(handle);
 
-  @override
-  SkwasmPathMetricIterator computeMetrics({bool forceClosed = false}) {
-    return SkwasmPathMetricIterator(this, forceClosed);
-  }
-
-  @override
-  String toSvgString() {
-    final SkStringHandle skString = pathGetSvgString(handle);
-    final Pointer<Int8> buffer = skStringGetData(skString);
-    final int length = skStringGetLength(skString);
-    final String svgString = utf8.decode(buffer.toUint8List(length));
-    skStringFree(skString);
-    return svgString;
-  }
+  static SkwasmPathBuilder combine(
+    ui.PathOperation operation,
+    SkwasmPath path1,
+    SkwasmPath path2,
+  ) => SkwasmPathBuilder.fromHandle(pathCombine(operation.index, path1.handle, path2.handle));
 }
 
 class SkwasmPathConstructors implements BackendPathConstructors {
   @override
-  SkwasmPath createNew() => SkwasmPath();
+  SkwasmPathBuilder createNew() => SkwasmPathBuilder();
 
   @override
-  BackendPathBuilder fromPath(BackendPath path) => SkwasmPath.from(path as SkwasmPath);
+  BackendPathBuilder fromPath(BackendPath path) => SkwasmPathBuilder.from(path as SkwasmPath);
 
   @override
-  SkwasmPath combinePaths(ui.PathOperation operation, BackendPath path1, BackendPath path2) {
-    return SkwasmPath.combine(operation, path1 as SkwasmPath, path2 as SkwasmPath);
+  SkwasmPathBuilder combinePaths(ui.PathOperation operation, BackendPath path1, BackendPath path2) {
+    return SkwasmPathBuilder.combine(operation, path1 as SkwasmPath, path2 as SkwasmPath);
   }
 }
 
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
index c1d5254e04e51..a33ae05508b1d 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
@@ -64,7 +64,9 @@ class SkwasmPathMetric implements BackendPathMetric {
 
   @override
   BackendPathBuilder extractPath(double start, double end, {bool startWithMoveTo = true}) {
-    return SkwasmPath.fromHandle(contourMeasureGetSegment(handle, start, end, startWithMoveTo));
+    return SkwasmPathBuilder.fromHandle(
+      contourMeasureGetSegment(handle, start, end, startWithMoveTo),
+    );
   }
 
   @override
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
index 8e022ac3f7e3b..282bd5710f01d 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
@@ -14,8 +14,12 @@ import 'package:ui/ui.dart' as ui;
 import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 class SkwasmRenderer extends Renderer {
+  @override
   bool get isMultiThreaded => skwasmIsMultiThreaded();
 
+  @override
+  bool get supportsResizingAnimatedImages => true;
+
   bool get isWimp => skwasmIsWimp();
 
   @override
@@ -114,6 +118,12 @@ class SkwasmRenderer extends Renderer {
   @override
   ui.Paint createPaint() => SkwasmPaint();
 
+  @override
+  BackendColorFilter createColorFilter(EngineColorFilter filter) => SkwasmColorFilter(filter);
+
+  @override
+  BackendMaskFilter createMaskFilter(EngineMaskFilter filter) => SkwasmMaskFilter(filter);
+
   @override
   ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style) =>
       SkwasmParagraphBuilder(style as SkwasmParagraphStyle, fontCollection);
@@ -265,28 +275,13 @@ class SkwasmRenderer extends Renderer {
   );
 
   @override
-  ui.Vertices createVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  }) => SkwasmVertices(
-    mode,
-    positions,
-    textureCoordinates: textureCoordinates,
-    colors: colors,
-    indices: indices,
-  );
-
-  @override
-  ui.Vertices createVerticesRaw(
+  BackendVertices createVertices(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
     Int32List? colors,
     Uint16List? indices,
-  }) => SkwasmVertices.raw(
+  }) => SkwasmVertices(
     mode,
     positions,
     textureCoordinates: textureCoordinates,
@@ -295,29 +290,16 @@ class SkwasmRenderer extends Renderer {
   );
 
   @override
-  void decodeImageFromPixels(
-    Uint8List pixels,
-    int width,
-    int height,
-    ui.PixelFormat format,
-    ui.ImageDecoderCallback callback, {
+  BackendImage decodeBackendImageFromPixels(
+    Uint8List pixels, {
+    required int width,
+    required int height,
+    required ui.PixelFormat format,
     int? rowBytes,
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) {
-    final EngineImage pixelImage = createSkwasmImageFromPixels(pixels, width, height, format);
-    final ui.Image scaledImage = scaleImageIfNeeded(
-      pixelImage,
-      targetWidth: targetWidth,
-      targetHeight: targetHeight,
-      allowUpscaling: allowUpscaling,
-    );
-    callback(scaledImage);
-  }
+  }) => createSkwasmImageFromPixels(pixels, width, height, format, rowBytes: rowBytes);
 
   @override
-  FutureOr<void> initialize() async {
+  FutureOr<void> initialize() {
     rasterizer = OffscreenCanvasRasterizer(
       (OffscreenCanvasProvider canvasProvider) => SkwasmSurface(canvasProvider),
     );
@@ -325,74 +307,19 @@ class SkwasmRenderer extends Renderer {
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodec(
-    Uint8List list, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) async {
-    final ImageType? contentType = detectImageType(list);
-    if (contentType == null) {
-      throw Exception('Could not determine content type of image from data');
-    }
-    if (browserSupportsImageDecoder) {
-      final baseDecoder = SkwasmBrowserImageDecoder(
-        contentType: contentType.mimeType,
-        dataSource: list.toJS,
-        debugSource: 'encoded image bytes',
-      );
-      await baseDecoder.initialize();
-      if (targetWidth == null && targetHeight == null) {
-        return baseDecoder;
-      }
-      return ResizingCodec(
-        baseDecoder,
-        targetWidth: targetWidth,
-        targetHeight: targetHeight,
-        allowUpscaling: allowUpscaling,
-      );
-    } else {
-      if (contentType.isAnimated) {
-        return SkwasmAnimatedImageDecoder(list, targetWidth, targetHeight);
-      } else {
-        final DomBlob blob = createDomBlob(<ByteBuffer>[list.buffer]);
-        return SkwasmDomImageDecoder(blob, targetWidth, targetHeight);
-      }
-    }
+  BackendAnimatedImage createAnimatedImage(Uint8List bytes, {int? targetWidth, int? targetHeight}) {
+    return SkwasmAnimatedImageDecoder(bytes, targetWidth, targetHeight);
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(
-    Uri uri, {
-    ui_web.ImageCodecChunkCallback? chunkCallback,
-  }) async {
-    final DomResponse response = await rawHttpGet(uri.toString());
-    final String? contentType = response.headers.get('Content-Type');
-    if (contentType == null) {
-      throw Exception('Could not determine content type of image at url $uri');
-    }
-    if (browserSupportsImageDecoder) {
-      final decoder = SkwasmBrowserImageDecoder(
-        contentType: contentType,
-        dataSource: response.body,
-        debugSource: uri.toString(),
-      );
-      await decoder.initialize();
-      return decoder;
-    } else {
-      final ByteBuffer buffer = await response.arrayBuffer();
-      final Uint8List data = buffer.asUint8List();
-      final ImageType? parsedContentType = detectImageType(data);
-      if (parsedContentType == null) {
-        throw Exception('Could not determine content type of image from data');
-      }
-      if (parsedContentType.isAnimated) {
-        return SkwasmAnimatedImageDecoder(data);
-      } else {
-        final DomBlob blob = createDomBlob(<ByteBuffer>[buffer]);
-        return SkwasmDomImageDecoder(blob);
-      }
-    }
+  BackendImage createImageFromImageSource(ImageSource source) {
+    final ImageHandle handle = imageCreateFromTextureSource(
+      source.canvasImageSource as JSObject,
+      source.width,
+      source.height,
+      (pictureToImageSurface as SkwasmSurface).handle,
+    );
+    return SkwasmImage(handle);
   }
 
   @override
@@ -439,57 +366,6 @@ class SkwasmRenderer extends Renderer {
     lineNumber: lineNumber,
   );
 
-  @override
-  ui.Image createImageFromImageBitmap(DomImageBitmap imageSource) {
-    // Cache the dimensions before passing the image to the texture source creator,
-    // which may transfer ownership of the bitmap to a web worker and detach it.
-    final int width = imageSource.width;
-    final int height = imageSource.height;
-
-    final ImageHandle handle = imageCreateFromTextureSource(
-      imageSource,
-      width,
-      height,
-      (pictureToImageSurface as SkwasmSurface).handle,
-    );
-    return EngineImage(
-      SkwasmImage(handle),
-      width,
-      height,
-      imageSource: ImageBitmapImageSource(imageSource),
-    );
-  }
-
-  @override
-  FutureOr<ui.Image> createImageFromTextureSource(
-    JSAny textureSource, {
-    required int width,
-    required int height,
-    required bool transferOwnership,
-  }) async {
-    // If the caller does not wish to transfer ownership, or if the runtime environment
-    // is multi-threaded and the provided texture type cannot be natively transferred
-    // between threads, convert the texture to a transferable DomImageBitmap first.
-    if (!transferOwnership || (isMultiThreaded && !_isTransferable(textureSource))) {
-      textureSource = (await createImageBitmap(textureSource, (
-        x: 0,
-        y: 0,
-        width: width,
-        height: height,
-      ))).toJSAnyShallow;
-    }
-    final ImageHandle handle = imageCreateFromTextureSource(
-      textureSource as JSObject,
-      width,
-      height,
-      (pictureToImageSurface as SkwasmSurface).handle,
-    );
-    return EngineImage(SkwasmImage(handle), width, height);
-  }
-
-  bool _isTransferable(JSAny object) =>
-      object.isA<DomImageBitmap>() || object.isA<VideoFrame>() || object.isA<DomOffscreenCanvas>();
-
   @override
   void dumpDebugInfo() {
     if (kDebugMode) {
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
index 8ab6586aa51c8..f04f2a46e1896 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
@@ -8,39 +8,10 @@ import 'dart:typed_data';
 import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
 import 'package:ui/ui.dart' as ui;
 
-class SkwasmVertices extends SkwasmObjectWrapper<RawVertices> implements ui.Vertices {
-  factory SkwasmVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  }) => withStackScope((StackScope scope) {
-    final RawPointArray rawPositions = scope.convertPointArrayToNative(positions);
-    final RawPointArray rawTextureCoordinates = textureCoordinates != null
-        ? scope.convertPointArrayToNative(textureCoordinates)
-        : nullptr;
-    final RawColorArray rawColors = colors != null
-        ? scope.convertColorArrayToNative(colors)
-        : nullptr;
-    final Pointer<Uint16> rawIndices = indices != null
-        ? scope.convertIntsToUint16Native(indices)
-        : nullptr;
-    final int indexCount = indices != null ? indices.length : 0;
-    return SkwasmVertices._(
-      verticesCreate(
-        mode.index,
-        positions.length,
-        rawPositions,
-        rawTextureCoordinates,
-        rawColors,
-        indexCount,
-        rawIndices,
-      ),
-    );
-  });
+import '../../backend/vertices.dart';
 
-  factory SkwasmVertices.raw(
+class SkwasmVertices implements BackendVertices {
+  factory SkwasmVertices(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
@@ -71,6 +42,12 @@ class SkwasmVertices extends SkwasmObjectWrapper<RawVertices> implements ui.Vert
     );
   });
 
-  SkwasmVertices._(VerticesHandle handle)
-    : super(handle, (VerticesHandle h) => verticesDispose(h), 'Vertices');
+  SkwasmVertices._(this.handle);
+
+  final VerticesHandle handle;
+
+  @override
+  void dispose() {
+    verticesDispose(handle);
+  }
 }
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
index 17a0e52fc7121..394feb21be1f7 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
@@ -3,23 +3,36 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:js_interop';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 class SkwasmRenderer extends Renderer {
+  @override
   bool get isMultiThreaded => false;
 
+  @override
+  bool get supportsResizingAnimatedImages =>
+      throw UnimplementedError('Skwasm not implemented on this platform.');
+
   bool get isWimp => false;
 
   @override
   BackendPathConstructors get pathConstructors =>
       throw UnimplementedError('Skwasm not implemented on this platform.');
 
+  @override
+  BackendColorFilter createColorFilter(EngineColorFilter filter) {
+    throw UnimplementedError('Skwasm not implemented on this platform.');
+  }
+
+  @override
+  BackendMaskFilter createMaskFilter(EngineMaskFilter filter) {
+    throw UnimplementedError('Skwasm not implemented on this platform.');
+  }
+
   @override
   ui.ImageFilter composeImageFilters({
     required ui.ImageFilter outer,
@@ -209,18 +222,7 @@ class SkwasmRenderer extends Renderer {
   }
 
   @override
-  ui.Vertices createVertices(
-    ui.VertexMode mode,
-    List<ui.Offset> positions, {
-    List<ui.Offset>? textureCoordinates,
-    List<ui.Color>? colors,
-    List<int>? indices,
-  }) {
-    throw UnimplementedError('Skwasm not implemented on this platform.');
-  }
-
-  @override
-  ui.Vertices createVerticesRaw(
+  BackendVertices createVertices(
     ui.VertexMode mode,
     Float32List positions, {
     Float32List? textureCoordinates,
@@ -231,16 +233,12 @@ class SkwasmRenderer extends Renderer {
   }
 
   @override
-  void decodeImageFromPixels(
-    Uint8List pixels,
-    int width,
-    int height,
-    ui.PixelFormat format,
-    ui.ImageDecoderCallback callback, {
+  FutureOr<BackendImage> decodeBackendImageFromPixels(
+    Uint8List pixels, {
+    required int width,
+    required int height,
+    required ui.PixelFormat format,
     int? rowBytes,
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
   }) {
     throw UnimplementedError('Skwasm not implemented on this platform.');
   }
@@ -250,20 +248,12 @@ class SkwasmRenderer extends Renderer {
       throw UnimplementedError('Skwasm not implemented on this platform.');
 
   @override
-  Future<ui.Codec> instantiateImageCodec(
-    Uint8List list, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true,
-  }) {
+  BackendAnimatedImage createAnimatedImage(Uint8List bytes, {int? targetWidth, int? targetHeight}) {
     throw UnimplementedError('Skwasm not implemented on this platform.');
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(
-    Uri uri, {
-    ui_web.ImageCodecChunkCallback? chunkCallback,
-  }) {
+  BackendImage createImageFromImageSource(ImageSource source) {
     throw UnimplementedError('Skwasm not implemented on this platform.');
   }
 
@@ -297,21 +287,6 @@ class SkwasmRenderer extends Renderer {
     required int lineNumber,
   }) => throw UnimplementedError('Skwasm not implemented on this platform.');
 
-  @override
-  ui.Image createImageFromImageBitmap(DomImageBitmap imageSource) {
-    throw UnimplementedError('Skwasm not implemented on this platform.');
-  }
-
-  @override
-  ui.Image createImageFromTextureSource(
-    JSAny object, {
-    required int width,
-    required int height,
-    required bool transferOwnership,
-  }) {
-    throw UnimplementedError('Skwasm not implemented on this platform.');
-  }
-
   @override
   void dumpDebugInfo() {
     throw UnimplementedError('Skwasm not implemented on this platform.');
diff --git a/engine/src/flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart b/engine/src/flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart
index bbfe990c88398..056d2df6498b2 100644
--- a/engine/src/flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart
+++ b/engine/src/flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart
@@ -17,7 +17,7 @@ typedef ImageCodecChunkCallback = void Function(int cumulativeBytesLoaded, int e
 /// The [chunkCallback] is called with progress updates as image chunks are
 /// loaded.
 Future<ui.Codec> createImageCodecFromUrl(Uri uri, {ImageCodecChunkCallback? chunkCallback}) {
-  return renderer.instantiateImageCodecFromUrl(uri, chunkCallback: chunkCallback);
+  return engineInstantiateImageCodecFromUrl(uri, chunkCallback: chunkCallback);
 }
 
 /// Creates a [ui.Image] from an ImageBitmap object.
diff --git a/engine/src/flutter/lib/web_ui/test/canvaskit/filter_test.dart b/engine/src/flutter/lib/web_ui/test/canvaskit/filter_test.dart
index 431aa25db7758..402c495469c55 100644
--- a/engine/src/flutter/lib/web_ui/test/canvaskit/filter_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/canvaskit/filter_test.dart
@@ -16,70 +16,39 @@ void main() {
 }
 
 void testMain() {
-  List<CkColorFilter> createColorFilters() {
-    return <CkColorFilter>[
-      createCkColorFilter(
-        const EngineColorFilter.mode(ui.Color(0x12345678), ui.BlendMode.srcOver),
-      )!,
-      createCkColorFilter(
-        const EngineColorFilter.mode(ui.Color(0x12345678), ui.BlendMode.dstOver),
-      )!,
-      createCkColorFilter(
-        const EngineColorFilter.mode(ui.Color(0x87654321), ui.BlendMode.dstOver),
-      )!,
-      createCkColorFilter(
-        const EngineColorFilter.matrix(<double>[
-          1,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-          0,
-        ]),
-      )!,
-      createCkColorFilter(
-        EngineColorFilter.matrix(
-          Float32List.fromList(<double>[
-            2,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-            0,
-          ]),
-        ),
-      )!,
-      createCkColorFilter(const EngineColorFilter.linearToSrgbGamma())!,
-      createCkColorFilter(const EngineColorFilter.srgbToLinearGamma())!,
-      createCkColorFilter(EngineColorFilter.saturation(0.5))!,
+  List<EngineColorFilter> createColorFilters() {
+    return <EngineColorFilter>[
+      const EngineColorFilter.mode(ui.Color(0x12345678), ui.BlendMode.srcOver),
+      const EngineColorFilter.mode(ui.Color(0x12345678), ui.BlendMode.dstOver),
+      const EngineColorFilter.mode(ui.Color(0x87654321), ui.BlendMode.dstOver),
+      const EngineColorFilter.matrix(<double>[
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+      ]),
+      EngineColorFilter.matrix(
+        Float32List.fromList(<double>[2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0]),
+      ),
+      const EngineColorFilter.linearToSrgbGamma(),
+      const EngineColorFilter.srgbToLinearGamma(),
+      EngineColorFilter.saturation(0.5),
     ];
   }
 
@@ -90,7 +59,7 @@ void testMain() {
       CkImageFilter.blur(sigmaX: 6, sigmaY: 5, tileMode: ui.TileMode.decal),
       CkImageFilter.dilate(radiusX: 5, radiusY: 6),
       CkImageFilter.erode(radiusX: 7, radiusY: 8),
-      for (final CkColorFilter colorFilter in createColorFilters())
+      for (final EngineColorFilter colorFilter in createColorFilters())
         CkImageFilter.color(colorFilter: colorFilter),
     ];
     filters.add(CkImageFilter.compose(outer: filters[0], inner: filters[1]));
@@ -101,25 +70,23 @@ void testMain() {
   setUpCanvasKitTest(withImplicitView: true);
 
   group('ImageFilters', () {
-    {
+    test('withSkImageFilter creates temp SkImageFilter', () {
       final List<CkImageFilter> testFilters = createImageFilters();
       for (final imageFilter in testFilters) {
-        test('${imageFilter.runtimeType}.withSkImageFilter creates temp SkImageFilter', () {
-          expect(imageFilter, isA<CkImageFilter>());
-          SkImageFilter? skFilter;
-          imageFilter.withSkImageFilter((value) {
-            expect(value.isDeleted(), isFalse);
-            skFilter = value;
-          });
-          expect(skFilter, isNotNull);
-          expect(
-            reason: 'Because the SkImageFilter instance is temporary',
-            skFilter!.isDeleted(),
-            isTrue,
-          );
+        expect(imageFilter, isA<CkImageFilter>());
+        SkImageFilter? skFilter;
+        imageFilter.withSkImageFilter((value) {
+          expect(value.isDeleted(), isFalse);
+          skFilter = value;
         });
+        expect(skFilter, isNotNull);
+        expect(
+          reason: 'Because the SkImageFilter instance is temporary',
+          skFilter!.isDeleted(),
+          isTrue,
+        );
       }
-    }
+    });
 
     test('reuses the Skia filter', () {
       final paint = CkPaint();
diff --git a/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart b/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart
index 33be50608409c..d4b071d79e765 100644
--- a/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart
@@ -22,7 +22,7 @@ Future<void> testMain() async {
     setUpCanvasKitTest(withImplicitView: true);
 
     test('ImageDecoder toByteData(PNG)', () async {
-      final image = CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test');
+      final image = EngineCodec.skia(CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test'));
       final ui.FrameInfo frame = await image.getNextFrame();
       final ByteData? png = await frame.image.toByteData(format: ui.ImageByteFormat.png);
       expect(png, isNotNull);
@@ -33,7 +33,7 @@ Future<void> testMain() async {
     });
 
     test('CkAnimatedImage toByteData(RGBA)', () async {
-      final image = CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test');
+      final image = EngineCodec.skia(CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test'));
       const expectedColors = <List<int>>[
         <int>[255, 0, 0, 255],
         <int>[0, 255, 0, 255],
diff --git a/engine/src/flutter/lib/web_ui/test/canvaskit/image_test.dart b/engine/src/flutter/lib/web_ui/test/canvaskit/image_test.dart
index 68e21038386be..0b779628a765a 100644
--- a/engine/src/flutter/lib/web_ui/test/canvaskit/image_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/canvaskit/image_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
@@ -31,38 +30,6 @@ void testMain() {
     image.dispose();
   });
 
-  test('fetchImage fetches image in chunks', () async {
-    final cumulativeBytesLoadedInvocations = <int>[];
-    final expectedTotalBytesInvocations = <int>[];
-    final Uint8List result = await fetchImage('/long_test_payload?length=100000&chunk=1000', (
-      int cumulativeBytesLoaded,
-      int expectedTotalBytes,
-    ) {
-      cumulativeBytesLoadedInvocations.add(cumulativeBytesLoaded);
-      expectedTotalBytesInvocations.add(expectedTotalBytes);
-    });
-
-    // Check that image payload was chunked.
-    expect(cumulativeBytesLoadedInvocations, hasLength(greaterThan(1)));
-
-    // Check that reported total byte count is the same across all invocations.
-    for (final expectedTotalBytes in expectedTotalBytesInvocations) {
-      expect(expectedTotalBytes, 100000);
-    }
-
-    // Check that cumulative byte count grows with each invocation.
-    cumulativeBytesLoadedInvocations.reduce((int previous, int next) {
-      expect(next, greaterThan(previous));
-      return next;
-    });
-
-    // Check that the last cumulative byte count matches the total byte count.
-    expect(cumulativeBytesLoadedInvocations.last, 100000);
-
-    // Check the contents of the returned data.
-    expect(result, List<int>.generate(100000, (int i) => i & 0xFF));
-  });
-
   test('EngineImage does not close image source too early', () async {
     // Create a shared ImageSource wrapping a blank 4x4 image bitmap.
     final ImageSource imageSource = ImageBitmapImageSource(
diff --git a/engine/src/flutter/lib/web_ui/test/engine/compositing/render_canvas_test.dart b/engine/src/flutter/lib/web_ui/test/engine/compositing/render_canvas_test.dart
index f5582c380df65..f22871fd6cceb 100644
--- a/engine/src/flutter/lib/web_ui/test/engine/compositing/render_canvas_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/engine/compositing/render_canvas_test.dart
@@ -22,12 +22,10 @@ void testMain() {
     });
 
     Future<DomImageBitmap> newBitmap(int width, int height) async {
-      return createImageBitmap(createBlankDomImageData(width, height) as JSAny, (
-        x: 0,
-        y: 0,
-        width: width,
-        height: height,
-      ));
+      return createImageBitmap(
+        createBlankDomImageData(width, height) as JSAny,
+        bounds: (x: 0, y: 0, width: width, height: height),
+      );
     }
 
     // Regression test for https://github.com/flutter/flutter/issues/75286
diff --git a/engine/src/flutter/lib/web_ui/test/engine/mouse/cursor_test.dart b/engine/src/flutter/lib/web_ui/test/engine/mouse/cursor_test.dart
index a9215b515c2d6..eb29c9848d867 100644
--- a/engine/src/flutter/lib/web_ui/test/engine/mouse/cursor_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/engine/mouse/cursor_test.dart
@@ -16,36 +16,28 @@ void testMain() {
       final DomElement rootViewElement = createDomElement('div');
       final mouseCursor = MouseCursor(rootViewElement);
 
-      // TODO(mdebbar): This should be `rootViewElement`.
-      //                https://github.com/flutter/flutter/issues/140226
-      final DomElement cursorTarget = domDocument.body!;
-
       mouseCursor.activateSystemCursor('alias');
-      expect(cursorTarget.style.cursor, 'alias');
+      expect(rootViewElement.style.cursor, 'alias');
 
       mouseCursor.activateSystemCursor('move');
-      expect(cursorTarget.style.cursor, 'move');
+      expect(rootViewElement.style.cursor, 'move');
 
       mouseCursor.activateSystemCursor('precise');
-      expect(cursorTarget.style.cursor, 'crosshair');
+      expect(rootViewElement.style.cursor, 'crosshair');
 
       mouseCursor.activateSystemCursor('resizeDownRight');
-      expect(cursorTarget.style.cursor, 'se-resize');
+      expect(rootViewElement.style.cursor, 'se-resize');
 
       mouseCursor.activateSystemCursor('basic');
-      expect(cursorTarget.style.cursor, isEmpty);
+      expect(rootViewElement.style.cursor, isEmpty);
     });
 
     test('handles unknown cursor type', () {
       final DomElement rootViewElement = createDomElement('div');
       final mouseCursor = MouseCursor(rootViewElement);
 
-      // TODO(mdebbar): This should be `rootViewElement`.
-      //                https://github.com/flutter/flutter/issues/140226
-      final DomElement cursorTarget = domDocument.body!;
-
       mouseCursor.activateSystemCursor('unknown');
-      expect(cursorTarget.style.cursor, isEmpty);
+      expect(rootViewElement.style.cursor, isEmpty);
 
       mouseCursor.activateSystemCursor(null);
     });
diff --git a/engine/src/flutter/lib/web_ui/test/engine/primitives/filter_caching_test.dart b/engine/src/flutter/lib/web_ui/test/engine/primitives/filter_caching_test.dart
new file mode 100644
index 0000000000000..26d53d02d38db
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/test/engine/primitives/filter_caching_test.dart
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  setUpUnitTests();
+  group('Filter Caching', () {
+    test('EngineColorFilter implements Expando caching', () {
+      const colorFilter = EngineColorFilter.mode(ui.Color(0x12345678), ui.BlendMode.srcOver);
+
+      final BackendColorFilter backendFilter1 = colorFilter.backendFilter;
+
+      expect(backendFilter1, isNotNull);
+
+      // Access it again, should be the exact same instance (cached)
+      final BackendColorFilter backendFilter2 = colorFilter.backendFilter;
+      expect(backendFilter1, same(backendFilter2));
+    });
+
+    test('EngineMaskFilter implements Expando caching', () {
+      const maskFilter = EngineMaskFilter.blur(ui.BlurStyle.normal, 5.0);
+
+      final BackendMaskFilter backendFilter1 = maskFilter.backendFilter;
+
+      expect(backendFilter1, isNotNull);
+
+      final BackendMaskFilter backendFilter2 = maskFilter.backendFilter;
+      expect(backendFilter1, same(backendFilter2));
+    });
+  });
+}
diff --git a/engine/src/flutter/lib/web_ui/test/engine/window_test.dart b/engine/src/flutter/lib/web_ui/test/engine/window_test.dart
index 8d3f065886d2d..fab35ddd2a50d 100644
--- a/engine/src/flutter/lib/web_ui/test/engine/window_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/engine/window_test.dart
@@ -546,23 +546,46 @@ void testMain() {
     expect(localeChangedCount, 1);
   });
 
-  test('dispatches browser event on flutter/service_worker channel', () async {
-    final completer = Completer<void>();
-    domWindow.addEventListener(
-      'flutter-first-frame',
-      createDomEventListener((DomEvent e) => completer.complete()),
-    );
-    final Zone innerZone = Zone.current.fork();
+  test('dispatches browser event asynchronously on flutter/service_worker channel', () async {
+    // Each dispatcher tracks its own first frame, and only the first one. The
+    // singleton's is already over by now, because previous tests pump frames on
+    // it, so this test brings its own dispatcher, like 'registration' below, to
+    // make the frame it pumps really the first one.
+    final ownDispatcher = EnginePlatformDispatcher();
+    addTearDown(ownDispatcher.dispose);
+
+    var eventCount = 0;
+    final DomEventListener listener = createDomEventListener((DomEvent e) => eventCount++);
+    domWindow.addEventListener('flutter-first-frame', listener);
+    addTearDown(() => domWindow.removeEventListener('flutter-first-frame', listener));
+
+    // The event is dispatched from an animation frame callback, so an animation
+    // frame is long enough to observe one that was sent.
+    Future<void> awaitAnimationFrame() {
+      final completer = Completer<void>();
+      domWindow.requestAnimationFrame((_) => Timer.run(completer.complete));
+      return completer.future;
+    }
 
-    innerZone.runGuarded(() {
-      myWindow.sendPlatformMessage(
-        'flutter/service_worker',
-        ByteData(0),
-        (ByteData? outputData) {},
-      );
-    });
+    ownDispatcher.sendPlatformMessage(
+      'flutter/service_worker',
+      ByteData(0),
+      (ByteData? outputData) {},
+    );
 
-    await expectLater(completer.future, completes);
+    // The event waits for the first frame to be on screen, which hasn't happened
+    // yet.
+    await awaitAnimationFrame();
+    expect(eventCount, 0);
+
+    // This frame renders no scene, but a first frame that rendered nothing is
+    // still a first frame, so ending it releases the event with nothing left to
+    // wait for. Ending the frame resolves what the dispatch is waiting on
+    // synchronously, so the dispatch is queued from a microtask, which runs
+    // before the animation frame below.
+    ownDispatcher.invokeOnDrawFrame();
+    await awaitAnimationFrame();
+    expect(eventCount, 1);
   });
 
   test('sets global html attributes', () {
diff --git a/engine/src/flutter/lib/web_ui/test/skwasm/concurrent_text_layout_raster_test.dart b/engine/src/flutter/lib/web_ui/test/skwasm/concurrent_text_layout_raster_test.dart
new file mode 100644
index 0000000000000..97a84c5873f48
--- /dev/null
+++ b/engine/src/flutter/lib/web_ui/test/skwasm/concurrent_text_layout_raster_test.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart' show renderer;
+import 'package:ui/ui.dart' as ui;
+
+import '../common/rendering.dart';
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+const int _maxFrames = 200;
+const Duration _maxTestTime = Duration(seconds: 10);
+const int _paragraphsPerFrame = 24;
+const int _spansPerParagraph = 3;
+
+const List<String> _fontFamilies = <String>['Roboto', 'RobotoVariable', 'Ahem'];
+const List<ui.FontWeight> _fontWeights = <ui.FontWeight>[
+  ui.FontWeight.w100,
+  ui.FontWeight.w300,
+  ui.FontWeight.w400,
+  ui.FontWeight.w500,
+  ui.FontWeight.w700,
+  ui.FontWeight.w900,
+];
+
+Future<void> testMain() async {
+  setUpUnitTests(withImplicitView: true, setUpTestViewDimensions: false);
+
+  // Advanced by an irrational stride so fractional font sizes never repeat,
+  // forcing a fresh SkStrike for every span.
+  double fontSizeSeed = 0;
+
+  List<ui.Paragraph> buildAndLayoutParagraphs(int frame) {
+    final paragraphs = <ui.Paragraph>[];
+    for (var i = 0; i < _paragraphsPerFrame; i++) {
+      final builder = ui.ParagraphBuilder(ui.ParagraphStyle());
+      for (var span = 0; span < _spansPerParagraph; span++) {
+        fontSizeSeed += 0.6180339887;
+        builder.pushStyle(
+          ui.TextStyle(
+            color: const ui.Color(0xFF000000),
+            fontFamily: _fontFamilies[(i + span) % _fontFamilies.length],
+            fontSize: 8.0 + (fontSizeSeed % 32.0),
+            fontWeight: _fontWeights[(frame + i + span) % _fontWeights.length],
+            fontStyle: (frame + i + span).isEven ? ui.FontStyle.normal : ui.FontStyle.italic,
+          ),
+        );
+        builder.addText('Quick zephyrs blow 0123456789 frame $frame paragraph $i span $span. ');
+        builder.pop();
+      }
+      final ui.Paragraph paragraph = builder.build();
+      paragraph.layout(const ui.ParagraphConstraints(width: 400));
+      paragraphs.add(paragraph);
+    }
+    return paragraphs;
+  }
+
+  ui.Picture recordPicture(List<ui.Paragraph> paragraphs) {
+    final recorder = ui.PictureRecorder();
+    final canvas = ui.Canvas(recorder, const ui.Rect.fromLTWH(0, 0, 500, 500));
+    canvas.drawColor(const ui.Color(0xFFFFFFFF), ui.BlendMode.src);
+    var offset = 0.0;
+    for (final paragraph in paragraphs) {
+      canvas.drawParagraph(paragraph, ui.Offset(0, offset));
+      offset += 20.0;
+    }
+    return recorder.endRecording();
+  }
+
+  test('concurrent text layout and rasterization does not corrupt the heap', () async {
+    List<ui.Paragraph> paragraphs = buildAndLayoutParagraphs(0);
+    final stopwatch = Stopwatch()..start();
+    var frame = 0;
+    while (frame < _maxFrames && stopwatch.elapsed < _maxTestTime) {
+      frame++;
+
+      final ui.Picture picture = recordPicture(paragraphs);
+      final sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.addPicture(ui.Offset.zero, picture);
+
+      // Kick off rasterization unawaited, then yield once so the render
+      // message reaches the raster thread.
+      final Future<void> renderFuture = renderScene(sceneBuilder.build());
+      await Future<void>.delayed(Duration.zero);
+
+      // Lay out the next frame's paragraphs while the raster thread is
+      // rasterizing this one — the concurrent strike cache access under test.
+      final List<ui.Paragraph> nextParagraphs = buildAndLayoutParagraphs(frame);
+
+      await renderFuture;
+
+      // Disposing exercises the concurrent teardown path of
+      // https://github.com/flutter/flutter/issues/184858.
+      for (final paragraph in paragraphs) {
+        paragraph.dispose();
+      }
+      picture.dispose();
+      paragraphs = nextParagraphs;
+
+      // Shrink and re-grow the GPU resource cache so purging runs against
+      // in-flight rasterization.
+      if (frame % 16 == 0) {
+        renderer.resourceCacheMaxBytes = frame % 32 == 0 ? 1024 * 1024 : 64 * 1024 * 1024;
+      }
+    }
+
+    for (final paragraph in paragraphs) {
+      paragraph.dispose();
+    }
+
+    // Completing without a RuntimeError or hang is the pass condition.
+    expect(frame, greaterThan(0));
+  }, timeout: const Timeout(Duration(minutes: 2)));
+}
diff --git a/engine/src/flutter/lib/web_ui/test/skwasm/native_memory_test.dart b/engine/src/flutter/lib/web_ui/test/skwasm/native_memory_test.dart
index bb3307cb332cd..083532c1cd67b 100644
--- a/engine/src/flutter/lib/web_ui/test/skwasm/native_memory_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/skwasm/native_memory_test.dart
@@ -18,7 +18,13 @@ void testMain() {
   group('Skwasm native memory', () {
     test('SkwasmImage.clone share same handle and box', () {
       final pixels = Uint8List(4);
-      final EngineImage image = createSkwasmImageFromPixels(pixels, 1, 1, ui.PixelFormat.rgba8888);
+      final SkwasmImage backendImage = createSkwasmImageFromPixels(
+        pixels,
+        1,
+        1,
+        ui.PixelFormat.rgba8888,
+      );
+      final image = EngineImage(backendImage, 1, 1);
 
       final EngineImage clone = image.clone();
       expect(
diff --git a/engine/src/flutter/lib/web_ui/test/ui/async_rendering_test.dart b/engine/src/flutter/lib/web_ui/test/ui/async_rendering_test.dart
index dd8c28c83012b..ccdc7166d4fe6 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/async_rendering_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/async_rendering_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
@@ -89,6 +90,149 @@ void testMain() {
     printWarning = originalPrintWarning;
   });
 
+  test('first-frame browser event waits for the first frame to be rendered', () async {
+    // Each dispatcher tracks only its own first frame, so this test brings its
+    // own and drives its `onDrawFrame` directly, instead of going through the
+    // singleton via `renderScene`, to stay independent of what ran before it.
+    final ownDispatcher = EnginePlatformDispatcher();
+    addTearDown(ownDispatcher.dispose);
+
+    final EngineFlutterView view = EnginePlatformDispatcher.instance.implicitView!;
+    final displayFactory = DisplayCanvasFactory<DisplayCanvas>(
+      createCanvas: () => FakeDisplayCanvas(),
+    );
+    final testRasterizer = TestRasterizer(view, displayFactory)
+      ..prepareCompleter = Completer<void>();
+    final ViewRasterizer originalRasterizer = renderer.rasterizers[view.viewId]!;
+    renderer.rasterizers[view.viewId] = testRasterizer;
+    addTearDown(() => renderer.rasterizers[view.viewId] = originalRasterizer);
+
+    var firstFrameEventCount = 0;
+    final firstFrameEvent = Completer<void>();
+    final DomEventListener listener = createDomEventListener((DomEvent event) {
+      firstFrameEventCount++;
+      if (!firstFrameEvent.isCompleted) {
+        firstFrameEvent.complete();
+      }
+    });
+    domWindow.addEventListener('flutter-first-frame', listener);
+    addTearDown(() => domWindow.removeEventListener('flutter-first-frame', listener));
+
+    // Wait for next frame.
+    Future<void> waitForAnimationFrame() {
+      final completer = Completer<void>();
+      domWindow.requestAnimationFrame((_) {
+        Timer.run(completer.complete);
+      });
+      return completer.future;
+    }
+
+    // `render` only draws anything in an `onDrawFrame` scope, so a frame is a
+    // scene rendered from within `onDrawFrame`.
+    Future<void> renderFrame() {
+      final ui.Scene scene = ui.SceneBuilder().build();
+      addTearDown(scene.dispose);
+      late final Future<void> rendered;
+      ownDispatcher.onDrawFrame = () {
+        rendered = ownDispatcher.render(scene, view);
+      };
+      ownDispatcher.invokeOnDrawFrame();
+      return rendered;
+    }
+
+    final Future<void> renderFuture = renderFrame();
+    ownDispatcher.sendPlatformMessage(
+      'flutter/service_worker',
+      ByteData(0),
+      (ByteData? response) {},
+    );
+
+    // The render is parked in `prepareToDraw`, so nothing is on screen yet. The
+    // event is dispatched from an animation frame callback, so waiting for one
+    // is enough to observe it if it were sent too early.
+    await waitForAnimationFrame();
+    expect(firstFrameEventCount, 0);
+
+    testRasterizer.prepareCompleter!.complete();
+    await renderFuture;
+    await expectLater(firstFrameEvent.future, completes);
+
+    // Renders requested by later frames are not tracked, and don't dispatch the
+    // event again, no matter how many frames go by.
+    await renderFrame();
+    await waitForAnimationFrame();
+    expect(firstFrameEventCount, 1);
+
+    await renderFrame();
+    await waitForAnimationFrame();
+    expect(firstFrameEventCount, 1);
+  });
+
+  test('first-frame browser event is still sent if a first-frame render fails', () async {
+    // Each dispatcher tracks only its own first frame, so this test brings its
+    // own and drives its `onDrawFrame` directly instead of going through
+    // `renderScene`, to stay independent of what ran before it.
+    final ownDispatcher = EnginePlatformDispatcher();
+    addTearDown(ownDispatcher.dispose);
+
+    final EngineFlutterView view = EnginePlatformDispatcher.instance.implicitView!;
+    final displayFactory = DisplayCanvasFactory<DisplayCanvas>(
+      createCanvas: () => FakeDisplayCanvas(),
+    );
+    final testRasterizer = TestRasterizer(view, displayFactory)
+      ..prepareCompleter = Completer<void>();
+    final ViewRasterizer originalRasterizer = renderer.rasterizers[view.viewId]!;
+    renderer.rasterizers[view.viewId] = testRasterizer;
+    addTearDown(() => renderer.rasterizers[view.viewId] = originalRasterizer);
+
+    var firstFrameEventCount = 0;
+    final firstFrameEvent = Completer<void>();
+    final DomEventListener listener = createDomEventListener((DomEvent event) {
+      firstFrameEventCount++;
+      if (!firstFrameEvent.isCompleted) {
+        firstFrameEvent.complete();
+      }
+    });
+    domWindow.addEventListener('flutter-first-frame', listener);
+    addTearDown(() => domWindow.removeEventListener('flutter-first-frame', listener));
+
+    // Wait for next frame.
+    Future<void> waitForAnimationFrame() {
+      final completer = Completer<void>();
+      domWindow.requestAnimationFrame((_) {
+        Timer.run(completer.complete);
+      });
+      return completer.future;
+    }
+
+    final ui.Scene scene = ui.SceneBuilder().build();
+    addTearDown(scene.dispose);
+    late final Future<void> renderFuture;
+    ownDispatcher.onDrawFrame = () {
+      renderFuture = ownDispatcher.render(scene, view);
+    };
+    ownDispatcher.invokeOnDrawFrame();
+    ownDispatcher.sendPlatformMessage(
+      'flutter/service_worker',
+      ByteData(0),
+      (ByteData? response) {},
+    );
+
+    // The render is parked in `prepareToDraw`, so the first frame is not
+    // settled yet and the event is withheld.
+    await waitForAnimationFrame();
+    expect(firstFrameEventCount, 0);
+
+    // Failing the render settles the first frame too: `render` reports the
+    // failure to its caller, and the event still goes out, so an app hiding its
+    // loading screen on the event is not stuck on a failed frame.
+    testRasterizer.prepareCompleter!.completeError(StateError('render failed'));
+    await expectLater(renderFuture, throwsStateError);
+    await expectLater(firstFrameEvent.future, completes);
+    await waitForAnimationFrame();
+    expect(firstFrameEventCount, 1);
+  });
+
   test('disposing platform view during prepareToDraw causes crash in submitFrame', () async {
     final EngineFlutterView view = EnginePlatformDispatcher.instance.implicitView!;
     final displayFactory = DisplayCanvasFactory<DisplayCanvas>(
diff --git a/engine/src/flutter/lib/web_ui/test/ui/codecs_test.dart b/engine/src/flutter/lib/web_ui/test/ui/codecs_test.dart
index 933cc05679630..65d66d13c2462 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/codecs_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/codecs_test.dart
@@ -286,12 +286,15 @@ class BitmapTestCodec extends TestCodec {
 
     await imageElement.decode();
 
-    final DomImageBitmap bitmap = await createImageBitmap(imageElement, (
-      x: 0,
-      y: 0,
-      width: imageElement.naturalWidth.toInt(),
-      height: imageElement.naturalHeight.toInt(),
-    ));
+    final DomImageBitmap bitmap = await createImageBitmap(
+      imageElement,
+      bounds: (
+        x: 0,
+        y: 0,
+        width: imageElement.naturalWidth.toInt(),
+        height: imageElement.naturalHeight.toInt(),
+      ),
+    );
 
     final ui.Image image = await codecFactory(bitmap);
     return BitmapSingleFrameCodec(bitmap, image);
@@ -315,7 +318,7 @@ class BitmapSingleFrameCodec implements ui.Codec {
 
   @override
   Future<ui.FrameInfo> getNextFrame() async {
-    return SingleFrameInfo(image);
+    return AnimatedImageFrameInfo(Duration.zero, image);
   }
 
   @override
@@ -394,6 +397,11 @@ Future<void> testMain() async {
           expect(image.width, isNonZero);
           expect(image.height, isNonZero);
 
+          if (testCodec.description.contains('300 x 300')) {
+            expect(image.width, 300);
+            expect(image.height, 300);
+          }
+
           final ByteData? byteData = await image.toByteData();
           expect(
             byteData,
@@ -455,6 +463,20 @@ Future<void> testMain() async {
     expect(gotError, isTrue, reason: 'Should have got CORS error');
   });
 
+  test('does not upscale when allowUpscaling is false', () async {
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    final Uint8List bytes = (await response.payload.asByteBuffer()).asUint8List();
+    final ui.Codec codec = await renderer.instantiateImageCodec(
+      bytes,
+      targetWidth: 100,
+      targetHeight: 100,
+      allowUpscaling: false,
+    );
+    final ui.FrameInfo frame = await codec.getNextFrame();
+    expect(frame.image.width, 1);
+    expect(frame.image.height, 1);
+  });
+
   test('isAvif', () {
     expect(isAvif(Uint8List.fromList(<int>[])), isFalse);
     expect(isAvif(Uint8List.fromList(<int>[1, 2, 3])), isFalse);
diff --git a/engine/src/flutter/lib/web_ui/test/ui/image/html_image_element_codec_test.dart b/engine/src/flutter/lib/web_ui/test/ui/image/html_image_element_codec_test.dart
deleted file mode 100644
index 366e172943f4a..0000000000000
--- a/engine/src/flutter/lib/web_ui/test/ui/image/html_image_element_codec_test.dart
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:typed_data';
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
-
-import '../../common/test_initialization.dart';
-import '../../ui/utils.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-Future<void> testMain() async {
-  setUpUnitTests();
-  setUp(() {
-    ImageDecodingManager.instance.debugReset();
-  });
-  group('$HtmlImageElementCodec', () {
-    test('supports raw images - RGBA8888', () async {
-      final completer = Completer<ui.Image>();
-      const width = 200;
-      const height = 300;
-      final list = Uint32List(width * height);
-      for (var index = 0; index < list.length; index += 1) {
-        list[index] = 0xFF0000FF;
-      }
-      ui.decodeImageFromPixels(
-        list.buffer.asUint8List(),
-        width,
-        height,
-        ui.PixelFormat.rgba8888,
-        (ui.Image image) => completer.complete(image),
-      );
-      final ui.Image image = await completer.future;
-      expect(image.width, width);
-      expect(image.height, height);
-    });
-    test('supports raw images - BGRA8888', () async {
-      final completer = Completer<ui.Image>();
-      const width = 200;
-      const height = 300;
-      final list = Uint32List(width * height);
-      for (var index = 0; index < list.length; index += 1) {
-        list[index] = 0xFF0000FF;
-      }
-      ui.decodeImageFromPixels(
-        list.buffer.asUint8List(),
-        width,
-        height,
-        ui.PixelFormat.bgra8888,
-        (ui.Image image) => completer.complete(image),
-      );
-      final ui.Image image = await completer.future;
-      expect(image.width, width);
-      expect(image.height, height);
-    });
-    test('loads sample image', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      final ui.FrameInfo frameInfo = await codec.getNextFrame();
-
-      expect(codec.imgElement, isNotNull);
-      expect(codec.imgElement!.src, contains('sample_image1.png'));
-      expect(codec.imgElement!.crossOrigin, 'anonymous');
-      expect(codec.imgElement!.decoding, 'async');
-
-      expect(frameInfo.image, isNotNull);
-      expect(frameInfo.image.width, 100);
-      expect(frameInfo.image.toString(), '[100×100]');
-    });
-    test('dispose image image', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      final ui.FrameInfo frameInfo = await codec.getNextFrame();
-      expect(frameInfo.image, isNotNull);
-      expect(frameInfo.image.debugDisposed, isFalse);
-      frameInfo.image.dispose();
-      expect(frameInfo.image.debugDisposed, isTrue);
-    });
-    test('provides image loading progress', () async {
-      final buffer = StringBuffer();
-      final HtmlImageElementCodec codec = CkImageElementCodec(
-        'sample_image1.png',
-        chunkCallback: (int loaded, int total) {
-          buffer.write('$loaded/$total,');
-        },
-      );
-      await codec.getNextFrame();
-      expect(buffer.toString(), '0/100,100/100,');
-    });
-
-    test('uses ImageDecodingManager', () async {
-      final ImageDecodingManager manager = ImageDecodingManager.instance;
-      // Occupy all slots
-      final requests = <ImageDecodingRequest>[];
-      for (var i = 0; i < 8; i++) {
-        requests.add(manager.requestDecodingSlot(100, 100));
-      }
-
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      var decoded = false;
-      final Future<void> decodeFuture = codec.decode().then((_) => decoded = true);
-
-      // Give it some time to load (Phase 1)
-      await Future<void>.delayed(const Duration(milliseconds: 100));
-      expect(decoded, false); // Should be blocked in Phase 2
-
-      // Release one slot
-      manager.releaseDecodingSlot(requests[0]);
-
-      // Wait for it to decode (Phase 3)
-      await decodeFuture;
-      expect(decoded, true);
-
-      // Clean up remaining slots
-      for (var i = 1; i < 8; i++) {
-        manager.releaseDecodingSlot(requests[i]);
-      }
-    });
-
-    test('dispose unblocks ImageDecodingManager queue', () async {
-      final ImageDecodingManager manager = ImageDecodingManager.instance;
-      // Occupy all slots
-      final requests = <ImageDecodingRequest>[];
-      for (var i = 0; i < 8; i++) {
-        requests.add(manager.requestDecodingSlot(100, 100));
-      }
-
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      var decodeFinished = false;
-      unawaited(codec.decode().whenComplete(() => decodeFinished = true));
-
-      // Give it some time to load (Phase 1)
-      await Future<void>.delayed(const Duration(milliseconds: 100));
-      expect(decodeFinished, false); // Should be blocked in Phase 2
-
-      // Dispose the codec while it's in the queue
-      codec.dispose();
-
-      // The decode future should complete (as requested in the plan)
-      await Future<void>.delayed(Duration.zero);
-      expect(decodeFinished, true);
-
-      // A new request should be able to get a slot if we release one.
-      manager.releaseDecodingSlot(requests[0]);
-      final ImageDecodingRequest request2 = manager.requestDecodingSlot(100, 100);
-      var granted2 = false;
-      unawaited(request2.future.then((_) => granted2 = true));
-      await Future<void>.delayed(Duration.zero);
-      expect(granted2, true);
-
-      // Clean up
-      for (var i = 1; i < 8; i++) {
-        manager.releaseDecodingSlot(requests[i]);
-      }
-      manager.releaseDecodingSlot(request2);
-    });
-
-    test('getNextFrame() throws StateError if disposed', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      codec.dispose();
-      expect(() => codec.getNextFrame(), throwsStateError);
-    });
-
-    test('clears src on loading failure', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec('non_existent_image.png');
-      try {
-        await codec.getNextFrame();
-        fail('Should have thrown an exception');
-      } catch (e) {
-        expect(e, isA<ImageCodecException>());
-      }
-      expect(codec.imgElement?.src, isNot(contains('non_existent_image.png')));
-    });
-
-    test('dispose does not clear src if image handed out', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec('sample_image1.png');
-      final ui.FrameInfo frame = await codec.getNextFrame();
-      final String? src = codec.imgElement?.src;
-      expect(src, contains('sample_image1.png'));
-
-      codec.dispose();
-      expect(codec.imgElement?.src, src); // Should NOT be cleared
-
-      frame.image.dispose();
-    });
-
-    /// Regression test for Firefox
-    /// https://github.com/flutter/flutter/issues/66412
-    test('Returns nonzero natural width/height', () async {
-      final HtmlImageElementCodec codec = CkImageElementCodec(
-        'data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9I'
-        'jAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dG'
-        'l0bGU+QWJzdHJhY3QgaWNvbjwvdGl0bGU+PHBhdGggZD0iTTEyIDBjOS42MDEgMCAx'
-        'MiAyLjM5OSAxMiAxMiAwIDkuNjAxLTIuMzk5IDEyLTEyIDEyLTkuNjAxIDAtMTItMi'
-        '4zOTktMTItMTJDMCAyLjM5OSAyLjM5OSAwIDEyIDB6bS0xLjk2OSAxOC41NjRjMi41'
-        'MjQuMDAzIDQuNjA0LTIuMDcgNC42MDktNC41OTUgMC0yLjUyMS0yLjA3NC00LjU5NS'
-        '00LjU5NS00LjU5NVM1LjQ1IDExLjQ0OSA1LjQ1IDEzLjk2OWMwIDIuNTE2IDIuMDY1'
-        'IDQuNTg4IDQuNTgxIDQuNTk1em04LjM0NC0uMTg5VjUuNjI1SDUuNjI1djIuMjQ3aD'
-        'EwLjQ5OHYxMC41MDNoMi4yNTJ6bS04LjM0NC02Ljc0OGEyLjM0MyAyLjM0MyAwIDEx'
-        'LS4wMDIgNC42ODYgMi4zNDMgMi4zNDMgMCAwMS4wMDItNC42ODZ6Ii8+PC9zdmc+',
-      );
-      final ui.FrameInfo frameInfo = await codec.getNextFrame();
-      expect(frameInfo.image.width, isNot(0));
-    });
-  }, skip: isSkwasm);
-
-  group('ImageCodecUrl', () {
-    test('loads sample image from web', () async {
-      final Uri uri = Uri.base.resolve('sample_image1.png');
-      final codec = await ui_web.createImageCodecFromUrl(uri) as HtmlImageElementCodec;
-      final ui.FrameInfo frameInfo = await codec.getNextFrame();
-
-      expect(codec.imgElement, isNotNull);
-      expect(codec.imgElement!.src, contains('sample_image1.png'));
-      expect(codec.imgElement!.crossOrigin, 'anonymous');
-      expect(codec.imgElement!.decoding, 'async');
-
-      expect(frameInfo.image, isNotNull);
-      expect(frameInfo.image.width, 100);
-    });
-    test('provides image loading progress from web', () async {
-      final Uri uri = Uri.base.resolve('sample_image1.png');
-      final buffer = StringBuffer();
-      final codec =
-          await ui_web.createImageCodecFromUrl(
-                uri,
-                chunkCallback: (int loaded, int total) {
-                  buffer.write('$loaded/$total,');
-                },
-              )
-              as HtmlImageElementCodec;
-      await codec.getNextFrame();
-      expect(buffer.toString(), '0/100,100/100,');
-    });
-  }, skip: isSkwasm);
-}
diff --git a/engine/src/flutter/lib/web_ui/test/ui/image_decoder_test.dart b/engine/src/flutter/lib/web_ui/test/ui/image_decoder_test.dart
index 17ff29d0c346d..58b8442f2d8b8 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/image_decoder_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/image_decoder_test.dart
@@ -2,12 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+import 'dart:js_interop';
+import 'dart:typed_data';
+
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
 import '../common/test_initialization.dart';
+import 'utils.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -16,11 +21,273 @@ void main() {
 Future<void> testMain() async {
   setUpUnitTests(setUpTestViewDimensions: false);
 
-  test('$ResizingCodec gives correct repetition count for GIFs', () async {
+  test('Codec gives correct repetition count for GIFs', () async {
     final ui.Codec codec = await renderer.instantiateImageCodecFromUrl(
       Uri(path: '/test_images/required.gif'),
     );
-    final ui.Codec resizingCodec = ResizingCodec(codec);
-    expect(resizingCodec.repetitionCount, 0);
+    expect(codec.repetitionCount, 0);
+    codec.dispose();
+  });
+
+  test('renderer.createAnimatedImage throws ImageCodecException on invalid bytes', () {
+    expect(
+      () => renderer.createAnimatedImage(Uint8List.fromList(<int>[1, 2, 3, 4, 5])),
+      throwsA(isA<ImageCodecException>()),
+    );
+  });
+
+  test('parseMimeType parses and cleans Content-Type headers', () {
+    expect(parseMimeType('image/png'), 'image/png');
+    expect(parseMimeType('image/jpeg'), 'image/jpeg');
+    expect(parseMimeType('IMAGE/PNG'), 'image/png');
+    expect(parseMimeType('image/jpeg; charset=utf-8'), 'image/jpeg');
+    expect(parseMimeType('  image/gif  ; boundary=abc'), 'image/gif');
+    expect(parseMimeType('image/webp;foo=bar;baz=qux'), 'image/webp');
+    expect(parseMimeType(''), '');
+    expect(parseMimeType(null), isNull);
+  });
+
+  test('ui.Image.toByteData(format: ui.ImageByteFormat.png) works without crashing', () async {
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    final Uint8List pngBytes = (await response.payload.asByteBuffer()).asUint8List();
+    final ui.Codec codec = await renderer.instantiateImageCodec(pngBytes);
+    final ui.FrameInfo frame = await codec.getNextFrame();
+    final ui.Image image = frame.image;
+
+    final ByteData? pngByteData = await image.toByteData(format: ui.ImageByteFormat.png);
+    expect(pngByteData, isNotNull);
+    expect(pngByteData!.lengthInBytes, isNonZero);
+
+    final Uint8List resultBytes = pngByteData.buffer.asUint8List();
+    expect(resultBytes.length, greaterThan(8));
+    expect(resultBytes[0], 0x89);
+    expect(resultBytes[1], 0x50);
+    expect(resultBytes[2], 0x4E);
+    expect(resultBytes[3], 0x47);
+
+    image.dispose();
+    codec.dispose();
   });
+
+  test(
+    'instantiateImageCodecFromUrl works with generic application/octet-stream MIME type via data URL',
+    () async {
+      const dataUrl =
+          'data:application/octet-stream;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==';
+
+      final ui.Codec codec = await renderer.instantiateImageCodecFromUrl(Uri.parse(dataUrl));
+      expect(codec.frameCount, 1);
+
+      final ui.FrameInfo frame = await codec.getNextFrame();
+      expect(frame.image.width, 1);
+      expect(frame.image.height, 1);
+
+      codec.dispose();
+    },
+  );
+
+  test('BrowserImageDecoder closes native decoder if disposed during initialization', () async {
+    if (!browserSupportsImageDecoder) {
+      return;
+    }
+
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    final Uint8List pngBytes = (await response.payload.asByteBuffer()).asUint8List();
+
+    final decoder = BrowserImageDecoder(
+      contentType: 'image/png',
+      dataSource: pngBytes.toJS,
+      debugSource: 'test',
+    );
+
+    final Future<void> initFuture = decoder.initialize();
+    decoder.dispose();
+    await initFuture;
+
+    expect(decoder.debugCachedWebDecoder, isNull);
+  });
+
+  test(
+    '_BrowserEngineCodec.getNextFrame() throws StateError and cleans up if disposed during decode',
+    () async {
+      if (!browserSupportsImageDecoder) {
+        return;
+      }
+
+      final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+      final Uint8List pngBytes = (await response.payload.asByteBuffer()).asUint8List();
+
+      final ui.Codec codec = await renderer.instantiateImageCodec(pngBytes);
+      final Future<ui.FrameInfo> frameFuture = codec.getNextFrame();
+      codec.dispose();
+
+      expect(frameFuture, throwsA(isA<StateError>()));
+    },
+  );
+
+  test(
+    '_SkiaEngineCodec.getNextFrame() throws StateError and cleans up if disposed during decode',
+    () async {
+      if (isSkwasm) {
+        // Skwasm does not compile animated image decoders in the Wasm fallback path
+        // (it relies entirely on the browser's native ImageDecoder).
+        return;
+      }
+
+      final HttpFetchResponse response = await httpFetch('/test_images/flightAnim.gif');
+      final Uint8List gifBytes = (await response.payload.asByteBuffer()).asUint8List();
+
+      final bool originalDecoderSupport = browserSupportsImageDecoder;
+      browserSupportsImageDecoder = false;
+      try {
+        final ui.Codec codec = await renderer.instantiateImageCodec(gifBytes);
+        final Future<ui.FrameInfo> frameFuture = codec.getNextFrame();
+        codec.dispose();
+
+        expect(frameFuture, throwsA(isA<StateError>()));
+      } finally {
+        browserSupportsImageDecoder = originalDecoderSupport;
+      }
+    },
+  );
+
+  test('handleProgressAndGetStream bypasses stream teeing when chunkCallback is null', () async {
+    final mockBody = JSObject();
+
+    final mockResponse = _TestHttpFetchResponse(stream: mockBody as DomReadableStream);
+
+    final DomReadableStream result = await handleProgressAndGetStream(mockResponse, null);
+    expect(result, mockBody);
+  });
+
+  test(
+    'handleProgressAndGetStream bypasses stream teeing when Content-Length is missing',
+    () async {
+      final mockBody = JSObject();
+
+      final mockResponse = _TestHttpFetchResponse(stream: mockBody as DomReadableStream);
+
+      final DomReadableStream result = await handleProgressAndGetStream(
+        mockResponse,
+        (int loaded, int total) {},
+      );
+      expect(result, mockBody);
+    },
+  );
+
+  test(
+    'handleProgressAndGetStream tees the stream when chunkCallback and Content-Length are present',
+    () async {
+      final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+      final DomReadableStream originalBody = response.payload.stream;
+
+      var callbackCalled = false;
+      final DomReadableStream result = await handleProgressAndGetStream(response, (
+        int loaded,
+        int total,
+      ) {
+        callbackCalled = true;
+      });
+
+      expect(result, isNot(originalBody));
+
+      // Read the result stream to trigger the progress callback on the teed stream
+      final DomStreamReader reader = result.getReader();
+      while (true) {
+        final DomStreamChunk chunk = await reader.read();
+        if (chunk.done) {
+          break;
+        }
+      }
+
+      expect(callbackCalled, isTrue);
+    },
+  );
+
+  test('ImageDecoder.dispose is robust against throwing callbacks', () async {
+    if (!browserSupportsImageDecoder) {
+      return;
+    }
+
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    final Uint8List pngBytes = (await response.payload.asByteBuffer()).asUint8List();
+
+    final decoder = BrowserImageDecoder(
+      contentType: 'image/png',
+      dataSource: pngBytes.toJS,
+      debugSource: 'test',
+    );
+
+    await decoder.initialize();
+    expect(decoder.debugCachedWebDecoder, isNotNull);
+
+    var secondCallbackCalled = false;
+    decoder.addDisposeCallback(() {
+      throw Exception('Callback failure');
+    });
+    decoder.addDisposeCallback(() {
+      secondCallbackCalled = true;
+    });
+
+    decoder.dispose();
+
+    expect(secondCallbackCalled, isTrue);
+    expect(decoder.debugCachedWebDecoder, isNull);
+  });
+
+  test('BrowserImageDecoder calls dispose callbacks on initialization failure', () async {
+    if (!browserSupportsImageDecoder) {
+      return;
+    }
+
+    final decoder = BrowserImageDecoder(
+      contentType: 'image/png',
+      // Providing invalid/empty data will cause initialization/decoding to fail
+      dataSource: Uint8List(0).toJS,
+      debugSource: 'test',
+    );
+
+    var disposeCalled = false;
+    decoder.addDisposeCallback(() {
+      disposeCalled = true;
+    });
+
+    try {
+      await decoder.initialize();
+      fail('initialize should have thrown an exception');
+    } catch (e) {
+      decoder.dispose();
+      expect(e, isA<ImageCodecException>());
+    }
+
+    expect(disposeCalled, isTrue);
+  });
+}
+
+class _TestHttpFetchResponse implements HttpFetchResponse {
+  _TestHttpFetchResponse({required this.stream});
+
+  final DomReadableStream stream;
+
+  @override
+  final int? contentLength = null;
+
+  @override
+  bool get hasPayload => true;
+
+  @override
+  HttpFetchPayload get payload => _TestHttpFetchPayload(stream);
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _TestHttpFetchPayload implements HttpFetchPayload {
+  _TestHttpFetchPayload(this.stream);
+
+  @override
+  final DomReadableStream stream;
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
diff --git a/engine/src/flutter/lib/web_ui/test/ui/image_golden_test.dart b/engine/src/flutter/lib/web_ui/test/ui/image_golden_test.dart
index ba655d1d18eb4..75c55661e6c07 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/image_golden_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/image_golden_test.dart
@@ -438,7 +438,7 @@ Future<void> testMain() async {
 
       expect(bitmap.width, 150);
       expect(bitmap.height, 150);
-      final ui.Image uiImage = await renderer.createImageFromImageBitmap(bitmap);
+      final ui.Image uiImage = renderer.createImageFromImageBitmap(bitmap);
 
       if (isSkwasm && isMultiThreaded) {
         // Multi-threaded skwasm transfers the bitmap to the web worker, so it should be
diff --git a/engine/src/flutter/lib/web_ui/test/ui/image_texture_source_test.dart b/engine/src/flutter/lib/web_ui/test/ui/image_texture_source_test.dart
index cdc4d65b245b0..b111caf6a011c 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/image_texture_source_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/image_texture_source_test.dart
@@ -62,7 +62,10 @@ Future<void> testMain() async {
     );
     await completer.future;
 
-    final DomImageBitmap bitmap = await createImageBitmap(image, (x: 0, y: 0, width: 1, height: 1));
+    final DomImageBitmap bitmap = await createImageBitmap(
+      image,
+      bounds: (x: 0, y: 0, width: 1, height: 1),
+    );
 
     final ui.Image uiImage = await ui_web.createImageFromTextureSource(
       bitmap,
diff --git a/engine/src/flutter/lib/web_ui/test/ui/path_test.dart b/engine/src/flutter/lib/web_ui/test/ui/path_test.dart
index ceaa774ba3738..aa4a4893a166d 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/path_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/path_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:math' show pi;
 import 'dart:typed_data' show Float64List;
 
 import 'package:test/bootstrap/browser.dart';
@@ -248,13 +249,193 @@ Future<void> testMain() async {
     expect(newFirstMetric.extractPath(4.0, 10.0).computeMetrics().first.length, 6.0);
   });
 
-  test('path relativeLineTo', () {
-    final p = Path();
-    p.moveTo(100, 100);
-    p.relativeLineTo(-50, -50);
-    p.relativeLineTo(100, 0);
-    p.relativeLineTo(-50, 50);
-    expect(p.getBounds(), equals(const Rect.fromLTRB(50.0, 50.0, 150.0, 100.0)));
+  group('path building', () {
+    test('fillType', () {
+      final p = Path();
+      expect(p.fillType, equals(PathFillType.nonZero));
+      p.fillType = PathFillType.evenOdd;
+      expect(p.fillType, equals(PathFillType.evenOdd));
+    });
+
+    test('moveTo', () {
+      final p = Path();
+      p.moveTo(10, 10);
+      p.lineTo(20, 10);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 10.0, 20.0, 10.0)));
+    });
+
+    test('relativeMoveTo', () {
+      final p = Path();
+      p.relativeMoveTo(10, 10);
+      p.lineTo(20, 10);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 10.0, 20.0, 10.0)));
+    });
+
+    test('lineTo', () {
+      final p = Path();
+      p.lineTo(0, 10);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 0.0, 10.0)));
+    });
+
+    test('path relativeLineTo', () {
+      final p = Path();
+      p.moveTo(100, 100);
+      p.relativeLineTo(-50, -50);
+      p.relativeLineTo(100, 0);
+      p.relativeLineTo(-50, 50);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(50.0, 50.0, 150.0, 100.0)));
+    });
+
+    test('quadraticBezierTo', () {
+      final p = Path();
+      p.quadraticBezierTo(0, 10, 10, 0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('relativeQuadraticBezierTo', () {
+      final p = Path();
+      p.moveTo(10, 10);
+      // Relative control (0,10), end (10,0) → absolute control (10,20), end (20,10).
+      // getBounds() returns the control-polygon bbox: (10,10), (10,20), (20,10).
+      p.relativeQuadraticBezierTo(0, 10, 10, 0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 10.0, 20.0, 20.0)));
+    });
+
+    test('cubicTo', () {
+      final p = Path();
+      // getBounds() returns the control-polygon bbox: (0,0), (0,10), (10,10), (10,0).
+      p.cubicTo(0, 10, 10, 10, 10, 0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('relativeCubicTo', () {
+      final p = Path();
+      p.moveTo(5, 5);
+      // Absolute control points: (5,15), (15,15), end (15,5).
+      // getBounds() returns the control-polygon bbox: (5,5), (5,15), (15,15), (15,5).
+      p.relativeCubicTo(0, 10, 10, 10, 10, 0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(5.0, 5.0, 15.0, 15.0)));
+    });
+
+    test('conicTo', () {
+      final p = Path();
+      // Conic with w=1 is equivalent to a quadratic bezier.
+      // getBounds() returns the control-polygon bbox: (0,0), (0,10), (10,0).
+      p.conicTo(0, 10, 10, 0, 1);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('relativeConicTo', () {
+      final p = Path();
+      p.moveTo(10, 10);
+      // Relative conic with w=1: equivalent to relativeQuadraticBezierTo.
+      // getBounds() returns the control-polygon bbox: (10,10), (10,20), (20,10).
+      p.relativeConicTo(0, 10, 10, 0, 1);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 10.0, 20.0, 20.0)));
+    });
+
+    test('arcTo', () {
+      final p = Path();
+      // Quarter-circle arc from (20,10) to (10,20), clockwise.
+      // Control-polygon bbox spans the bottom-right quadrant of the oval.
+      p.arcTo(const Rect.fromLTRB(0.0, 0.0, 20.0, 20.0), 0, pi / 2, true);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 10.0, 20.0, 20.0)));
+    });
+
+    test('arcToPoint', () {
+      final p = Path();
+      p.moveTo(10, 0);
+      // Small clockwise quarter-circle from (10,0) to (0,10) with radius 10.
+      // Center at the origin; the arc spans the first quadrant.
+      p.arcToPoint(const Offset(0, 10), radius: const Radius.circular(10));
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('relativeArcToPoint', () {
+      final p = Path();
+      p.moveTo(10, 0);
+      // Relative (-10, 10) from (10, 0) = absolute endpoint (0, 10): same arc as arcToPoint.
+      p.relativeArcToPoint(const Offset(-10, 10), radius: const Radius.circular(10));
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('addRect', () {
+      final p = Path();
+      p.addRect(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0));
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0)));
+    });
+
+    test('addOval', () {
+      final p = Path();
+      p.addOval(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0));
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0)));
+    });
+
+    test('addArc', () {
+      final p = Path();
+      p.addArc(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0), 0, 2 * pi);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0)));
+    });
+
+    test('addPolygon', () {
+      final p = Path();
+      p.addPolygon(const <Offset>[
+        Offset(10.0, 20.0),
+        Offset(30.0, 40.0),
+        Offset(50.0, 60.0),
+      ], true);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 50.0, 60.0)));
+    });
+
+    test('addRRect', () {
+      final p = Path();
+      p.addRRect(RRect.fromLTRBR(10.0, 20.0, 30.0, 40.0, const Radius.circular(5.0)));
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0)));
+    });
+
+    test('addRSuperellipse', () {
+      final p = Path();
+      p.addRSuperellipse(
+        RSuperellipse.fromLTRBR(10.0, 20.0, 30.0, 40.0, const Radius.circular(5.0)),
+      );
+      expect(p.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0)));
+    });
+
+    test('addPath', () {
+      final p1 = Path()..addRect(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0));
+      final p2 = Path()..addRect(const Rect.fromLTRB(50.0, 60.0, 70.0, 80.0));
+      p1.addPath(p2, const Offset(10.0, 10.0));
+      expect(p1.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 80.0, 90.0)));
+    });
+
+    test('extendWithPath', () {
+      final p1 = Path()..addRect(const Rect.fromLTRB(10.0, 20.0, 30.0, 40.0));
+      final p2 = Path()..addRect(const Rect.fromLTRB(50.0, 60.0, 70.0, 80.0));
+      p1.extendWithPath(p2, const Offset(10.0, 10.0));
+      expect(p1.getBounds(), equals(const Rect.fromLTRB(10.0, 20.0, 80.0, 90.0)));
+    });
+
+    test('close', () {
+      final p = Path();
+      p.lineTo(10.0, 10.0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+      p.close();
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+    });
+
+    test('reset', () {
+      final p = Path();
+      p.lineTo(10.0, 10.0);
+      expect(p.getBounds(), equals(const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)));
+      p.reset();
+      expect(p.getBounds(), equals(Rect.zero));
+    });
+
+    test('contains', () {
+      final p = Path()..addRect(const Rect.fromLTRB(0, 0, 10, 10));
+      expect(p.contains(const Offset(5, 5)), isTrue);
+      expect(p.contains(const Offset(15, 5)), isFalse);
+    });
   });
 
   test('path containing polygon with thousands of points', () {
diff --git a/engine/src/flutter/lib/web_ui/test/ui/platform_view_test.dart b/engine/src/flutter/lib/web_ui/test/ui/platform_view_test.dart
index 518902f38ced1..00de1727c6845 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/platform_view_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/platform_view_test.dart
@@ -824,6 +824,59 @@ Future<void> testMain() async {
     expect(platformViewsHost.querySelector('flt-platform-view'), isNull);
   });
 
+  test('does not crash when a platform view is disposed mid-frame', () async {
+    await createPlatformView(0, platformViewType);
+    await createPlatformView(1, platformViewType);
+
+    final sb = ui.SceneBuilder()
+      ..pushOffset(0, 0)
+      ..addPlatformView(0, width: 10, height: 10)
+      ..addPlatformView(1, width: 10, height: 10)
+      ..pop();
+    await renderScene(sb.build());
+    _expectSceneMatches(<_EmbeddedViewMarker>[_platformView, _platformView]);
+
+    // Build the next frame by hand so that a platform view can be disposed
+    // after the composition was created, but before the frame is submitted.
+    final ViewRasterizer rasterizer = renderer.rasterizers[implicitView.viewId]!;
+    final PlatformViewEmbedder embedder = rasterizer.viewEmbedder;
+    final rootLayer = RootLayer();
+    // The views are composited in the opposite order, so the DOM needs to be
+    // updated for this composition.
+    rootLayer.children.add(PlatformViewLayer(1, ui.Offset.zero, 10, 10));
+    rootLayer.children.add(PlatformViewLayer(0, ui.Offset.zero, 10, 10));
+
+    embedder.frameSize = rasterizer.currentFrameSize;
+    final Frame frame = rasterizer.context.acquireFrame(embedder);
+    frame.raster(LayerTree(rootLayer), rasterizer.currentFrameSize, null);
+
+    // View 0 is disposed while it is still part of the composition which is
+    // about to be submitted.
+    embedder.disposeView(0);
+
+    final warnings = <String>[];
+    final void Function(String) originalPrintWarning = printWarning;
+    printWarning = (String warning) => warnings.add(warning);
+    try {
+      await expectLater(embedder.submitFrame(null), completes);
+    } finally {
+      printWarning = originalPrintWarning;
+    }
+
+    // The disposed view is left out of the composition.
+    _expectSceneMatches(<_EmbeddedViewMarker>[_platformView]);
+    expect(embedder.debugActiveComposition.entities, hasLength(1));
+    expect(
+      warnings,
+      contains(
+        contains(
+          'Cannot render platform views: 0. '
+          'These views were disposed while they were being composited.',
+        ),
+      ),
+    );
+  });
+
   test('preserves the DOM node of an unrendered platform view', () async {
     await createPlatformView(1, platformViewType);
 
diff --git a/engine/src/flutter/lib/web_ui/test/ui/vertices_test.dart b/engine/src/flutter/lib/web_ui/test/ui/vertices_test.dart
index bc6655364da4b..7d0f1855f6df8 100644
--- a/engine/src/flutter/lib/web_ui/test/ui/vertices_test.dart
+++ b/engine/src/flutter/lib/web_ui/test/ui/vertices_test.dart
@@ -41,6 +41,29 @@ void testMain() {
       vertices.dispose();
       expect(vertices.debugDisposed, isTrue);
     });
+
+    test('raw can be empty', () {
+      final vertices = ui.Vertices.raw(ui.VertexMode.triangles, Float32List(0));
+      expect(vertices.debugDisposed, isFalse);
+
+      final recorder = ui.PictureRecorder();
+      final canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      canvas.drawVertices(vertices, ui.BlendMode.srcOver, ui.Paint());
+      vertices.dispose();
+      expect(vertices.debugDisposed, isTrue);
+    });
+
+    test('throws StateError if used after dispose', () {
+      final ui.Vertices vertices = _testVertices();
+      vertices.dispose();
+
+      final recorder = ui.PictureRecorder();
+      final canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      expect(
+        () => canvas.drawVertices(vertices, ui.BlendMode.srcOver, ui.Paint()),
+        throwsStateError,
+      );
+    });
   });
 
   test('Vertices are not anti-aliased by default', () async {
diff --git a/engine/src/flutter/shell/common/animator_unittests.cc b/engine/src/flutter/shell/common/animator_unittests.cc
index f5f71ae341f72..3ae6fa6117445 100644
--- a/engine/src/flutter/shell/common/animator_unittests.cc
+++ b/engine/src/flutter/shell/common/animator_unittests.cc
@@ -17,7 +17,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -57,14 +57,12 @@ TEST_F(ShellTest, VSyncTargetTime) {
   int64_t target_time;
   fml::AutoResetWaitableEvent on_target_time_latch;
   auto nativeOnBeginFrame = [&on_target_time_latch,
-                             &target_time](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    target_time =
-        tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
+                             &target_time](int64_t microseconds) {
+    target_time = microseconds;
     on_target_time_latch.Signal();
   };
-  AddNativeCallback("NativeOnBeginFrame",
-                    CREATE_NATIVE_ENTRY(nativeOnBeginFrame));
+  AddFfiNativeCallback("NativeOnBeginFrame",
+                       CREATE_FFI_LAMBDA(nativeOnBeginFrame));
 
   // Create all te prerequisites for a shell.
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
diff --git a/engine/src/flutter/shell/common/dart_native_benchmarks.cc b/engine/src/flutter/shell/common/dart_native_benchmarks.cc
index ff3999eefe0ac..15d614a8d1b96 100644
--- a/engine/src/flutter/shell/common/dart_native_benchmarks.cc
+++ b/engine/src/flutter/shell/common/dart_native_benchmarks.cc
@@ -12,7 +12,7 @@
 #include "fml/synchronization/count_down_latch.h"
 #include "runtime/dart_vm_lifecycle.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter::testing {
@@ -35,10 +35,8 @@ BENCHMARK_F(DartNativeBenchmarks, TimeToFirstNativeMessageFromIsolateInNewVM)
     fml::AutoResetWaitableEvent latch;
     st.PauseTiming();
     ASSERT_FALSE(DartVMRef::IsInstanceRunning());
-    AddNativeCallback("NotifyNative",
-                      CREATE_NATIVE_ENTRY(([&latch](Dart_NativeArguments args) {
-                        latch.Signal();
-                      })));
+    AddFfiNativeCallback("NotifyNative",
+                         CREATE_FFI_LAMBDA(([&latch]() { latch.Signal(); })));
 
     const auto settings = CreateSettingsForFixture();
     DartVMRef vm_ref = DartVMRef::Create(settings);
@@ -72,10 +70,8 @@ BENCHMARK_F(DartNativeBenchmarks, MultipleDartToNativeMessages)
     fml::CountDownLatch latch(1000);
     st.PauseTiming();
     ASSERT_FALSE(DartVMRef::IsInstanceRunning());
-    AddNativeCallback("NotifyNative",
-                      CREATE_NATIVE_ENTRY(([&latch](Dart_NativeArguments args) {
-                        latch.CountDown();
-                      })));
+    AddFfiNativeCallback(
+        "NotifyNative", CREATE_FFI_LAMBDA(([&latch]() { latch.CountDown(); })));
 
     const auto settings = CreateSettingsForFixture();
     DartVMRef vm_ref = DartVMRef::Create(settings);
diff --git a/engine/src/flutter/shell/common/engine_animator_unittests.cc b/engine/src/flutter/shell/common/engine_animator_unittests.cc
index bda96f6085009..d9010dc27869c 100644
--- a/engine/src/flutter/shell/common/engine_animator_unittests.cc
+++ b/engine/src/flutter/shell/common/engine_animator_unittests.cc
@@ -13,7 +13,7 @@
 #include "gmock/gmock.h"
 #include "impeller/core/runtime_types.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -303,7 +303,8 @@ TEST_F(EngineAnimatorTest, AnimatorAcceptsMultipleRenders) {
       });
 
   native_latch.Reset();
-  AddNativeCallback("NotifyNative", [](auto args) { native_latch.Signal(); });
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([]() { native_latch.Signal(); }));
 
   std::unique_ptr<Animator> animator;
   PostSync(task_runners_.GetUITaskRunner(),
@@ -395,8 +396,7 @@ TEST_F(EngineAnimatorTest, IgnoresDuplicateRenders) {
   std::unique_ptr<EngineContext> engine_context;
 
   std::vector<std::shared_ptr<Layer>> benchmark_layers;
-  auto capture_root_layer = [&benchmark_layers](Dart_NativeArguments args) {
-    auto handle = Dart_GetNativeArgument(args, 0);
+  auto capture_root_layer = [&benchmark_layers](Dart_Handle handle) {
     intptr_t peer = 0;
     Dart_Handle result = Dart_GetNativeInstanceField(
         handle, tonic::DartWrappable::kPeerIndex, &peer);
@@ -438,8 +438,8 @@ TEST_F(EngineAnimatorTest, IgnoresDuplicateRenders) {
         });
       });
 
-  AddNativeCallback("CaptureRootLayer",
-                    CREATE_NATIVE_ENTRY(capture_root_layer));
+  AddFfiNativeCallback("CaptureRootLayer",
+                       CREATE_FFI_LAMBDA(capture_root_layer));
 
   std::unique_ptr<Animator> animator;
   PostSync(task_runners_.GetUITaskRunner(),
@@ -506,11 +506,11 @@ TEST_F(EngineAnimatorTest, AnimatorSubmitsImplicitViewBeforeDrawFrameEnds) {
 
   native_latch.Reset();
   // The native_latch is signaled at the end of handleDrawFrame.
-  AddNativeCallback("NotifyNative",
-                    CREATE_NATIVE_ENTRY([&rasterization_started](auto args) {
-                      EXPECT_EQ(rasterization_started, true);
-                      native_latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&rasterization_started]() {
+                         EXPECT_EQ(rasterization_started, true);
+                         native_latch.Signal();
+                       }));
 
   engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
                                          std::move(animator));
diff --git a/engine/src/flutter/shell/common/fixtures/shell_test.dart b/engine/src/flutter/shell/common/fixtures/shell_test.dart
index c66cec3b37e2e..6c54545296027 100644
--- a/engine/src/flutter/shell/common/fixtures/shell_test.dart
+++ b/engine/src/flutter/shell/common/fixtures/shell_test.dart
@@ -6,6 +6,7 @@
 
 import 'dart:async';
 import 'dart:convert' show json, utf8;
+import 'dart:ffi';
 import 'dart:isolate';
 import 'dart:typed_data';
 import 'dart:ui';
@@ -23,11 +24,11 @@ void mainNotifyNative() {
   notifyNative();
 }
 
-@pragma('vm:external-name', 'NativeReportTimingsCallback')
+@Native<Void Function(Handle)>(symbol: 'NativeReportTimingsCallback')
 external void nativeReportTimingsCallback(List<int> timings);
-@pragma('vm:external-name', 'NativeOnBeginFrame')
+@Native<Void Function(Int64)>(symbol: 'NativeOnBeginFrame')
 external void nativeOnBeginFrame(int microseconds);
-@pragma('vm:external-name', 'NativeOnPointerDataPacket')
+@Native<Void Function(Handle)>(symbol: 'NativeOnPointerDataPacket')
 external void nativeOnPointerDataPacket(List<int> sequences);
 
 @pragma('vm:entry-point')
@@ -50,9 +51,9 @@ void onErrorB() {
   throw Exception('I should be coming from B');
 }
 
-@pragma('vm:external-name', 'NotifyErrorA')
+@Native<Void Function(Handle)>(symbol: 'NotifyErrorA')
 external void notifyErrorA(String message);
-@pragma('vm:external-name', 'NotifyErrorB')
+@Native<Void Function(Handle)>(symbol: 'NotifyErrorB')
 external void notifyErrorB(String message);
 
 @pragma('vm:entry-point')
@@ -120,7 +121,7 @@ void reportMetrics() {
   };
 }
 
-@pragma('vm:external-name', 'ReportMetrics')
+@Native<Void Function(Double, Double, Double)>(symbol: 'ReportMetrics')
 external void _reportMetrics(double devicePixelRatio, double width, double height);
 
 @pragma('vm:entry-point')
@@ -133,11 +134,11 @@ void fixturesAreFunctionalMain() {
   sayHiFromFixturesAreFunctionalMain();
 }
 
-@pragma('vm:external-name', 'SayHiFromFixturesAreFunctionalMain')
+@Native<Void Function()>(symbol: 'SayHiFromFixturesAreFunctionalMain')
 external void sayHiFromFixturesAreFunctionalMain();
 
 @pragma('vm:entry-point')
-@pragma('vm:external-name', 'NotifyNative')
+@Native<Void Function()>(symbol: 'NotifyNative')
 external void notifyNative();
 
 @pragma('vm:entry-point')
@@ -184,7 +185,7 @@ void testSkiaResourceCacheSendsResponse() {
   );
 }
 
-@pragma('vm:external-name', 'NotifyWidthHeight')
+@Native<Void Function(Int, Int)>(symbol: 'NotifyWidthHeight')
 external void notifyWidthHeight(int width, int height);
 
 @pragma('vm:entry-point')
@@ -215,7 +216,7 @@ void performanceModeImpactsNotifyIdle() {
   PlatformDispatcher.instance.requestDartPerformanceMode(DartPerformanceMode.balanced);
 }
 
-@pragma('vm:external-name', 'NotifyMessage')
+@Native<Void Function(Handle)>(symbol: 'NotifyMessage')
 external void notifyMessage(String string);
 
 @pragma('vm:entry-point')
@@ -229,10 +230,10 @@ void canRegisterImageDecoders() {
   );
 }
 
-@pragma('vm:external-name', 'NotifyLocalTime')
+@Native<Void Function(Handle)>(symbol: 'NotifyLocalTime')
 external void notifyLocalTime(String string);
 
-@pragma('vm:external-name', 'WaitFixture')
+@Native<Bool Function()>(symbol: 'WaitFixture')
 external bool waitFixture();
 
 // Return local date-time as a string, to an hour resolution.  So, "2020-07-23
@@ -258,10 +259,10 @@ void timezonesChange() {
   } while (waitFixture());
 }
 
-@pragma('vm:external-name', 'NotifyCanAccessResource')
+@Native<Void Function(Bool)>(symbol: 'NotifyCanAccessResource')
 external void notifyCanAccessResource(bool success);
 
-@pragma('vm:external-name', 'NotifySetAssetBundlePath')
+@Native<Void Function()>(symbol: 'NotifySetAssetBundlePath')
 external void notifySetAssetBundlePath();
 
 @pragma('vm:entry-point')
@@ -276,10 +277,10 @@ Future<void> canAccessResourceFromAssetDir() async {
   );
 }
 
-@pragma('vm:external-name', 'NotifyNativeWhenEngineRun')
+@Native<Void Function(Bool)>(symbol: 'NotifyNativeWhenEngineRun')
 external void notifyNativeWhenEngineRun(bool success);
 
-@pragma('vm:external-name', 'NotifyNativeWhenEngineSpawn')
+@Native<Void Function(Bool)>(symbol: 'NotifyNativeWhenEngineSpawn')
 external void notifyNativeWhenEngineSpawn(bool success);
 
 @pragma('vm:entry-point')
@@ -307,7 +308,7 @@ void frameCallback(Object? image, int durationMilliseconds, String decodeError)
   }
 }
 
-@pragma('vm:external-name', 'NativeOnBeforeToImageSync')
+@Native<Void Function()>(symbol: 'NativeOnBeforeToImageSync')
 external void onBeforeToImageSync();
 
 @pragma('vm:entry-point')
@@ -373,7 +374,7 @@ Future<void> runCallback(IsolateParam param) async {
 }
 
 @pragma('vm:entry-point')
-@pragma('vm:external-name', 'NotifyNativeBool')
+@Native<Void Function(Bool)>(symbol: 'NotifyNativeBool')
 external void notifyNativeBool(bool value);
 
 @pragma('vm:entry-point')
@@ -419,7 +420,7 @@ Future<void> testThatAssetLoadingHappensOnWorkerThread() async {
   notifyNative();
 }
 
-@pragma('vm:external-name', 'NativeReportViewIdsCallback')
+@Native<Void Function(Bool, Handle)>(symbol: 'NativeReportViewIdsCallback')
 external void nativeReportViewIdsCallback(bool hasImplicitView, List<int> viewIds);
 
 List<int> getCurrentViewIds() {
@@ -468,7 +469,7 @@ List<int> getCurrentViewWidths() {
   return result;
 }
 
-@pragma('vm:external-name', 'NativeReportViewWidthsCallback')
+@Native<Void Function(Handle)>(symbol: 'NativeReportViewWidthsCallback')
 external void nativeReportViewWidthsCallback(List<int> viewWidthPacket);
 
 // This entrypoint reports the list of views and their widths using
@@ -513,7 +514,7 @@ void renderViewsInFrameAndOutOfFrame() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
-@pragma('vm:external-name', 'CaptureRootLayer')
+@Native<Void Function(Handle)>(symbol: 'CaptureRootLayer')
 external void _captureRootLayer(SceneBuilder sceneBuilder);
 
 @pragma('vm:entry-point')
@@ -634,7 +635,7 @@ void testSendViewFocusEvent() {
   notifyNative();
 }
 
-@pragma('vm:external-name', 'ReportEngineId')
+@Native<Void Function(Handle)>(symbol: 'ReportEngineId')
 external void _reportEngineId(int? identifier);
 
 @pragma('vm:entry-point')
diff --git a/engine/src/flutter/shell/common/input_events_unittests.cc b/engine/src/flutter/shell/common/input_events_unittests.cc
index a0a22d14ded42..fd7823df51d64 100644
--- a/engine/src/flutter/shell/common/input_events_unittests.cc
+++ b/engine/src/flutter/shell/common/input_events_unittests.cc
@@ -5,7 +5,7 @@
 #include "flutter/shell/common/shell_test.h"
 #include "flutter/testing/testing.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -79,7 +79,7 @@ static void TestSimulatedInputEvents(
   int frame_drawn = 0;
   auto nativeOnPointerDataPacket = [&events_consumed_at_frame,
                                     &will_draw_new_frame, &events_consumed,
-                                    &frame_drawn](Dart_NativeArguments args) {
+                                    &frame_drawn](Dart_Handle sequences) {
     events_consumed += 1;
     if (will_draw_new_frame) {
       frame_drawn += 1;
@@ -89,8 +89,8 @@ static void TestSimulatedInputEvents(
       events_consumed_at_frame.back() = events_consumed;
     }
   };
-  fixture->AddNativeCallback("NativeOnPointerDataPacket",
-                             CREATE_NATIVE_ENTRY(nativeOnPointerDataPacket));
+  fixture->AddFfiNativeCallback("NativeOnPointerDataPacket",
+                                CREATE_FFI_LAMBDA(nativeOnPointerDataPacket));
 
   ASSERT_TRUE(configuration.IsValid());
   fixture->RunEngine(shell.get(), std::move(configuration));
@@ -327,16 +327,15 @@ TEST_F(ShellTest, CanCorrectlyPipePointerPacket) {
   // Sets up native handler.
   fml::AutoResetWaitableEvent reportLatch;
   std::vector<int64_t> result_sequence;
-  auto nativeOnPointerDataPacket = [&reportLatch, &result_sequence](
-                                       Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    result_sequence = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
-        args, 0, exception);
+  auto nativeOnPointerDataPacket = [&reportLatch,
+                                    &result_sequence](Dart_Handle sequences) {
+    result_sequence =
+        tonic::DartConverter<std::vector<int64_t>>::FromDart(sequences);
     reportLatch.Signal();
   };
   // Starts engine.
-  AddNativeCallback("NativeOnPointerDataPacket",
-                    CREATE_NATIVE_ENTRY(nativeOnPointerDataPacket));
+  AddFfiNativeCallback("NativeOnPointerDataPacket",
+                       CREATE_FFI_LAMBDA(nativeOnPointerDataPacket));
   ASSERT_TRUE(configuration.IsValid());
   RunEngine(shell.get(), std::move(configuration));
   // Starts test.
@@ -392,16 +391,15 @@ TEST_F(ShellTest, CanCorrectlySynthesizePointerPacket) {
   // Sets up native handler.
   fml::AutoResetWaitableEvent reportLatch;
   std::vector<int64_t> result_sequence;
-  auto nativeOnPointerDataPacket = [&reportLatch, &result_sequence](
-                                       Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    result_sequence = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
-        args, 0, exception);
+  auto nativeOnPointerDataPacket = [&reportLatch,
+                                    &result_sequence](Dart_Handle sequences) {
+    result_sequence =
+        tonic::DartConverter<std::vector<int64_t>>::FromDart(sequences);
     reportLatch.Signal();
   };
   // Starts engine.
-  AddNativeCallback("NativeOnPointerDataPacket",
-                    CREATE_NATIVE_ENTRY(nativeOnPointerDataPacket));
+  AddFfiNativeCallback("NativeOnPointerDataPacket",
+                       CREATE_FFI_LAMBDA(nativeOnPointerDataPacket));
   ASSERT_TRUE(configuration.IsValid());
   RunEngine(shell.get(), std::move(configuration));
   // Starts test.
diff --git a/engine/src/flutter/shell/common/shell_fuchsia_unittests.cc b/engine/src/flutter/shell/common/shell_fuchsia_unittests.cc
index da6bd0f641432..07b0e0fc9db47 100644
--- a/engine/src/flutter/shell/common/shell_fuchsia_unittests.cc
+++ b/engine/src/flutter/shell/common/shell_fuchsia_unittests.cc
@@ -173,22 +173,21 @@ TEST_F(FuchsiaShellTest, LocaltimesVaryOnTimezoneChanges) {
   // there.
   fml::AutoResetWaitableEvent latch;
   std::string dart_isolate_time_str;
-  AddNativeCallback("NotifyLocalTime", CREATE_NATIVE_ENTRY([&](auto args) {
-                      dart_isolate_time_str =
-                          tonic::DartConverter<std::string>::FromDart(
-                              Dart_GetNativeArgument(args, 0));
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NotifyLocalTime", CREATE_FFI_LAMBDA([&](Dart_Handle string_handle) {
+        dart_isolate_time_str =
+            tonic::DartConverter<std::string>::FromDart(string_handle);
+        latch.Signal();
+      }));
 
   // As long as this is set, the isolate will keep rerunning its only task.
   bool continue_fixture = true;
   fml::AutoResetWaitableEvent fixture_latch;
-  AddNativeCallback("WaitFixture", CREATE_NATIVE_ENTRY([&](auto args) {
-                      // Wait for the test fixture to advance.
-                      fixture_latch.Wait();
-                      tonic::DartConverter<bool>::SetReturnValue(
-                          args, continue_fixture);
-                    }));
+  AddFfiNativeCallback("WaitFixture", CREATE_FFI_LAMBDA([&]() {
+                         // Wait for the test fixture to advance.
+                         fixture_latch.Wait();
+                         return continue_fixture;
+                       }));
 
   auto settings = CreateSettingsForFixture();
   auto configuration = RunConfiguration::InferFromSettings(settings);
diff --git a/engine/src/flutter/shell/common/shell_unittests.cc b/engine/src/flutter/shell/common/shell_unittests.cc
index 110b4ccbe9640..371e824d7b04b 100644
--- a/engine/src/flutter/shell/common/shell_unittests.cc
+++ b/engine/src/flutter/shell/common/shell_unittests.cc
@@ -57,7 +57,7 @@
 #include "flutter/vulkan/vulkan_application.h"  // nogncheck
 #endif
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -592,9 +592,9 @@ TEST_F(ShellTest, FixturesAreFunctional) {
   configuration.SetEntrypoint("fixturesAreFunctionalMain");
 
   fml::AutoResetWaitableEvent main_latch;
-  AddNativeCallback(
+  AddFfiNativeCallback(
       "SayHiFromFixturesAreFunctionalMain",
-      CREATE_NATIVE_ENTRY([&main_latch](auto args) { main_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&main_latch]() { main_latch.Signal(); }));
 
   RunEngine(shell.get(), std::move(configuration));
   main_latch.Wait();
@@ -682,9 +682,8 @@ TEST_F(ShellTest, SecondaryIsolateBindingsAreSetupViaShellSettings) {
   configuration.SetEntrypoint("testCanLaunchSecondaryIsolate");
 
   fml::CountDownLatch latch(2);
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&latch](auto args) {
-                      latch.CountDown();
-                    }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   RunEngine(shell.get(), std::move(configuration));
 
@@ -708,8 +707,8 @@ TEST_F(ShellTest, LastEntrypoint) {
 
   fml::AutoResetWaitableEvent main_latch;
   std::string last_entry_point;
-  AddNativeCallback(
-      "SayHiFromFixturesAreFunctionalMain", CREATE_NATIVE_ENTRY([&](auto args) {
+  AddFfiNativeCallback(
+      "SayHiFromFixturesAreFunctionalMain", CREATE_FFI_LAMBDA([&]() {
         last_entry_point = shell->GetEngine()->GetLastEntrypoint();
         main_latch.Signal();
       }));
@@ -737,8 +736,8 @@ TEST_F(ShellTest, LastEntrypointArgs) {
 
   fml::AutoResetWaitableEvent main_latch;
   std::vector<std::string> last_entry_point_args;
-  AddNativeCallback(
-      "SayHiFromFixturesAreFunctionalMain", CREATE_NATIVE_ENTRY([&](auto args) {
+  AddFfiNativeCallback(
+      "SayHiFromFixturesAreFunctionalMain", CREATE_FFI_LAMBDA([&]() {
         last_entry_point_args = shell->GetEngine()->GetLastEntrypointArgs();
         main_latch.Signal();
       }));
@@ -879,16 +878,14 @@ TEST_F(ShellTest, ReportTimingsIsCalled) {
   configuration.SetEntrypoint("reportTimingsMain");
   fml::AutoResetWaitableEvent reportLatch;
   std::vector<int64_t> timestamps;
-  auto nativeTimingCallback = [&reportLatch,
-                               &timestamps](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
+  auto nativeTimingCallback = [&reportLatch, &timestamps](Dart_Handle timings) {
     ASSERT_EQ(timestamps.size(), 0ul);
-    timestamps = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
-        args, 0, exception);
+    timestamps = tonic::DartConverter<std::vector<int64_t>>::FromDart(timings);
     reportLatch.Signal();
   };
-  AddNativeCallback("NativeReportTimingsCallback",
-                    CREATE_NATIVE_ENTRY(nativeTimingCallback));
+  AddFfiNativeCallback("NativeReportTimingsCallback",
+                       CREATE_FFI_LAMBDA(nativeTimingCallback));
+
   RunEngine(shell.get(), std::move(configuration));
 
   // Pump many frames so we can trigger the report quickly instead of waiting
@@ -952,13 +949,11 @@ TEST_F(ShellTest, FrameRasterizedCallbackIsCalled) {
   configuration.SetEntrypoint("onBeginFrameMain");
 
   int64_t frame_target_time;
-  auto nativeOnBeginFrame = [&frame_target_time](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    frame_target_time =
-        tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
+  auto nativeOnBeginFrame = [&frame_target_time](int64_t microseconds) {
+    frame_target_time = microseconds;
   };
-  AddNativeCallback("NativeOnBeginFrame",
-                    CREATE_NATIVE_ENTRY(nativeOnBeginFrame));
+  AddFfiNativeCallback("NativeOnBeginFrame",
+                       CREATE_FFI_LAMBDA(nativeOnBeginFrame));
 
   RunEngine(shell.get(), std::move(configuration));
   PumpOneFrame(shell.get());
@@ -1647,16 +1642,13 @@ TEST_F(ShellTest, ReportTimingsIsCalledImmediatelyAfterTheFirstFrame) {
   configuration.SetEntrypoint("reportTimingsMain");
   fml::AutoResetWaitableEvent reportLatch;
   std::vector<int64_t> timestamps;
-  auto nativeTimingCallback = [&reportLatch,
-                               &timestamps](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
+  auto nativeTimingCallback = [&reportLatch, &timestamps](Dart_Handle timings) {
     ASSERT_EQ(timestamps.size(), 0ul);
-    timestamps = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
-        args, 0, exception);
+    timestamps = tonic::DartConverter<std::vector<int64_t>>::FromDart(timings);
     reportLatch.Signal();
   };
-  AddNativeCallback("NativeReportTimingsCallback",
-                    CREATE_NATIVE_ENTRY(nativeTimingCallback));
+  AddFfiNativeCallback("NativeReportTimingsCallback",
+                       CREATE_FFI_LAMBDA(nativeTimingCallback));
   ASSERT_TRUE(configuration.IsValid());
   RunEngine(shell.get(), std::move(configuration));
 
@@ -2091,9 +2083,8 @@ TEST_F(ShellTest, SetResourceCacheSizeNotifiesDart) {
             static_cast<size_t>(3840000U));
 
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&latch](auto args) {
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   RunEngine(shell.get(), std::move(configuration));
   PumpOneFrame(shell.get());
@@ -2121,16 +2112,12 @@ TEST_F(ShellTest, CanCreateImagefromDecompressedBytes) {
   configuration.SetEntrypoint("canCreateImageFromDecompressedData");
 
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback("NotifyWidthHeight",
-                    CREATE_NATIVE_ENTRY([&latch](auto args) {
-                      auto width = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 0));
-                      auto height = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 1));
-                      ASSERT_EQ(width, 10);
-                      ASSERT_EQ(height, 10);
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyWidthHeight",
+                       CREATE_FFI_LAMBDA([&latch](int width, int height) {
+                         ASSERT_EQ(width, 10);
+                         ASSERT_EQ(height, 10);
+                         latch.Signal();
+                       }));
 
   RunEngine(shell.get(), std::move(configuration));
 
@@ -2226,14 +2213,13 @@ TEST_F(ShellTest, IsolateCanAccessPersistentIsolateData) {
   );
 
   fml::AutoResetWaitableEvent message_latch;
-  AddNativeCallback("NotifyMessage",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      const auto message_from_dart =
-                          tonic::DartConverter<std::string>::FromDart(
-                              Dart_GetNativeArgument(args, 0));
-                      ASSERT_EQ(message, message_from_dart);
-                      message_latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NotifyMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        const auto message_from_dart =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
+        ASSERT_EQ(message, message_from_dart);
+        message_latch.Signal();
+      }));
 
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
 
@@ -2254,14 +2240,12 @@ TEST_F(ShellTest, CanScheduleFrameFromPlatform) {
   Settings settings = CreateSettingsForFixture();
   TaskRunners task_runners = GetTaskRunnersForFixture();
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback(
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
   fml::AutoResetWaitableEvent check_latch;
-  AddNativeCallback("NativeOnBeginFrame",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      check_latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NativeOnBeginFrame",
+      CREATE_FFI_LAMBDA([&](int64_t microseconds) { check_latch.Signal(); }));
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
   ASSERT_TRUE(shell->IsSetup());
 
@@ -2286,20 +2270,19 @@ TEST_F(ShellTest, SecondaryVsyncCallbackShouldBeCalledAfterVsyncCallback) {
   Settings settings = CreateSettingsForFixture();
   TaskRunners task_runners = GetTaskRunnersForFixture();
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback(
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
   fml::CountDownLatch count_down_latch(2);
-  AddNativeCallback("NativeOnBeginFrame",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      if (!test_started) {
-                        return;
-                      }
-                      EXPECT_FALSE(is_on_begin_frame_called);
-                      EXPECT_FALSE(is_secondary_callback_called);
-                      is_on_begin_frame_called = true;
-                      count_down_latch.CountDown();
-                    }));
+  AddFfiNativeCallback("NativeOnBeginFrame",
+                       CREATE_FFI_LAMBDA([&](int64_t microseconds) {
+                         if (!test_started) {
+                           return;
+                         }
+                         EXPECT_FALSE(is_on_begin_frame_called);
+                         EXPECT_FALSE(is_secondary_callback_called);
+                         is_on_begin_frame_called = true;
+                         count_down_latch.CountDown();
+                       }));
   std::unique_ptr<Shell> shell = CreateShell({
       .settings = settings,
       .task_runners = task_runners,
@@ -2313,23 +2296,34 @@ TEST_F(ShellTest, SecondaryVsyncCallbackShouldBeCalledAfterVsyncCallback) {
   // Wait for the application to attach the listener.
   latch.Wait();
 
+  auto vsync_task = [&]() {
+    shell->GetEngine()->ScheduleSecondaryVsyncCallback(0, [&]() {
+      if (!test_started) {
+        return;
+      }
+      EXPECT_TRUE(is_on_begin_frame_called);
+      EXPECT_FALSE(is_secondary_callback_called);
+      is_secondary_callback_called = true;
+      count_down_latch.CountDown();
+    });
+    shell->GetEngine()->ScheduleFrame();
+    test_started = true;
+  };
+
+  // Run the test task after a vsync occurs so that the
+  // ScheduleSecondaryVsyncCallback and ScheduleFrame calls will happen within
+  // the same vsync interval.
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetUITaskRunner(), [&]() {
-        shell->GetEngine()->ScheduleSecondaryVsyncCallback(0, [&]() {
-          if (!test_started) {
-            return;
-          }
-          EXPECT_TRUE(is_on_begin_frame_called);
-          EXPECT_FALSE(is_secondary_callback_called);
-          is_secondary_callback_called = true;
-          count_down_latch.CountDown();
-        });
-        shell->GetEngine()->ScheduleFrame();
-        test_started = true;
+        auto vsync_waiter = shell->GetEngine()->GetVsyncWaiter().lock();
+        vsync_waiter->AsyncWaitForVsync(
+            [&](auto frame_timings_recorder) { vsync_task(); });
       });
+
   count_down_latch.Wait();
   EXPECT_TRUE(is_on_begin_frame_called);
   EXPECT_TRUE(is_secondary_callback_called);
+
   DestroyShell(std::move(shell), task_runners);
 }
 
@@ -2417,12 +2411,12 @@ TEST_F(ShellTest, LocaltimesMatch) {
 
   // See fixtures/shell_test.dart, the callback NotifyLocalTime is declared
   // there.
-  AddNativeCallback("NotifyLocalTime", CREATE_NATIVE_ENTRY([&](auto args) {
-                      dart_isolate_time_str =
-                          tonic::DartConverter<std::string>::FromDart(
-                              Dart_GetNativeArgument(args, 0));
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NotifyLocalTime", CREATE_FFI_LAMBDA([&](Dart_Handle string_handle) {
+        dart_isolate_time_str =
+            tonic::DartConverter<std::string>::FromDart(string_handle);
+        latch.Signal();
+      }));
 
   auto settings = CreateSettingsForFixture();
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -2492,15 +2486,12 @@ class SinglePixelImageGenerator : public ImageGenerator {
 
 TEST_F(ShellTest, CanRegisterImageDecoders) {
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback("NotifyWidthHeight", CREATE_NATIVE_ENTRY([&](auto args) {
-                      auto width = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 0));
-                      auto height = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 1));
-                      ASSERT_EQ(width, 1);
-                      ASSERT_EQ(height, 1);
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyWidthHeight",
+                       CREATE_FFI_LAMBDA([&](int width, int height) {
+                         ASSERT_EQ(width, 1);
+                         ASSERT_EQ(height, 1);
+                         latch.Signal();
+                       }));
 
   auto settings = CreateSettingsForFixture();
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -2905,22 +2896,14 @@ TEST_F(ShellTest, IgnoresInvalidMetrics) {
   double last_device_pixel_ratio;
   double last_width;
   double last_height;
-  auto native_report_device_pixel_ratio = [&](Dart_NativeArguments args) {
-    auto dpr_handle = Dart_GetNativeArgument(args, 0);
-    ASSERT_TRUE(Dart_IsDouble(dpr_handle));
-    Dart_DoubleValue(dpr_handle, &last_device_pixel_ratio);
+  auto native_report_device_pixel_ratio = [&](double device_pixel_ratio,
+                                              double width, double height) {
+    last_device_pixel_ratio = device_pixel_ratio;
+    last_width = width;
+    last_height = height;
     ASSERT_FALSE(last_device_pixel_ratio == 0.0);
-
-    auto width_handle = Dart_GetNativeArgument(args, 1);
-    ASSERT_TRUE(Dart_IsDouble(width_handle));
-    Dart_DoubleValue(width_handle, &last_width);
     ASSERT_FALSE(last_width == 0.0);
-
-    auto height_handle = Dart_GetNativeArgument(args, 2);
-    ASSERT_TRUE(Dart_IsDouble(height_handle));
-    Dart_DoubleValue(height_handle, &last_height);
     ASSERT_FALSE(last_height == 0.0);
-
     latch.Signal();
   };
 
@@ -2929,8 +2912,8 @@ TEST_F(ShellTest, IgnoresInvalidMetrics) {
   TaskRunners task_runners("test", task_runner, task_runner, task_runner,
                            task_runner);
 
-  AddNativeCallback("ReportMetrics",
-                    CREATE_NATIVE_ENTRY(native_report_device_pixel_ratio));
+  AddFfiNativeCallback("ReportMetrics",
+                       CREATE_FFI_LAMBDA(native_report_device_pixel_ratio));
 
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
 
@@ -2981,11 +2964,10 @@ TEST_F(ShellTest, IgnoresMetricsUpdateToInvalidView) {
   fml::AutoResetWaitableEvent latch;
   double last_device_pixel_ratio;
   // This callback will be called whenever any view's metrics change.
-  auto native_report_device_pixel_ratio = [&](Dart_NativeArguments args) {
+  auto native_report_device_pixel_ratio = [&](double device_pixel_ratio,
+                                              double width, double height) {
     // The correct call will have a DPR of 3.
-    auto dpr_handle = Dart_GetNativeArgument(args, 0);
-    ASSERT_TRUE(Dart_IsDouble(dpr_handle));
-    Dart_DoubleValue(dpr_handle, &last_device_pixel_ratio);
+    last_device_pixel_ratio = device_pixel_ratio;
     ASSERT_TRUE(last_device_pixel_ratio > 2.5);
 
     latch.Signal();
@@ -2996,8 +2978,8 @@ TEST_F(ShellTest, IgnoresMetricsUpdateToInvalidView) {
   TaskRunners task_runners("test", task_runner, task_runner, task_runner,
                            task_runner);
 
-  AddNativeCallback("ReportMetrics",
-                    CREATE_NATIVE_ENTRY(native_report_device_pixel_ratio));
+  AddFfiNativeCallback("ReportMetrics",
+                       CREATE_FFI_LAMBDA(native_report_device_pixel_ratio));
 
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
 
@@ -3037,32 +3019,29 @@ TEST_F(ShellTest, OnServiceProtocolSetAssetBundlePathWorks) {
   // Callback used to signal whether the resource was loaded successfully.
   bool can_access_resource = false;
   auto native_can_access_resource = [&can_access_resource,
-                                     &latch](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    can_access_resource =
-        tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+                                     &latch](bool success) {
+    can_access_resource = success;
     latch.Signal();
   };
-  AddNativeCallback("NotifyCanAccessResource",
-                    CREATE_NATIVE_ENTRY(native_can_access_resource));
+  AddFfiNativeCallback("NotifyCanAccessResource",
+                       CREATE_FFI_LAMBDA(native_can_access_resource));
 
   // Callback used to delay the asset load until after the service
   // protocol method has finished.
-  auto native_notify_set_asset_bundle_path =
-      [&shell](Dart_NativeArguments args) {
-        // Update the asset directory to a bonus path.
-        ServiceProtocol::Handler::ServiceProtocolMap params;
-        params["assetDirectory"] = "assetDirectory";
-        rapidjson::Document document;
-        OnServiceProtocol(shell.get(), ServiceProtocolEnum::kSetAssetBundlePath,
-                          shell->GetTaskRunners().GetUITaskRunner(), params,
-                          &document);
-        rapidjson::StringBuffer buffer;
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        document.Accept(writer);
-      };
-  AddNativeCallback("NotifySetAssetBundlePath",
-                    CREATE_NATIVE_ENTRY(native_notify_set_asset_bundle_path));
+  auto native_notify_set_asset_bundle_path = [&shell]() {
+    // Update the asset directory to a bonus path.
+    ServiceProtocol::Handler::ServiceProtocolMap params;
+    params["assetDirectory"] = "assetDirectory";
+    rapidjson::Document document;
+    OnServiceProtocol(shell.get(), ServiceProtocolEnum::kSetAssetBundlePath,
+                      shell->GetTaskRunners().GetUITaskRunner(), params,
+                      &document);
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    document.Accept(writer);
+  };
+  AddFfiNativeCallback("NotifySetAssetBundlePath",
+                       CREATE_FFI_LAMBDA(native_notify_set_asset_bundle_path));
 
   RunEngine(shell.get(), std::move(configuration));
 
@@ -3243,19 +3222,18 @@ TEST_F(ShellTest, Spawn) {
   fml::AutoResetWaitableEvent main_latch;
   std::string last_entry_point;
   // Fulfill native function for the first Shell's entrypoint.
-  AddNativeCallback(
-      "SayHiFromFixturesAreFunctionalMain", CREATE_NATIVE_ENTRY([&](auto args) {
+  AddFfiNativeCallback(
+      "SayHiFromFixturesAreFunctionalMain", CREATE_FFI_LAMBDA([&]() {
         last_entry_point = shell->GetEngine()->GetLastEntrypoint();
         main_latch.Signal();
       }));
   // Fulfill native function for the second Shell's entrypoint.
   fml::CountDownLatch second_latch(2);
-  AddNativeCallback(
+  AddFfiNativeCallback(
       // The Dart native function names aren't very consistent but this is
       // just the native function name of the second vm entrypoint in the
       // fixture.
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](auto args) { second_latch.CountDown(); }));
+      "NotifyNative", CREATE_FFI_LAMBDA([&]() { second_latch.CountDown(); }));
 
   RunEngine(shell.get(), std::move(configuration));
   main_latch.Wait();
@@ -3349,25 +3327,21 @@ TEST_F(ShellTest, SpawnWithDartEntrypointArgs) {
   fml::AutoResetWaitableEvent main_latch;
   std::string last_entry_point;
   // Fulfill native function for the first Shell's entrypoint.
-  AddNativeCallback("NotifyNativeWhenEngineRun",
-                    CREATE_NATIVE_ENTRY(([&](Dart_NativeArguments args) {
-                      ASSERT_TRUE(tonic::DartConverter<bool>::FromDart(
-                          Dart_GetNativeArgument(args, 0)));
-                      last_entry_point =
-                          shell->GetEngine()->GetLastEntrypoint();
-                      main_latch.Signal();
-                    })));
+  AddFfiNativeCallback(
+      "NotifyNativeWhenEngineRun", CREATE_FFI_LAMBDA(([&](bool success) {
+        ASSERT_TRUE(success);
+        last_entry_point = shell->GetEngine()->GetLastEntrypoint();
+        main_latch.Signal();
+      })));
 
   fml::AutoResetWaitableEvent second_latch;
   // Fulfill native function for the second Shell's entrypoint.
-  AddNativeCallback("NotifyNativeWhenEngineSpawn",
-                    CREATE_NATIVE_ENTRY(([&](Dart_NativeArguments args) {
-                      ASSERT_TRUE(tonic::DartConverter<bool>::FromDart(
-                          Dart_GetNativeArgument(args, 0)));
-                      last_entry_point =
-                          shell->GetEngine()->GetLastEntrypoint();
-                      second_latch.Signal();
-                    })));
+  AddFfiNativeCallback(
+      "NotifyNativeWhenEngineSpawn", CREATE_FFI_LAMBDA(([&](bool success) {
+        ASSERT_TRUE(success);
+        last_entry_point = shell->GetEngine()->GetLastEntrypoint();
+        second_latch.Signal();
+      })));
 
   RunEngine(shell.get(), std::move(configuration));
   main_latch.Wait();
@@ -3919,10 +3893,10 @@ TEST_F(ShellTest, UIWorkAfterOnPlatformViewDestroyed) {
 
   fml::AutoResetWaitableEvent latch;
   fml::AutoResetWaitableEvent notify_native_latch;
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
-                      notify_native_latch.Signal();
-                      latch.Wait();
-                    }));
+  AddFfiNativeCallback("NotifyNative", CREATE_FFI_LAMBDA([&]() {
+                         notify_native_latch.Signal();
+                         latch.Wait();
+                       }));
 
   RunEngine(shell.get(), std::move(configuration));
   // Wait to make sure we get called back from Dart and thus have latched
@@ -4011,21 +3985,19 @@ TEST_F(ShellTest, SpawnWorksWithOnError) {
 
   fml::CountDownLatch latch(2);
 
-  AddNativeCallback(
-      "NotifyErrorA", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto string_handle = Dart_GetNativeArgument(args, 0);
-        const char* c_str;
-        Dart_StringToCString(string_handle, &c_str);
-        EXPECT_STREQ(c_str, "Exception: I should be coming from A");
+  AddFfiNativeCallback(
+      "NotifyErrorA", CREATE_FFI_LAMBDA([&](Dart_Handle string_handle) {
+        const auto message =
+            tonic::DartConverter<std::string>::FromDart(string_handle);
+        EXPECT_EQ(message, "Exception: I should be coming from A");
         latch.CountDown();
       }));
 
-  AddNativeCallback(
-      "NotifyErrorB", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto string_handle = Dart_GetNativeArgument(args, 0);
-        const char* c_str;
-        Dart_StringToCString(string_handle, &c_str);
-        EXPECT_STREQ(c_str, "Exception: I should be coming from B");
+  AddFfiNativeCallback(
+      "NotifyErrorB", CREATE_FFI_LAMBDA([&](Dart_Handle string_handle) {
+        const auto message =
+            tonic::DartConverter<std::string>::FromDart(string_handle);
+        EXPECT_EQ(message, "Exception: I should be coming from B");
         latch.CountDown();
       }));
 
@@ -4071,8 +4043,8 @@ TEST_F(ShellTest, ImmutableBufferLoadsAssetOnBackgroundThread) {
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
 
   fml::CountDownLatch latch(1);
-  AddNativeCallback("NotifyNative",
-                    CREATE_NATIVE_ENTRY([&](auto args) { latch.CountDown(); }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -4109,18 +4081,17 @@ TEST_F(ShellTest, PictureToImageSync) {
       }),
   });
 
-  AddNativeCallback("NativeOnBeforeToImageSync",
-                    CREATE_NATIVE_ENTRY([&](auto args) {
-                      // nop
-                    }));
+  AddFfiNativeCallback("NativeOnBeforeToImageSync", CREATE_FFI_LAMBDA([&]() {
+                         // nop
+                       }));
 
   fml::CountDownLatch latch(2);
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
-                      // Teardown and set up rasterizer again.
-                      PlatformViewNotifyDestroyed(shell.get());
-                      PlatformViewNotifyCreated(shell.get());
-                      latch.CountDown();
-                    }));
+  AddFfiNativeCallback("NotifyNative", CREATE_FFI_LAMBDA([&]() {
+                         // Teardown and set up rasterizer again.
+                         PlatformViewNotifyDestroyed(shell.get());
+                         PlatformViewNotifyCreated(shell.get());
+                         latch.CountDown();
+                       }));
 
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
@@ -4152,18 +4123,17 @@ TEST_F(ShellTest, PictureToImageSyncImpellerNoSurface) {
       }),
   });
 
-  AddNativeCallback("NativeOnBeforeToImageSync",
-                    CREATE_NATIVE_ENTRY([&](auto args) {
-                      // nop
-                    }));
+  AddFfiNativeCallback("NativeOnBeforeToImageSync", CREATE_FFI_LAMBDA([&]() {
+                         // nop
+                       }));
 
   fml::CountDownLatch latch(2);
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
-                      // Teardown and set up rasterizer again.
-                      PlatformViewNotifyDestroyed(shell.get());
-                      PlatformViewNotifyCreated(shell.get());
-                      latch.CountDown();
-                    }));
+  AddFfiNativeCallback("NotifyNative", CREATE_FFI_LAMBDA([&]() {
+                         // Teardown and set up rasterizer again.
+                         PlatformViewNotifyDestroyed(shell.get());
+                         PlatformViewNotifyCreated(shell.get());
+                         latch.CountDown();
+                       }));
 
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
@@ -4204,21 +4174,21 @@ TEST_F(ShellTest, PictureToImageSyncWithTrampledContext) {
       }),
   });
 
-  AddNativeCallback(
-      "NativeOnBeforeToImageSync", CREATE_NATIVE_ENTRY([&](auto args) {
-        // Trample the GL context. If the rasterizer fails
-        // to make the right one current again, test will
-        // fail.
-        ::eglMakeCurrent(::eglGetCurrentDisplay(), NULL, NULL, NULL);
-      }));
+  AddFfiNativeCallback("NativeOnBeforeToImageSync", CREATE_FFI_LAMBDA([&]() {
+                         // Trample the GL context. If the rasterizer fails
+                         // to make the right one current again, test will
+                         // fail.
+                         ::eglMakeCurrent(::eglGetCurrentDisplay(), NULL, NULL,
+                                          NULL);
+                       }));
 
   fml::CountDownLatch latch(2);
-  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
-                      // Teardown and set up rasterizer again.
-                      PlatformViewNotifyDestroyed(shell.get());
-                      PlatformViewNotifyCreated(shell.get());
-                      latch.CountDown();
-                    }));
+  AddFfiNativeCallback("NotifyNative", CREATE_FFI_LAMBDA([&]() {
+                         // Teardown and set up rasterizer again.
+                         PlatformViewNotifyDestroyed(shell.get());
+                         PlatformViewNotifyCreated(shell.get());
+                         latch.CountDown();
+                       }));
 
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
@@ -4241,12 +4211,10 @@ TEST_F(ShellTest, PluginUtilitiesCallbackHandleErrorHandling) {
 
   fml::AutoResetWaitableEvent latch;
   bool test_passed;
-  AddNativeCallback("NotifyNativeBool", CREATE_NATIVE_ENTRY([&](auto args) {
-                      Dart_Handle exception = nullptr;
-                      test_passed = tonic::DartConverter<bool>::FromArguments(
-                          args, 0, exception);
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyNativeBool", CREATE_FFI_LAMBDA([&](bool value) {
+                         test_passed = value;
+                         latch.Signal();
+                       }));
 
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
@@ -4328,11 +4296,8 @@ TEST_F(ShellTest, NotifyIdleNotCalledInLatencyMode) {
   // succeed. After the first `NotifyNativeBool` we expect to be in latency
   // mode, where we expect idle notifications to fail.
   fml::CountDownLatch latch(2);
-  AddNativeCallback(
-      "NotifyNativeBool", CREATE_NATIVE_ENTRY([&](auto args) {
-        Dart_Handle exception = nullptr;
-        bool is_in_latency_mode =
-            tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  AddFfiNativeCallback(
+      "NotifyNativeBool", CREATE_FFI_LAMBDA([&](bool is_in_latency_mode) {
         auto runtime_controller = const_cast<RuntimeController*>(
             shell->GetEngine()->GetRuntimeController());
         bool success =
@@ -4443,12 +4408,11 @@ TEST_F(ShellTest, SemanticsActionsFlushMessageLoop) {
 
   RunEngine(shell.get(), std::move(configuration));
   fml::CountDownLatch latch(1);
-  AddNativeCallback(
+  AddFfiNativeCallback(
       // The Dart native function names aren't very consistent but this is
       // just the native function name of the second vm entrypoint in the
       // fixture.
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](auto args) { latch.CountDown(); }));
+      "NotifyNative", CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   task_runners.GetPlatformTaskRunner()->PostTask([&] {
     SendSemanticsAction(shell.get(), 456, 0, SemanticsAction::kTap,
@@ -4477,12 +4441,11 @@ TEST_F(ShellTest, PointerPacketFlushMessageLoop) {
 
   RunEngine(shell.get(), std::move(configuration));
   fml::CountDownLatch latch(1);
-  AddNativeCallback(
+  AddFfiNativeCallback(
       // The Dart native function names aren't very consistent but this is
       // just the native function name of the second vm entrypoint in the
       // fixture.
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](auto args) { latch.CountDown(); }));
+      "NotifyNative", CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   DispatchFakePointerData(shell.get(), 23);
   latch.Wait();
@@ -4509,11 +4472,11 @@ TEST_F(ShellTest, DISABLED_PointerPacketsAreDispatchedWithTask) {
   RunEngine(shell.get(), std::move(configuration));
   fml::CountDownLatch latch(1);
   bool did_invoke_callback = false;
-  AddNativeCallback(
+  AddFfiNativeCallback(
       // The Dart native function names aren't very consistent but this is
       // just the native function name of the second vm entrypoint in the
       // fixture.
-      "NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
+      "NotifyNative", CREATE_FFI_LAMBDA([&]() {
         did_invoke_callback = true;
         latch.CountDown();
       }));
@@ -4546,21 +4509,6 @@ TEST_F(ShellTest, DiesIfSoftwareRenderingAndImpellerAreEnabledDeathTest) {
 #endif  // OS_FUCHSIA
 }
 
-// Parse the arguments of NativeReportViewIdsCallback and
-// store them in hasImplicitView and viewIds.
-static void ParseViewIdsCallback(const Dart_NativeArguments& args,
-                                 bool* hasImplicitView,
-                                 std::vector<int64_t>* viewIds) {
-  Dart_Handle exception = nullptr;
-  viewIds->clear();
-  *hasImplicitView =
-      tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-  ASSERT_EQ(exception, nullptr);
-  *viewIds = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
-      args, 1, exception);
-  ASSERT_EQ(exception, nullptr);
-}
-
 TEST_F(ShellTest, ShellStartsWithImplicitView) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
@@ -4573,13 +4521,15 @@ TEST_F(ShellTest, ShellStartsWithImplicitView) {
   bool hasImplicitView;
   std::vector<int64_t> viewIds;
   fml::AutoResetWaitableEvent reportLatch;
-  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView,
-                                &viewIds](Dart_NativeArguments args) {
-    ParseViewIdsCallback(args, &hasImplicitView, &viewIds);
+  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView, &viewIds](
+                                   bool has_implicit_view,
+                                   Dart_Handle view_ids) {
+    hasImplicitView = has_implicit_view;
+    viewIds = tonic::DartConverter<std::vector<int64_t>>::FromDart(view_ids);
     reportLatch.Signal();
   };
-  AddNativeCallback("NativeReportViewIdsCallback",
-                    CREATE_NATIVE_ENTRY(nativeViewIdsCallback));
+  AddFfiNativeCallback("NativeReportViewIdsCallback",
+                       CREATE_FFI_LAMBDA(nativeViewIdsCallback));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4613,13 +4563,15 @@ TEST_F(ShellTest, ShellCanAddViewOrRemoveView) {
   bool hasImplicitView;
   std::vector<int64_t> viewIds;
   fml::AutoResetWaitableEvent reportLatch;
-  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView,
-                                &viewIds](Dart_NativeArguments args) {
-    ParseViewIdsCallback(args, &hasImplicitView, &viewIds);
+  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView, &viewIds](
+                                   bool has_implicit_view,
+                                   Dart_Handle view_ids) {
+    hasImplicitView = has_implicit_view;
+    viewIds = tonic::DartConverter<std::vector<int64_t>>::FromDart(view_ids);
     reportLatch.Signal();
   };
-  AddNativeCallback("NativeReportViewIdsCallback",
-                    CREATE_NATIVE_ENTRY(nativeViewIdsCallback));
+  AddFfiNativeCallback("NativeReportViewIdsCallback",
+                       CREATE_FFI_LAMBDA(nativeViewIdsCallback));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4680,11 +4632,13 @@ TEST_F(ShellTest, ShellCannotAddDuplicateViewId) {
   bool has_implicit_view;
   std::vector<int64_t> view_ids;
   fml::AutoResetWaitableEvent report_latch;
-  AddNativeCallback("NativeReportViewIdsCallback",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      ParseViewIdsCallback(args, &has_implicit_view, &view_ids);
-                      report_latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NativeReportViewIdsCallback",
+      CREATE_FFI_LAMBDA([&](bool has_implicit, Dart_Handle ids) {
+        has_implicit_view = has_implicit;
+        view_ids = tonic::DartConverter<std::vector<int64_t>>::FromDart(ids);
+        report_latch.Signal();
+      }));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4747,11 +4701,13 @@ TEST_F(ShellTest, ShellCannotRemoveNonexistentId) {
   bool has_implicit_view;
   std::vector<int64_t> view_ids;
   fml::AutoResetWaitableEvent report_latch;
-  AddNativeCallback("NativeReportViewIdsCallback",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      ParseViewIdsCallback(args, &has_implicit_view, &view_ids);
-                      report_latch.Signal();
-                    }));
+  AddFfiNativeCallback(
+      "NativeReportViewIdsCallback",
+      CREATE_FFI_LAMBDA([&](bool has_implicit, Dart_Handle ids) {
+        has_implicit_view = has_implicit;
+        view_ids = tonic::DartConverter<std::vector<int64_t>>::FromDart(ids);
+        report_latch.Signal();
+      }));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4781,14 +4737,11 @@ TEST_F(ShellTest, ShellCannotRemoveNonexistentId) {
 
 // Parse the arguments of NativeReportViewWidthsCallback and
 // store them in viewWidths.
-static void ParseViewWidthsCallback(const Dart_NativeArguments& args,
+static void ParseViewWidthsCallback(Dart_Handle view_width_packet,
                                     std::map<int64_t, int64_t>* viewWidths) {
-  Dart_Handle exception = nullptr;
   viewWidths->clear();
   std::vector<int64_t> viewWidthPacket =
-      tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 0,
-                                                                exception);
-  ASSERT_EQ(exception, nullptr);
+      tonic::DartConverter<std::vector<int64_t>>::FromDart(view_width_packet);
   ASSERT_EQ(viewWidthPacket.size() % 2, 0ul);
   for (size_t packetIndex = 0; packetIndex < viewWidthPacket.size();
        packetIndex += 2) {
@@ -4827,15 +4780,15 @@ TEST_F(ShellTest, ShellFlushesPlatformStatesByMain) {
   bool first_report = true;
   std::map<int64_t, int64_t> viewWidths;
   fml::AutoResetWaitableEvent reportLatch;
-  auto nativeViewWidthsCallback = [&reportLatch, &viewWidths,
-                                   &first_report](Dart_NativeArguments args) {
+  auto nativeViewWidthsCallback = [&reportLatch, &viewWidths, &first_report](
+                                      Dart_Handle view_width_packet) {
     EXPECT_TRUE(first_report);
     first_report = false;
-    ParseViewWidthsCallback(args, &viewWidths);
+    ParseViewWidthsCallback(view_width_packet, &viewWidths);
     reportLatch.Signal();
   };
-  AddNativeCallback("NativeReportViewWidthsCallback",
-                    CREATE_NATIVE_ENTRY(nativeViewWidthsCallback));
+  AddFfiNativeCallback("NativeReportViewWidthsCallback",
+                       CREATE_FFI_LAMBDA(nativeViewWidthsCallback));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4881,13 +4834,14 @@ TEST_F(ShellTest, CanRemoveViewBeforeLaunchingIsolate) {
   bool first_report = true;
   std::map<int64_t, int64_t> view_widths;
   fml::AutoResetWaitableEvent report_latch;
-  AddNativeCallback("NativeReportViewWidthsCallback",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      EXPECT_TRUE(first_report);
-                      first_report = false;
-                      ParseViewWidthsCallback(args, &view_widths);
-                      report_latch.Signal();
-                    }));
+  AddFfiNativeCallback("NativeReportViewWidthsCallback",
+                       CREATE_FFI_LAMBDA([&](Dart_Handle view_width_packet) {
+                         EXPECT_TRUE(first_report);
+                         first_report = false;
+                         ParseViewWidthsCallback(view_width_packet,
+                                                 &view_widths);
+                         report_latch.Signal();
+                       }));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4935,13 +4889,14 @@ TEST_F(ShellTest, IgnoresBadAddViewsBeforeLaunchingIsolate) {
   bool first_report = true;
   std::map<int64_t, int64_t> view_widths;
   fml::AutoResetWaitableEvent report_latch;
-  AddNativeCallback("NativeReportViewWidthsCallback",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      EXPECT_TRUE(first_report);
-                      first_report = false;
-                      ParseViewWidthsCallback(args, &view_widths);
-                      report_latch.Signal();
-                    }));
+  AddFfiNativeCallback("NativeReportViewWidthsCallback",
+                       CREATE_FFI_LAMBDA([&](Dart_Handle view_width_packet) {
+                         EXPECT_TRUE(first_report);
+                         first_report = false;
+                         ParseViewWidthsCallback(view_width_packet,
+                                                 &view_widths);
+                         report_latch.Signal();
+                       }));
 
   PlatformViewNotifyCreated(shell.get());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -4986,18 +4941,16 @@ TEST_F(ShellTest, SendViewFocusEvent) {
   fml::AutoResetWaitableEvent latch;
   std::string last_event;
 
-  AddNativeCallback(
-      "NotifyNative",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
-
-  AddNativeCallback("NotifyMessage",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      const auto message_from_dart =
-                          tonic::DartConverter<std::string>::FromDart(
-                              Dart_GetNativeArgument(args, 0));
-                      last_event = message_from_dart;
-                      latch.Signal();
-                    }));
+  AddFfiNativeCallback("NotifyNative",
+                       CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
+
+  AddFfiNativeCallback(
+      "NotifyMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message) {
+        const auto message_from_dart =
+            tonic::DartConverter<std::string>::FromDart(message);
+        last_event = message_from_dart;
+        latch.Signal();
+      }));
   fml::AutoResetWaitableEvent check_latch;
 
   std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
@@ -5036,9 +4989,8 @@ TEST_F(ShellTest, ProvidesEngineId) {
 
   std::optional<int> reported_handle = std::nullopt;
 
-  AddNativeCallback(
-      "ReportEngineId", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        Dart_Handle arg = Dart_GetNativeArgument(args, 0);
+  AddFfiNativeCallback(
+      "ReportEngineId", CREATE_FFI_LAMBDA([&](Dart_Handle arg) {
         if (Dart_IsNull(arg)) {
           reported_handle = std::nullopt;
         } else {
@@ -5077,9 +5029,8 @@ TEST_F(ShellTest, ProvidesNullEngineId) {
 
   std::optional<int> reported_handle = std::nullopt;
 
-  AddNativeCallback(
-      "ReportEngineId", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        Dart_Handle arg = Dart_GetNativeArgument(args, 0);
+  AddFfiNativeCallback(
+      "ReportEngineId", CREATE_FFI_LAMBDA([&](Dart_Handle arg) {
         if (Dart_IsNull(arg)) {
           reported_handle = std::nullopt;
         } else {
@@ -5122,8 +5073,8 @@ TEST_F(ShellTest, MergeUIAndPlatformThreadsAfterLaunch) {
       task_runners.GetPlatformTaskRunner()->GetTaskQueueId()));
 
   fml::AutoResetWaitableEvent latch;
-  AddNativeCallback(
-      "NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
+  AddFfiNativeCallback(
+      "NotifyNative", CREATE_FFI_LAMBDA([&]() {
         ASSERT_TRUE(
             task_runners.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
         latch.Signal();
diff --git a/engine/src/flutter/shell/common/vsync_waiter.cc b/engine/src/flutter/shell/common/vsync_waiter.cc
index 5aa60e92fce35..f9abf3dc3a564 100644
--- a/engine/src/flutter/shell/common/vsync_waiter.cc
+++ b/engine/src/flutter/shell/common/vsync_waiter.cc
@@ -94,7 +94,7 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
 
   {
     std::scoped_lock lock(callback_mutex_);
-    callback = std::move(callback_);
+    callback_.swap(callback);
     for (auto& pair : secondary_callbacks_) {
       secondary_callbacks.push_back(std::move(pair.second));
     }
diff --git a/engine/src/flutter/shell/gpu/BUILD.gn b/engine/src/flutter/shell/gpu/BUILD.gn
index 3e0ed6f660ef5..9206beb12e1da 100644
--- a/engine/src/flutter/shell/gpu/BUILD.gn
+++ b/engine/src/flutter/shell/gpu/BUILD.gn
@@ -103,8 +103,6 @@ if (shell_enable_metal) {
       "gpu_surface_metal_delegate.h",
       "gpu_surface_metal_skia.h",
       "gpu_surface_metal_skia.mm",
-      "gpu_surface_noop.h",
-      "gpu_surface_noop.mm",
     ]
 
     public_deps = gpu_common_deps
@@ -126,10 +124,7 @@ if (is_mac) {
     cflags_objc = flutter_cflags_objc
     cflags_objcc = flutter_cflags_objcc
 
-    sources = [
-      "gpu_surface_metal_impeller_unittests.mm",
-      "gpu_surface_noop_unittests.mm",
-    ]
+    sources = [ "gpu_surface_metal_impeller_unittests.mm" ]
 
     frameworks = [
       "AppKit.framework",
diff --git a/engine/src/flutter/shell/gpu/gpu_surface_noop.h b/engine/src/flutter/shell/gpu/gpu_surface_noop.h
deleted file mode 100644
index faaca53c38914..0000000000000
--- a/engine/src/flutter/shell/gpu/gpu_surface_noop.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_NOOP_H_
-#define FLUTTER_SHELL_GPU_GPU_SURFACE_NOOP_H_
-
-#include <Metal/Metal.h>
-
-#include "flutter/flow/surface.h"
-
-namespace flutter {
-
-/// @brief A rendering surface that accepts rendering intent but does not render
-///        anything.
-///
-/// This is useful for running on platforms that need an engine instance and
-/// don't have the required drivers.
-class GPUSurfaceNoop : public Surface {
- public:
-  explicit GPUSurfaceNoop();
-
-  // |Surface|
-  ~GPUSurfaceNoop();
-
-  // |Surface|
-  bool IsValid() override;
-
-  // |Surface|
-  Surface::SurfaceData GetSurfaceData() const override;
-
- private:
-  // |Surface|
-  std::unique_ptr<SurfaceFrame> AcquireFrame(
-      const DlISize& frame_size) override;
-
-  std::unique_ptr<SurfaceFrame> AcquireFrameFromCAMetalLayer(
-      const DlISize& frame_size);
-
-  std::unique_ptr<SurfaceFrame> AcquireFrameFromMTLTexture(
-      const DlISize& frame_size);
-
-  // |Surface|
-  DlMatrix GetRootTransformation() const override;
-
-  // |Surface|
-  GrDirectContext* GetContext() override;
-
-  // |Surface|
-  std::unique_ptr<GLContextResult> MakeRenderContextCurrent() override;
-
-  // |Surface|
-  bool AllowsDrawingWhenGpuDisabled() const override;
-
-  // |Surface|
-  bool EnableRasterCache() const override;
-
-  // |Surface|
-  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
-
-  GPUSurfaceNoop(const GPUSurfaceNoop&) = delete;
-
-  GPUSurfaceNoop& operator=(const GPUSurfaceNoop&) = delete;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_NOOP_H_
diff --git a/engine/src/flutter/shell/gpu/gpu_surface_noop.mm b/engine/src/flutter/shell/gpu/gpu_surface_noop.mm
deleted file mode 100644
index 618874c650f31..0000000000000
--- a/engine/src/flutter/shell/gpu/gpu_surface_noop.mm
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/gpu/gpu_surface_noop.h"
-
-#import <Metal/Metal.h>
-#import <QuartzCore/QuartzCore.h>
-
-#include "flow/surface.h"
-#include "flow/surface_frame.h"
-#include "flutter/common/settings.h"
-#include "flutter/fml/mapping.h"
-#include "flutter/fml/trace_event.h"
-
-static_assert(__has_feature(objc_arc), "ARC must be enabled.");
-
-namespace flutter {
-
-GPUSurfaceNoop::GPUSurfaceNoop() = default;
-
-GPUSurfaceNoop::~GPUSurfaceNoop() = default;
-
-// |Surface|
-bool GPUSurfaceNoop::IsValid() {
-  return true;
-}
-
-Surface::SurfaceData GPUSurfaceNoop::GetSurfaceData() const {
-  return Surface::SurfaceData{};
-}
-
-// |Surface|
-std::unique_ptr<SurfaceFrame> GPUSurfaceNoop::AcquireFrame(const DlISize& frame_size) {
-  auto callback = [](const SurfaceFrame&, DlCanvas*) { return true; };
-  auto submit_callback = [](const SurfaceFrame&) { return true; };
-  SurfaceFrame::FramebufferInfo framebuffer_info;
-
-  return std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr,
-      /*framebuffer_info=*/framebuffer_info,
-      /*encode_callback=*/callback,
-      /*submit_callback=*/submit_callback,
-      /*frame_size=*/frame_size,
-      /*context_result=*/nullptr,
-      /*display_list_fallback=*/true);
-}
-
-std::unique_ptr<SurfaceFrame> GPUSurfaceNoop::AcquireFrameFromMTLTexture(
-    const DlISize& frame_size) {
-  auto callback = [](const SurfaceFrame&, DlCanvas*) { return true; };
-  auto submit_callback = [](const SurfaceFrame&) { return true; };
-  SurfaceFrame::FramebufferInfo framebuffer_info;
-
-  return std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr,
-      /*framebuffer_info=*/framebuffer_info,
-      /*encode_callback=*/callback,
-      /*submit_callback=*/submit_callback,
-      /*frame_size=*/frame_size,
-      /*context_result=*/nullptr,
-      /*display_list_fallback=*/true);
-}
-
-// |Surface|
-DlMatrix GPUSurfaceNoop::GetRootTransformation() const {
-  // This backend does not currently support root surface transformations. Just
-  // return identity.
-  return {};
-}
-
-// |Surface|
-GrDirectContext* GPUSurfaceNoop::GetContext() {
-  return nullptr;
-}
-
-// |Surface|
-std::unique_ptr<GLContextResult> GPUSurfaceNoop::MakeRenderContextCurrent() {
-  // This backend has no such concept.
-  return std::make_unique<GLContextDefaultResult>(true);
-}
-
-bool GPUSurfaceNoop::AllowsDrawingWhenGpuDisabled() const {
-  return true;
-}
-
-// |Surface|
-bool GPUSurfaceNoop::EnableRasterCache() const {
-  return false;
-}
-
-// |Surface|
-std::shared_ptr<impeller::AiksContext> GPUSurfaceNoop::GetAiksContext() const {
-  return nullptr;
-}
-
-}  // namespace flutter
diff --git a/engine/src/flutter/shell/gpu/gpu_surface_noop_unittests.mm b/engine/src/flutter/shell/gpu/gpu_surface_noop_unittests.mm
deleted file mode 100644
index ec462a400cb36..0000000000000
--- a/engine/src/flutter/shell/gpu/gpu_surface_noop_unittests.mm
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <Foundation/Foundation.h>
-#include <QuartzCore/QuartzCore.h>
-
-#include "flutter/shell/gpu/gpu_surface_noop.h"
-#include "gtest/gtest.h"
-#include "impeller/entity/mtl/entity_shaders.h"
-#include "impeller/entity/mtl/framebuffer_blend_shaders.h"
-#include "impeller/entity/mtl/modern_shaders.h"
-#include "impeller/renderer/backend/metal/context_mtl.h"
-
-namespace flutter {
-namespace testing {
-
-TEST(GPUSurfaceNoop, InvalidImpellerContextCreatesCausesSurfaceToBeInvalid) {
-  auto surface = std::make_shared<GPUSurfaceNoop>();
-
-  EXPECT_TRUE(surface->IsValid());
-}
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc
index 8af15f632fca7..2d2efb737d2f0 100644
--- a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc
+++ b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc
@@ -86,8 +86,7 @@ void AndroidExternalViewEmbedder::SubmitFlutterView(
       SliceViews(frame->Canvas(),     //
                  composition_order_,  //
                  slices_,             //
-                 view_rects,          //
-                 {}                   //
+                 view_rects           //
       );
 
   // Submit the background canvas frame before switching the GL context to
diff --git a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_2.cc b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_2.cc
index cadb90f1459a6..6eb0f9ba6faf8 100644
--- a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_2.cc
+++ b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_2.cc
@@ -99,8 +99,7 @@ void AndroidExternalViewEmbedder2::SubmitFlutterView(
       SliceViews(frame->Canvas(),     //
                  composition_order_,  //
                  slices_,             //
-                 view_rects,          //
-                 {}                   //
+                 view_rects           //
       );
 
   // If there is no overlay Surface, initialize one on the platform thread. This
@@ -240,11 +239,9 @@ void AndroidExternalViewEmbedder2::PrepareFlutterView(
     double device_pixel_ratio) {
   Reset();
 
-  // The surface size changed. Therefore, destroy existing surfaces as
-  // the existing surfaces in the pool can't be recycled.
+  // The singular overlay surface is persistent, so it is resized in place by
+  // |SurfacePool::GetLayer| rather than destroyed and recreated here.
   if (frame_size_ != frame_size) {
-    DestroySurfaces();
-
     // This should not block to prevent deadlocks with
     // setViewportMetrics.
     task_runners_.GetPlatformTaskRunner()->PostTask(fml::MakeCopyable(
diff --git a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
index dc15f144864cf..dc2c89ad49e97 100644
--- a/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
+++ b/engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
@@ -11,6 +11,7 @@
 
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/surface.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/raster_thread_merger.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/fml/thread.h"
@@ -18,6 +19,7 @@
 #include "flutter/shell/platform/android/jni/jni_mock.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
 #include "flutter/shell/platform/android/surface/android_surface_mock.h"
+#include "flutter/testing/post_task_sync.h"
 #include "flutter/testing/testing.h"
 
 #include "gmock/gmock.h"
@@ -1188,5 +1190,249 @@ TEST(AndroidExternalViewEmbedder2,
   embedder.reset();
 }
 
+TEST(AndroidExternalViewEmbedder2, FrameSizeChangeDoesNotDestroySurfaces) {
+  auto jni_mock = std::make_shared<JNIMock>();
+  auto android_context =
+      std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi | ThreadHost::Type::kRaster);
+  TaskRunners task_runners(
+      "test",
+      thread_host.platform_thread->GetTaskRunner(),  // platform
+      thread_host.raster_thread->GetTaskRunner(),    // raster
+      thread_host.ui_thread->GetTaskRunner(),        // ui
+      thread_host.io_thread->GetTaskRunner()         // io
+  );
+  const DlISize frame_size1(100, 100);
+  const DlISize frame_size2(200, 200);
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+
+  auto surface_mock = std::make_unique<SurfaceMock>();
+  EXPECT_CALL(*surface_mock, AcquireFrame(frame_size1))
+      .WillOnce(Return(ByMove(std::make_unique<SurfaceFrame>(
+          SkSurfaces::Null(100, 100), framebuffer_info,
+          [](const SurfaceFrame&, DlCanvas*) { return true; },
+          [](const SurfaceFrame&) { return true; }, frame_size1))));
+  EXPECT_CALL(*surface_mock, AcquireFrame(frame_size2))
+      .WillOnce(Return(ByMove(std::make_unique<SurfaceFrame>(
+          SkSurfaces::Null(200, 200), framebuffer_info,
+          [](const SurfaceFrame&, DlCanvas*) { return true; },
+          [](const SurfaceFrame&) { return true; }, frame_size2))));
+
+  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
+      fml::MakeCopyable([frame_size2,
+                         surface_mock = std::move(surface_mock)]() mutable {
+        auto android_surface = std::make_unique<AndroidSurfaceMock>();
+        EXPECT_CALL(*android_surface, IsValid()).WillRepeatedly(Return(true));
+        EXPECT_CALL(*android_surface, SetNativeWindow(_, _))
+            .WillRepeatedly(Return(true));
+        EXPECT_CALL(*android_surface, CreateGPUSurface(_))
+            .WillOnce(Return(ByMove(std::move(surface_mock))));
+        EXPECT_CALL(*android_surface, OnScreenSurfaceResize(frame_size2))
+            .Times(1);
+        return android_surface;
+      }));
+
+  fml::RefPtr<AndroidNativeWindow> window =
+      fml::MakeRefCounted<AndroidNativeWindow>(nullptr);
+  EXPECT_CALL(*jni_mock, createOverlaySurface2())
+      .Times(1)
+      .WillOnce(Return(
+          ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
+              0, window))));
+  EXPECT_CALL(*jni_mock, destroyOverlaySurface2()).Times(0);
+
+  auto embedder = std::make_unique<AndroidExternalViewEmbedder2>(
+      *android_context, jni_mock, surface_factory, task_runners);
+
+  const int64_t view_id = 42;
+  MutatorsStack mutators;
+  DlMatrix matrix = DlMatrix::MakeTranslation({0, 0});
+  DlPaint rect_paint;
+  rect_paint.setColor(DlColor::kCyan());
+  rect_paint.setDrawStyle(DlDrawStyle::kFill);
+
+  // First frame with size 100x100
+  embedder->PrepareFlutterView(frame_size1, 1.0);
+  embedder->PrerollCompositeEmbeddedView(
+      view_id,
+      std::make_unique<EmbeddedViewParams>(matrix, DlSize(50, 50), mutators));
+  auto canvas1 = embedder->CompositeEmbeddedView(view_id);
+  canvas1->DrawRect(DlRect::MakeXYWH(0, 0, 50, 50), rect_paint);
+
+  EXPECT_CALL(*jni_mock,
+              onDisplayPlatformView2(view_id, 0, 0, 50, 50, 50, 50, mutators));
+  EXPECT_CALL(*jni_mock, swapTransaction());
+  EXPECT_CALL(*jni_mock, onEndFrame2());
+
+  auto surface_frame1 = std::make_unique<SurfaceFrame>(
+      SkSurfaces::Null(100, 100), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; },
+      [](const SurfaceFrame& surface_frame) { return true; },
+      /*frame_size=*/frame_size1);
+
+  PostTaskSync(task_runners.GetRasterTaskRunner(), [&]() {
+    embedder->SubmitFlutterView(kImplicitViewId, nullptr, nullptr,
+                                std::move(surface_frame1));
+  });
+  // Drain the work that SubmitFlutterView posted to the platform thread.
+  PostTaskSync(task_runners.GetPlatformTaskRunner(), []() {});
+
+  // Second frame with size 200x200 (simulating rotation/resize).
+  // PrepareFlutterView should NOT destroy overlay surfaces.
+  EXPECT_CALL(*jni_mock, MaybeResizeSurfaceView(200, 200));
+  embedder->PrepareFlutterView(frame_size2, 1.0);
+  embedder->PrerollCompositeEmbeddedView(
+      view_id,
+      std::make_unique<EmbeddedViewParams>(matrix, DlSize(100, 100), mutators));
+  auto canvas2 = embedder->CompositeEmbeddedView(view_id);
+  canvas2->DrawRect(DlRect::MakeXYWH(0, 0, 100, 100), rect_paint);
+
+  EXPECT_CALL(*jni_mock, onDisplayPlatformView2(view_id, 0, 0, 100, 100, 100,
+                                                100, mutators));
+  EXPECT_CALL(*jni_mock, swapTransaction());
+  EXPECT_CALL(*jni_mock, onEndFrame2());
+
+  auto surface_frame2 = std::make_unique<SurfaceFrame>(
+      SkSurfaces::Null(200, 200), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; },
+      [](const SurfaceFrame& surface_frame) { return true; },
+      /*frame_size=*/frame_size2);
+
+  PostTaskSync(task_runners.GetRasterTaskRunner(), [&]() {
+    embedder->SubmitFlutterView(kImplicitViewId, nullptr, nullptr,
+                                std::move(surface_frame2));
+  });
+  PostTaskSync(task_runners.GetPlatformTaskRunner(), []() {});
+
+  EXPECT_CALL(*jni_mock, destroyOverlaySurface2()).Times(1);
+  embedder->Teardown();
+  embedder.reset();
+}
+
+// Regression test for the HCPP rotation ANR.
+//
+// The platform thread is unavailable while it is inside
+// ViewRootImpl.performTraversals dispatching surfaceChanged, so a frame resize
+// on the raster thread must not block waiting on it. Rather than reproduce both
+// halves of the deadlock, this occupies the platform thread directly and
+// asserts the raster thread still makes progress.
+TEST(AndroidExternalViewEmbedder2, ResizeDoesNotBlockRasterOnPlatformThread) {
+  auto jni_mock = std::make_shared<JNIMock>();
+  auto android_context =
+      std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi | ThreadHost::Type::kRaster);
+  TaskRunners task_runners(
+      "test",
+      thread_host.platform_thread->GetTaskRunner(),  // platform
+      thread_host.raster_thread->GetTaskRunner(),    // raster
+      thread_host.ui_thread->GetTaskRunner(),        // ui
+      thread_host.io_thread->GetTaskRunner()         // io
+  );
+  const DlISize frame_size1(100, 100);
+  const DlISize frame_size2(200, 200);
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+
+  auto surface_mock = std::make_unique<SurfaceMock>();
+  EXPECT_CALL(*surface_mock, AcquireFrame(frame_size1))
+      .WillOnce(Return(ByMove(std::make_unique<SurfaceFrame>(
+          SkSurfaces::Null(100, 100), framebuffer_info,
+          [](const SurfaceFrame&, DlCanvas*) { return true; },
+          [](const SurfaceFrame&) { return true; }, frame_size1))));
+
+  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
+      fml::MakeCopyable([surface_mock = std::move(surface_mock)]() mutable {
+        auto android_surface = std::make_unique<AndroidSurfaceMock>();
+        EXPECT_CALL(*android_surface, IsValid()).WillRepeatedly(Return(true));
+        EXPECT_CALL(*android_surface, SetNativeWindow(_, _))
+            .WillRepeatedly(Return(true));
+        EXPECT_CALL(*android_surface, CreateGPUSurface(_))
+            .WillOnce(Return(ByMove(std::move(surface_mock))));
+        return android_surface;
+      }));
+
+  fml::RefPtr<AndroidNativeWindow> window =
+      fml::MakeRefCounted<AndroidNativeWindow>(nullptr);
+  EXPECT_CALL(*jni_mock, createOverlaySurface2())
+      .Times(1)
+      .WillOnce(Return(
+          ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
+              0, window))));
+
+  auto embedder = std::make_unique<AndroidExternalViewEmbedder2>(
+      *android_context, jni_mock, surface_factory, task_runners);
+
+  const int64_t view_id = 42;
+  MutatorsStack mutators;
+  DlMatrix matrix = DlMatrix::MakeTranslation({0, 0});
+  DlPaint rect_paint;
+  rect_paint.setColor(DlColor::kCyan());
+  rect_paint.setDrawStyle(DlDrawStyle::kFill);
+
+  // Run one frame so the overlay layer exists. Without a layer, DestroySurfaces
+  // early-returns and there is nothing to deadlock on.
+  embedder->PrepareFlutterView(frame_size1, 1.0);
+  embedder->PrerollCompositeEmbeddedView(
+      view_id,
+      std::make_unique<EmbeddedViewParams>(matrix, DlSize(50, 50), mutators));
+  auto canvas = embedder->CompositeEmbeddedView(view_id);
+  canvas->DrawRect(DlRect::MakeXYWH(0, 0, 50, 50), rect_paint);
+
+  EXPECT_CALL(*jni_mock,
+              onDisplayPlatformView2(view_id, 0, 0, 50, 50, 50, 50, mutators));
+  EXPECT_CALL(*jni_mock, swapTransaction());
+  EXPECT_CALL(*jni_mock, onEndFrame2());
+
+  auto surface_frame = std::make_unique<SurfaceFrame>(
+      SkSurfaces::Null(100, 100), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; },
+      [](const SurfaceFrame& surface_frame) { return true; },
+      /*frame_size=*/frame_size1);
+
+  PostTaskSync(task_runners.GetRasterTaskRunner(), [&]() {
+    embedder->SubmitFlutterView(kImplicitViewId, nullptr, nullptr,
+                                std::move(surface_frame));
+  });
+  PostTaskSync(task_runners.GetPlatformTaskRunner(), []() {});
+
+  // Occupy the platform thread, standing in for a layout traversal.
+  fml::AutoResetWaitableEvent platform_occupied;
+  fml::AutoResetWaitableEvent release_platform;
+  task_runners.GetPlatformTaskRunner()->PostTask([&]() {
+    platform_occupied.Signal();
+    release_platform.Wait();
+  });
+  platform_occupied.Wait();
+
+  EXPECT_CALL(*jni_mock, MaybeResizeSurfaceView(200, 200));
+
+  // The resize must complete without the platform thread running anything.
+  fml::AutoResetWaitableEvent resize_done;
+  task_runners.GetRasterTaskRunner()->PostTask([&]() {
+    embedder->PrepareFlutterView(frame_size2, 1.0);
+    resize_done.Signal();
+  });
+  const bool timed_out =
+      resize_done.WaitWithTimeout(fml::TimeDelta::FromSeconds(10));
+
+  // Release the platform thread before asserting so that a regression fails
+  // this test instead of hanging the suite.
+  release_platform.Signal();
+  if (timed_out) {
+    resize_done.Wait();
+  }
+  EXPECT_FALSE(timed_out)
+      << "PrepareFlutterView blocked the raster thread on the platform thread";
+
+  PostTaskSync(task_runners.GetPlatformTaskRunner(), []() {});
+
+  EXPECT_CALL(*jni_mock, destroyOverlaySurface2()).Times(1);
+  embedder->Teardown();
+  embedder.reset();
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool.cc b/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool.cc
index 07f1bdf4827e7..c0b91116a8264 100644
--- a/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool.cc
+++ b/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool.cc
@@ -28,9 +28,18 @@ std::shared_ptr<OverlayLayer> SurfacePool::GetLayer(
     const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade,
     const std::shared_ptr<AndroidSurfaceFactory>& surface_factory) {
   std::lock_guard lock(mutex_);
-  // Destroy current layers in the pool if the frame size has changed.
   if (requested_frame_size_ != current_frame_size_) {
-    DestroyLayersLocked(jni_facade);
+    if (use_new_surface_methods_) {
+      // The overlay surface is persistent, so resize it in place. Nothing else
+      // resizes the swapchain: |Surface::AcquireFrame| ignores the size it is
+      // handed.
+      for (const std::shared_ptr<OverlayLayer>& layer : layers_) {
+        layer->android_surface->OnScreenSurfaceResize(requested_frame_size_);
+      }
+    } else {
+      // Destroy current layers in the pool if the frame size has changed.
+      DestroyLayersLocked(jni_facade);
+    }
   }
   intptr_t gr_context_key = reinterpret_cast<intptr_t>(gr_context);
   // Allocate a new surface if there isn't one available.
diff --git a/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc b/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
index f052aedebc17f..dd07b3ee5cc0b 100644
--- a/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
+++ b/engine/src/flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
@@ -304,7 +304,7 @@ TEST(SurfacePool, DestroyLayersFrameSizeChanged) {
   ASSERT_TRUE(pool->HasLayers());
 }
 
-TEST(SurfacePool, DestroyLayersFrameSizeChangedNew) {
+TEST(SurfacePool, DoesNotDestroyLayersFrameSizeChangedNew) {
   auto pool = std::make_unique<SurfacePool>(/*use_new_surface_methods=*/true);
   auto jni_mock = std::make_shared<JNIMock>();
 
@@ -320,6 +320,9 @@ TEST(SurfacePool, DestroyLayersFrameSizeChangedNew) {
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window, _));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
+        EXPECT_CALL(*android_surface_mock,
+                    OnScreenSurfaceResize(DlISize(20, 20)))
+            .Times(1);
         return android_surface_mock;
       });
   pool->SetFrameSize(DlISize(10, 10));
@@ -332,21 +335,20 @@ TEST(SurfacePool, DestroyLayersFrameSizeChangedNew) {
 
   ASSERT_FALSE(pool->HasLayers());
 
-  pool->GetLayer(gr_context.get(), *android_context, jni_mock, surface_factory);
+  auto layer_1 = pool->GetLayer(gr_context.get(), *android_context, jni_mock,
+                                surface_factory);
 
   ASSERT_TRUE(pool->HasLayers());
+  ASSERT_NE(nullptr, layer_1);
 
+  pool->RecycleLayers();
   pool->SetFrameSize(DlISize(20, 20));
-  EXPECT_CALL(*jni_mock, destroyOverlaySurface2()).Times(1);
-  EXPECT_CALL(*jni_mock, createOverlaySurface2())
-      .Times(1)
-      .WillOnce(Return(
-          ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
-              1, window))));
-  pool->GetLayer(gr_context.get(), *android_context, jni_mock, surface_factory);
+  auto layer_2 = pool->GetLayer(gr_context.get(), *android_context, jni_mock,
+                                surface_factory);
 
   ASSERT_TRUE(pool->GetUnusedLayers().empty());
   ASSERT_TRUE(pool->HasLayers());
+  ASSERT_EQ(layer_1, layer_2);
 }
 
 }  // namespace testing
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
index 8ebcc8cd2f44c..c0998e4aaf5a2 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
@@ -459,15 +459,25 @@ public void loadDartLibrary(int loadingUnitId, @NonNull String componentName) {
       }
     }
 
+    // These paths are handed to the native loader in descending priority order: it tries them
+    // first to last and stops at the first that loads (see FlutterJNI.loadDartDeferredLibrary).
+    // Ordering matters for security -- OS-installed signed APKs must be preferred over standalone,
+    // unbundled .so files in the app-writable internal storage dir (getFilesDir()), which are only
+    // a fallback and could be tampered with if anything else manages to write into internal
+    // storage.
     List<String> searchPaths = new ArrayList<>();
 
-    // Add the bare filename as the first search path. In some devices, the so
-    // file can be dlopen-ed with just the file name.
+    // Add the bare filename as the first search path. On some devices the .so file can be
+    // dlopen-ed with just the file name (resolved via the linker's own trusted search path).
     searchPaths.add(aotSharedLibraryName);
 
+    // Signed split APKs installed by the OS. Preferred over anything in app-writable storage.
     for (String path : apkPaths) {
       searchPaths.add(path + "!lib/" + abi + "/" + aotSharedLibraryName);
     }
+
+    // Standalone, unbundled .so files discovered in getFilesDir(). App-writable, so least trusted:
+    // searched last and only used as a fallback when no signed APK contains the library.
     searchPaths.addAll(soPaths);
 
     flutterJNI.loadDartDeferredLibrary(
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
index b4efad084c707..aff81a5a89cf4 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
@@ -8,6 +8,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.StandardMethodCodec;
@@ -87,7 +88,14 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
   public ProcessTextChannel(
       @NonNull DartExecutor dartExecutor, @NonNull PackageManager packageManager) {
     this.packageManager = packageManager;
-    channel = new MethodChannel(dartExecutor, CHANNEL_NAME, StandardMethodCodec.INSTANCE);
+    BinaryMessenger.TaskQueue taskQueue =
+        dartExecutor.getBinaryMessenger().makeBackgroundTaskQueue();
+    channel =
+        new MethodChannel(
+            dartExecutor.getBinaryMessenger(),
+            CHANNEL_NAME,
+            StandardMethodCodec.INSTANCE,
+            taskQueue);
     channel.setMethodCallHandler(parsingMethodHandler);
   }
 
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
index c032fcfc25864..b0df9ed3cf929 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
@@ -718,7 +718,7 @@ public Configuration(
    * A text input type.
    *
    * <p>If the {@link #type} is {@link TextInputType#NUMBER}, this {@code InputType} also reports
-   * whether that number {@link #isSigned} and {@link #isDecimal}.
+   * whether that number {@link #isSigned}, {@link #isDecimal}, and {@link #isPassword}.
    */
   public static class InputType {
     @NonNull
@@ -727,17 +727,29 @@ public static InputType fromJson(@NonNull JSONObject json)
       return new InputType(
           TextInputType.fromValue(json.getString("name")),
           json.optBoolean("signed", false),
-          json.optBoolean("decimal", false));
+          json.optBoolean("decimal", false),
+          json.optBoolean("password", false));
     }
 
     @NonNull public final TextInputType type;
     public final boolean isSigned;
     public final boolean isDecimal;
+    public final boolean isPassword;
 
+    /**
+     * Convenience overload equivalent to {@code new InputType(type, isSigned, isDecimal, false)}.
+     */
     public InputType(@NonNull TextInputType type, boolean isSigned, boolean isDecimal) {
+      this(type, isSigned, isDecimal, false);
+    }
+
+    /** Constructs an {@code InputType} for {@code type} with the given NUMBER-variation flags. */
+    public InputType(
+        @NonNull TextInputType type, boolean isSigned, boolean isDecimal, boolean isPassword) {
       this.type = type;
       this.isSigned = isSigned;
       this.isDecimal = isDecimal;
+      this.isPassword = isPassword;
     }
   }
 
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
index 67cda46e3b27b..8dc7a92aacb01 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
@@ -261,6 +261,9 @@ private static int inputTypeFromTextInputType(
       if (type.isDecimal) {
         textType |= InputType.TYPE_NUMBER_FLAG_DECIMAL;
       }
+      if (type.isPassword) {
+        textType |= InputType.TYPE_NUMBER_VARIATION_PASSWORD;
+      }
       return textType;
     } else if (type.type == TextInputChannel.TextInputType.PHONE) {
       return InputType.TYPE_CLASS_PHONE;
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
index beeebbd0c4cca..1dbb84a4fe19e 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
@@ -11,6 +11,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
@@ -32,9 +34,14 @@ public class ProcessTextPlugin
 
   @NonNull private final ProcessTextChannel processTextChannel;
   @NonNull private final PackageManager packageManager;
-  @Nullable private ActivityPluginBinding activityBinding;
+  @NonNull private final Handler mainThreadHandler;
+  @Nullable private volatile ActivityPluginBinding activityBinding;
+  // The use of a Map for this variable assumes that it is only accessed
+  // serially on the background task queue.
   private Map<String, ResolveInfo> resolveInfosById;
 
+  // The use of a Map for this variable assumes that it is only accessed
+  // serially on the main thread.
   @NonNull
   private Map<Integer, MethodChannel.Result> requestsByCode =
       new HashMap<Integer, MethodChannel.Result>();
@@ -42,6 +49,7 @@ public class ProcessTextPlugin
   public ProcessTextPlugin(@NonNull ProcessTextChannel processTextChannel) {
     this.processTextChannel = processTextChannel;
     this.packageManager = processTextChannel.packageManager;
+    this.mainThreadHandler = new Handler(Looper.getMainLooper());
 
     processTextChannel.setMethodHandler(this);
   }
@@ -81,20 +89,27 @@ public void processTextAction(
       return;
     }
 
-    Integer requestCode = result.hashCode();
-    requestsByCode.put(requestCode, result);
-
-    Intent intent = new Intent();
-    intent.setClassName(info.activityInfo.packageName, info.activityInfo.name);
-    intent.setAction(Intent.ACTION_PROCESS_TEXT);
-    intent.setType("text/plain");
-    intent.putExtra(Intent.EXTRA_PROCESS_TEXT, text);
-    intent.putExtra(Intent.EXTRA_PROCESS_TEXT_READONLY, readOnly);
-
-    // Start the text processing activity. When the activity completes, the onActivityResult
-    // callback
-    // is called.
-    activityBinding.getActivity().startActivityForResult(intent, requestCode);
+    mainThreadHandler.post(
+        () -> {
+          if (activityBinding == null) {
+            result.error("error", "Plugin not bound to an Activity", null);
+            return;
+          }
+
+          final Integer requestCode = result.hashCode();
+          requestsByCode.put(requestCode, result);
+
+          Intent intent = new Intent();
+          intent.setClassName(info.activityInfo.packageName, info.activityInfo.name);
+          intent.setAction(Intent.ACTION_PROCESS_TEXT);
+          intent.setType("text/plain");
+          intent.putExtra(Intent.EXTRA_PROCESS_TEXT, text);
+          intent.putExtra(Intent.EXTRA_PROCESS_TEXT_READONLY, readOnly);
+
+          // Start the text processing activity. When the activity completes, the
+          // onActivityResult callback is called.
+          activityBinding.getActivity().startActivityForResult(intent, requestCode);
+        });
   }
 
   private void cacheResolveInfos() {
diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
index 5f6bbf0c606ef..84a81a9f4394c 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -709,8 +709,13 @@ private void setBoldTextFlag() {
     if (rootAccessibilityView.getResources() == null) {
       return;
     }
-    boolean shouldBold =
-        Api31Impl.isBoldText(rootAccessibilityView.getResources().getConfiguration());
+    boolean shouldBold = false;
+    try {
+      shouldBold = Api31Impl.isBoldText(rootAccessibilityView.getResources().getConfiguration());
+    } catch (NoSuchFieldError exception) {
+      // Some vendor-modified runtimes report API 31+ but omit this API-31 field.
+      // Treat bold-text detection as unavailable rather than crashing at startup.
+    }
 
     updateAccessibilityFeature(AccessibilityFeature.BOLD_TEXT, shouldBold);
   }
diff --git a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc
index 1c9964a714740..054137c2f47a7 100644
--- a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc
+++ b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc
@@ -680,6 +680,25 @@ static void DeferredComponentInstallFailure(JNIEnv* env,
                          static_cast<bool>(jTransient));
 }
 
+void* FindFirstLoadableLibrary(
+    const std::vector<std::string>& search_paths,
+    const std::function<void*(const std::string&)>& open_library) {
+  // Search paths are provided in descending priority order (see the contract
+  // on FlutterJNI.loadDartDeferredLibrary): try them from first to last and
+  // stop at the first one that loads. This matters for security as well as
+  // correctness -- callers place the most trusted candidates (e.g.
+  // OS-installed signed APKs) ahead of less trusted fallbacks (e.g. standalone
+  // unbundled .so files in app-writable storage), so the trusted candidate
+  // must win when more than one is loadable.
+  for (const std::string& path : search_paths) {
+    void* handle = open_library(path);
+    if (handle != nullptr) {
+      return handle;
+    }
+  }
+  return nullptr;
+}
+
 static void LoadDartDeferredLibrary(JNIEnv* env,
                                     jobject obj,
                                     jlong shell_holder,
@@ -690,14 +709,11 @@ static void LoadDartDeferredLibrary(JNIEnv* env,
   std::vector<std::string> search_paths =
       fml::jni::StringArrayToVector(env, jSearchPaths);
 
-  // Use dlopen here to directly check if handle is nullptr before creating a
-  // NativeLibrary.
-  void* handle = nullptr;
-  while (handle == nullptr && !search_paths.empty()) {
-    std::string path = search_paths.back();
-    handle = ::dlopen(path.c_str(), RTLD_NOW);
-    search_paths.pop_back();
-  }
+  // Use dlopen here (via FindFirstLoadableLibrary) to directly check if handle
+  // is nullptr before creating a NativeLibrary.
+  void* handle = FindFirstLoadableLibrary(
+      search_paths,
+      [](const std::string& path) { return ::dlopen(path.c_str(), RTLD_NOW); });
   if (handle == nullptr) {
     LoadLoadingUnitFailure(loading_unit_id,
                            "No lib .so found for provided search paths.", true);
diff --git a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.h b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.h
index eacf7fed22bc2..32cb82cabb244 100644
--- a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.h
+++ b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.h
@@ -5,11 +5,31 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_IMPL_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_IMPL_H_
 
+#include <functional>
+#include <string>
+#include <vector>
+
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 
 namespace flutter {
 
+//------------------------------------------------------------------------------
+/// @brief      Returns the handle from the first entry of `search_paths` that
+///             `open_library` loads (returns non-null for), or nullptr if none
+///             of them load.
+///
+///             Paths are tried in order, i.e. in descending priority: this
+///             matches the contract documented on
+///             `FlutterJNI.loadDartDeferredLibrary`, so callers list the most
+///             trusted candidate first. The loader is a parameter (rather than
+///             calling `dlopen` directly) so the ordering can be covered by
+///             unit tests; production callers pass a `dlopen` wrapper.
+///
+void* FindFirstLoadableLibrary(
+    const std::vector<std::string>& search_paths,
+    const std::function<void*(const std::string&)>& open_library);
+
 //------------------------------------------------------------------------------
 /// @brief      Concrete implementation of `PlatformViewAndroidJNI` that is
 ///             compiled with the Android toolchain.
diff --git a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl_unittests.cc b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl_unittests.cc
index 076ac9fde13bf..1ef91ef0664e9 100644
--- a/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl_unittests.cc
+++ b/engine/src/flutter/shell/platform/android/platform_view_android_jni_impl_unittests.cc
@@ -18,6 +18,7 @@ namespace flutter {
 namespace testing {
 
 using ::testing::_;
+using ::testing::ElementsAre;
 using ::testing::Return;
 using ::testing::ReturnArg;
 
@@ -173,5 +174,39 @@ TEST_F(PlatformViewAndroidJNIImplTest, SetViewportMetricsEmptyArrays) {
                        0, 0, 0, 0, 0, 0, 0, 0);
 }
 
+// The load order is exercised with an injected loader rather than real
+// dlopen(): the property under test is purely the ordering (first-to-last,
+// stop at the first that loads), and a fake loader makes that deterministic
+// and free of any platform- or system-library-specific behavior. Whether a
+// given path format is actually loadable is covered end-to-end by
+// dev/integration_tests/deferred_components_test.
+TEST(FindFirstLoadableLibraryTest, TriesInOrderAndStopsAtFirstSuccess) {
+  std::vector<std::string> attempted;
+  void* const handle = reinterpret_cast<void*>(0x1234);
+  auto opener = [&](const std::string& path) -> void* {
+    attempted.push_back(path);
+    return path == "b" ? handle : nullptr;
+  };
+  EXPECT_EQ(FindFirstLoadableLibrary({"a", "b", "c"}, opener), handle);
+  // "c" is never attempted because "b" already loaded.
+  EXPECT_THAT(attempted, ElementsAre("a", "b"));
+}
+
+TEST(FindFirstLoadableLibraryTest, TriesAllAndReturnsNullWhenNoneLoad) {
+  std::vector<std::string> attempted;
+  auto opener = [&](const std::string& path) -> void* {
+    attempted.push_back(path);
+    return nullptr;
+  };
+  EXPECT_EQ(FindFirstLoadableLibrary({"a", "b"}, opener), nullptr);
+  EXPECT_THAT(attempted, ElementsAre("a", "b"));
+}
+
+TEST(FindFirstLoadableLibraryTest, EmptyReturnsNull) {
+  EXPECT_EQ(FindFirstLoadableLibrary(
+                {}, [](const std::string&) -> void* { return nullptr; }),
+            nullptr);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
index bc983db113f7b..538944ff37314 100644
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
@@ -242,6 +242,39 @@ public void searchPathsAddsApks() throws NameNotFoundException {
     assertEquals(123, jni.loadingUnitId);
   }
 
+  @Test
+  public void searchPathsPrioritizeSignedApksOverInternalStorageSo() throws NameNotFoundException {
+    TestFlutterJNI jni = new TestFlutterJNI();
+    Context spyContext = createSpyContext(null);
+    doReturn(null).when(spyContext).getAssets();
+
+    // A standalone, unbundled .so file sitting directly in the app-writable internal storage dir
+    // (getFilesDir()).
+    String soTestPath = "test/path/libapp.so-123.part.so";
+    doReturn(new File(soTestPath)).when(spyContext).getFilesDir();
+
+    // A signed split APK installed by the OS, referenced via splitSourceDirs.
+    String apkTestPath = "test/path/TestModuleName_armeabi_v7a.apk";
+    spyContext.getApplicationInfo().splitSourceDirs = new String[] {apkTestPath};
+
+    TestPlayStoreDeferredComponentManager playStoreManager =
+        new TestPlayStoreDeferredComponentManager(spyContext, jni);
+    jni.setDeferredComponentManager(playStoreManager);
+
+    playStoreManager.installDeferredComponent(123, "TestModuleName");
+    assertEquals(1, jni.loadDartDeferredLibraryCalled);
+    assertEquals(0, jni.deferredComponentInstallFailureCalled);
+
+    // Search paths are ordered most-preferred first (the native loader tries them in order and
+    // stops at the first that loads). The OS-installed signed APK must be ordered before the
+    // app-writable getFilesDir() .so, so it is attempted first.
+    assertEquals(3, jni.searchPaths.length);
+    assertEquals("libapp.so-123.part.so", jni.searchPaths[0]);
+    assertTrue(jni.searchPaths[1].endsWith(apkTestPath + "!lib/armeabi-v7a/libapp.so-123.part.so"));
+    assertTrue(jni.searchPaths[2].endsWith(soTestPath));
+    assertEquals(123, jni.loadingUnitId);
+  }
+
   @Test
   public void searchPathsSearchesSplitConfig() throws NameNotFoundException {
     TestFlutterJNI jni = new TestFlutterJNI();
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
index 19bdec0a67139..f824f0b12b22f 100644
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
@@ -7,6 +7,8 @@
 import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -114,4 +116,32 @@ private JSONObject createConfigurationJsonWithAutofillHint(String hint) throws J
 
     return arguments;
   }
+
+  @Test
+  public void inputTypeFromJsonParsesPassword() throws JSONException, NoSuchFieldException {
+    final JSONObject json = new JSONObject();
+    json.put("name", "TextInputType.number");
+    json.put("password", true);
+
+    final TextInputChannel.InputType inputType = TextInputChannel.InputType.fromJson(json);
+
+    assertEquals(TextInputChannel.TextInputType.NUMBER, inputType.type);
+    assertTrue(inputType.isPassword);
+    assertFalse(inputType.isSigned);
+    assertFalse(inputType.isDecimal);
+  }
+
+  @Test
+  public void inputTypeFromJsonDefaultsPasswordToFalseWhenMissing()
+      throws JSONException, NoSuchFieldException {
+    // Backward-compatibility guard: an older framework payload without the "password" key must
+    // deserialize to isPassword == false so plain numeric fields keep their existing IME behavior.
+    final JSONObject json = new JSONObject();
+    json.put("name", "TextInputType.number");
+
+    final TextInputChannel.InputType inputType = TextInputChannel.InputType.fromJson(json);
+
+    assertEquals(TextInputChannel.TextInputType.NUMBER, inputType.type);
+    assertFalse(inputType.isPassword);
+  }
 }
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
index 57339634d0b23..936088c97402d 100644
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
@@ -3040,6 +3040,152 @@ public void inputConnection_hintLocalesIsSetInEditorInfo() {
     assertEquals(editorInfo.hintLocales, new LocaleList(hintLocales));
   }
 
+  /**
+   * Helper that constructs a minimal {@link TextInputChannel.Configuration} with the given number
+   * variation flags and captures the resulting {@link EditorInfo} from {@link
+   * TextInputPlugin#createInputConnection}.
+   */
+  private EditorInfo editorInfoForNumberConfig(
+      boolean isSigned,
+      boolean isDecimal,
+      boolean isPassword,
+      boolean obscureText,
+      boolean enableIMEPersonalizedLearning,
+      TextInputChannel.Configuration.Autofill autofill) {
+    View testView = new View(ctx);
+    DartExecutor dartExecutor = mock(DartExecutor.class);
+    TextInputChannel textInputChannel = new TextInputChannel(dartExecutor);
+    ScribeChannel scribeChannel = new ScribeChannel(mock(DartExecutor.class));
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(
+            testView,
+            textInputChannel,
+            scribeChannel,
+            mock(PlatformViewsController.class),
+            mock(PlatformViewsController2.class));
+    textInputPlugin.setTextInputClient(
+        0,
+        new TextInputChannel.Configuration(
+            obscureText,
+            false,
+            true,
+            enableIMEPersonalizedLearning,
+            false,
+            TextInputChannel.TextCapitalization.NONE,
+            new TextInputChannel.InputType(
+                TextInputChannel.TextInputType.NUMBER, isSigned, isDecimal, isPassword),
+            null,
+            null,
+            autofill,
+            null,
+            null,
+            null));
+
+    EditorInfo editorInfo = new EditorInfo();
+    textInputPlugin.createInputConnection(testView, mock(KeyboardManager.class), editorInfo);
+    return editorInfo;
+  }
+
+  @Test
+  public void inputType_number() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(false, false, false, false, true, null);
+    assertEquals(InputType.TYPE_CLASS_NUMBER, editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberWithPassword() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(false, false, true, false, true, null);
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD,
+        editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberWithSigned() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(true, false, false, false, true, null);
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED, editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberWithDecimal() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(false, true, false, false, true, null);
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL, editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberWithSignedAndPassword() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(true, false, true, false, true, null);
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER
+            | InputType.TYPE_NUMBER_FLAG_SIGNED
+            | InputType.TYPE_NUMBER_VARIATION_PASSWORD,
+        editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberWithDecimalAndPassword() {
+    EditorInfo editorInfo = editorInfoForNumberConfig(false, true, true, false, true, null);
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER
+            | InputType.TYPE_NUMBER_FLAG_DECIMAL
+            | InputType.TYPE_NUMBER_VARIATION_PASSWORD,
+        editorInfo.inputType);
+  }
+
+  @Test
+  public void inputType_numberObscureTextDoesNotSetPasswordVariation() {
+    // obscureText is orthogonal to the numeric password variation; it must not implicitly set
+    // TYPE_NUMBER_VARIATION_PASSWORD on a NUMBER field. This test is load-bearing because the
+    // obscureText branch lives in the same inputTypeFromTextInputType() function as the NUMBER
+    // branch — the two are the most plausible place for accidental coupling.
+    EditorInfo editorInfo = editorInfoForNumberConfig(false, false, false, true, true, null);
+    assertEquals(InputType.TYPE_CLASS_NUMBER, editorInfo.inputType);
+    assertEquals(0, editorInfo.inputType & InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+  }
+
+  @Test
+  public void inputType_numberWithPasswordJsonRoundTrip()
+      throws JSONException, NoSuchFieldException {
+    // End-to-end coverage from JSON through Configuration.fromJson -> InputType.fromJson ->
+    // setTextInputClient -> createInputConnection. Catches typos in the "password" JSON key,
+    // gaps in Configuration.fromJson's recursive inputType handling, and any break in the
+    // JSON -> field -> plugin chain that the matrix tests bypass by calling new InputType(...)
+    // directly.
+    final JSONObject inputType = new JSONObject();
+    inputType.put("name", "TextInputType.number");
+    inputType.put("password", true);
+
+    final JSONObject arguments = new JSONObject();
+    arguments.put("inputAction", "TextInputAction.done");
+    arguments.put("textCapitalization", "TextCapitalization.none");
+    arguments.put("inputType", inputType);
+
+    final TextInputChannel.Configuration configuration =
+        TextInputChannel.Configuration.fromJson(arguments);
+
+    View testView = new View(ctx);
+    DartExecutor dartExecutor = mock(DartExecutor.class);
+    TextInputChannel textInputChannel = new TextInputChannel(dartExecutor);
+    ScribeChannel scribeChannel = new ScribeChannel(mock(DartExecutor.class));
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(
+            testView,
+            textInputChannel,
+            scribeChannel,
+            mock(PlatformViewsController.class),
+            mock(PlatformViewsController2.class));
+    textInputPlugin.setTextInputClient(0, configuration);
+
+    EditorInfo editorInfo = new EditorInfo();
+    textInputPlugin.createInputConnection(testView, mock(KeyboardManager.class), editorInfo);
+
+    assertEquals(
+        InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD,
+        editorInfo.inputType);
+  }
+
   interface EventHandler {
     void sendAppPrivateCommand(View view, String action, Bundle data);
   }
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java
index 3976f9710891c..a15248c845dfc 100644
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -34,6 +35,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(AndroidJUnit4.class)
 @TargetApi(API_LEVELS.API_24)
@@ -48,18 +50,19 @@ private static void sendToBinaryMessageHandler(
         (ByteBuffer) encodedMethodCall.flip(), mock(BinaryMessenger.BinaryReply.class));
   }
 
-  @SuppressWarnings("deprecation")
-  // setMessageHandler is deprecated.
   @Test
   public void respondsToProcessTextChannelMessage() {
     ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
         ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class);
-    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    DartExecutor mockDartExecutor = mock(DartExecutor.class);
+    BinaryMessenger mockBinaryMessenger = mock(BinaryMessenger.class);
+    when(mockDartExecutor.getBinaryMessenger()).thenReturn(mockBinaryMessenger);
+    doReturn(null).when(mockBinaryMessenger).makeBackgroundTaskQueue();
     ProcessTextChannel.ProcessTextMethodHandler mockHandler =
         mock(ProcessTextChannel.ProcessTextMethodHandler.class);
     PackageManager mockPackageManager = mock(PackageManager.class);
     ProcessTextChannel processTextChannel =
-        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+        new ProcessTextChannel(mockDartExecutor, mockPackageManager);
 
     processTextChannel.setMethodHandler(mockHandler);
 
@@ -74,14 +77,15 @@ public void respondsToProcessTextChannelMessage() {
     verify(mockHandler).queryTextActions();
   }
 
-  @SuppressWarnings("deprecation")
-  // setMessageHandler is deprecated.
   @Test
   public void performQueryTextActions() {
-    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    DartExecutor mockDartExecutor = mock(DartExecutor.class);
+    BinaryMessenger mockBinaryMessenger = mock(BinaryMessenger.class);
+    when(mockDartExecutor.getBinaryMessenger()).thenReturn(mockBinaryMessenger);
+    doReturn(null).when(mockBinaryMessenger).makeBackgroundTaskQueue();
     PackageManager mockPackageManager = mock(PackageManager.class);
     ProcessTextChannel processTextChannel =
-        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+        new ProcessTextChannel(mockDartExecutor, mockPackageManager);
 
     // Set up mocked result for PackageManager.queryIntentActivities.
     ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
@@ -100,14 +104,15 @@ public void performQueryTextActions() {
     assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
   }
 
-  @SuppressWarnings("deprecation")
-  // setMessageHandler is deprecated.
   @Test
   public void performProcessTextActionWithNoReturnedValue() {
-    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    DartExecutor mockDartExecutor = mock(DartExecutor.class);
+    BinaryMessenger mockBinaryMessenger = mock(BinaryMessenger.class);
+    when(mockDartExecutor.getBinaryMessenger()).thenReturn(mockBinaryMessenger);
+    doReturn(null).when(mockBinaryMessenger).makeBackgroundTaskQueue();
     PackageManager mockPackageManager = mock(PackageManager.class);
     ProcessTextChannel processTextChannel =
-        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+        new ProcessTextChannel(mockDartExecutor, mockPackageManager);
 
     // Set up mocked result for PackageManager.queryIntentActivities.
     ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
@@ -130,10 +135,11 @@ public void performProcessTextActionWithNoReturnedValue() {
     when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
     processTextPlugin.onAttachedToActivity(mockActivityPluginBinding);
 
-    // Execute th first action.
+    // Execute the first action.
     String textToBeProcessed = "Flutter!";
     MethodChannel.Result result = mock(MethodChannel.Result.class);
     processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+    ShadowLooper.runUiThreadTasks();
 
     // Activity.startActivityForResult should have been called.
     ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -149,14 +155,15 @@ public void performProcessTextActionWithNoReturnedValue() {
     verify(result).success(null);
   }
 
-  @SuppressWarnings("deprecation")
-  // setMessageHandler is deprecated.
   @Test
   public void performProcessTextActionWithReturnedValue() {
-    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    DartExecutor mockDartExecutor = mock(DartExecutor.class);
+    BinaryMessenger mockBinaryMessenger = mock(BinaryMessenger.class);
+    when(mockDartExecutor.getBinaryMessenger()).thenReturn(mockBinaryMessenger);
+    doReturn(null).when(mockBinaryMessenger).makeBackgroundTaskQueue();
     PackageManager mockPackageManager = mock(PackageManager.class);
     ProcessTextChannel processTextChannel =
-        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+        new ProcessTextChannel(mockDartExecutor, mockPackageManager);
 
     // Set up mocked result for PackageManager.queryIntentActivities.
     ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
@@ -183,6 +190,7 @@ public void performProcessTextActionWithReturnedValue() {
     String textToBeProcessed = "Flutter!";
     MethodChannel.Result result = mock(MethodChannel.Result.class);
     processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+    ShadowLooper.runUiThreadTasks();
 
     // Activity.startActivityForResult should have been called.
     ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -200,14 +208,15 @@ public void performProcessTextActionWithReturnedValue() {
     verify(result).success(processedText);
   }
 
-  @SuppressWarnings("deprecation")
-  // setMessageHandler is deprecated.
   @Test
   public void doNotCrashOnNonRelatedActivityResult() {
-    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    DartExecutor mockDartExecutor = mock(DartExecutor.class);
+    BinaryMessenger mockBinaryMessenger = mock(BinaryMessenger.class);
+    when(mockDartExecutor.getBinaryMessenger()).thenReturn(mockBinaryMessenger);
+    doReturn(null).when(mockBinaryMessenger).makeBackgroundTaskQueue();
     PackageManager mockPackageManager = mock(PackageManager.class);
     ProcessTextChannel processTextChannel =
-        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+        new ProcessTextChannel(mockDartExecutor, mockPackageManager);
 
     // Set up mocked result for PackageManager.queryIntentActivities.
     ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
@@ -234,6 +243,7 @@ public void doNotCrashOnNonRelatedActivityResult() {
     String textToBeProcessed = "Flutter!";
     MethodChannel.Result result = mock(MethodChannel.Result.class);
     processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+    ShadowLooper.runUiThreadTasks();
 
     // Activity.startActivityForResult should have been called.
     ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
diff --git a/engine/src/flutter/shell/platform/common/accessibility_bridge.cc b/engine/src/flutter/shell/platform/common/accessibility_bridge.cc
index d2524d35c1d34..e4cda5b14add1 100644
--- a/engine/src/flutter/shell/platform/common/accessibility_bridge.cc
+++ b/engine/src/flutter/shell/platform/common/accessibility_bridge.cc
@@ -318,7 +318,7 @@ void AccessibilityBridge::SetRoleFromFlutterUpdate(ui::AXNodeData& node_data,
     node_data.role = ax::mojom::Role::kButton;
     return;
   }
-  if (flags->is_text_field && !flags->is_read_only) {
+  if (flags->is_text_field) {
     node_data.role = ax::mojom::Role::kTextField;
     return;
   }
@@ -373,6 +373,11 @@ void AccessibilityBridge::SetStateFromFlutterUpdate(ui::AXNodeData& node_data,
   if (flags->is_text_field && !flags->is_read_only) {
     node_data.AddState(ax::mojom::State::kEditable);
   }
+  if (flags->is_enabled == FlutterTristate::kFlutterTristateFalse) {
+    node_data.SetRestriction(ax::mojom::Restriction::kDisabled);
+  } else if (flags->is_read_only) {
+    node_data.SetRestriction(ax::mojom::Restriction::kReadOnly);
+  }
   if (node_data.role == ax::mojom::Role::kStaticText &&
       (actions & kHasScrollingAction) == 0 && node.value.empty() &&
       node.label.empty() && node.hint.empty()) {
diff --git a/engine/src/flutter/shell/platform/common/accessibility_bridge_unittests.cc b/engine/src/flutter/shell/platform/common/accessibility_bridge_unittests.cc
index 4a1e1143a47e5..b47ddd3623d6e 100644
--- a/engine/src/flutter/shell/platform/common/accessibility_bridge_unittests.cc
+++ b/engine/src/flutter/shell/platform/common/accessibility_bridge_unittests.cc
@@ -302,6 +302,95 @@ TEST(AccessibilityBridgeTest, SliderHasSliderRole) {
   EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSlider);
 }
 
+TEST(AccessibilityBridgeTest, DisabledButtonHasDisabledRestriction) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  auto flags = FlutterSemanticsFlags{
+      .is_enabled = FlutterTristate::kFlutterTristateFalse,
+      .is_button = true,
+  };
+  root.flags2 = &flags;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kButton);
+  EXPECT_EQ(root_node->GetData().GetRestriction(),
+            ax::mojom::Restriction::kDisabled);
+}
+
+TEST(AccessibilityBridgeTest, EnabledButtonHasNoRestriction) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  auto flags = FlutterSemanticsFlags{
+      .is_enabled = FlutterTristate::kFlutterTristateTrue,
+      .is_button = true,
+  };
+  root.flags2 = &flags;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kButton);
+  EXPECT_EQ(root_node->GetData().GetRestriction(),
+            ax::mojom::Restriction::kNone);
+}
+
+TEST(AccessibilityBridgeTest, ReadOnlyTextFieldHasReadOnlyRestriction) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  auto flags = FlutterSemanticsFlags{
+      .is_enabled = FlutterTristate::kFlutterTristateTrue,
+      .is_text_field = true,
+      .is_read_only = true,
+  };
+  root.flags2 = &flags;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  EXPECT_EQ(root_node->GetData().GetRestriction(),
+            ax::mojom::Restriction::kReadOnly);
+}
+
+TEST(AccessibilityBridgeTest, ReadOnlyTextFieldHasTextFieldRole) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  auto flags = FlutterSemanticsFlags{
+      .is_enabled = FlutterTristate::kFlutterTristateTrue,
+      .is_text_field = true,
+      .is_read_only = true,
+  };
+  root.flags2 = &flags;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kTextField);
+}
+
+TEST(AccessibilityBridgeTest, EditableTextFieldHasTextFieldRole) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  auto flags = FlutterSemanticsFlags{
+      .is_enabled = FlutterTristate::kFlutterTristateTrue,
+      .is_text_field = true,
+      .is_read_only = false,
+  };
+  root.flags2 = &flags;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kTextField);
+  EXPECT_TRUE(root_node->GetData().HasState(ax::mojom::State::kEditable));
+}
+
 // Ensure that checkboxes have their checked status set apropriately
 // Previously, only Radios could have this flag updated
 // Resulted in the issue seen at
diff --git a/engine/src/flutter/shell/platform/darwin/common/BUILD.gn b/engine/src/flutter/shell/platform/darwin/common/BUILD.gn
index fb3805429953b..24e9e35a36448 100644
--- a/engine/src/flutter/shell/platform/darwin/common/BUILD.gn
+++ b/engine/src/flutter/shell/platform/darwin/common/BUILD.gn
@@ -17,9 +17,11 @@ config("config") {
     lib_dirs = mac_swift_lib_paths
   }
 
+  swiftflags = []
+
   # Allow use of @testable imports in debug builds and when tests are enabled.
   if ((is_ios && enable_ios_unittests) || (is_mac && enable_unittests)) {
-    swiftflags = [ "-enable-testing" ]
+    swiftflags += [ "-enable-testing" ]
   }
 }
 
@@ -217,6 +219,10 @@ source_set("test_utils_swift") {
     ":config",
     ":test_config",
   ]
+
+  # Specifying a bridging header forces the swift compiler to add even internal
+  # members of this library in test_utils_swift.h
+  bridge_header = "InternalFlutterSwiftCommon-Bridging-Header.h"
   sources = [ "framework/Source/LoggerTestUtils.swift" ]
   deps = [ ":framework_common" ]
 }
diff --git a/engine/src/flutter/shell/platform/darwin/common/SwiftTestingRunner.swift b/engine/src/flutter/shell/platform/darwin/common/SwiftTestingRunner.swift
index 6c9db43337026..07a8ddb54e9c5 100644
--- a/engine/src/flutter/shell/platform/darwin/common/SwiftTestingRunner.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/SwiftTestingRunner.swift
@@ -61,13 +61,13 @@ private func resolveSwiftTestingEntrypoint() -> SwiftTestingEntryPointFunc {
 }
 
 /// A test runner for Swift Testing tests.
-public struct SwiftTestingRunner {
-  public init() {}
+struct SwiftTestingRunner {
+  init() {}
 
   /// Runs all Swift Testing tests (annotated with `@Test`) in the current executable.
   ///
   /// Returns 0 on pass, non-zero on failure.
-  public func run() async -> CInt {
+  func run() async -> CInt {
     let testRunnerEntryPoint = resolveSwiftTestingEntrypoint()
     do {
       let result = try await testRunnerEntryPoint(nil) { _ in
diff --git a/engine/src/flutter/shell/platform/darwin/common/framework/Source/Logger.swift b/engine/src/flutter/shell/platform/darwin/common/framework/Source/Logger.swift
index 089b2068a3bcf..a4db8d8fab978 100644
--- a/engine/src/flutter/shell/platform/darwin/common/framework/Source/Logger.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/framework/Source/Logger.swift
@@ -9,7 +9,7 @@ import Foundation
 ///
 /// These levels are used by `Logger` to determine if a message should be output.
 /// They are ordered by increasing severity.
-@objc(FlutterLogLevel) public enum LogLevel: Int {
+@objc(FlutterLogLevel) enum LogLevel: Int, Sendable {
   /// Informational messages that are helpful for tracing application flow.
   case info
 
@@ -38,17 +38,41 @@ import Foundation
 /// Logger.logLevel = .warning  // Only show warnings and above
 /// Logger.logError("Failed to load asset: \(assetKey)")
 /// ```
-@objc(FlutterLogger) public final class Logger: NSObject {
-  private static var shared = Logger()
-  private let outputWriter: OutputWriter
-  public let logLevel: LogLevel
+@objc(FlutterLogger) final class Logger: NSObject, @unchecked Sendable {
+  private static let shared = Logger()
+  private let lock = NSLock()
+  private var _outputWriter: OutputWriter
+  private var _logLevel: LogLevel
+
+  var outputWriter: OutputWriter {
+    get {
+      return lock.withLock { _outputWriter }
+    }
+    set {
+      lock.withLock {
+        _outputWriter = newValue
+      }
+    }
+  }
+
+  var logLevel: LogLevel {
+    get {
+      return lock.withLock { _logLevel }
+    }
+    set {
+      lock.withLock {
+        _logLevel = newValue
+      }
+    }
+  }
 
-  public init(outputWriter: OutputWriter, logLevel: LogLevel) {
-    self.outputWriter = outputWriter
-    self.logLevel = logLevel
+  init(outputWriter: OutputWriter, logLevel: LogLevel) {
+    self._outputWriter = outputWriter
+    self._logLevel = logLevel
+    super.init()
   }
 
-  public override convenience init() {
+  override convenience init() {
     #if os(iOS)
       // On iOS, the user has no access to stdout.
       // Output can be read from the log by the user or the `flutter` tool.
@@ -59,64 +83,106 @@ import Foundation
     #endif
   }
 
-  public func log(level: LogLevel, _ message: String) {
-    if level.rawValue >= logLevel.rawValue {
-      outputWriter.writeLine(level: level, message)
+  func log(level: LogLevel, _ message: @autoclosure () -> String) {
+    guard level.rawValue >= logLevel.rawValue else { return }
+
+    // Evaluate outside the lock keep lock time minimal and to guard against the possibility of
+    // someone accidentally calling the Logger from within the autoclosure.
+    let line = message()
+    lock.withLock {
+      _outputWriter.writeLine(level: level, line)
+    }
+  }
+
+  func logDirect(_ message: String) {
+    lock.withLock {
+      _outputWriter.writeLine(level: .important, message)
     }
   }
 }
 
 extension Logger {
   /// Sets the minimum log level.
-  @objc public static var outputWriter: OutputWriter {
+  @objc static var outputWriter: OutputWriter {
     get { return shared.outputWriter }
-    set(newValue) { shared = Logger(outputWriter: newValue, logLevel: shared.logLevel) }
+    set(newValue) { shared.outputWriter = newValue }
   }
 
   /// Sets the minimum log level.
-  @objc public static var logLevel: LogLevel {
+  @objc static var logLevel: LogLevel {
     get { return shared.logLevel }
-    set(newValue) { shared = Logger(outputWriter: shared.outputWriter, logLevel: newValue) }
+    set(newValue) { shared.logLevel = newValue }
   }
 
   /// Logs a message at `LogLevel.info`.
-  @objc public static func logInfo(_ message: String) {
+  @available(swift, obsoleted: 1.0)
+  @objc(logInfo:) static func objcLogInfo(_ message: String) {
     shared.log(level: .info, message)
   }
 
+  /// Logs a message at `LogLevel.info`.
+  static func logInfo(_ message: @autoclosure () -> String) {
+    shared.log(level: .info, message())
+  }
+
   /// Logs a message at `LogLevel.important`.
-  @objc public static func logImportant(_ message: String) {
+  @available(swift, obsoleted: 1.0)
+  @objc(logImportant:) static func objcLogImportant(_ message: String) {
     shared.log(level: .important, message)
   }
 
+  /// Logs a message at `LogLevel.important`.
+  static func logImportant(_ message: @autoclosure () -> String) {
+    shared.log(level: .important, message())
+  }
+
   /// Logs a message at `LogLevel.warning`.
-  @objc public static func logWarning(_ message: String) {
+  @available(swift, obsoleted: 1.0)
+  @objc(logWarning:) static func objcLogWarning(_ message: String) {
     shared.log(level: .warning, message)
   }
 
+  /// Logs a message at `LogLevel.warning`.
+  static func logWarning(_ message: @autoclosure () -> String) {
+    shared.log(level: .warning, message())
+  }
+
   /// Logs a message at `LogLevel.error`.
-  @objc public static func logError(_ message: String) {
+  @available(swift, obsoleted: 1.0)
+  @objc(logError:) static func objcLogError(_ message: String) {
     shared.log(level: .error, message)
   }
 
+  /// Logs a message at `LogLevel.error`.
+  static func logError(_ message: @autoclosure () -> String) {
+    shared.log(level: .error, message())
+  }
+
   /// Logs a message at `LogLevel.fatal` and immediately terminates the application.
-  @objc public static func logFatal(_ message: String) {
+  @available(swift, obsoleted: 1.0)
+  @objc(logFatal:) static func objcLogFatal(_ message: String) {
     shared.log(level: .fatal, message)
     abort()
   }
 
+  /// Logs a message at `LogLevel.fatal` and immediately terminates the application.
+  static func logFatal(_ message: @autoclosure () -> String) {
+    shared.log(level: .fatal, message())
+    abort()
+  }
+
   /// Logs a message unconditionally.
-  @objc public static func logDirect(_ message: String) {
-    shared.outputWriter.writeLine(level: .important, message)
+  @objc static func logDirect(_ message: String) {
+    shared.logDirect(message)
   }
 }
 
 @objc(FlutterOutputWriter)
-public protocol OutputWriter {
+protocol OutputWriter: Sendable {
   func writeLine(level: LogLevel, _ message: String)
 }
 
-final class SyslogOutputWriter: OutputWriter {
+final class SyslogOutputWriter: OutputWriter, Sendable {
   func writeLine(level: LogLevel, _ message: String) {
     // TODO(cbracken): replace this with os_log-based approach.
     // https://github.com/flutter/flutter/issues/44030
@@ -124,7 +190,7 @@ final class SyslogOutputWriter: OutputWriter {
   }
 }
 
-final class StdoutOutputWriter: OutputWriter {
+final class StdoutOutputWriter: OutputWriter, Sendable {
   func writeLine(level: LogLevel, _ message: String) {
     fputs(message, stdout)
     fputs("\n", stdout)
diff --git a/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTestUtils.swift b/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTestUtils.swift
index 43121bb348268..6e3111c4d6df7 100644
--- a/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTestUtils.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTestUtils.swift
@@ -3,18 +3,18 @@
 // found in the LICENSE file.
 
 import Foundation
-import InternalFlutterSwiftCommon
+@testable import InternalFlutterSwiftCommon
 
 /// An `OutputWriter` that stores the most recently logged output in a string.
 @objc(FlutterStringOutputWriter)
-public final class StringOutputWriter: NSObject, OutputWriter {
-  @objc public var didLog = false
-  public var lastLevel: LogLevel!
-  @objc public var lastLine: String!
-  @objc public var expectedOutput: String?
-  @objc public var gotExpectedOutput = false
+final class StringOutputWriter: NSObject, OutputWriter, @unchecked Sendable {
+  @objc var didLog = false
+  var lastLevel: LogLevel!
+  @objc var lastLine: String!
+  @objc var expectedOutput: String?
+  @objc var gotExpectedOutput = false
 
-  public func writeLine(level: LogLevel, _ message: String) {
+  func writeLine(level: LogLevel, _ message: String) {
     didLog = true
     lastLevel = level
     lastLine = message
@@ -23,7 +23,7 @@ public final class StringOutputWriter: NSObject, OutputWriter {
     }
   }
 
-  @objc public func reset() {
+  @objc func reset() {
     didLog = false
     lastLevel = nil
     lastLine = nil
diff --git a/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTests.swift b/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTests.swift
index 9872233df543d..9cfa2e317fe79 100644
--- a/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/framework/Source/LoggerTests.swift
@@ -3,10 +3,9 @@
 // found in the LICENSE file.
 
 import Foundation
+@testable import InternalFlutterSwiftCommon
 import Testing
-
-import InternalFlutterSwiftCommon
-import test_utils_swift
+@testable import test_utils_swift
 
 @Suite struct LoggerTests {
 
@@ -55,4 +54,85 @@ import test_utils_swift
     #expect(writer.lastLine == "Hello world")
   }
 
+  @Test func testAutoclosureDoesNotEvaluateMessageBelowLogLevel() {
+    let writer = StringOutputWriter()
+    let logger = Logger(outputWriter: writer, logLevel: .warning)
+    var wasEvaluated = false
+
+    logger.log(
+      level: .info,
+      {
+        wasEvaluated = true
+        return "Hello world"
+      }())
+    #expect(!writer.didLog)
+    #expect(!wasEvaluated)
+  }
+
+  @Test func testAutoclosureEvaluatesMessageAtOrAboveLogLevel() {
+    let writer = StringOutputWriter()
+    let logger = Logger(outputWriter: writer, logLevel: .info)
+    var wasEvaluated = false
+
+    logger.log(
+      level: .info,
+      {
+        wasEvaluated = true
+        return "Hello world"
+      }())
+    #expect(writer.didLog)
+    #expect(wasEvaluated)
+  }
+
+  @Test func testStaticLogInfoDoesNotEvaluateMessageBelowLogLevel() {
+    let writer = StringOutputWriter()
+    let oldWriter = Logger.outputWriter
+    let oldLevel = Logger.logLevel
+    defer {
+      Logger.outputWriter = oldWriter
+      Logger.logLevel = oldLevel
+    }
+    Logger.outputWriter = writer
+    Logger.logLevel = .warning
+    var wasEvaluated = false
+
+    Logger.logInfo(
+      {
+        wasEvaluated = true
+        return "Hello world"
+      }())
+    #expect(!writer.didLog)
+    #expect(!wasEvaluated)
+  }
+
+  // Hammers the shared `Logger` from concurrent tasks so that unsynchronised access to mutable
+  // state is caught under TSan.
+  @Test func testConcurrentLoggingAndLevelMutation() async {
+    let writer = StringOutputWriter()
+    let oldWriter = Logger.outputWriter
+    let oldLevel = Logger.logLevel
+    defer {
+      Logger.outputWriter = oldWriter
+      Logger.logLevel = oldLevel
+    }
+    Logger.outputWriter = writer
+    Logger.logLevel = .info
+
+    await withTaskGroup(of: Void.self) { group in
+      for i in 0..<100 {
+        group.addTask {
+          if i % 2 == 0 {
+            Logger.logLevel = .warning
+          } else {
+            Logger.logLevel = .info
+          }
+          Logger.logInfo("Message \(i)")
+        }
+      }
+    }
+
+    // After concurrent mutations and logging, Logger should remain in a valid state without data
+    // races or crashes.
+    #expect(Logger.logLevel == .info || Logger.logLevel == .warning)
+  }
 }
diff --git a/engine/src/flutter/shell/platform/darwin/common/framework/Source/Tracing+TraceScope.swift b/engine/src/flutter/shell/platform/darwin/common/framework/Source/Tracing+TraceScope.swift
index 37d545c042b70..de4e7ac5f94d7 100644
--- a/engine/src/flutter/shell/platform/darwin/common/framework/Source/Tracing+TraceScope.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/framework/Source/Tracing+TraceScope.swift
@@ -13,11 +13,11 @@ import Foundation
 /// will fire in debug builds, and the scope will be ended automatically to
 /// prevent timeline corruption.
 @objc(FlutterTraceScope)
-public final class TraceScope: NSObject {
+final class TraceScope: NSObject {
   private let name: String
   private var isEnded = false
 
-  internal init(name: String) {
+  init(name: String) {
     self.name = name
     Tracing.beginSection(name)
   }
@@ -25,7 +25,7 @@ public final class TraceScope: NSObject {
   /// Ends the tracing scope.
   ///
   /// This method must be called exactly once. Calling it multiple times has no effect.
-  @objc public func end() {
+  @objc func end() {
     guard !isEnded else { return }
     isEnded = true
     Tracing.endSection(name)
@@ -68,8 +68,7 @@ extension Tracing {
   ///   - name: The name of the tracing scope.
   ///   - work: The block of work to synchronously execute, optionally returning a value.
   /// - Returns: The value returned by the `work` block.
-  @inlinable
-  public static func withTrace<T>(_ name: String, _ work: () throws -> T) rethrows -> T {
+  static func withTrace<T>(_ name: String, _ work: () throws -> T) rethrows -> T {
     let scope = beginScope(name)
     defer { scope.end() }
     return try work()
@@ -86,7 +85,7 @@ extension Tracing {
   ///
   /// - Parameter name: The name of the tracing scope.
   /// - Returns: A `TraceScope` token that must be ended.
-  public static func beginScope(_ name: String) -> TraceScope {
+  static func beginScope(_ name: String) -> TraceScope {
     return TraceScope(name: name)
   }
 }
diff --git a/engine/src/flutter/shell/platform/darwin/common/framework/Source/TracingTests.swift b/engine/src/flutter/shell/platform/darwin/common/framework/Source/TracingTests.swift
index 7efb53c35bafb..760aab8deaeb4 100644
--- a/engine/src/flutter/shell/platform/darwin/common/framework/Source/TracingTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/common/framework/Source/TracingTests.swift
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import Foundation
-import InternalFlutterSwiftCommon
+@testable import InternalFlutterSwiftCommon
 import Testing
 
 @Suite struct TracingTests {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn
index 52f3054d9d8af..90a1f9ac5936c 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn
+++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn
@@ -169,8 +169,6 @@ source_set("flutter_framework_source") {
     "ios_context.mm",
     "ios_context_metal_impeller.h",
     "ios_context_metal_impeller.mm",
-    "ios_context_noop.h",
-    "ios_context_noop.mm",
     "ios_external_texture_metal.h",
     "ios_external_texture_metal.mm",
     "ios_external_view_embedder.h",
@@ -179,8 +177,6 @@ source_set("flutter_framework_source") {
     "ios_surface.mm",
     "ios_surface_metal_impeller.h",
     "ios_surface_metal_impeller.mm",
-    "ios_surface_noop.h",
-    "ios_surface_noop.mm",
     "platform_message_handler_ios.h",
     "platform_message_handler_ios.mm",
     "platform_view_ios.h",
@@ -328,8 +324,6 @@ if (enable_ios_unittests) {
       "framework/Source/VsyncWaiterIOSTest.mm",
       "framework/Source/accessibility_bridge_test.mm",
       "framework/Source/availability_version_check_test.mm",
-      "ios_context_noop_unittests.mm",
-      "ios_surface_noop_unittests.mm",
       "platform_message_handler_ios_test.mm",
       "platform_view_ios_test.mm",
     ]
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/AccessibilityFeatures.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/AccessibilityFeatures.swift
index 46b3b70babbf7..de21e82711472 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/AccessibilityFeatures.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/AccessibilityFeatures.swift
@@ -28,9 +28,9 @@ struct AccessibilityFeatureFlag: OptionSet {
 
 /// A wrapper for native iOS accessibility settings.
 @objc(FlutterAccessibilityFeatures)
-public class AccessibilityFeatures: NSObject {
+class AccessibilityFeatures: NSObject {
     /// Returns the current accessibility flags as a bitmask.
-    @objc public var flags: Int32 {
+    @objc var flags: Int32 {
         var flags: AccessibilityFeatureFlag = []
         
         if self.isVoiceOverRunning() || self.isSwitchControlRunning() {
@@ -66,7 +66,7 @@ public class AccessibilityFeatures: NSObject {
     
     /// Returns an array of notification names to observe for accessibility
     /// changes.
-    @objc public var observedNotificationNames: [String] {
+    @objc var observedNotificationNames: [String] {
         var names: [String] = [
             AccessibilityFeatures.voiceOverStatusDidChangeNotification,
             AccessibilityFeatures.switchControlStatusDidChangeNotification,
@@ -90,95 +90,95 @@ public class AccessibilityFeatures: NSObject {
     }
     
     /// Notification name for changes to `VoiceOver` status.
-    @objc public static var voiceOverStatusDidChangeNotification: String {
+    @objc static var voiceOverStatusDidChangeNotification: String {
         return UIAccessibility.voiceOverStatusDidChangeNotification.rawValue
     }
     
     /// Whether `VoiceOver` is running.
-    @objc public func isVoiceOverRunning() -> Bool {
+    @objc func isVoiceOverRunning() -> Bool {
         return UIAccessibility.isVoiceOverRunning
     }
     
     /// Notification name for changes to `Switch Control` status.
-    @objc public static var switchControlStatusDidChangeNotification: String {
+    @objc static var switchControlStatusDidChangeNotification: String {
         return UIAccessibility.switchControlStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Switch Control` is running.
-    @objc public func isSwitchControlRunning() -> Bool {
+    @objc func isSwitchControlRunning() -> Bool {
         return UIAccessibility.isSwitchControlRunning
     }
     
     /// Notification name for changes to `Speak Screen` setting.
-    @objc public static var speakScreenStatusDidChangeNotification: String {
+    @objc static var speakScreenStatusDidChangeNotification: String {
         return UIAccessibility.speakScreenStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Speak Screen` setting is enabled.
-    @objc public func isSpeakScreenEnabled() -> Bool {
+    @objc func isSpeakScreenEnabled() -> Bool {
         return UIAccessibility.isSpeakScreenEnabled
     }
     
     /// Notification name for changes to `Classic Invert` setting.
-    @objc public static var invertColorsStatusDidChangeNotification: String {
+    @objc static var invertColorsStatusDidChangeNotification: String {
         return UIAccessibility.invertColorsStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Classic Invert` setting is enabled.
-    @objc public func isInvertColorsEnabled() -> Bool {
+    @objc func isInvertColorsEnabled() -> Bool {
         return UIAccessibility.isInvertColorsEnabled
     }
     
     /// Notification name for changes to `Reduce Motion` setting.
-    @objc public static var reduceMotionStatusDidChangeNotification: String {
+    @objc static var reduceMotionStatusDidChangeNotification: String {
         return UIAccessibility.reduceMotionStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Reduce Motion` setting is enabled.
-    @objc public func isReduceMotionEnabled() -> Bool {
+    @objc func isReduceMotionEnabled() -> Bool {
         return UIAccessibility.isReduceMotionEnabled
     }
     
     /// Notification name for changes to `Bold Text` setting.
-    @objc public static var boldTextStatusDidChangeNotification: String {
+    @objc static var boldTextStatusDidChangeNotification: String {
         return UIAccessibility.boldTextStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Bold Text` setting is enabled.
-    @objc public func isBoldTextEnabled() -> Bool {
+    @objc func isBoldTextEnabled() -> Bool {
         return UIAccessibility.isBoldTextEnabled
     }
     
     /// Notification name for changes to `Increase Contrast` setting.
-    @objc public static var darkerSystemColorsStatusDidChangeNotification: String {
+    @objc static var darkerSystemColorsStatusDidChangeNotification: String {
         return UIAccessibility.darkerSystemColorsStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Increase Contrast` setting is enabled.
-    @objc public func isDarkerSystemColorsEnabled() -> Bool {
+    @objc func isDarkerSystemColorsEnabled() -> Bool {
         return UIAccessibility.isDarkerSystemColorsEnabled
     }
     
     /// Notification name for changes to `On/Off Labels` setting.
-    @objc public static var onOffSwitchLabelsDidChangeNotification: String {
+    @objc static var onOffSwitchLabelsDidChangeNotification: String {
         return UIAccessibility.onOffSwitchLabelsDidChangeNotification.rawValue
     }
     
     /// Whether `On/Off Labels` setting is enabled.
-    @objc public func isOnOffSwitchLabelsEnabled() -> Bool {
+    @objc func isOnOffSwitchLabelsEnabled() -> Bool {
         return UIAccessibility.isOnOffSwitchLabelsEnabled
     }
     
     /// Notification name for changes to `Auto-Play Animated Images` setting.
     @available(iOS 18.0, *)
-    @objc public static var animatedImagesAutoPlayStatusDidChangeNotification: String {
+    @objc static var animatedImagesAutoPlayStatusDidChangeNotification: String {
         return AccessibilitySettings.animatedImagesEnabledDidChangeNotification.rawValue
     }
     
     /// Whether `Auto-Play Animated Images` setting is enabled.
     ///
     /// Defaults to `true` on iOS versions earlier than 18.
-    @objc public func isAnimatedImagesAutoPlayEnabled() -> Bool {
+    @objc func isAnimatedImagesAutoPlayEnabled() -> Bool {
         if #available(iOS 18.0, *) {
             return AccessibilitySettings.animatedImagesEnabled
         }
@@ -186,25 +186,25 @@ public class AccessibilityFeatures: NSObject {
     }
     
     /// Notification name for changes to `Auto-Play Video Previews` setting.
-    @objc public static var videosAutoPlayStatusDidChangeNotification: String {
+    @objc static var videosAutoPlayStatusDidChangeNotification: String {
         return UIAccessibility.videoAutoplayStatusDidChangeNotification.rawValue
     }
     
     /// Whether `Auto-Play Video Previews` setting is enabled.
-    @objc public func isVideosAutoPlayEnabled() -> Bool {
+    @objc func isVideosAutoPlayEnabled() -> Bool {
         return UIAccessibility.isVideoAutoplayEnabled
     }
     
     /// Notification name for changes to `Prefer Non-Blinking Cursor` setting.
     @available(iOS 18.0, *)
-    @objc public static var deterministicCursorStatusDidChangeNotification: String {
+    @objc static var deterministicCursorStatusDidChangeNotification: String {
         return AccessibilitySettings.prefersNonBlinkingTextInsertionIndicatorDidChangeNotification.rawValue
     }
     
     /// Whether `Prefer Non-Blinking Cursor` setting is enabled.
     ///
     /// Defaults to `false` on iOS versions earlier than 18.
-    @objc public func isDeterministicCursorEnabled() -> Bool {
+    @objc func isDeterministicCursorEnabled() -> Bool {
         if #available(iOS 18.0, *) {
             return AccessibilitySettings.prefersNonBlinkingTextInsertionIndicator
         }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollection.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollection.swift
index 6950f8024c220..686bd7d8c278f 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollection.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollection.swift
@@ -11,8 +11,8 @@ import Foundation
 /// This class is not thread-safe. All accesses should happen from the
 /// platform thread.
 @objc(FlutterConnectionCollection)
-public class ConnectionCollection: NSObject {
-  public typealias ConnectionID = Int64
+class ConnectionCollection: NSObject {
+  typealias ConnectionID = Int64
 
   // The connection ID of the most recently used connection, or 0 if none.
   private var counter: ConnectionID = 0
@@ -21,7 +21,7 @@ public class ConnectionCollection: NSObject {
   private var connections: [String: ConnectionID] = [:]
 
   /// Acquires a new connection for the specified channel.
-  @objc public func acquireConnection(forChannel channel: String) -> ConnectionID {
+  @objc func acquireConnection(forChannel channel: String) -> ConnectionID {
     counter += 1
     connections[channel] = counter
     return counter
@@ -31,7 +31,7 @@ public class ConnectionCollection: NSObject {
   ///
   /// Returns the name of the associated channel if successful, otherwise the
   /// empty string.
-  @objc public func cleanupConnection(withID connectionID: ConnectionID) -> String {
+  @objc func cleanupConnection(withID connectionID: ConnectionID) -> String {
     guard
       connectionID > 0,
       let entry = connections.first(where: { $0.value == connectionID })
@@ -42,7 +42,7 @@ public class ConnectionCollection: NSObject {
   }
 
   /// Creates an error connection from an error code.
-  @objc public static func makeErrorConnection(errorCode: Int64) -> ConnectionID {
+  @objc static func makeErrorConnection(errorCode: Int64) -> ConnectionID {
     return abs(errorCode)
   }
 }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollectionTests.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollectionTests.swift
index 0f400a195b7ee..3360591cecfb5 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollectionTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/ConnectionCollectionTests.swift
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import InternalFlutterSwift
+@testable import InternalFlutterSwift
 import Testing
 
 struct ConnectionCollectionTests {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/DisplayLinkManager.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/DisplayLinkManager.swift
index 15d8e484e35ee..515ea18383b5e 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/DisplayLinkManager.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/DisplayLinkManager.swift
@@ -31,7 +31,7 @@ import UIKit
 /// while holding a lock; every other stored property is immutable, so instances are safe to share
 /// and read from any thread once constructed.
 @objc(FlutterDisplayLinkManager)
-public final class DisplayLinkManager: NSObject, @unchecked Sendable {
+final class DisplayLinkManager: NSObject, @unchecked Sendable {
 
   /// The shared DisplayLinkManager.
   ///
@@ -40,13 +40,13 @@ public final class DisplayLinkManager: NSObject, @unchecked Sendable {
   /// callers remain responsible for calling from the main thread themselves.
   @MainActor
   @objc
-  public static let shared = DisplayLinkManager()
+  static let shared = DisplayLinkManager()
 
   /// Info.plist key enabling the full range of ProMotion refresh rates for CADisplayLink callbacks
   /// and CAAnimation animations in the app.
   ///
   /// - SeeAlso: https://developer.apple.com/documentation/quartzcore/optimizing_promotion_refresh_rates_for_iphone_13_pro_and_ipad_pro#3885321
-  internal static let disableMinimumFrameDurationOnPhoneKey = "CADisableMinimumFrameDurationOnPhone"
+  static let disableMinimumFrameDurationOnPhoneKey = "CADisableMinimumFrameDurationOnPhone"
 
   /// Whether the max refresh rate on iPhone ProMotion devices is enabled.
   ///
@@ -56,11 +56,11 @@ public final class DisplayLinkManager: NSObject, @unchecked Sendable {
   ///
   /// - Returns: `true` if the max refresh rate on ProMotion devices is enabled.
   @objc
-  public let maxRefreshRateEnabledOnIPhone: Bool
+  let maxRefreshRateEnabledOnIPhone: Bool
 
   /// The maximum display refresh rate, in frames per second.
   @objc
-  public internal(set) var displayRefreshRate: Double {
+  var displayRefreshRate: Double {
     get {
       // We cache the refresh rate rather than query from UIKit on every read, since this can be
       // read from background engine threads. The value is kept up-to-date by observing
@@ -111,7 +111,7 @@ public final class DisplayLinkManager: NSObject, @unchecked Sendable {
   /// Testing initializer that injects configuration values.
   ///
   /// Unlike the standard initializer, this does not start observing system notifications.
-  internal init(maxRefreshRateEnabled: Bool, refreshRate: Double) {
+  init(maxRefreshRateEnabled: Bool, refreshRate: Double) {
     self.maxRefreshRateEnabledOnIPhone = maxRefreshRateEnabled
     self._displayRefreshRate = refreshRate
     super.init()
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FakeUIPressProxy.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FakeUIPressProxy.swift
index 9e57f2631349c..aa291c52a9865 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FakeUIPressProxy.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FakeUIPressProxy.swift
@@ -9,29 +9,29 @@ import UIKit
 /// UIPressProxy subclass for use to create fake UIPress events in tests.
 @available(iOS 13.4, *)
 @objc
-public class FakeUIPressProxy: UIPressProxy {
+class FakeUIPressProxy: UIPressProxy {
   private let dataPhase: UIPress.Phase
   private let dataKey: UIKey  // Store the copied key
   private let dataType: UIEvent.EventType
   private let dataTimestamp: TimeInterval
 
-  @objc override public var phase: UIPress.Phase {
+  @objc override var phase: UIPress.Phase {
     return dataPhase
   }
 
-  @objc override public var key: UIKey? {
+  @objc override var key: UIKey? {
     return dataKey
   }
 
-  @objc override public var type: UIEvent.EventType {
+  @objc override var type: UIEvent.EventType {
     return dataType
   }
 
-  @objc override public var timestamp: TimeInterval {
+  @objc override var timestamp: TimeInterval {
     return dataTimestamp
   }
 
-  @objc public init(
+  @objc init(
     phase: UIPress.Phase,
     key: UIKey,
     type: UIEvent.EventType,
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
index 9f3cb2553a402..22f86c652cf63 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
@@ -149,14 +149,12 @@ - (BOOL)application:(UIApplication*)application
     return YES;
   }
 
-  // Relaying to the system here will case an infinite loop, so we don't do it here.
-  return [self handleOpenURL:url options:options relayToSystemIfUnhandled:NO];
+  return [self handleOpenURL:url options:options];
 }
 
 // Helper function for opening an URL, either with a custom scheme or a http/https scheme.
 - (BOOL)handleOpenURL:(NSURL*)url
-                     options:(NSDictionary<UIApplicationOpenURLOptionsKey, id>*)options
-    relayToSystemIfUnhandled:(BOOL)throwBack {
+              options:(NSDictionary<UIApplicationOpenURLOptionsKey, id>*)options {
   UIApplication* flutterApplication = FlutterSharedApplication.application;
   if (flutterApplication == nil) {
     return NO;
@@ -168,13 +166,8 @@ - (BOOL)handleOpenURL:(NSURL*)url
   FlutterViewController* flutterViewController = [self rootFlutterViewController];
   if (flutterViewController) {
     [flutterViewController.engine sendDeepLinkToFramework:url
-                                        completionHandler:^(BOOL success) {
-                                          if (!success && throwBack) {
-                                            // throw it back to iOS
-                                            [flutterApplication openURL:url
-                                                                options:@{}
-                                                      completionHandler:nil];
-                                          }
+                                        completionHandler:^(BOOL success){
+                                            // no-op.
                                         }];
   } else {
     [FlutterLogger logError:@"Attempting to open an URL without a Flutter RootViewController."];
@@ -224,7 +217,7 @@ - (BOOL)application:(UIApplication*)application
     return YES;
   }
 
-  return [self handleOpenURL:userActivity.webpageURL options:@{} relayToSystemIfUnhandled:YES];
+  return [self handleOpenURL:userActivity.webpageURL options:@{}];
 }
 
 #pragma mark - FlutterPluginRegistry methods. All delegating to the rootViewController
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
index 8b5271f164365..6d6182414cbe7 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
@@ -192,7 +192,7 @@ - (void)testUniversalLinkPushRouteInformation {
   OCMVerifyAll(self.mockNavigationChannel);
 }
 
-- (void)testUseNonDeprecatedOpenURLAPI {
+- (void)testUniversalLinkDoesNotRelayToSystemWhenUnhandled {
   OCMStub([self.mockMainBundle objectForInfoDictionaryKey:@"FlutterDeepLinkingEnabled"])
       .andReturn(@YES);
   NSUserActivity* userActivity = [[NSUserActivity alloc] initWithActivityType:@"com.example.test"];
@@ -205,13 +205,15 @@ - (void)testUseNonDeprecatedOpenURLAPI {
       });
   id mockApplication = OCMClassMock([UIApplication class]);
   OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+
   BOOL result = [self.appDelegate
                application:[UIApplication sharedApplication]
       continueUserActivity:userActivity
         restorationHandler:^(NSArray<id<UIUserActivityRestoring>>* __nullable restorableObjects){
         }];
   XCTAssertTrue(result);
-  OCMVerify([mockApplication openURL:[OCMArg any]
+  // openURL should NOT have been called.
+  OCMReject([mockApplication openURL:[OCMArg any]
                              options:[OCMArg any]
                    completionHandler:[OCMArg any]]);
 }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
index 2ed1a6ec4a3b6..387b4f9139120 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -267,7 +267,14 @@ static BOOL DoesHardwareSupportWideGamut() {
   CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height * scale;
   settings.resource_cache_max_bytes_threshold = screenWidth * screenHeight * 12 * 4;
 
-  // Whether to enable ios embedder api.
+  // Whether to run the iOS embedder on top of the embedder API rather than `Shell` directly.
+  //
+  // This is an opt-in flag while we add support for running on top of the embedder API. Once the
+  // embedder API implementation reaches parity with the default implementation directly on `Shell`
+  // and friends, we'll eventually make this default and support opt-out, before being removed
+  // altogether.
+  //
+  // See: https://github.com/flutter/flutter/issues/112232
   NSNumber* enable_embedder_api =
       [mainBundle objectForInfoDictionaryKey:@"FLTEnableIOSEmbedderAPI"];
   // Change the default only if the option is present.
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
index 929e96a9a3d5f..923b1aafc24d3 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
-#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 #include <_types/_uint64_t.h>
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine+Test.h b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine+Test.h
index c3d64636e0712..a7045beb0be77 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine+Test.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine+Test.h
@@ -9,7 +9,6 @@
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
 #include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
 @class FlutterBinaryMessengerRelay;
@@ -30,7 +29,6 @@ class ThreadHost;
 - (flutter::PlatformViewIOS*)platformView;
 
 - (void)setBinaryMessenger:(FlutterBinaryMessengerRelay*)binaryMessenger;
-- (flutter::IOSRenderingAPI)platformViewsRenderingAPI;
 - (void)waitForFirstFrame:(NSTimeInterval)timeout callback:(void (^)(BOOL didTimeout))callback;
 - (FlutterEngine*)spawnWithEntrypoint:(/*nullable*/ NSString*)entrypoint
                            libraryURI:(/*nullable*/ NSString*)libraryURI
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
index b07f3c32c4844..23c8b99212eaf 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
@@ -41,7 +41,6 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 #include "flutter/shell/profiling/sampling_profiler.h"
 
 FLUTTER_ASSERT_ARC
@@ -200,14 +199,12 @@ @implementation FlutterEngine {
   // -destroyContext must wait for this group to drain before it is safe to free _shell.
   dispatch_group_t _firstFrameWaiters;
 
-  flutter::IOSRenderingAPI _renderingApi;
   std::shared_ptr<flutter::SamplingProfiler> _profiler;
 
   FlutterBinaryMessengerRelay* _binaryMessenger;
   FlutterTextureRegistryRelay* _textureRegistry;
 
   FlutterFMLTaskRunner* _platformTaskRunnerWrapper;
-  FlutterFMLTaskRunner* _uiTaskRunnerWrapper;
   FlutterFMLTaskRunner* _rasterTaskRunnerWrapper;
 }
 
@@ -251,7 +248,7 @@ - (instancetype)initWithName:(NSString*)labelPrefix
 
   _enableEmbedderAPI = _dartProject.settings.enable_embedder_api;
   if (_enableEmbedderAPI) {
-    NSLog(@"============== iOS: enable_embedder_api is on ==============");
+    [FlutterLogger logInfo:@"Embedder API enabled."];
     _embedderAPI.struct_size = sizeof(FlutterEngineProcTable);
     FlutterEngineGetProcAddresses(&_embedderAPI);
   }
@@ -343,14 +340,9 @@ - (void)sceneWillConnect:(NSNotification*)notification API_AVAILABLE(ios(13.0))
 }
 
 - (void)recreatePlatformViewsController {
-  _renderingApi = flutter::GetRenderingAPIForProcess();
   _platformViewsController = [[FlutterPlatformViewsController alloc] init];
 }
 
-- (flutter::IOSRenderingAPI)platformViewsRenderingAPI {
-  return _renderingApi;
-}
-
 - (void)dealloc {
   /// Notify plugins of dealloc.  This should happen first in dealloc since the
   /// plugins may be talking to things like the binaryMessenger.
@@ -463,7 +455,8 @@ - (FlutterFMLTaskRunner*)platformTaskRunner {
 }
 
 - (FlutterFMLTaskRunner*)uiTaskRunner {
-  return _uiTaskRunnerWrapper;
+  // The platform and UI threads are always merged on iOS.
+  return _platformTaskRunnerWrapper;
 }
 
 - (FlutterFMLTaskRunner*)rasterTaskRunner {
@@ -589,7 +582,6 @@ - (void)destroyContext {
   _threadHost.reset();
   _platformViewsController = nil;
   _platformTaskRunnerWrapper = nil;
-  _uiTaskRunnerWrapper = nil;
   _rasterTaskRunnerWrapper = nil;
 }
 
@@ -813,8 +805,6 @@ - (void)setUpShell:(std::unique_ptr<flutter::Shell>)shell
   _shell = std::move(shell);
   _platformTaskRunnerWrapper = [[FlutterFMLTaskRunner alloc]
       initWithTaskRunner:_shell->GetTaskRunners().GetPlatformTaskRunner()];
-  _uiTaskRunnerWrapper =
-      [[FlutterFMLTaskRunner alloc] initWithTaskRunner:_shell->GetTaskRunners().GetUITaskRunner()];
   _rasterTaskRunnerWrapper = [[FlutterFMLTaskRunner alloc]
       initWithTaskRunner:_shell->GetTaskRunners().GetRasterTaskRunner()];
 
@@ -842,16 +832,14 @@ + (NSString*)generateThreadLabel:(NSString*)labelPrefix {
   return [NSString stringWithFormat:@"%@.%zu", labelPrefix, ++s_shellCount];
 }
 
-static flutter::ThreadHost MakeThreadHost(NSString* thread_label,
-                                          const flutter::Settings& settings) {
+static flutter::ThreadHost MakeThreadHost(NSString* thread_label) {
   // The current thread will be used as the platform thread. Ensure that the message loop is
   // initialized.
   fml::MessageLoop::EnsureInitializedForCurrentThread();
 
+  // No dedicated UI thread is created: on iOS the UI thread is always merged onto the platform
+  // thread. FlutterDartProject rejects any other threading configuration at startup.
   uint32_t threadHostType = flutter::ThreadHost::Type::kRaster | flutter::ThreadHost::Type::kIo;
-  if (settings.merged_platform_ui_thread != flutter::Settings::MergedPlatformUIThread::kEnabled) {
-    threadHostType |= flutter::ThreadHost::Type::kUi;
-  }
 
   if ([FlutterEngine isProfilerEnabled]) {
     threadHostType = threadHostType | flutter::ThreadHost::Type::kProfiler;
@@ -860,10 +848,6 @@ + (NSString*)generateThreadLabel:(NSString*)labelPrefix {
   flutter::ThreadHost::ThreadHostConfig host_config(thread_label.UTF8String, threadHostType,
                                                     IOSPlatformThreadConfigSetter);
 
-  host_config.ui_config =
-      fml::Thread::ThreadConfig(flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-                                    flutter::ThreadHost::Type::kUi, thread_label.UTF8String),
-                                fml::Thread::ThreadPriority::kDisplay);
   host_config.raster_config =
       fml::Thread::ThreadConfig(flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
                                     flutter::ThreadHost::Type::kRaster, thread_label.UTF8String),
@@ -914,7 +898,7 @@ - (BOOL)createShell:(NSString*)entrypoint
 
   NSString* threadLabel = [FlutterEngine generateThreadLabel:self.labelPrefix];
   _threadHost = std::make_shared<flutter::ThreadHost>();
-  *_threadHost = MakeThreadHost(threadLabel, settings);
+  *_threadHost = MakeThreadHost(threadLabel);
 
   __weak FlutterEngine* weakSelf = self;
   flutter::Shell::CreateCallback<flutter::PlatformView> on_create_platform_view =
@@ -926,26 +910,22 @@ - (BOOL)createShell:(NSString*)entrypoint
         [strongSelf recreatePlatformViewsController];
         strongSelf.platformViewsController.taskRunner = [[FlutterFMLTaskRunner alloc]
             initWithTaskRunner:shell.GetTaskRunners().GetPlatformTaskRunner()];
-        return std::make_unique<flutter::PlatformViewIOS>(
-            shell, strongSelf->_renderingApi, strongSelf.platformViewsController,
-            shell.GetTaskRunners(), shell.GetIsGpuDisabledSyncSwitch());
+        return std::make_unique<flutter::PlatformViewIOS>(shell, strongSelf.platformViewsController,
+                                                          shell.GetTaskRunners(),
+                                                          shell.GetIsGpuDisabledSyncSwitch());
       };
 
   flutter::Shell::CreateCallback<flutter::Rasterizer> on_create_rasterizer =
       [](flutter::Shell& shell) { return std::make_unique<flutter::Rasterizer>(shell); };
 
-  fml::RefPtr<fml::TaskRunner> ui_runner;
-  if (settings.enable_impeller &&
-      settings.merged_platform_ui_thread == flutter::Settings::MergedPlatformUIThread::kEnabled) {
-    ui_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
-  } else {
-    ui_runner = _threadHost->ui_thread->GetTaskRunner();
-  }
-  flutter::TaskRunners task_runners(threadLabel.UTF8String,                          // label
-                                    fml::MessageLoop::GetCurrent().GetTaskRunner(),  // platform
-                                    _threadHost->raster_thread->GetTaskRunner(),     // raster
-                                    ui_runner,                                       // ui
-                                    _threadHost->io_thread->GetTaskRunner()          // io
+  // The platform and UI threads are always merged on iOS, so the UI task runner is the platform
+  // thread's task runner.
+  fml::RefPtr<fml::TaskRunner> platform_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
+  flutter::TaskRunners task_runners(threadLabel.UTF8String,                       // label
+                                    platform_runner,                              // platform
+                                    _threadHost->raster_thread->GetTaskRunner(),  // raster
+                                    platform_runner,                              // ui
+                                    _threadHost->io_thread->GetTaskRunner()       // io
   );
 
   // Disable GPU if the app or scene is running in the background.
@@ -1534,13 +1514,6 @@ - (void)onStatusBarTap {
   [self.statusBarChannel invokeMethod:@"handleScrollToTop" arguments:nil];
 }
 
-- (void)waitForFirstFrameSync:(NSTimeInterval)timeout
-                     callback:(NS_NOESCAPE void (^_Nonnull)(BOOL didTimeout))callback {
-  fml::TimeDelta waitTime = fml::TimeDelta::FromMilliseconds(timeout * 1000);
-  fml::Status status = self.shell.WaitForFirstFrame(waitTime);
-  callback(status.code() == fml::StatusCode::kDeadlineExceeded);
-}
-
 - (void)waitForFirstFrame:(NSTimeInterval)timeout
                  callback:(void (^_Nonnull)(BOOL didTimeout))callback {
   dispatch_queue_t queue = dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0);
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
index e4b3a64564ff2..6de5f50e2cc21 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
@@ -86,9 +86,6 @@ - (void)setUp {
                                /*io=*/thread_task_runner);
   platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/fake_delegate,
-      /*rendering_api=*/fake_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/sync_switch);
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
index 028339d0ab032..de4166748e465 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
@@ -10,6 +10,9 @@
 
 #import "flutter/common/settings.h"
 #include "flutter/fml/synchronization/sync_switch.h"
+#include "flutter/lib/ui/window/platform_message.h"
+#include "flutter/lib/ui/window/platform_message_response.h"
+#import "flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon/InternalFlutterSwiftCommon.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/common/test_utils_swift/test_utils_swift.h"
@@ -24,6 +27,24 @@
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 FLUTTER_ASSERT_ARC
 
+namespace {
+// A `PlatformMessageResponse` that records completion.
+//
+// This allows tests to inject an inbound platform message the way the engine's platform view would
+// and observe that it was answered.
+class TestPlatformMessageResponse : public flutter::PlatformMessageResponse {
+ public:
+  static fml::RefPtr<TestPlatformMessageResponse> Create() {
+    return fml::AdoptRef(new TestPlatformMessageResponse());
+  }
+  void Complete(std::unique_ptr<fml::Mapping> data) override { is_complete_ = true; }
+  void CompleteEmpty() override { is_complete_ = true; }
+
+ private:
+  TestPlatformMessageResponse() = default;
+};
+}  // namespace
+
 @protocol TestFlutterPluginWithSceneEvents <NSObject, FlutterPlugin, FlutterSceneLifeCycleDelegate>
 @end
 
@@ -284,14 +305,6 @@ - (void)testInitialRouteSettingsSendsNavigationMessage {
                                        message:encodedSetInitialRouteMethod]);
 }
 
-- (void)testPlatformViewsControllerRenderingMetalBackend {
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine run];
-  flutter::IOSRenderingAPI renderingApi = [engine platformViewsRenderingAPI];
-
-  XCTAssertEqual(renderingApi, flutter::IOSRenderingAPI::kMetal);
-}
-
 - (void)testWaitForFirstFrameTimeout {
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar"];
   [engine run];
@@ -382,7 +395,6 @@ - (void)testCanEnableDisableEmbedderAPIThroughInfoPlist {
   {
     // Not enable embedder API by default
     auto settings = FLTDefaultSettingsForBundle();
-    settings.enable_software_rendering = true;
     FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
     FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
     XCTAssertFalse(engine.enableEmbedderAPI);
@@ -393,7 +405,6 @@ - (void)testCanEnableDisableEmbedderAPIThroughInfoPlist {
     OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableIOSEmbedderAPI"])
         .andReturn(@"YES");
     auto settings = FLTDefaultSettingsForBundle();
-    settings.enable_software_rendering = true;
     FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
     FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
     XCTAssertTrue(engine.enableEmbedderAPI);
@@ -533,6 +544,128 @@ - (void)testLifeCycleNotificationWillEnterForegroundForScene {
   [mockBundle stopMocking];
 }
 
+// Locks in current behaviour for GPU state reset, which is arguably wrong.
+//
+// If `isGpuDisabled` is set before the engine runs, it is silently discarded, because
+// `createShell:` assigns to the property from the live view controller or application state
+// immediately before creating the shell.
+//
+// `createShell:` *does* need to sample the current lifecycle state there. Background/foreground
+// notifications only fire on transitions, so an engine created while the app is already
+// backgrounded would otherwise never know about it. However, this sampling is implemented as an
+// unconditional assignment to a public readwrite property, so it also destroys any state previously
+// set by the caller.
+//
+// TODO(cbracken): https://github.com/flutter/flutter/issues/190835
+//
+// Move this sampling to `init` and `setViewController:` and stop `createShell:` from clobbering
+// this state, then change this test to asserts the opposite of what it currently does.
+- (void)testGpuStateIsDerivedFromApplicationStateWhenShellIsCreated {
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+
+  // Claim the GPU is disabled before the shell exists.
+  //
+  // There is no view controller and the test host is foregrounded, so creating the shell must
+  // overwrite this with NO.
+  engine.isGpuDisabled = YES;
+  XCTAssertTrue(engine.isGpuDisabled);
+
+  [engine run];
+
+  XCTAssertFalse(engine.isGpuDisabled);
+
+  BOOL gpuDisabled = YES;
+  [engine shell].GetIsGpuDisabledSyncSwitch()->Execute(
+      fml::SyncSwitch::Handlers().SetIfTrue([&] { gpuDisabled = YES; }).SetIfFalse([&] {
+        gpuDisabled = NO;
+      }));
+  XCTAssertFalse(gpuDisabled);
+}
+
+// Verifies a handler registered against a background FlutterTaskQueue runs off the platform thread.
+//
+// Using the `FlutterTaskQueue` public API, a plugin may register a channel handler against a
+// background queue and expect to be called off the platform thread. `PlatformMessageHandlerIosTest`
+// tests the handler in isolation, but doesn't cover the full path an actual plugin takes:
+//
+// `-[FlutterEngine makeBackgroundTaskQueue]` and
+// `-[FlutterEngine setMessageHandlerOnChannel:binaryMessageHandler:taskQueue:]`.
+//
+// The embedder API has no equivalent concept: `EmbedderPlatformMessageHandler` always trampolines
+// to the platform thread, so this contract has to be reproduced explicitly during embedder API
+// migration.
+//
+// `testNilTaskQueueDeliversOnThePlatformThread`, tests the other direction.
+- (void)testBackgroundTaskQueueDeliversOffThePlatformThread {
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+  [engine run];
+
+  NSObject<FlutterTaskQueue>* taskQueue = [engine makeBackgroundTaskQueue];
+  XCTAssertNotNil(taskQueue);
+
+  NSString* channel = @"com.example.background";
+  XCTestExpectation* didCallHandler = [self expectationWithDescription:@"didCallHandler"];
+  FlutterBinaryMessengerConnection connection =
+      [engine setMessageHandlerOnChannel:channel
+                    binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply reply) {
+                      XCTAssertFalse([NSThread isMainThread]);
+                      reply(nil);
+                      [didCallHandler fulfill];
+                    }
+                               taskQueue:taskQueue];
+  XCTAssertTrue(connection > 0);
+
+  // Deliver a message the way the platform view would on receiving one from the engine.
+  auto response = TestPlatformMessageResponse::Create();
+  engine.platformView->GetPlatformMessageHandlerIos()->HandlePlatformMessage(
+      std::make_unique<flutter::PlatformMessage>(channel.UTF8String, response));
+
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
+  XCTAssertTrue(response->is_complete());
+
+  [engine cleanUpConnection:connection];
+}
+
+// Verifies a handler registered without a task queue runs on the platform thread.
+//
+// Together with `testBackgroundTaskQueueDeliversOffThePlatformThread` locks in the invariant that
+// the task queue argument, and nothing else, decides the thread. The default is the platform
+// thread, which needs to be preserved throughout embedder API migration: this is what allows
+// plugins interact with UIKit directly from their channel handlers.
+//
+// This is the half the embedder API migration is most likely to cause to pass by accident.
+// `EmbedderPlatformMessageHandler` trampolines everything to the platform thread, so an
+// implementation that never leaves it goes green here and fails only in
+// `testBackgroundTaskQueueDeliversOffThePlatformThread`.
+- (void)testNilTaskQueueDeliversOnThePlatformThread {
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+  [engine run];
+
+  NSString* channel = @"com.example.platform";
+  XCTestExpectation* didCallHandler = [self expectationWithDescription:@"didCallHandler"];
+  FlutterBinaryMessengerConnection connection =
+      [engine setMessageHandlerOnChannel:channel
+                    binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply reply) {
+                      XCTAssertTrue([NSThread isMainThread]);
+                      reply(nil);
+                      [didCallHandler fulfill];
+                    }
+                               taskQueue:nil];
+  XCTAssertTrue(connection > 0);
+
+  auto response = TestPlatformMessageResponse::Create();
+  engine.platformView->GetPlatformMessageHandlerIos()->HandlePlatformMessage(
+      std::make_unique<flutter::PlatformMessage>(channel.UTF8String, response));
+
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
+  XCTAssertTrue(response->is_complete());
+
+  [engine cleanUpConnection:connection];
+}
+
 - (void)testLifeCycleNotificationSceneWillConnect {
   FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
@@ -587,19 +720,6 @@ - (void)testCanMergePlatformAndUIThread {
 #endif  // defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
 }
 
-- (void)testCanUnMergePlatformAndUIThread {
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
-  auto settings = FLTDefaultSettingsForBundle();
-  settings.merged_platform_ui_thread = flutter::Settings::MergedPlatformUIThread::kDisabled;
-  FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
-  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
-  [engine run];
-
-  XCTAssertNotEqual(engine.shell.GetTaskRunners().GetUITaskRunner(),
-                    engine.shell.GetTaskRunners().GetPlatformTaskRunner());
-#endif  // defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
-}
-
 - (void)testAddSceneDelegateToRegistrar {
   FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"engine" project:project];
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
index 1dc1a840ceeca..a3c0d8b4ef7da 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
@@ -65,10 +65,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)attachView;
 - (void)notifyLowMemory;
 
-/// Blocks until the first frame is presented or the timeout is exceeded, then invokes callback.
-- (void)waitForFirstFrameSync:(NSTimeInterval)timeout
-                     callback:(NS_NOESCAPE void (^)(BOOL didTimeout))callback;
-
 /// Asynchronously waits until the first frame is presented or the timeout is exceeded, then invokes
 /// callback.
 - (void)waitForFirstFrame:(NSTimeInterval)timeout callback:(void (^)(BOOL didTimeout))callback;
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
index 5001a2b453f13..b46019035cee9 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERFAKEKEYEVENTS_H_
 
 #import <Foundation/Foundation.h>
-#import <OCMock/OCMock.h>
 #import <UIKit/UIKit.h>
 
 #import "flutter/shell/platform/darwin/ios/InternalFlutterSwift/InternalFlutterSwift.h"
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsController.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsController.mm
index 8b9ac45822f1c..7349d124c5fb0 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsController.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsController.mm
@@ -7,7 +7,6 @@
 #include "impeller/geometry/rounding_radii.h"
 
 #include "flutter/display_list/effects/image_filters/dl_blur_image_filter.h"
-#include "flutter/display_list/geometry/dl_geometry_conversions.h"
 #include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 #include "flutter/flow/surface_frame.h"
 #include "flutter/flow/view_slicer.h"
@@ -91,74 +90,6 @@ static CGRect GetCGRectFromDlRect(const DlRect& clipDlRect) {
                     clipDlRect.GetHeight());
 }
 
-static bool HasNonRectClipForUnderlayCutout(const flutter::EmbeddedViewParams& params) {
-  auto iter = params.mutatorsStack().Begin();
-  while (iter != params.mutatorsStack().End()) {
-    switch ((*iter)->GetType()) {
-      case flutter::MutatorType::kClipRRect:
-      case flutter::MutatorType::kClipRSE:
-      case flutter::MutatorType::kClipPath:
-        return true;
-      default:
-        break;
-    }
-    ++iter;
-  }
-  return false;
-}
-
-// Overlay canvas needs to be clipped to the shape of platform view to ensure
-// underlay shows up correctly, so that when there's backdrop filter, the region outside of platform
-// view's shape is blurred. See: https://github.com/flutter/flutter/issues/150660
-static void ApplyNonRectClipToOverlayCanvas(flutter::DlCanvas* overlay_canvas,
-                                            const flutter::EmbeddedViewParams& params) {
-  flutter::DlMatrix transform;
-  auto iter = params.mutatorsStack().Begin();
-  while (iter != params.mutatorsStack().End()) {
-    switch ((*iter)->GetType()) {
-      case flutter::MutatorType::kTransform:
-        transform = transform * (*iter)->GetMatrix();
-        break;
-      case flutter::MutatorType::kClipRRect: {
-        if (transform.IsIdentity()) {
-          overlay_canvas->ClipRoundRect((*iter)->GetRRect(), flutter::DlClipOp::kIntersect, true);
-        } else {
-          auto path = flutter::DlPath::MakeRoundRect((*iter)->GetRRect());
-          auto transformed_path =
-              flutter::DlPath(path.GetSkPath().makeTransform(flutter::ToSkMatrix(transform)));
-          overlay_canvas->ClipPath(transformed_path, flutter::DlClipOp::kIntersect, true);
-        }
-        break;
-      }
-      case flutter::MutatorType::kClipRSE: {
-        if (transform.IsIdentity()) {
-          overlay_canvas->ClipRoundSuperellipse((*iter)->GetRSE(), flutter::DlClipOp::kIntersect,
-                                                true);
-        } else {
-          auto path = flutter::DlPath::MakeRoundSuperellipse((*iter)->GetRSE());
-          auto transformed_path =
-              flutter::DlPath(path.GetSkPath().makeTransform(flutter::ToSkMatrix(transform)));
-          overlay_canvas->ClipPath(transformed_path, flutter::DlClipOp::kIntersect, true);
-        }
-        break;
-      }
-      case flutter::MutatorType::kClipPath: {
-        if (transform.IsIdentity()) {
-          overlay_canvas->ClipPath((*iter)->GetPath(), flutter::DlClipOp::kIntersect, true);
-        } else {
-          auto transformed_path = flutter::DlPath(
-              (*iter)->GetPath().GetSkPath().makeTransform(flutter::ToSkMatrix(transform)));
-          overlay_canvas->ClipPath(transformed_path, flutter::DlClipOp::kIntersect, true);
-        }
-        break;
-      }
-      default:
-        break;
-    }
-    ++iter;
-  }
-}
-
 @interface FlutterPlatformViewsController ()
 
 // The pool of reusable view layers. The pool allows to recycle layer in each frame.
@@ -834,19 +765,13 @@ - (BOOL)submitFrame:(std::unique_ptr<flutter::SurfaceFrame>)background_frame
   std::vector<std::unique_ptr<flutter::SurfaceFrame>> surfaceFrames;
   surfaceFrames.reserve(self.compositionOrder.size());
   std::unordered_map<int64_t, DlRect> viewRects;
-  std::unordered_set<int64_t> viewsWithUnderlayPreserved;
 
   for (int64_t viewId : self.compositionOrder) {
-    const flutter::EmbeddedViewParams& params = self.currentCompositionParams[viewId];
-    viewRects[viewId] = params.finalBoundingRect();
-    if (HasNonRectClipForUnderlayCutout(params)) {
-      viewsWithUnderlayPreserved.insert(viewId);
-    }
+    viewRects[viewId] = self.currentCompositionParams[viewId].finalBoundingRect();
   }
 
   std::unordered_map<int64_t, DlRect> overlayLayers =
-      SliceViews(background_frame->Canvas(), self.compositionOrder, self.slices, viewRects,
-                 viewsWithUnderlayPreserved);
+      SliceViews(background_frame->Canvas(), self.compositionOrder, self.slices, viewRects);
 
   size_t requiredOverlayLayers = 0;
   for (int64_t viewId : self.compositionOrder) {
@@ -882,9 +807,6 @@ - (BOOL)submitFrame:(std::unique_ptr<flutter::SurfaceFrame>)background_frame
     int restoreCount = overlayCanvas->GetSaveCount();
     overlayCanvas->Save();
     overlayCanvas->ClipRect(overlay->second);
-    if (viewsWithUnderlayPreserved.find(viewId) != viewsWithUnderlayPreserved.end()) {
-      ApplyNonRectClipToOverlayCanvas(overlayCanvas, self.currentCompositionParams[viewId]);
-    }
     overlayCanvas->Clear(flutter::DlColor::kTransparent());
     self.slices[viewId]->render_into(overlayCanvas);
     overlayCanvas->RestoreToCount(restoreCount);
@@ -1024,8 +946,10 @@ - (void)performSubmit:(const LayersMap&)platformViewLayers
 
 - (void)bringLayersIntoView:(const LayersMap&)layerMap
        withCompositionOrder:(const std::vector<int64_t>&)compositionOrder {
-  FML_DCHECK(self.flutterView);
   UIView* flutterView = self.flutterView;
+  if (flutterView == nil) {
+    return;
+  }
 
   _previousCompositionOrder.clear();
   NSMutableArray* desiredPlatformSubviews = [NSMutableArray array];
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
index 1fdcb42de2585..7e1242b03e02a 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
@@ -26,11 +26,27 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTestHelper.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView+Test.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_noop.h"
+#include "flutter/shell/platform/darwin/ios/ios_context.h"
 #include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 FLUTTER_ASSERT_ARC
 
+namespace {
+// An IOSContext fake for tests that do not need a real GPU context.
+class FakeIOSContext : public flutter::IOSContext {
+ public:
+  FakeIOSContext() = default;
+  ~FakeIOSContext() override = default;
+
+  // |IOSContext|
+  std::unique_ptr<flutter::Texture> CreateExternalTexture(
+      int64_t texture_id,
+      NSObject<FlutterTexture>* texture) override {
+    return nullptr;
+  }
+};
+}  // namespace
+
 @class FlutterPlatformViewsTestMockPlatformView;
 __weak static UIView* gMockPlatformView = nil;
 const float kFloatCompareEpsilon = 0.001;
@@ -362,7 +378,6 @@ - (void)testFlutterViewOnlyCreateOnceInOneFrame {
       CreateTestPlatformViewsController(self.name);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -415,7 +430,6 @@ - (void)testCanCreatePlatformViewWithoutFlutterView {
       CreateTestPlatformViewsController(self.name);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -509,7 +523,6 @@ - (void)testApplyBackdropFilter {
       CreateTestPlatformViewsController(self.name);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -586,7 +599,6 @@ - (void)testApplyBackdropFilterWithCorrectFrame {
       CreateTestPlatformViewsController(self.name);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -663,7 +675,6 @@ - (void)testApplyMultipleBackdropFilters {
       CreateTestPlatformViewsController(self.name);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -742,7 +753,6 @@ - (void)testAddBackdropFilters {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -867,7 +877,6 @@ - (void)testRemoveBackdropFilters {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1019,7 +1028,6 @@ - (void)testEditBackdropFilters {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1319,7 +1327,6 @@ - (void)testApplyBackdropFilterNotDlBlurImageFilter {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1631,7 +1638,6 @@ - (void)testApplyBackdropFilterRespectsClipRRect {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1710,7 +1716,6 @@ - (void)testApplyBackdropFilterRespectsClipRSuperellipse {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1814,7 +1819,6 @@ - (void)testCompositePlatformView {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1874,7 +1878,6 @@ - (void)testBackdropFilterCorrectlyPushedAndReset {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1979,7 +1982,6 @@ - (void)testChildClippingViewShouldBeTheBoundingRectOfPlatformView {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2053,7 +2055,6 @@ - (void)testClipsDoNotInterceptWithPlatformViewShouldNotAddMaskView {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2125,7 +2126,6 @@ - (void)testClipRRectOnlyHasCornersInterceptWithPlatformViewShouldAddMaskView {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2196,7 +2196,6 @@ - (void)testClipRect {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2272,7 +2271,6 @@ - (void)testClipRect_multipleClips {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2368,7 +2366,6 @@ - (void)testClipRRect {
   flutterPlatformViewsController.taskRunner = flutter::testing::GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2472,7 +2469,6 @@ - (void)testClipRRect_multipleClips {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2593,7 +2589,6 @@ - (void)testClipPath {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2697,7 +2692,6 @@ - (void)testClipPath_multipleClips {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2818,7 +2812,6 @@ - (void)testSetFlutterViewControllerAfterCreateCanStillDispatchTouchEvents {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2872,7 +2865,6 @@ - (void)testSetFlutterViewControllerInTheMiddleOfTouchEventShouldStillAllowGestu
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2983,7 +2975,6 @@ - (void)testSetFlutterViewControllerInTheMiddleOfTouchEventShouldStillAllowGestu
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3083,7 +3074,6 @@ - (void)testFlutterPlatformViewTouchesCancelledEventAreForcedToBeCancelled {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3142,7 +3132,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3224,7 +3213,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3288,7 +3276,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3353,7 +3340,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3417,7 +3403,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3470,7 +3455,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
     flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
         /*platform_views_controller=*/flutterPlatformViewsController,
         /*task_runners=*/runners.taskRunners,
         /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3582,7 +3566,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
     flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
         /*platform_views_controller=*/flutterPlatformViewsController,
         /*task_runners=*/runners.taskRunners,
         /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3727,7 +3710,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
     flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
         /*platform_views_controller=*/flutterPlatformViewsController,
         /*task_runners=*/runners.taskRunners,
         /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3879,7 +3861,6 @@ - (void)testFlutterPlatformViewTouchesEndedOrTouchesCancelledEventDoesNotFailThe
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3921,7 +3902,6 @@ - (void)testFlutterPlatformViewGestureBlockingPolicy_ShouldAddDelayingRecognizer
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -3968,7 +3948,6 @@ - (void)testFlutterPlatformViewHitTest_AcceptTouchIfInstructedByFramework {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4024,7 +4003,6 @@ - (void)testFlutterPlatformViewHitTest_RejectTouchIfInstructedByFramework {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4080,7 +4058,6 @@ - (void)testFlutterPlatformViewGestureBlockingPolicy_PolicyMappingIsCorrect {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4182,7 +4159,6 @@ - (void)testFlutterPlatformViewControllerSubmitFrameWithoutFlutterViewNotCrashin
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4225,9 +4201,8 @@ - (void)testFlutterPlatformViewControllerSubmitFrameWithoutFlutterViewNotCrashin
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return false; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600));
-  XCTAssertFalse([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertFalse([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                              withIosContext:std::make_shared<FakeIOSContext>()]);
 
   auto embeddedViewParams_2 =
       std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, flutter::DlSize(300, 300), stack);
@@ -4242,9 +4217,8 @@ - (void)testFlutterPlatformViewControllerSubmitFrameWithoutFlutterViewNotCrashin
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600));
-  XCTAssertTrue([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface_submit_true)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface_submit_true)
+                                             withIosContext:std::make_shared<FakeIOSContext>()]);
 }
 
 - (void)
@@ -4257,7 +4231,6 @@ - (void)testFlutterPlatformViewControllerSubmitFrameWithoutFlutterViewNotCrashin
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4309,7 +4282,6 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4375,7 +4347,6 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4431,9 +4402,8 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
-  XCTAssertTrue([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                             withIosContext:std::make_shared<FakeIOSContext>()]);
 
   // platform view is wrapped by touch interceptor, which itself is wrapped by clipping view.
   UIView* clippingView1 = view1.superview.superview;
@@ -4460,9 +4430,8 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
-  XCTAssertTrue([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                             withIosContext:std::make_shared<FakeIOSContext>()]);
 
   XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] >
                     [flutterView.subviews indexOfObject:clippingView2],
@@ -4479,7 +4448,6 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4535,9 +4503,8 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
-  XCTAssertTrue([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                             withIosContext:std::make_shared<FakeIOSContext>()]);
 
   // platform view is wrapped by touch interceptor, which itself is wrapped by clipping view.
   UIView* clippingView1 = view1.superview.superview;
@@ -4564,9 +4531,8 @@ - (void)testFlutterPlatformViewControllerBeginFrameShouldResetCompisitionOrder {
       [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
-  XCTAssertTrue([flutterPlatformViewsController
-         submitFrame:std::move(mock_surface)
-      withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+  XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                             withIosContext:std::make_shared<FakeIOSContext>()]);
 
   XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] <
                     [flutterView.subviews indexOfObject:clippingView2],
@@ -4670,7 +4636,6 @@ - (void)testClipMaskViewIsReused {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4768,7 +4733,6 @@ - (void)testDifferentClipMaskViewIsUsedForEachView {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4853,7 +4817,6 @@ - (void)testMaskViewUsesCAShapeLayerAsTheBackingLayer {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -4946,7 +4909,6 @@ - (void)testDisposingViewInCompositionOrderDoNotCrash {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -5015,9 +4977,8 @@ - (void)testDisposingViewInCompositionOrderDoNotCrash {
         [](const flutter::SurfaceFrame& surface_frame) { return true; },
         /*frame_size=*/flutter::DlISize(800, 600), nullptr,
         /*display_list_fallback=*/true);
-    XCTAssertTrue([flutterPlatformViewsController
-           submitFrame:std::move(mock_surface)
-        withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+    XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                               withIosContext:std::make_shared<FakeIOSContext>()]);
 
     // Disposing won't remove embedded views until the view is removed from the composition_order_
     XCTAssertEqual(flutterPlatformViewsController.embeddedViewCount, 2UL);
@@ -5042,9 +5003,8 @@ - (void)testDisposingViewInCompositionOrderDoNotCrash {
         [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
         [](const flutter::SurfaceFrame& surface_frame) { return true; },
         /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
-    XCTAssertTrue([flutterPlatformViewsController
-           submitFrame:std::move(mock_surface)
-        withIosContext:std::make_shared<flutter::IOSContextNoop>()]);
+    XCTAssertTrue([flutterPlatformViewsController submitFrame:std::move(mock_surface)
+                                               withIosContext:std::make_shared<FakeIOSContext>()]);
 
     // Disposing won't remove embedded views until the view is removed from the composition_order_
     XCTAssertEqual(flutterPlatformViewsController.embeddedViewCount, 1UL);
@@ -5061,7 +5021,6 @@ - (void)testOnlyPlatformViewsAreRemovedWhenReset {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -5108,7 +5067,7 @@ - (void)testOnlyPlatformViewsAreRemovedWhenReset {
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
   [flutterPlatformViewsController submitFrame:std::move(mock_surface)
-                               withIosContext:std::make_shared<flutter::IOSContextNoop>()];
+                               withIosContext:std::make_shared<FakeIOSContext>()];
 
   UIView* someView = [[UIView alloc] init];
   [flutterView addSubview:someView];
@@ -5127,7 +5086,6 @@ - (void)testResetClearsPreviousCompositionOrder {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -5174,7 +5132,7 @@ - (void)testResetClearsPreviousCompositionOrder {
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
   [flutterPlatformViewsController submitFrame:std::move(mock_surface)
-                               withIosContext:std::make_shared<flutter::IOSContextNoop>()];
+                               withIosContext:std::make_shared<FakeIOSContext>()];
 
   // The above code should result in previousCompositionOrder having one viewId in it
   XCTAssertEqual(flutterPlatformViewsController.previousCompositionOrder.count, 1ul);
@@ -5195,7 +5153,6 @@ - (void)testNilPlatformViewDoesntCrash {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -5243,7 +5200,7 @@ - (void)testNilPlatformViewDoesntCrash {
       [](const flutter::SurfaceFrame& surface_frame) { return true; },
       /*frame_size=*/flutter::DlISize(800, 600), nullptr, /*display_list_fallback=*/true);
   [flutterPlatformViewsController submitFrame:std::move(mock_surface)
-                               withIosContext:std::make_shared<flutter::IOSContextNoop>()];
+                               withIosContext:std::make_shared<FakeIOSContext>()];
 
   XCTAssertEqual(flutterView.subviews.count, 1u);
 }
@@ -5289,7 +5246,6 @@ - (void)testFlutterPlatformViewControllerSubmitFramePreservingFrameDamage {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -5354,7 +5310,7 @@ - (void)testFlutterPlatformViewControllerSubmitFramePreservingFrameDamage {
   });
 
   [flutterPlatformViewsController submitFrame:std::move(mock_surface)
-                               withIosContext:std::make_shared<flutter::IOSContextNoop>()];
+                               withIosContext:std::make_shared<FakeIOSContext>()];
 
   XCTAssertTrue(submit_info.has_value());
   XCTAssertEqual(*submit_info->frame_damage, flutter::DlIRect::MakeWH(800, 600));
@@ -5370,7 +5326,6 @@ - (void)testClipSuperellipse {
   flutterPlatformViewsController.taskRunner = GetDefaultTaskRunner();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners.taskRunners,
       /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
index b4490ca3324a1..b99173d097670 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
@@ -197,6 +197,8 @@ - (void)testDidEnterBackground {
   XCTNSNotificationExpectation* expectation = [[XCTNSNotificationExpectation alloc]
       initWithName:UIApplicationDidEnterBackgroundNotification];
   FlutterPluginAppLifeCycleDelegate* delegate = [[FlutterPluginAppLifeCycleDelegate alloc] init];
+  id mockApplication = OCMClassMock([FlutterSharedApplication class]);
+  OCMStub([mockApplication hasSceneDelegate]).andReturn(NO);
   id plugin = OCMProtocolMock(@protocol(FlutterPlugin));
   [delegate addDelegate:plugin];
   [[NSNotificationCenter defaultCenter]
@@ -246,6 +248,8 @@ - (void)testWillEnterForeground {
       initWithName:UIApplicationWillEnterForegroundNotification];
 
   FlutterPluginAppLifeCycleDelegate* delegate = [[FlutterPluginAppLifeCycleDelegate alloc] init];
+  id mockApplication = OCMClassMock([FlutterSharedApplication class]);
+  OCMStub([mockApplication hasSceneDelegate]).andReturn(NO);
   id plugin = OCMProtocolMock(@protocol(FlutterPlugin));
   [delegate addDelegate:plugin];
   [[NSNotificationCenter defaultCenter]
@@ -294,6 +298,8 @@ - (void)testWillResignActive {
       [[XCTNSNotificationExpectation alloc] initWithName:UIApplicationWillResignActiveNotification];
 
   FlutterPluginAppLifeCycleDelegate* delegate = [[FlutterPluginAppLifeCycleDelegate alloc] init];
+  id mockApplication = OCMClassMock([FlutterSharedApplication class]);
+  OCMStub([mockApplication hasSceneDelegate]).andReturn(NO);
   id plugin = OCMProtocolMock(@protocol(FlutterPlugin));
   [delegate addDelegate:plugin];
   [[NSNotificationCenter defaultCenter]
@@ -342,6 +348,8 @@ - (void)testDidBecomeActive {
       [[XCTNSNotificationExpectation alloc] initWithName:UIApplicationDidBecomeActiveNotification];
 
   FlutterPluginAppLifeCycleDelegate* delegate = [[FlutterPluginAppLifeCycleDelegate alloc] init];
+  id mockApplication = OCMClassMock([FlutterSharedApplication class]);
+  OCMStub([mockApplication hasSceneDelegate]).andReturn(NO);
   id plugin = OCMProtocolMock(@protocol(FlutterPlugin));
   [delegate addDelegate:plugin];
   [[NSNotificationCenter defaultCenter]
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterSceneLifeCycle.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterSceneLifeCycle.mm
index 019de11b5bbbd..53f1ba5f6bafd 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterSceneLifeCycle.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterSceneLifeCycle.mm
@@ -311,7 +311,7 @@ - (void)scene:(UIScene*)scene openURLContexts:(NSSet<UIOpenURLContext*>*)URLCont
       continue;
     }
     for (UIOpenURLContext* urlContext in URLContexts) {
-      if ([self handleDeeplink:urlContext.URL flutterEngine:engine relayToSystemIfUnhandled:NO]) {
+      if ([self handleDeeplink:urlContext.URL flutterEngine:engine]) {
         break;
       }
     }
@@ -344,7 +344,7 @@ - (void)scene:(UIScene*)scene continueUserActivity:(NSUserActivity*)userActivity
     if ([enginesHandledByPlugin containsObject:engine]) {
       continue;
     }
-    [self handleDeeplink:userActivity.webpageURL flutterEngine:engine relayToSystemIfUnhandled:YES];
+    [self handleDeeplink:userActivity.webpageURL flutterEngine:engine];
   }
 }
 
@@ -436,9 +436,7 @@ - (void)handleDeeplinkingForEngine:(FlutterEngine*)engine
   //  scene(_:continue:) when the universal link is tapped while your app is running or suspended in
   //  memory.
   for (NSUserActivity* userActivity in connectionOptions.userActivities) {
-    if ([self handleDeeplink:userActivity.webpageURL
-                       flutterEngine:engine
-            relayToSystemIfUnhandled:YES]) {
+    if ([self handleDeeplink:userActivity.webpageURL flutterEngine:engine]) {
       return;
     }
   }
@@ -447,15 +445,13 @@ - (void)handleDeeplinkingForEngine:(FlutterEngine*)engine
   //  the scene:willConnectToSession:options: delegate method after launch, and to
   //  scene:openURLContexts: when your app opens a URL while running or suspended in memory.
   for (UIOpenURLContext* urlContext in connectionOptions.URLContexts) {
-    if ([self handleDeeplink:urlContext.URL flutterEngine:engine relayToSystemIfUnhandled:YES]) {
+    if ([self handleDeeplink:urlContext.URL flutterEngine:engine]) {
       return;
     }
   }
 }
 
-- (BOOL)handleDeeplink:(NSURL*)url
-               flutterEngine:(FlutterEngine*)engine
-    relayToSystemIfUnhandled:(BOOL)throwBack {
+- (BOOL)handleDeeplink:(NSURL*)url flutterEngine:(FlutterEngine*)engine {
   if (!url) {
     return NO;
   }
@@ -465,13 +461,8 @@ - (BOOL)handleDeeplink:(NSURL*)url
   }
   // if deep linking is enabled, send it to the framework
   [engine sendDeepLinkToFramework:url
-                completionHandler:^(BOOL success) {
-                  if (!success && throwBack) {
-                    // throw it back to iOS
-                    [FlutterSharedApplication.application openURL:url
-                                                          options:@{}
-                                                completionHandler:nil];
-                  }
+                completionHandler:^(BOOL success){
+                    // no-op.
                 }];
   return YES;
 }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
index 907e2ff8a35d2..07920eb58f53e 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
@@ -891,9 +891,6 @@ - (void)testHotRestart {
   thread_task_runner->PostTask([&] {
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_platform_view_delegate,
-        /*rendering_api=*/mock_platform_view_delegate.settings_.enable_impeller
-            ? flutter::IOSRenderingAPI::kMetal
-            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/nil,
         /*task_runners=*/runners,
         /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm
index 4e93dd30b57d3..7f522f43af0a9 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm
@@ -8,6 +8,7 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSceneLifeCycle_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSharedApplication.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
+#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -191,7 +192,7 @@ - (void)layoutSubviews {
 }
 
 + (Class)layerClass {
-  return flutter::GetCoreAnimationLayerClassForRenderingAPI(flutter::GetRenderingAPIForProcess());
+  return flutter::GetCoreAnimationLayerClass();
 }
 
 - (void)drawLayer:(CALayer*)layer inContext:(CGContextRef)context {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
index 042f078c22f7f..5c787776e9ba0 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -1393,27 +1393,12 @@ - (void)viewDidLayoutSubviews {
   [self updateViewportMetricsIfNeeded];
 
   // There is no guarantee that UIKit will layout subviews when the application/scene is active.
-  // Creating the surface when inactive will cause GPU accesses from the background. Only wait for
-  // the first frame to render when the application/scene is actually active.
+  // Creating the surface when inactive will cause GPU accesses from the background, so only
+  // create the surface when the application/scene is actually active.
   // This must run after updateViewportMetrics so that the surface creation tasks are queued after
   // the viewport metrics update tasks.
   if (firstViewBoundsUpdate && self.stateIsActive && self.engine) {
     [self surfaceUpdated:YES];
-#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
-    NSTimeInterval timeout = 0.2;
-#else
-    NSTimeInterval timeout = 0.1;
-#endif
-    [self.engine
-        waitForFirstFrameSync:timeout
-                     callback:^(BOOL didTimeout) {
-                       if (didTimeout) {
-                         [FlutterLogger logInfo:@"Timeout waiting for the first frame to render. "
-                                                 "This may happen in unoptimized builds. If this is"
-                                                 "a release build, you should load a less complex "
-                                                 "frame to avoid the timeout."];
-                       }
-                     }];
   }
 }
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
index 3df5a73f01582..54f5391b7e9f1 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
@@ -2310,7 +2310,12 @@ - (void)testLifeCycleNotificationApplicationBecameActive {
   [engine runWithEntrypoint:nil];
   FlutterViewController* flutterViewController =
       [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
-  UIWindow* window = [[UIWindow alloc] init];
+  // The window must be attached to the connected scene to have a screen, without which the
+  // viewport metrics stay empty and the surface is never updated.
+  UIWindowScene* windowScene =
+      (UIWindowScene*)UIApplication.sharedApplication.connectedScenes.anyObject;
+  XCTAssertNotNil(windowScene, @"The host app must have a connected scene for test");
+  UIWindow* window = [[UIWindow alloc] initWithWindowScene:windowScene];
   [window addSubview:flutterViewController.view];
   flutterViewController.view.bounds = CGRectMake(0, 0, 100, 100);
   [flutterViewController viewDidLayoutSubviews];
@@ -2348,7 +2353,12 @@ - (void)testLifeCycleNotificationSceneBecameActive {
   [engine runWithEntrypoint:nil];
   FlutterViewController* flutterViewController =
       [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
-  UIWindow* window = [[UIWindow alloc] init];
+  // The window must be attached to the connected scene to have a screen, without which the
+  // viewport metrics stay empty and the surface is never updated.
+  UIWindowScene* windowScene =
+      (UIWindowScene*)UIApplication.sharedApplication.connectedScenes.anyObject;
+  XCTAssertNotNil(windowScene, @"The host app must have a connected scene for test");
+  UIWindow* window = [[UIWindow alloc] initWithWindowScene:windowScene];
   [window addSubview:flutterViewController.view];
   flutterViewController.view.bounds = CGRectMake(0, 0, 100, 100);
   [flutterViewController viewDidLayoutSubviews];
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
index 8ad9a7418396d..665f886b7ceb5 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
@@ -225,8 +225,13 @@ - (FlutterView*)createViewInWindowWithWideGamut:(BOOL)enableWideGamut {
   FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate
                                                      opaque:NO
                                             enableWideGamut:enableWideGamut];
-  // Add to a real window so layoutSubviews has access to screen.
-  UIWindow* window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  // Add to a real window so layoutSubviews has access to screen. The host app uses the UIScene
+  // life cycle, so the window only has a screen once it is attached to the connected scene.
+  UIWindowScene* windowScene =
+      (UIWindowScene*)UIApplication.sharedApplication.connectedScenes.anyObject;
+  XCTAssertNotNil(windowScene, @"The host app must have a connected scene for test");
+  UIWindow* window = [[UIWindow alloc] initWithWindowScene:windowScene];
+  window.frame = CGRectMake(0, 0, 100, 100);
   [window addSubview:view];
   view.frame = window.bounds;
   [view layoutSubviews];
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/KeyboardInsetManager.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/KeyboardInsetManager.swift
index 41599687f7d13..f21fd8df6b9b5 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/KeyboardInsetManager.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/KeyboardInsetManager.swift
@@ -4,13 +4,13 @@
 
 import UIKit
 
-@objc public enum FlutterKeyboardMode: Int {
+@objc enum FlutterKeyboardMode: Int {
   case hidden
   case docked
   case floating
 }
 
-public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterval) -> Void
+typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterval) -> Void
 
 /// @brief Coordinates the animation of the bottom viewport inset in response to system keyboard
 /// visibility changes.
@@ -53,7 +53,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
 ///   active view controller.
 ///
 /// @see [FlutterViewController], which owns this manager and acts as its delegate.
-@objc public protocol FlutterKeyboardInsetManagerDelegate: NSObjectProtocol {
+@objc protocol FlutterKeyboardInsetManagerDelegate: NSObjectProtocol {
   @objc(updateViewportMetricsWithInset:)
   func updateViewportMetrics(withInset inset: CGFloat)
   func physicalViewInsetBottom() -> CGFloat
@@ -67,7 +67,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
   func isViewLoaded() -> Bool
 }
 
-@objc public protocol FlutterKeyboardInsetManagerProtocol: NSObjectProtocol {
+@objc protocol FlutterKeyboardInsetManagerProtocol: NSObjectProtocol {
   var delegate: FlutterKeyboardInsetManagerDelegate? { get set }
   var targetViewInsetBottom: CGFloat { get set }
   var isKeyboardInOrTransitioningFromBackground: Bool { get set }
@@ -87,21 +87,21 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
   func ensureViewportMetricsIsCorrect()
 }
 
-@objc open class FlutterKeyboardInsetManager: NSObject, FlutterKeyboardInsetManagerProtocol {
-  @objc public weak var delegate: FlutterKeyboardInsetManagerDelegate?
-  @objc public var targetViewInsetBottom: CGFloat = 0
+@objc class FlutterKeyboardInsetManager: NSObject, FlutterKeyboardInsetManagerProtocol {
+  @objc weak var delegate: FlutterKeyboardInsetManagerDelegate?
+  @objc var targetViewInsetBottom: CGFloat = 0
 
   private var originalViewInsetBottom: CGFloat = 0
-  @objc public var keyboardAnimationVSyncClient: VSyncClient?
-  @objc public var keyboardAnimationIsShowing: Bool = false
+  @objc var keyboardAnimationVSyncClient: VSyncClient?
+  @objc var keyboardAnimationIsShowing: Bool = false
   private var keyboardAnimationStartTime: CFTimeInterval = 0
-  @objc public var keyboardAnimationView: UIView?
-  @objc public var keyboardSpringAnimation: SpringAnimation?
-  @objc public var isKeyboardInOrTransitioningFromBackground: Bool = false
+  @objc var keyboardAnimationView: UIView?
+  @objc var keyboardSpringAnimation: SpringAnimation?
+  @objc var isKeyboardInOrTransitioningFromBackground: Bool = false
 
   private let displayLinkManager: DisplayLinkManager
 
-  @objc public init(
+  @objc init(
     delegate: FlutterKeyboardInsetManagerDelegate, displayLinkManager: DisplayLinkManager
   ) {
     self.delegate = delegate
@@ -109,7 +109,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     super.init()
   }
 
-  @objc public func handleKeyboardNotification(_ notification: Notification) {
+  @objc func handleKeyboardNotification(_ notification: Notification) {
     // See https://flutter.dev/go/ios-keyboard-calculating-inset for more details on why
     // notifications are used and how things are calculated.
     guard delegate != nil else { return }
@@ -162,7 +162,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     }
   }
 
-  @objc public func shouldIgnoreKeyboardNotification(_ notification: Notification) -> Bool {
+  @objc func shouldIgnoreKeyboardNotification(_ notification: Notification) -> Bool {
     // Don't ignore UIKeyboardWillHideNotification notifications.
     // Even if the notification is triggered in the background or by a different app/view
     // controller, we want to always handle this notification to avoid inaccurate inset when in a
@@ -199,7 +199,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     return false
   }
 
-  @objc public func isKeyboardNotificationForDifferentView(_ notification: Notification) -> Bool {
+  @objc func isKeyboardNotificationForDifferentView(_ notification: Notification) -> Bool {
     let info = notification.userInfo
     // Keyboard notifications related to other apps (e.g. in split view mode on iPad).
     // If the UIKeyboardIsLocalUserInfoKey key doesn't exist (this should not happen after iOS 8),
@@ -211,7 +211,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     return delegate.engine()?.viewController !== (delegate as AnyObject)
   }
 
-  @objc public func calculateKeyboardAttachMode(_ notification: Notification) -> FlutterKeyboardMode
+  @objc func calculateKeyboardAttachMode(_ notification: Notification) -> FlutterKeyboardMode
   {
     // There are multiple types of keyboard: docked, undocked, split, split docked,
     // floating, expanded shortcuts bar, minimized shortcuts bar.
@@ -273,7 +273,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     return .hidden
   }
 
-  @objc public func calculateMultitaskingAdjustment(_ screenRect: CGRect, keyboardFrame: CGRect)
+  @objc func calculateMultitaskingAdjustment(_ screenRect: CGRect, keyboardFrame: CGRect)
     -> CGFloat
   {
     guard let delegate else { return 0 }
@@ -302,7 +302,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     return 0
   }
 
-  @objc public func calculateKeyboardInset(
+  @objc func calculateKeyboardInset(
     _ keyboardFrame: CGRect, keyboardMode: FlutterKeyboardMode
   ) -> CGFloat {
     // Only docked keyboards will have an inset.
@@ -322,7 +322,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     return portionOfKeyboardInView * scale
   }
 
-  @objc public func startKeyBoardAnimation(_ duration: TimeInterval) {
+  @objc func startKeyBoardAnimation(_ duration: TimeInterval) {
     guard let delegate, delegate.isViewLoaded() else { return }
     let view = delegate.view()
 
@@ -385,7 +385,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
       })
   }
 
-  @objc public func handleKeyboardAnimationCallback(withTargetTime targetTime: CFTimeInterval) {
+  @objc func handleKeyboardAnimationCallback(withTargetTime targetTime: CFTimeInterval) {
     guard let delegate else { return }
     if !delegate.isViewLoaded() { return }
 
@@ -411,7 +411,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     delegate.updateViewportMetrics(withInset: currentInset)
   }
 
-  @objc public func hideKeyboardImmediately() {
+  @objc func hideKeyboardImmediately() {
     invalidateKeyboardAnimationVSyncClient()
     if let keyboardAnimationView = keyboardAnimationView {
       keyboardAnimationView.layer.removeAllAnimations()
@@ -423,23 +423,23 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     ensureViewportMetricsIsCorrect()
   }
 
-  @objc public func invalidate() {
+  @objc func invalidate() {
     invalidateKeyboardAnimationVSyncClient()
     removeKeyboardAnimationView()
   }
 
-  @objc public func invalidateKeyboardAnimationVSyncClient() {
+  @objc func invalidateKeyboardAnimationVSyncClient() {
     keyboardAnimationVSyncClient?.invalidate()
     keyboardAnimationVSyncClient = nil
   }
 
-  @objc public func removeKeyboardAnimationView() {
+  @objc func removeKeyboardAnimationView() {
     if keyboardAnimationView?.superview != nil {
       keyboardAnimationView?.removeFromSuperview()
     }
   }
 
-  @objc public func setUpKeyboardSpringAnimationIfNeeded(_ keyboardAnimation: CAAnimation?) {
+  @objc func setUpKeyboardSpringAnimationIfNeeded(_ keyboardAnimation: CAAnimation?) {
     // If keyboard animation is nil or not a spring animation, fallback to DisplayLink tracking.
     guard let keyboardCASpringAnimation = keyboardAnimation as? CASpringAnimation else {
       keyboardSpringAnimation = nil
@@ -457,7 +457,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     )
   }
 
-  @objc public func setUpKeyboardAnimationVsyncClient(
+  @objc func setUpKeyboardAnimationVsyncClient(
     _ animationCallback: FlutterKeyboardAnimationCallback?
   ) {
     guard let animationCallback = animationCallback else { return }
@@ -485,7 +485,7 @@ public typealias FlutterKeyboardAnimationCallback = (_ targetTime: CFTimeInterva
     keyboardAnimationVSyncClient?.await()
   }
 
-  @objc public func ensureViewportMetricsIsCorrect() {
+  @objc func ensureViewportMetricsIsCorrect() {
     delegate?.updateViewportMetrics(withInset: targetViewInsetBottom)
   }
 }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngine.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngine.swift
index b6038a16e59cb..0d0f2fb725718 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngine.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngine.swift
@@ -29,7 +29,7 @@ import Foundation
 /// `FlutterImplicitEngineDelegate` and implementing `didInitializeImplicitFlutterEngine` instead of
 /// relying on `FlutterAppDelegate`'s automatic registration.
 @objc(FlutterLaunchEngine)
-public final class LaunchEngine: NSObject {
+final class LaunchEngine: NSObject {
 
   /// The lifecycle state of the contained engine.
   private enum State {
@@ -49,7 +49,7 @@ public final class LaunchEngine: NSObject {
   ///
   /// In cases where `takeEngine` has not yet been called, this will lazily allocate and return an
   /// engine.
-  @objc public func acquireEngine() -> FlutterEngine? {
+  @objc func acquireEngine() -> FlutterEngine? {
     switch state {
     case .uninitialized:
       let newEngine = FlutterEngine(
@@ -73,7 +73,7 @@ public final class LaunchEngine: NSObject {
   /// Take ownership of the launch engine.
   ///
   /// After this is called `acquireEngine` and `takeEngine` will always return nil.
-  @objc public func takeEngine() -> FlutterEngine? {
+  @objc func takeEngine() -> FlutterEngine? {
     let result: FlutterEngine?
     switch state {
     case .created(let engine):
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngineTests.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngineTests.swift
index 73896f1660588..753253cd13e70 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngineTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/LaunchEngineTests.swift
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import InternalFlutterSwift
+@testable import InternalFlutterSwift
 import Testing
 
 @MainActor
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/SplashScreenManager.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/SplashScreenManager.swift
index c8b51762a2875..fea08d6651700 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/SplashScreenManager.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/SplashScreenManager.swift
@@ -9,7 +9,7 @@ import UIKit
 /// Handles loading from storyboards or XIBs based on the `UILaunchStoryboardName` in the app's
 /// Info.plist. Performs an animated fade-out transition when the splash screen is removed.
 @objc(FlutterSplashScreenManager)
-public final class SplashScreenManager: NSObject {
+final class SplashScreenManager: NSObject {
 
   /// The default duration for the splash screen fade-out animation.
   private static let defaultAnimationDuration: TimeInterval = 0.2
@@ -23,7 +23,7 @@ public final class SplashScreenManager: NSObject {
   /// Setting this property to a new view will update view and apply flexible width/height
   /// autoresizing masks. Setting to `nil` will trigger the removal of the current splash screen
   /// with a fade-out animation.
-  @objc public var splashScreenView: UIView? {
+  @objc var splashScreenView: UIView? {
     get { return _splashScreenView }
     set {
       guard newValue !== _splashScreenView else { return }
@@ -40,20 +40,20 @@ public final class SplashScreenManager: NSObject {
   /// Initializes a new manager with the specified bundle.
   ///
   /// The bundle is used to look up the launch storyboard name and resources.
-  @objc public init(bundle: Bundle = .main) {
+  @objc init(bundle: Bundle = .main) {
     self.bundle = bundle
     super.init()
   }
 
   /// Initializes a new manager with the main bundle.
-  @objc public override convenience init() {
+  @objc override convenience init() {
     self.init(bundle: .main)
   }
 
   /// Attempts to load the splash screen view specified by `UILaunchStoryboardName` in Info.plist.
   /// - Returns: `true` if successful, `false` otherwise.
   @discardableResult
-  @objc public func loadDefaultSplashScreenView() -> Bool {
+  @objc func loadDefaultSplashScreenView() -> Bool {
     guard let launchscreenName = bundle.infoDictionary?["UILaunchStoryboardName"] as? String else {
       return false
     }
@@ -93,7 +93,7 @@ public final class SplashScreenManager: NSObject {
   ///
   /// The completion block is invoked after the animation completes and the view is removed from its
   /// superview.
-  @objc public func removeSplashScreen(completion: (() -> Void)?) {
+  @objc func removeSplashScreen(completion: (() -> Void)?) {
     // If no splash screen, bail out immediately and invoke the completion handler.
     guard let splashScreen = _splashScreenView else {
       completion?()
@@ -115,7 +115,7 @@ public final class SplashScreenManager: NSObject {
   /// Installs the splash screen view into the specified parent view, if it is not already added.
   ///
   /// The view's frame is set to match the parent view's bounds.
-  @objc public func installSplashScreenView(asSubviewOf parentView: UIView) {
+  @objc func installSplashScreenView(asSubviewOf parentView: UIView) {
     guard let splashScreen = splashScreenView else { return }
 
     splashScreen.frame = parentView.bounds
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/TaskRunnerTests.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/TaskRunnerTests.swift
index 9eae6d1329809..7b6696ef73148 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/TaskRunnerTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/TaskRunnerTests.swift
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import InternalFlutterSwift
+@testable import InternalFlutterSwift
 import QuartzCore
 import Testing
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/UIPressProxy.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/UIPressProxy.swift
index 6b0810f995180..b3c81d3171a4c 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/UIPressProxy.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/UIPressProxy.swift
@@ -9,7 +9,7 @@ import UIKit
 /// UIEvent or UIPress directly.
 @available(iOS 13.4, *)
 @objc(FlutterUIPressProxy)
-public class UIPressProxy: NSObject {
+class UIPressProxy: NSObject {
   private var press: UIPress?
   private var event: UIEvent?
 
@@ -18,7 +18,7 @@ public class UIPressProxy: NSObject {
    * - Parameter press: The UIPress object to wrap.
    * - Parameter event: The UIEvent object to wrap.
    */
-  @objc public init(press: UIPress, event: UIEvent) {
+  @objc init(press: UIPress, event: UIEvent) {
     self.press = press
     self.event = event
     super.init()  // Call superclass initializer
@@ -29,7 +29,7 @@ public class UIPressProxy: NSObject {
    * Subclasses using this MUST override the properties below as needed,
    * as the internal press/event objects will be nil.
    */
-  @objc override public init() {
+  @objc override init() {
     self.press = nil
     self.event = nil
     super.init()
@@ -40,7 +40,7 @@ public class UIPressProxy: NSObject {
   }
 
   /// The phase of the press event.
-  @objc public var phase: UIPress.Phase {
+  @objc var phase: UIPress.Phase {
     guard let press = press else {
       fatalError("nil UIPress")
     }
@@ -49,12 +49,12 @@ public class UIPressProxy: NSObject {
 
   /// The key associated with the press event, if any.
   /// Note: In Swift, `UIPress.key` is optional.
-  @objc public var key: UIKey? {
+  @objc var key: UIKey? {
     return press?.key
   }
 
   /// The type of the event.
-  @objc public var type: UIEvent.EventType {
+  @objc var type: UIEvent.EventType {
     guard let event = event else {
       fatalError("nil UIEvent")
     }
@@ -63,7 +63,7 @@ public class UIPressProxy: NSObject {
 
   /// The time at which the event occurred.
   /// NSTimeInterval is typealiased to TimeInterval in Swift.
-  @objc public var timestamp: TimeInterval {
+  @objc var timestamp: TimeInterval {
     guard let event = event else {
       fatalError("nil UIEvent")
     }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClient.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClient.swift
index 281be1ca1e85a..ae1aec59ae18d 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClient.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClient.swift
@@ -7,7 +7,7 @@ import QuartzCore
 import UIKit
 
 @objc(FlutterVSyncClient)
-public class VSyncClient: NSObject {
+class VSyncClient: NSObject {
   private static let defaultRefreshRate: Double = 60.0
 
   private let taskRunner: TaskRunner
@@ -16,7 +16,7 @@ public class VSyncClient: NSObject {
 
   /// The display link used to coordinate vsync callbacks.
   @objc
-  internal private(set) var displayLink: CADisplayLink?
+  private(set) var displayLink: CADisplayLink?
 
   private var _refreshRate: Double = defaultRefreshRate
 
@@ -29,7 +29,7 @@ public class VSyncClient: NSObject {
   /// If the current refresh rate is unknown or invalid (e.g., during startup or a paused transition),
   /// this property falls back to `defaultRefreshRate` (60Hz).
   @objc
-  public var refreshRate: Double {
+  var refreshRate: Double {
     return _refreshRate > 0.0 ? _refreshRate : VSyncClient.defaultRefreshRate
   }
 
@@ -37,7 +37,7 @@ public class VSyncClient: NSObject {
   /// signal. Setting this property to `false` can avoid this and vsync client will trigger vsync
   /// callback continuously.
   @objc
-  public var allowPauseAfterVsync: Bool = true
+  var allowPauseAfterVsync: Bool = true
 
   /// Initializes the vsync client.
   ///
@@ -47,7 +47,7 @@ public class VSyncClient: NSObject {
   ///   - maxRefreshRate: The maximum refresh rate to configure the display link with.
   ///   - callback: The callback to invoke when a vsync signal is received.
   @objc
-  public init(
+  init(
     taskRunner: TaskRunner,
     isVariableRefreshRateEnabled: Bool,
     maxRefreshRate: Double,
@@ -86,7 +86,7 @@ public class VSyncClient: NSObject {
   ///
   /// - Parameter requestedRate: The target maximum refresh rate in Hertz.
   @objc
-  public func setMaxRefreshRate(_ requestedRate: Double) {
+  func setMaxRefreshRate(_ requestedRate: Double) {
     guard isVariableRefreshRateEnabled else { return }
     guard let link = displayLink else { return }
 
@@ -109,7 +109,7 @@ public class VSyncClient: NSObject {
   /// Calling this method unpauses the underlying `CADisplayLink`, allowing it to trigger
   /// `onDisplayLink(_:)` on the next vsync event.
   @objc
-  public func await() {
+  func await() {
     displayLink?.isPaused = false
   }
 
@@ -118,7 +118,7 @@ public class VSyncClient: NSObject {
   /// Calling this method pauses the underlying `CADisplayLink`, preventing it from triggering
   /// any subsequent vsync events until `await()` is called.
   @objc
-  public func pause() {
+  func pause() {
     displayLink?.isPaused = true
   }
 
@@ -127,7 +127,7 @@ public class VSyncClient: NSObject {
   /// This method must be called before releasing the `VSyncClient` instance to prevent memory leaks
   /// caused by the `CADisplayLink` retaining its target.
   @objc
-  public func invalidate() {
+  func invalidate() {
     guard let link = displayLink else { return }
     displayLink = nil
 
@@ -152,7 +152,7 @@ public class VSyncClient: NSObject {
   ///
   /// - Parameter link: The display link triggering this event.
   @objc
-  internal func onDisplayLink(_ link: CADisplayLink) {
+  func onDisplayLink(_ link: CADisplayLink) {
     // CADisplayLink timestamps use the CACurrentMediaTime() monotonic clock (seconds since boot).
     // CACurrentMediaTime() is based on mach_absolute_time, whereas the core engine uses
     // fml::TimePoint, which is implemented with std::chrono::steady_clock, which uses
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClientTests.swift b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClientTests.swift
index ea09d333686bd..00ebf51a42179 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClientTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/VSyncClientTests.swift
@@ -2,10 +2,45 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import Foundation
 import Testing
 
 @testable import InternalFlutterSwift
 
+extension TaskRunner {
+  /// Runs `work` on this runner's thread and returns its result once complete.
+  ///
+  /// `VSyncClient` owns its `CADisplayLink` on the runner's thread. To prevent races, all
+  /// interactions with it to happen via this call, and are dispatched to the owning thread, never
+  /// invoked directly from the test thread.
+  fileprivate func run<T>(_ work: @escaping () -> T) async -> T {
+    await withCheckedContinuation { continuation in
+      postTask {
+        continuation.resume(returning: work())
+      }
+    }
+  }
+}
+
+extension AsyncStream where Element: Sendable {
+  /// Returns the stream's next element, or `nil` if `timeout` elapses first.
+  fileprivate func next(timeout: TimeInterval) async -> Element? {
+    await withTaskGroup(of: Element?.self) { group in
+      group.addTask {
+        var iterator = self.makeAsyncIterator()
+        return await iterator.next()
+      }
+      group.addTask {
+        try? await Task.sleep(nanoseconds: UInt64(timeout * 1_000_000_000))
+        return nil
+      }
+      let result = await group.next() ?? nil
+      group.cancelAll()
+      return result
+    }
+  }
+}
+
 struct VSyncClientTests {
   let threadTaskRunner = TaskRunnerTestHelper.makeTaskRunner(withLabel: "VSyncClientTest")
 
@@ -27,7 +62,7 @@ struct VSyncClientTests {
   /// This test passes a newly created, paused `CADisplayLink` (whose properties both evaluate to
   /// 0.0) and asserts that the client intercepts the invalid state and synthesizes a safe, positive
   /// next-frame target timestamp based on the display's maximum refresh rate.
-  @Test func realDisplayLinkVsyncTimestampsCorrect() throws {
+  @Test func realDisplayLinkVsyncTimestampsCorrect() async throws {
     var callbackStartTime: CFTimeInterval = -1
     var callbackTargetTime: CFTimeInterval = -1
     let vsyncClient = VSyncClient(
@@ -40,7 +75,7 @@ struct VSyncClientTests {
     }
     let link = try #require(vsyncClient.displayLink)
 
-    vsyncClient.onDisplayLink(link)
+    await threadTaskRunner.run { vsyncClient.onDisplayLink(link) }
 
     // Since the display link is paused and has not delivered a frame yet, both timestamp and
     // targetTimestamp are 0.0. Verify the client synthesizes a valid target timestamp using the max
@@ -49,7 +84,7 @@ struct VSyncClientTests {
     #expect(abs((callbackTargetTime - callbackStartTime) - 1.0 / 60.0) <= 0.0001)
   }
 
-  @Test func vsyncClientPreventsZeroRefreshRateDivision() throws {
+  @Test func vsyncClientPreventsZeroRefreshRateDivision() async throws {
     var callbackStartTime: CFTimeInterval = -1
     var callbackTargetTime: CFTimeInterval = -1
     // Initialize with maxRefreshRate = 0.0 to simulate uninitialized/zero max refresh rate.
@@ -63,7 +98,7 @@ struct VSyncClientTests {
     }
     let link = try #require(vsyncClient.displayLink)
 
-    vsyncClient.onDisplayLink(link)
+    await threadTaskRunner.run { vsyncClient.onDisplayLink(link) }
 
     #expect(callbackStartTime > 0.0)
     // Should fallback to effectiveRefreshRate of 60.0.
@@ -84,7 +119,7 @@ struct VSyncClientTests {
     #expect(vsyncClient.refreshRate == 60.0)
   }
 
-  @Test func setAllowPauseAfterVsyncCorrect() throws {
+  @Test func setAllowPauseAfterVsyncCorrect() async throws {
     let vsyncClient = VSyncClient(
       taskRunner: threadTaskRunner,
       isVariableRefreshRateEnabled: false,
@@ -92,18 +127,24 @@ struct VSyncClientTests {
     ) { _, _ in }
     let link = try #require(vsyncClient.displayLink)
 
-    vsyncClient.allowPauseAfterVsync = false
-    vsyncClient.await()
-    vsyncClient.onDisplayLink(link)
-    #expect(link.isPaused == false)
+    let pausedWhenDisallowed = await threadTaskRunner.run { () -> Bool in
+      vsyncClient.allowPauseAfterVsync = false
+      vsyncClient.await()
+      vsyncClient.onDisplayLink(link)
+      return link.isPaused
+    }
+    #expect(pausedWhenDisallowed == false)
 
-    vsyncClient.allowPauseAfterVsync = true
-    vsyncClient.await()
-    vsyncClient.onDisplayLink(link)
-    #expect(link.isPaused)
+    let pausedWhenAllowed = await threadTaskRunner.run { () -> Bool in
+      vsyncClient.allowPauseAfterVsync = true
+      vsyncClient.await()
+      vsyncClient.onDisplayLink(link)
+      return link.isPaused
+    }
+    #expect(pausedWhenAllowed)
   }
 
-  @Test func setCorrectVariableRefreshRates() throws {
+  @Test func setCorrectVariableRefreshRates() async throws {
     let maxFrameRate: Double = 120.0
     let vsyncClient = VSyncClient(
       taskRunner: threadTaskRunner,
@@ -113,15 +154,19 @@ struct VSyncClientTests {
     let link = try #require(vsyncClient.displayLink)
 
     if #available(iOS 15.0, *) {
-      #expect(abs(Double(link.preferredFrameRateRange.maximum) - maxFrameRate) <= 0.1)
-      #expect(abs(Double(link.preferredFrameRateRange.preferred ?? 0) - maxFrameRate) <= 0.1)
-      #expect(abs(Double(link.preferredFrameRateRange.minimum) - maxFrameRate / 2) <= 0.1)
+      let range = await threadTaskRunner.run { link.preferredFrameRateRange }
+      #expect(abs(Double(range.maximum) - maxFrameRate) <= 0.1)
+      #expect(abs(Double(range.preferred ?? 0) - maxFrameRate) <= 0.1)
+      #expect(abs(Double(range.minimum) - maxFrameRate / 2) <= 0.1)
     } else {
-      #expect(abs(Double(link.preferredFramesPerSecond) - maxFrameRate) <= 0.1)
+      let framesPerSecond = await threadTaskRunner.run { link.preferredFramesPerSecond }
+      #expect(abs(Double(framesPerSecond) - maxFrameRate) <= 0.1)
     }
   }
 
-  @Test func doNotSetVariableRefreshRatesIfCADisableMinimumFrameDurationOnPhoneIsNotOn() throws {
+  @Test func doNotSetVariableRefreshRatesIfCADisableMinimumFrameDurationOnPhoneIsNotOn()
+    async throws
+  {
     let maxFrameRate: Double = 120.0
     let vsyncClient = VSyncClient(
       taskRunner: threadTaskRunner,
@@ -131,15 +176,17 @@ struct VSyncClientTests {
     let link = try #require(vsyncClient.displayLink)
 
     if #available(iOS 15.0, *) {
-      #expect(abs(Double(link.preferredFrameRateRange.maximum)) <= 0.1)
-      #expect(abs(Double(link.preferredFrameRateRange.preferred ?? 0)) <= 0.1)
-      #expect(abs(Double(link.preferredFrameRateRange.minimum)) <= 0.1)
+      let range = await threadTaskRunner.run { link.preferredFrameRateRange }
+      #expect(abs(Double(range.maximum)) <= 0.1)
+      #expect(abs(Double(range.preferred ?? 0)) <= 0.1)
+      #expect(abs(Double(range.minimum)) <= 0.1)
     } else {
-      #expect(abs(Double(link.preferredFramesPerSecond)) <= 0.1)
+      let framesPerSecond = await threadTaskRunner.run { link.preferredFramesPerSecond }
+      #expect(abs(Double(framesPerSecond)) <= 0.1)
     }
   }
 
-  @Test func awaitAndPauseWillWorkCorrectly() throws {
+  @Test func awaitAndPauseWillWorkCorrectly() async throws {
     let vsyncClient = VSyncClient(
       taskRunner: threadTaskRunner,
       isVariableRefreshRateEnabled: false,
@@ -147,49 +194,56 @@ struct VSyncClientTests {
     ) { _, _ in }
     let link = try #require(vsyncClient.displayLink)
 
-    #expect(link.isPaused)
-    vsyncClient.await()
-    #expect(link.isPaused == false)
-    vsyncClient.pause()
-    #expect(link.isPaused)
+    let (initiallyPaused, pausedAfterAwait, pausedAfterPause) = await threadTaskRunner.run {
+      () -> (Bool, Bool, Bool) in
+      let initiallyPaused = link.isPaused
+      vsyncClient.await()
+      let pausedAfterAwait = link.isPaused
+      vsyncClient.pause()
+      let pausedAfterPause = link.isPaused
+      return (initiallyPaused, pausedAfterAwait, pausedAfterPause)
+    }
+
+    #expect(initiallyPaused)
+    #expect(pausedAfterAwait == false)
+    #expect(pausedAfterPause)
   }
 
-  @Test func releasesLinkOnInvalidation() {
+  @Test func releasesLinkOnInvalidation() async {
     weak var weakClient: VSyncClient?
+    let (vsyncSignals, vsyncContinuation) = AsyncStream.makeStream(of: Void.self)
 
-    autoreleasepool {
-      let vsyncSignal = DispatchSemaphore(value: 0)
+    // Scope the VSyncClient to a nested function so it is released on return.
+    func awaitFirstVsyncThenInvalidate() async {
       let client = VSyncClient(
         taskRunner: threadTaskRunner,
         isVariableRefreshRateEnabled: false,
         maxRefreshRate: 60.0
       ) { _, _ in
-        vsyncSignal.signal()
+        vsyncContinuation.yield()
       }
       weakClient = client
 
-      threadTaskRunner.postTask {
-        client.await()
-      }
+      await threadTaskRunner.run { client.await() }
 
-      #expect(vsyncSignal.wait(timeout: .now() + 1.0) == .success)
+      // Wait for the display link to deliver its first vsync on the runner's thread.
+      let vsync = await vsyncSignals.next(timeout: 1.0)
+      #expect(vsync != nil)
 
       client.invalidate()
     }
+    await awaitFirstVsyncThenInvalidate()
 
-    let backgroundThreadFlushed = DispatchSemaphore(value: 0)
-    threadTaskRunner.postTask {
-      backgroundThreadFlushed.signal()
-    }
-
-    #expect(backgroundThreadFlushed.wait(timeout: .now() + 1.0) == .success)
+    // Flush the task queue to ensure the invalidate() dispatched to the runner on dealloc has run.
+    await threadTaskRunner.run {}
     #expect(weakClient == nil)
   }
 
-  @Test func deallocatesWithoutExplicitInvalidation() {
+  @Test func deallocatesWithoutExplicitInvalidation() async {
     weak var weakClient: VSyncClient?
 
-    autoreleasepool {
+    // Scope the VSyncClient to a nested function so it is released on return.
+    func create() {
       let client = VSyncClient(
         taskRunner: threadTaskRunner,
         isVariableRefreshRateEnabled: false,
@@ -197,7 +251,11 @@ struct VSyncClientTests {
       ) { _, _ in }
       weakClient = client
     }
+    create()
 
+    // Flush the task queue to run the registration task dispatched in init. That task holds only a
+    // weak reference to the client, so the client can dealloc.
+    await threadTaskRunner.run {}
     #expect(weakClient == nil)
   }
 
@@ -205,24 +263,23 @@ struct VSyncClientTests {
   /// the display server has taken ownership of the link. On iOS 27+, QuartzCore holds a
   /// `_CADisplayLinkAssertion` on registered links; a never-unpaused link may therefore
   /// outlive `VSyncClient` itself, which is expected.
-  @Test func deallocatesAfterRegistrationCompletes() {
+  @Test func deallocatesAfterRegistrationCompletes() async {
     weak var weakClient: VSyncClient?
 
-    autoreleasepool {
+    // Scope the VSyncClient to a nested function so it is released on return.
+    func createAndAwaitRegistration() async {
       let client = VSyncClient(
         taskRunner: threadTaskRunner,
         isVariableRefreshRateEnabled: false,
         maxRefreshRate: 60.0
       ) { _, _ in }
-
       weakClient = client
 
-      // Registration is dispatched to the task runner in init. Post a barrier task after it
-      // so we know registration has completed before deinit fires.
-      let registered = DispatchSemaphore(value: 0)
-      threadTaskRunner.postTask { registered.signal() }
-      #expect(registered.wait(timeout: .now() + 1.0) == .success)
+      // Flush the task queue to run the registration dispatched in init. This ensures registration
+      // has completed before the strong reference is released.
+      await threadTaskRunner.run {}
     }
+    await createAndAwaitRegistration()
 
     #expect(weakClient == nil)
   }
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
index ff0b5ba433f54..d2ffde9532b4d 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
@@ -162,9 +162,6 @@ - (void)testCreate {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -185,9 +182,6 @@ - (void)testUpdateSemanticsEmpty {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -215,9 +209,6 @@ - (void)testUpdateSemanticsOneNode {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -262,9 +253,6 @@ - (void)testIsVoiceOverRunning {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -297,9 +285,6 @@ - (void)testSemanticsDeallocated {
         [[FlutterFMLTaskRunner alloc] initWithTaskRunner:thread_task_runner];
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/mock_delegate.settings_.enable_impeller
-            ? flutter::IOSRenderingAPI::kMetal
-            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/flutterPlatformViewsController,
         /*task_runners=*/runners,
         /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -362,9 +347,6 @@ - (void)testSemanticsDeallocatedWithoutLoadingView {
         [[FlutterFMLTaskRunner alloc] initWithTaskRunner:thread_task_runner];
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/mock_delegate.settings_.enable_impeller
-            ? flutter::IOSRenderingAPI::kMetal
-            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/flutterPlatformViewsController,
         /*task_runners=*/runners,
         /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -413,9 +395,6 @@ - (void)testReplacedSemanticsDoesNotCleanupChildren {
       [[FlutterFMLTaskRunner alloc] initWithTaskRunner:thread_task_runner];
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -511,9 +490,6 @@ - (void)testScrollableSemanticsDeallocated {
       [[FlutterFMLTaskRunner alloc] initWithTaskRunner:thread_task_runner];
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -585,9 +561,6 @@ - (void)testBridgeReplacesSemanticsNode {
       [[FlutterPlatformViewsController alloc] init];
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -658,9 +631,6 @@ - (void)testAnnouncesRouteChanges {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -727,9 +697,6 @@ - (void)testRadioButtonIsNotSwitchButton {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -774,9 +741,6 @@ - (void)testSemanticObjectWithNoAccessibilityFlagNotMarkedAsResponsiveToUserInte
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -818,9 +782,6 @@ - (void)testSemanticObjectWithAccessibilityFlagsMarkedAsResponsiveToUserInteract
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -868,9 +829,6 @@ - (void)testLabeledParentAndChildNotInteractive {
       [[FlutterPlatformViewsController alloc] init];
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -927,9 +885,6 @@ - (void)testLayoutChangeWithNonAccessibilityElement {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1012,9 +967,6 @@ - (void)testLayoutChangeDoesCallNativeAccessibility {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1088,9 +1040,6 @@ - (void)testLayoutChangeDoesCallNativeAccessibilityWhenFocusChanged {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1163,9 +1112,6 @@ - (void)testScrollableSemanticsContainerReturnsCorrectChildren {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1221,9 +1167,6 @@ - (void)testAnnouncesRouteChangesAndLayoutChangeInOneUpdate {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1319,9 +1262,6 @@ - (void)testAnnouncesRouteChangesWhenAddAdditionalRoute {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1406,9 +1346,6 @@ - (void)testAnnouncesRouteChangesRemoveRouteInMiddle {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1499,9 +1436,6 @@ - (void)testHandleEvent {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1556,9 +1490,6 @@ - (void)testAccessibilityObjectDidBecomeFocused {
 
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1596,9 +1527,6 @@ - (void)testAnnouncesRouteChangesWhenNoNamesRoute {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1667,9 +1595,6 @@ - (void)testAnnouncesLayoutChangeWithNilIfLastFocusIsRemoved {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1737,9 +1662,6 @@ - (void)testAnnouncesLayoutChangeWithTheSameItemFocused {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1813,9 +1735,6 @@ - (void)testAnnouncesLayoutChangeWhenFocusMovedOutside {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1891,9 +1810,6 @@ - (void)testAnnouncesScrollChangeWithLastFocused {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -1965,9 +1881,6 @@ - (void)testAnnouncesScrollChangeDoesCallNativeAccessibility {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2041,9 +1954,6 @@ - (void)testAnnouncesIgnoresRouteChangesWhenModal {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2099,9 +2009,6 @@ - (void)testAnnouncesIgnoresLayoutChangeWhenModal {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2162,9 +2069,6 @@ - (void)testAnnouncesIgnoresScrollChangeWhenModal {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2233,9 +2137,6 @@ - (void)testAccessibilityMessageAfterDeletion {
 
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2267,9 +2168,6 @@ - (void)testFlutterSemanticsScrollViewManagedObjectLifecycleCorrectly {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2317,9 +2215,6 @@ - (void)testPlatformViewDestructorDoesNotCallSemanticsAPIs {
   thread_task_runner->PostTask([&] {
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/test_delegate,
-        /*rendering_api=*/test_delegate.settings_.enable_impeller
-            ? flutter::IOSRenderingAPI::kMetal
-            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/nil,
         /*task_runners=*/runners,
         /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2364,9 +2259,6 @@ - (void)testResetsAccessibilityElementsOnHotRestart {
   thread_task_runner->PostTask([&] {
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/mock_delegate.settings_.enable_impeller
-            ? flutter::IOSRenderingAPI::kMetal
-            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/nil,
         /*task_runners=*/runners,
         /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2394,9 +2286,6 @@ - (void)testWeakViewController {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2428,9 +2317,6 @@ - (void)testSemanticsObjectAndContainerAccessAfterBridgeDestruction {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -2499,9 +2385,6 @@ - (void)testAccessibilityChannelCallbackAfterBridgeDestruction {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/mock_delegate.settings_.enable_impeller
-          ? flutter::IOSRenderingAPI::kMetal
-          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
index c843893c216e8..d2c783923ad8b 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
@@ -4,7 +4,6 @@
 
 #import <tuple>
 
-#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/availability_version_check.h"
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context.h b/engine/src/flutter/shell/platform/darwin/ios/ios_context.h
index da8df41347cf9..1e966046c28b9 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_context.h
@@ -14,7 +14,6 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/sync_switch.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
-#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 #include "impeller/display_list/aiks_context.h"
 
 namespace impeller {
@@ -42,19 +41,9 @@ class IOSContext {
   /// @brief      Create an iOS context object capable of creating the on-screen
   ///             and off-screen GPU context for use by Impeller.
   ///
-  ///             In case the engine does not support the specified client
-  ///             rendering API, this a `nullptr` may be returned.
-  ///
-  /// @param[in]  api       A client rendering API supported by the
-  ///                       engine/platform.
-  /// @param[in]  backend   A client rendering backend supported by the
-  ///                       engine/platform.
-  ///
   /// @return     A valid context on success. `nullptr` on failure.
   ///
   static std::unique_ptr<IOSContext> Create(
-      IOSRenderingAPI api,
-      IOSRenderingBackend backend,
       const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
       const Settings& settings);
 
@@ -64,13 +53,6 @@ class IOSContext {
   ///
   virtual ~IOSContext();
 
-  //----------------------------------------------------------------------------
-  /// @brief      Get the rendering backend used by this context.
-  ///
-  /// @return     The rendering backend.
-  ///
-  virtual IOSRenderingBackend GetBackend() const;
-
   //----------------------------------------------------------------------------
   /// @brief      Creates an external texture proxy of the appropriate client
   ///             rendering API.
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_context.mm
index fe89967cde340..7ae306c6d8269 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_context.mm
@@ -9,8 +9,6 @@
 #include "flutter/fml/logging.h"
 #import "flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon/InternalFlutterSwiftCommon.h"
 #include "flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_noop.h"
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -21,36 +19,9 @@
 IOSContext::~IOSContext() = default;
 
 std::unique_ptr<IOSContext> IOSContext::Create(
-    IOSRenderingAPI api,
-    IOSRenderingBackend backend,
     const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
     const Settings& settings) {
-  switch (api) {
-    case IOSRenderingAPI::kSoftware:
-      [FlutterLogger logImportant:@"Software rendering is incompatible with Impeller.\n"
-                                   "Software rendering may have been automatically selected when "
-                                   "running on a simulator in an environment that does not support "
-                                   "Metal. Enabling GPU passthrough in your environment may fix "
-                                   "this."];
-      return std::make_unique<IOSContextNoop>();
-    case IOSRenderingAPI::kMetal:
-      switch (backend) {
-        case IOSRenderingBackend::kSkia:
-          [FlutterLogger logFatal:@"Impeller opt-out unavailable."];
-          return nullptr;
-        case IOSRenderingBackend::kImpeller:
-          return std::make_unique<IOSContextMetalImpeller>(settings, is_gpu_disabled_sync_switch);
-      }
-    default:
-      break;
-  }
-  FML_CHECK(false);
-  return nullptr;
-}
-
-IOSRenderingBackend IOSContext::GetBackend() const {
-  // Overridden by Impeller subclasses.
-  return IOSRenderingBackend::kSkia;
+  return std::make_unique<IOSContextMetalImpeller>(settings, is_gpu_disabled_sync_switch);
 }
 
 std::shared_ptr<impeller::Context> IOSContext::GetImpellerContext() const {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h b/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h
index 00f489199e9b6..a54b3c898e2c4 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h
@@ -26,8 +26,6 @@ class IOSContextMetalImpeller final : public IOSContext {
 
   ~IOSContextMetalImpeller();
 
-  IOSRenderingBackend GetBackend() const override;
-
  private:
   FlutterDarwinContextMetalImpeller* darwin_context_metal_impeller_;
   std::shared_ptr<impeller::AiksContext> aiks_context_;
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm
index d5c3deb1edd9b..116ba7d070902 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm
@@ -34,10 +34,6 @@
 
 IOSContextMetalImpeller::~IOSContextMetalImpeller() = default;
 
-IOSRenderingBackend IOSContextMetalImpeller::GetBackend() const {
-  return IOSRenderingBackend::kImpeller;
-}
-
 // |IOSContext|
 std::shared_ptr<impeller::Context> IOSContextMetalImpeller::GetImpellerContext() const {
   return darwin_context_metal_impeller_.context;
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.h b/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.h
deleted file mode 100644
index 71ee138705adf..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_NOOP_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_NOOP_H_
-
-#import "flutter/shell/platform/darwin/ios/ios_context.h"
-
-namespace flutter {
-
-/// @brief A noop rendering context for usage on simulators without metal support.
-class IOSContextNoop final : public IOSContext {
- public:
-  IOSContextNoop();
-
-  // |IOSContext|
-  ~IOSContextNoop();
-
-  // |IOSContext|
-  std::unique_ptr<Texture> CreateExternalTexture(int64_t texture_id,
-                                                 NSObject<FlutterTexture>* texture) override;
-
-  IOSRenderingBackend GetBackend() const override;
-
- private:
-  IOSContextNoop(const IOSContextNoop&) = delete;
-
-  IOSContextNoop& operator=(const IOSContextNoop&) = delete;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_NOOP_H_
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.mm
deleted file mode 100644
index 8c50308924a54..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop.mm
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "flutter/shell/platform/darwin/ios/ios_context_noop.h"
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
-#include "ios_context.h"
-
-FLUTTER_ASSERT_ARC
-
-namespace flutter {
-
-IOSContextNoop::IOSContextNoop() = default;
-
-// |IOSContext|
-IOSContextNoop::~IOSContextNoop() = default;
-
-// |IOSContext|
-IOSRenderingBackend IOSContextNoop::GetBackend() const {
-  return IOSRenderingBackend::kImpeller;
-}
-
-// |IOSContext|
-std::unique_ptr<Texture> IOSContextNoop::CreateExternalTexture(int64_t texture_id,
-                                                               NSObject<FlutterTexture>* texture) {
-  // Don't use FML for logging as it will contain engine specific details. This is a user facing
-  // message.
-  NSLog(@"Flutter: Attempted to composite external texture sources using the noop backend. "
-        @"This backend is only used on simulators. This feature is only available on actual "
-        @"devices where Metal is used for rendering.");
-
-  // Not supported in this backend.
-  return nullptr;
-}
-
-}  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop_unittests.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop_unittests.mm
deleted file mode 100644
index f5c882f150140..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_context_noop_unittests.mm
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <QuartzCore/QuartzCore.h>
-#import <XCTest/XCTest.h>
-
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#include "shell/platform/darwin/ios/ios_context_noop.h"
-#include "shell/platform/darwin/ios/rendering_api_selection.h"
-
-FLUTTER_ASSERT_ARC
-
-@interface IOSContextNoopTest : XCTestCase
-@end
-
-@implementation IOSContextNoopTest
-- (void)testCreateNoop {
-  flutter::IOSContextNoop noop;
-
-  XCTAssertTrue(noop.GetBackend() == flutter::IOSRenderingBackend::kImpeller);
-}
-
-@end
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_surface.h b/engine/src/flutter/shell/platform/darwin/ios/ios_surface.h
index a9fd3f5f5d250..5185fef8fb5c9 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_surface.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_surface.h
@@ -19,7 +19,8 @@ namespace flutter {
 
 class IOSSurface {
  public:
-  static std::unique_ptr<IOSSurface> Create(std::shared_ptr<IOSContext> context, CALayer* layer);
+  static std::unique_ptr<IOSSurface> Create(const std::shared_ptr<IOSContext>& context,
+                                            CALayer* layer);
 
   std::shared_ptr<IOSContext> GetContext() const;
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_surface.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_surface.mm
index b03b9b4600dfe..37e9cf6b41f40 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_surface.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/ios_surface.mm
@@ -6,35 +6,33 @@
 
 #include <memory>
 
+#include "flutter/fml/logging.h"
 #import "flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon/InternalFlutterSwiftCommon.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface_metal_impeller.h"
-#import "flutter/shell/platform/darwin/ios/ios_surface_noop.h"
 #include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 FLUTTER_ASSERT_ARC
 
 namespace flutter {
 
-std::unique_ptr<IOSSurface> IOSSurface::Create(std::shared_ptr<IOSContext> context,
+std::unique_ptr<IOSSurface> IOSSurface::Create(const std::shared_ptr<IOSContext>& context,
                                                CALayer* layer) {
   FML_DCHECK(layer);
   FML_DCHECK(context);
 
   if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) {
     if ([layer isKindOfClass:[CAMetalLayer class]]) {
-      switch (context->GetBackend()) {
-        case IOSRenderingBackend::kSkia:
-          [FlutterLogger logFatal:@"Impeller opt-out unavailable."];
-          return nullptr;
-        case IOSRenderingBackend::kImpeller:
-          return std::make_unique<IOSSurfaceMetalImpeller>(
-              static_cast<CAMetalLayer*>(layer),  // Metal layer
-              std::move(context)                  // context
-          );
-      }
+      return std::make_unique<IOSSurfaceMetalImpeller>(
+          static_cast<CAMetalLayer*>(layer),  // Metal layer
+          context                             // context
+      );
     }
   }
-  return std::make_unique<IOSSurfaceNoop>(std::move(context));
+  // The layer MUST be a CAMetalLayer or FlutterMetalLayer, which overrides
+  // isKindOfClass to return true for the above check. Anything else means the
+  // rendering surface was misconfigured.
+  FML_CHECK(false) << "Expected a Metal-backed layer for iOS rendering.";
+  FML_UNREACHABLE();
 }
 
 IOSSurface::IOSSurface(std::shared_ptr<IOSContext> ios_context)
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.h b/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.h
deleted file mode 100644
index c97c80c356d17..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_NOOP_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_NOOP_H_
-
-#import "flutter/shell/platform/darwin/ios/ios_context.h"
-#import "flutter/shell/platform/darwin/ios/ios_surface.h"
-
-@class CALayer;
-
-namespace flutter {
-
-/// @brief A rendering surface that accepts rendering intent but does not render
-///        anything.
-///
-/// This is useful for running on platforms that need an engine instance and
-/// don't have the required drivers.
-class IOSSurfaceNoop final : public IOSSurface {
- public:
-  explicit IOSSurfaceNoop(std::shared_ptr<IOSContext> context);
-
-  ~IOSSurfaceNoop() override;
-
-  // |IOSSurface|
-  bool IsValid() const override;
-
-  // |IOSSurface|
-  void UpdateStorageSizeIfNecessary() override;
-
-  // |IOSSurface|
-  std::unique_ptr<Surface> CreateGPUSurface() override;
-
- private:
-  IOSSurfaceNoop(const IOSSurfaceNoop&) = delete;
-
-  IOSSurfaceNoop& operator=(const IOSSurfaceNoop&) = delete;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_NOOP_H_
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.mm
deleted file mode 100644
index a41c5e53cd5d1..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop.mm
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "flutter/shell/platform/darwin/ios/ios_surface_noop.h"
-#include "shell/gpu/gpu_surface_noop.h"
-
-#include <QuartzCore/CALayer.h>
-
-#include <memory>
-
-#include "flutter/fml/logging.h"
-#include "flutter/fml/platform/darwin/cf_utils.h"
-#include "flutter/fml/trace_event.h"
-
-FLUTTER_ASSERT_ARC
-
-namespace flutter {
-
-IOSSurfaceNoop::IOSSurfaceNoop(std::shared_ptr<IOSContext> context)
-    : IOSSurface(std::move(context)) {}
-
-IOSSurfaceNoop::~IOSSurfaceNoop() = default;
-
-bool IOSSurfaceNoop::IsValid() const {
-  return true;
-}
-
-void IOSSurfaceNoop::UpdateStorageSizeIfNecessary() {}
-
-std::unique_ptr<Surface> IOSSurfaceNoop::CreateGPUSurface() {
-  return std::make_unique<GPUSurfaceNoop>();
-}
-
-}  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop_unittests.mm b/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop_unittests.mm
deleted file mode 100644
index b85dbfedcc010..0000000000000
--- a/engine/src/flutter/shell/platform/darwin/ios/ios_surface_noop_unittests.mm
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <QuartzCore/QuartzCore.h>
-#import <XCTest/XCTest.h>
-
-#import "flutter/shell/platform/darwin/ios/ios_surface_noop.h"
-
-#import "flutter/common/task_runners.h"
-#import "flutter/fml/message_loop.h"
-#import "flutter/fml/thread.h"
-#import "flutter/lib/ui/window/platform_message.h"
-#import "flutter/lib/ui/window/platform_message_response.h"
-#import "flutter/shell/common/thread_host.h"
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/ios_context_noop.h"
-
-FLUTTER_ASSERT_ARC
-
-@interface IOSSurfaceNoopTest : XCTestCase
-@end
-
-@implementation IOSSurfaceNoopTest
-- (void)testCreateSurface {
-  auto context = std::make_shared<flutter::IOSContextNoop>();
-  flutter::IOSSurfaceNoop noop(context);
-
-  XCTAssertTrue(noop.IsValid());
-  XCTAssertTrue(!!noop.CreateGPUSurface());
-}
-
-@end
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h
index 51a387032cb7e..20df802942fe5 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h
@@ -19,7 +19,6 @@
 #import "flutter/shell/platform/darwin/ios/ios_external_view_embedder.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
 #import "flutter/shell/platform/darwin/ios/platform_message_handler_ios.h"
-#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 @class FlutterViewController;
 
@@ -46,7 +45,6 @@ class PlatformViewIOS final : public PlatformView {
 
   explicit PlatformViewIOS(
       PlatformView::Delegate& delegate,
-      IOSRenderingAPI rendering_api,
       __weak FlutterPlatformViewsController* platform_views_controller,
       const flutter::TaskRunners& task_runners,
       const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch);
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm
index 814b380f0e213..21e76981ef433 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm
@@ -32,19 +32,14 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
 
 PlatformViewIOS::PlatformViewIOS(
     PlatformView::Delegate& delegate,
-    IOSRenderingAPI rendering_api,
     __weak FlutterPlatformViewsController* platform_views_controller,
     const flutter::TaskRunners& task_runners,
     const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
-    : PlatformViewIOS(delegate,
-                      IOSContext::Create(rendering_api,
-                                         delegate.OnPlatformViewGetSettings().enable_impeller
-                                             ? IOSRenderingBackend::kImpeller
-                                             : IOSRenderingBackend::kSkia,
-                                         is_gpu_disabled_sync_switch,
-                                         delegate.OnPlatformViewGetSettings()),
-                      platform_views_controller,
-                      task_runners) {}
+    : PlatformViewIOS(
+          delegate,
+          IOSContext::Create(is_gpu_disabled_sync_switch, delegate.OnPlatformViewGetSettings()),
+          platform_views_controller,
+          task_runners) {}
 
 PlatformViewIOS::~PlatformViewIOS() = default;
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm
index 0852c3055a594..802afdde1ebda 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm
@@ -88,7 +88,6 @@ - (void)testSetSemanticsTreeEnabled {
 
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
@@ -127,7 +126,6 @@ - (void)testLocaleCanBeSetWithoutViewController {
 
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/nil,
       /*task_runners=*/runners,
       /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
diff --git a/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.h b/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.h
index a285657dca883..4b737686e558c 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.h
+++ b/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.h
@@ -11,19 +11,9 @@
 
 namespace flutter {
 
-enum class IOSRenderingAPI {
-  kSoftware,
-  kMetal,
-};
-
-enum class IOSRenderingBackend {
-  kSkia,
-  kImpeller,
-};
-
-IOSRenderingAPI GetRenderingAPIForProcess();
-
-Class GetCoreAnimationLayerClassForRenderingAPI(IOSRenderingAPI rendering_api);
+// Returns the CoreAnimation layer class to back a Flutter view. Fails fast if
+// no Metal device is available.
+Class GetCoreAnimationLayerClass();
 
 }  // namespace flutter
 
diff --git a/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.mm b/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.mm
index 60e623475e411..1417099d26c3f 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/rendering_api_selection.mm
@@ -18,8 +18,9 @@
 FLUTTER_ASSERT_ARC
 
 namespace flutter {
+namespace {
 
-bool ShouldUseMetalRenderer() {
+bool IsMetalAvailable() {
   bool ios_version_supports_metal = false;
   if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) {
     id<MTLDevice> device = MTLCreateSystemDefaultDevice();
@@ -28,41 +29,22 @@ bool ShouldUseMetalRenderer() {
   return ios_version_supports_metal;
 }
 
-IOSRenderingAPI GetRenderingAPIForProcess() {
-  static bool should_use_metal = ShouldUseMetalRenderer();
-  if (should_use_metal) {
-    return IOSRenderingAPI::kMetal;
-  }
+}  // namespace
 
-  // When Metal isn't available we use Skia software rendering since it performs
-  // a little better than emulated OpenGL. Also, omitting an OpenGL backend
-  // reduces binary footprint.
-#if TARGET_OS_SIMULATOR
-  return IOSRenderingAPI::kSoftware;
-#else
-  FML_CHECK(false) << "Metal may only be unavailable on simulators";
-  return IOSRenderingAPI::kSoftware;
-#endif  // TARGET_OS_SIMULATOR
-}
+Class GetCoreAnimationLayerClass() {
+  static bool metal_available = IsMetalAvailable();
+  FML_CHECK(metal_available)
+      << "Metal is unavailable. On a simulator this means the host environment "
+         "does not expose a Metal device; enabling GPU passthrough may fix this.";
 
-Class GetCoreAnimationLayerClassForRenderingAPI(IOSRenderingAPI rendering_api) {
-  switch (rendering_api) {
-    case IOSRenderingAPI::kSoftware:
-      return [CALayer class];
-    case IOSRenderingAPI::kMetal:
-      if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) {
-        if ([FlutterMetalLayer enabled]) {
-          return [FlutterMetalLayer class];
-        } else {
-          return [CAMetalLayer class];
-        }
-      }
-      FML_CHECK(false) << "Metal availability should already have been checked";
-      break;
-    default:
-      break;
+  if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) {
+    // FlutterMetalLayer reports itself as a CAMetalLayer via -isKindOfClass:.
+    if ([FlutterMetalLayer enabled]) {
+      return [FlutterMetalLayer class];
+    }
+    return [CAMetalLayer class];
   }
-  FML_CHECK(false) << "Unknown client rendering API";
+  FML_CHECK(false) << "Metal availability should already have been checked";
   return [CALayer class];
 }
 
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
index ccc14b11ec931..36578fb1347a9 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
@@ -1658,11 +1658,18 @@ - (void)setApplicationState:(flutter::AppLifecycleState)state {
  */
 - (void)handleWillBecomeActive:(NSNotification*)notification {
   _active = YES;
-  if (!_visible) {
-    [self setApplicationState:flutter::AppLifecycleState::kHidden];
-  } else {
-    [self setApplicationState:flutter::AppLifecycleState::kResumed];
+  // occlusionState can latch stale on an occlusion->visible transition (same-screen
+  // Cmd-Tab / Mission Control), so `_visible` is unreliable here. Resume from
+  // NSWindow.isVisible instead — NO for a minimized window, so it won't resume hidden.
+  // https://github.com/flutter/flutter/issues/155977
+  for (NSWindow* window in [NSApplication sharedApplication].windows) {
+    if (window.isVisible) {
+      _visible = YES;
+      break;
+    }
   }
+  [self setApplicationState:_visible ? flutter::AppLifecycleState::kResumed
+                                     : flutter::AppLifecycleState::kHidden];
 }
 
 /**
@@ -1679,8 +1686,8 @@ - (void)handleWillResignActive:(NSNotification*)notification {
 }
 
 /**
- * Called when the |FlutterAppDelegate| gets the applicationDidUnhide
- * notification.
+ * Called when the application's occlusion state changes
+ * (NSApplicationDidChangeOcclusionStateNotification).
  */
 - (void)handleDidChangeOcclusionState:(NSNotification*)notification {
   NSApplicationOcclusionState occlusionState = [[NSApplication sharedApplication] occlusionState];
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
index c43c3025945ed..3413d650f996e 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
@@ -15,6 +15,7 @@
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
+#import "flutter/shell/platform/darwin/common/InternalFlutterSwiftCommon/InternalFlutterSwiftCommon.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/common/test_utils_swift/test_utils_swift.h"
@@ -33,7 +34,7 @@
 #include "flutter/testing/test_dart_native_resolver.h"
 #include "gtest/gtest.h"
 
-// CREATE_NATIVE_ENTRY and MOCK_ENGINE_PROC are leaky by design
+// CREATE_FFI_LAMBDA and MOCK_ENGINE_PROC are leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 @interface FlutterEngine (Test)
@@ -153,12 +154,12 @@ @implementation MockableFlutterEngine
 
   // Block until notified by the Dart test of the value of Platform.executable.
   BOOL signaled = NO;
-  AddNativeCallback("NotifyStringValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      const auto dart_string = tonic::DartConverter<std::string>::FromDart(
-                          Dart_GetNativeArgument(args, 0));
-                      EXPECT_EQ(executable_name, dart_string);
-                      signaled = YES;
-                    }));
+  AddFfiNativeCallback("NotifyStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle value) {
+                         const auto dart_string =
+                             tonic::DartConverter<std::string>::FromDart(value);
+                         EXPECT_EQ(executable_name, dart_string);
+                         signaled = YES;
+                       }));
 
   // Launch the test entrypoint.
   EXPECT_TRUE([engine runWithEntrypoint:@"executableNameNotNull"]);
@@ -216,8 +217,7 @@ @implementation MockableFlutterEngine
 TEST_F(FlutterEngineTest, CanLogToStdout) {
   // Block until completion of print statement.
   BOOL signaled = NO;
-  AddNativeCallback("SignalNativeTest",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { signaled = YES; }));
+  AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() { signaled = YES; }));
 
   // Replace stdout stream buffer with our own.
   FlutterStringOutputWriter* writer = [[FlutterStringOutputWriter alloc] init];
@@ -242,16 +242,16 @@ @implementation MockableFlutterEngine
 
   // Latch to ensure the entire layer tree has been generated and presented.
   BOOL signaled = NO;
-  AddNativeCallback("SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      CALayer* rootLayer = engine.viewController.flutterView.layer;
-                      EXPECT_TRUE(rootLayer.backgroundColor != nil);
-                      if (rootLayer.backgroundColor != nil) {
-                        NSColor* actualBackgroundColor =
-                            [NSColor colorWithCGColor:rootLayer.backgroundColor];
-                        EXPECT_EQ(actualBackgroundColor, [NSColor blackColor]);
-                      }
-                      signaled = YES;
-                    }));
+  AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                         CALayer* rootLayer = engine.viewController.flutterView.layer;
+                         EXPECT_TRUE(rootLayer.backgroundColor != nil);
+                         if (rootLayer.backgroundColor != nil) {
+                           NSColor* actualBackgroundColor =
+                               [NSColor colorWithCGColor:rootLayer.backgroundColor];
+                           EXPECT_EQ(actualBackgroundColor, [NSColor blackColor]);
+                         }
+                         signaled = YES;
+                       }));
 
   // Launch the test entrypoint.
   EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
@@ -273,16 +273,16 @@ @implementation MockableFlutterEngine
 
   // Latch to ensure the entire layer tree has been generated and presented.
   BOOL signaled = NO;
-  AddNativeCallback("SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      CALayer* rootLayer = engine.viewController.flutterView.layer;
-                      EXPECT_TRUE(rootLayer.backgroundColor != nil);
-                      if (rootLayer.backgroundColor != nil) {
-                        NSColor* actualBackgroundColor =
-                            [NSColor colorWithCGColor:rootLayer.backgroundColor];
-                        EXPECT_EQ(actualBackgroundColor, [NSColor whiteColor]);
-                      }
-                      signaled = YES;
-                    }));
+  AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                         CALayer* rootLayer = engine.viewController.flutterView.layer;
+                         EXPECT_TRUE(rootLayer.backgroundColor != nil);
+                         if (rootLayer.backgroundColor != nil) {
+                           NSColor* actualBackgroundColor =
+                               [NSColor colorWithCGColor:rootLayer.backgroundColor];
+                           EXPECT_EQ(actualBackgroundColor, [NSColor whiteColor]);
+                         }
+                         signaled = YES;
+                       }));
 
   // Launch the test entrypoint.
   EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
@@ -512,8 +512,7 @@ @implementation MockableFlutterEngine
 
 TEST_F(FlutterEngineTest, NativeCallbacks) {
   BOOL latch_called = NO;
-  AddNativeCallback("SignalNativeTest",
-                    CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch_called = YES; }));
+  AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() { latch_called = YES; }));
 
   FlutterEngine* engine = GetFlutterEngine();
   EXPECT_TRUE([engine runWithEntrypoint:@"nativeCallback"]);
@@ -937,14 +936,13 @@ @implementation MockableFlutterEngine
 
   BOOL signaled = NO;
   std::optional<int64_t> engineId;
-  AddNativeCallback("NotifyEngineId", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                      const auto argument = Dart_GetNativeArgument(args, 0);
-                      if (!Dart_IsNull(argument)) {
-                        const auto id = tonic::DartConverter<int64_t>::FromDart(argument);
-                        engineId = id;
-                      }
-                      signaled = YES;
-                    }));
+  AddFfiNativeCallback("NotifyEngineId", CREATE_FFI_LAMBDA([&](Dart_Handle argument) {
+                         if (!Dart_IsNull(argument)) {
+                           const auto id = tonic::DartConverter<int64_t>::FromDart(argument);
+                           engineId = id;
+                         }
+                         signaled = YES;
+                       }));
 
   EXPECT_TRUE([engine runWithEntrypoint:@"testEngineId"]);
   while (!signaled) {
@@ -1220,6 +1218,16 @@ @implementation MockableFlutterEngine
         [invocation setReturnValue:&visibility];
       });
 
+  // handleWillBecomeActive derives visibility from the windows (not from the
+  // occlusion state, which can latch stale), so provide a window whose visibility
+  // we can toggle independently.
+  __block BOOL windowVisible = YES;
+  id mockWindow = OCMClassMock([NSWindow class]);
+  OCMStub([mockWindow isVisible]).andDo(^(NSInvocation* invocation) {
+    [invocation setReturnValue:&windowVisible];
+  });
+  OCMStub([mockApplication windows]).andReturn(@[ mockWindow ]);
+
   NSNotification* willBecomeActive =
       [[NSNotification alloc] initWithName:NSApplicationWillBecomeActiveNotification
                                     object:nil
@@ -1248,12 +1256,30 @@ @implementation MockableFlutterEngine
   [engineMock handleDidChangeOcclusionState:didChangeOcclusionState];
   EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
 
+  // Becoming active with an on-screen window resumes even though occlusionState still
+  // reads not-visible (the stale-latch case). Regression test for #155977.
   [engineMock handleWillBecomeActive:willBecomeActive];
-  EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kResumed);
 
+  // The app is now active and considered visible, so resigning active makes it
+  // inactive (not hidden) until a real occlusion notification hides it.
   [engineMock handleWillResignActive:willResignActive];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kInactive);
+
+  // Occlusion stays authoritative after a becomeActive resume: a genuine
+  // not-visible occlusion notification still hides the app.
+  visibility = 0;
+  [engineMock handleDidChangeOcclusionState:didChangeOcclusionState];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
+
+  // Becoming active while no window is visible (e.g. activated with all windows
+  // minimized, which does not deminiaturize) must not resume: visibility is
+  // derived from the windows, not from the activation itself.
+  windowVisible = NO;
+  [engineMock handleWillBecomeActive:willBecomeActive];
   EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
 
+  [mockWindow stopMocking];
   [mockApplication stopMocking];
 }
 
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
index d9d78f88d1072..475d1121b1715 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
@@ -25,6 +25,7 @@ class FlutterEngineTest : public AutoreleasePoolTest {
   void TearDown() override;
 
   void AddNativeCallback(const char* name, Dart_NativeFunction function);
+  void AddFfiNativeCallback(const char* name, void* function);
 
   static void IsolateCreateCallback(void* user_data);
 
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
index b2ff26cab0d60..a2bf5cebcb4c4 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
@@ -73,6 +73,10 @@ - (BOOL)setString:(NSString*)string forType:(NSPasteboardType)dataType {
   native_resolver_->AddNativeCallback({name}, function);
 }
 
+void FlutterEngineTest::AddFfiNativeCallback(const char* name, void* function) {
+  native_resolver_->AddFfiNativeCallback({name}, function);
+}
+
 id CreateMockFlutterEngine(NSString* pasteboardString) {
   NSString* fixtures = @(testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
index 24c84818044b4..bb3a4bf913568 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
@@ -320,6 +320,85 @@
   EXPECT_EQ([native_text_field.stringValue isEqualToString:@"textfield"], YES);
 }
 
+// A disabled (but otherwise editable) text field must be exposed as static text
+// rather than a `FlutterTextField`. This exercises the `!IsReadOnlyOrDisabled()`
+// guard in `Init`: the `GetData()` override rewrites the role to `kStaticText`,
+// but the node retains its `kEditableRoot` attribute, so `GetData().IsTextField()`
+// still returns true. The restriction check is what keeps a disabled field from
+// being instantiated as an editable `FlutterTextField`.
+TEST(FlutterPlatformNodeDelegateMac, DisabledTextFieldDoesNotUseFlutterTextField) {
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
+  [viewController loadView];
+
+  // Creates a NSWindow so that the native accessibility element has a hosting view.
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
+                                                 styleMask:NSBorderlessWindowMask
+                                                   backing:NSBackingStoreBuffered
+                                                     defer:NO];
+  window.contentView = viewController.view;
+  engine.semanticsEnabled = YES;
+
+  auto bridge = viewController.accessibilityBridge.lock();
+  // Initialize ax node data.
+  FlutterSemanticsNode2 root = {};
+  FlutterSemanticsFlags flags = FlutterSemanticsFlags{0};
+  // A text field that is editable (not read-only) but disabled.
+  FlutterSemanticsFlags child_flags =
+      FlutterSemanticsFlags{.is_enabled = FlutterTristate::kFlutterTristateFalse,
+                            .is_text_field = true,
+                            .is_read_only = false};
+  root.id = 0;
+  root.flags2 = &flags;
+  // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange)
+  root.actions = static_cast<FlutterSemanticsAction>(0);
+  root.label = "root";
+  root.hint = "";
+  root.value = "";
+  root.increased_value = "";
+  root.decreased_value = "";
+  root.tooltip = "";
+  root.child_count = 1;
+  int32_t children[] = {1};
+  root.children_in_traversal_order = children;
+  root.custom_accessibility_actions_count = 0;
+  root.identifier = "";
+  root.rect = {0, 0, 100, 100};  // LTRB
+  root.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+
+  FlutterSemanticsNode2 child1 = {};
+  child1.id = 1;
+  child1.flags2 = &child_flags;
+  // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange)
+  child1.actions = static_cast<FlutterSemanticsAction>(0);
+  child1.label = "";
+  child1.hint = "";
+  child1.value = "disabled textfield";
+  child1.increased_value = "";
+  child1.decreased_value = "";
+  child1.tooltip = "";
+  child1.text_selection_base = -1;
+  child1.text_selection_extent = -1;
+  child1.child_count = 0;
+  child1.custom_accessibility_actions_count = 0;
+  child1.identifier = "";
+  child1.rect = {0, 0, 50, 50};  // LTRB
+  child1.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+
+  bridge->CommitUpdates();
+
+  auto child_platform_node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
+  // The disabled text field must not be backed by a `FlutterTextField`.
+  id native_accessibility = child_platform_node_delegate->GetNativeViewAccessible();
+  EXPECT_FALSE([native_accessibility isKindOfClass:[FlutterTextField class]]);
+  EXPECT_TRUE(
+      [[native_accessibility accessibilityRole] isEqualToString:NSAccessibilityStaticTextRole]);
+
+  [engine shutDownEngine];
+}
+
 TEST(FlutterPlatformNodeDelegateMac, ChangingFlagsUpdatesNativeViewAccessible) {
   FlutterViewController* viewController = CreateTestViewController();
   FlutterEngine* engine = viewController.engine;
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterRunLoop.swift b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterRunLoop.swift
index f5b01d48512b1..551b6da796824 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterRunLoop.swift
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterRunLoop.swift
@@ -11,7 +11,7 @@ import Foundation
 /// schedules the task in both common run loop mode and a private run loop mode,
 /// which allows it to run in a mode where it only processes Flutter messages
 /// (`pollFlutterMessagesOnce()`).
-@objc public final class FlutterRunLoop: NSObject {
+@objc final class FlutterRunLoop: NSObject {
   private static let flutterRunLoopMode = CFRunLoopMode("FlutterRunLoopMode" as CFString)
 
   private static var _mainRunLoop: FlutterRunLoop?
@@ -91,7 +91,7 @@ import Foundation
 
   // Ensures that the `FlutterRunLoop` for main thread is initialized. Only
   // needs to be called once and must be called on the main thread.
-  @objc public static func ensureMainLoopInitialized() {
+  @objc static func ensureMainLoopInitialized() {
     assert(Thread.isMainThread, "Must be called on the main thread.")
     if _mainRunLoop == nil {
       _mainRunLoop = FlutterRunLoop()
@@ -99,7 +99,7 @@ import Foundation
   }
 
   // The `FlutterRunLoop` for the main thread.
-  @objc public static var mainRunLoop: FlutterRunLoop {
+  @objc static var mainRunLoop: FlutterRunLoop {
     assert(
       _mainRunLoop != nil,
       "Main run loop has not been initialized. Call ensureMainLoopInitialized() first."
@@ -108,7 +108,7 @@ import Foundation
   }
 
   // Schedules a block to be executed on the main thread.
-  @objc public func perform(afterDelay delay: TimeInterval, block: @escaping () -> Void) {
+  @objc func perform(afterDelay delay: TimeInterval, block: @escaping () -> Void) {
     tasksLock.lock()
     defer { tasksLock.unlock() }
 
@@ -123,7 +123,7 @@ import Foundation
 
   // Schedules a block to be executed on the main thread after a delay.
   @objc(performBlock:)
-  public func perform(_ block: @escaping () -> Void) {
+  func perform(_ block: @escaping () -> Void) {
     perform(afterDelay: 0, block: block)
   }
 
@@ -158,7 +158,7 @@ import Foundation
 
   /// Executes single iteration of the run loop in the mode where only Flutter
   /// messages are processed.
-  @objc public func pollFlutterMessagesOnce() {
+  @objc func pollFlutterMessagesOnce() {
     CFRunLoopRunInMode(Self.flutterRunLoopMode, 0.1, true)
   }
 }
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm
index 078192149b45c..0d49ae4051815 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterWindowControllerTest.mm
@@ -26,10 +26,10 @@ void SetUp() {
 
     signalled_ = false;
 
-    AddNativeCallback("SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                        isolate_ = Isolate::Current();
-                        signalled_ = true;
-                      }));
+    AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                           isolate_ = Isolate::Current();
+                           signalled_ = true;
+                         }));
 
     while (!signalled_) {
       CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, false);
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizer.swift b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizer.swift
index 21bb9ee0efea8..de4c3d13d8fc4 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizer.swift
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizer.swift
@@ -41,7 +41,7 @@ import Foundation
 ///   - Thread Safety: The class manages its internal state in a thread-safe manner to coordinate
 ///     actions between the platform thread and the raster thread.
 @objc(FlutterResizeSynchronizer)
-public final class ResizeSynchronizer: NSObject {
+final class ResizeSynchronizer: NSObject {
   private static let invalidSize = CGSize(width: -1, height: -1)
 
   // Synchronizes access to _isInResize_unsafe: isInResize is accessed from multiple threads and
@@ -75,7 +75,7 @@ public final class ResizeSynchronizer: NSObject {
   /// Blocks the thread until `performCommit(forSize:notify:delay:)` with the same size is called.
   /// While the thread is blocked, Flutter messages are being pumped.
   /// See `FlutterRunLoop.mainRunLoop.pollFlutterMessagesOnce()`.
-  @objc public func beginResize(
+  @objc func beginResize(
     forSize size: CGSize,
     notify: () -> Void,
     onTimeout: (() -> Void)? = nil
@@ -121,7 +121,7 @@ public final class ResizeSynchronizer: NSObject {
   /// on the platform thread, if waiting for the surface during resize.
   ///
   /// Called from the raster thread on frame present.
-  @objc public func performCommit(
+  @objc func performCommit(
     forSize size: CGSize,
     afterDelay delay: TimeInterval,
     notify: @escaping () -> Void
@@ -143,7 +143,7 @@ public final class ResizeSynchronizer: NSObject {
   /// Notifies the synchronizer that the Flutter view is being shut down.
   ///
   /// Unblocks the platform thread if blocked.
-  @objc public func shutDown() {
+  @objc func shutDown() {
     FlutterRunLoop.mainRunLoop.perform {
       self.isShuttingDown = true
     }
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizerTests.swift b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizerTests.swift
index 47fdfa9d31fa8..ff50150b773ef 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizerTests.swift
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/ResizeSynchronizerTests.swift
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import InternalFlutterSwift
+@testable import InternalFlutterSwift
 import Testing
 
 // Tests for `ResizeSynchronizer`.
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart
index a58f2eecb94e6..587e3726029e8 100644
--- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart
+++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart
@@ -4,11 +4,12 @@
 
 // ignore_for_file: avoid_print
 
+import 'dart:ffi';
 import 'dart:io';
 import 'dart:typed_data';
 import 'dart:ui';
 
-@pragma('vm:external-name', 'SignalNativeTest')
+@Native<Void Function()>(symbol: 'SignalNativeTest')
 external void signalNativeTest();
 
 void main() {}
@@ -20,7 +21,7 @@ void empty() {}
 ///
 /// This is used to notify the native side of the test of a string value from
 /// the Dart fixture under test.
-@pragma('vm:external-name', 'NotifyStringValue')
+@Native<Void Function(Handle)>(symbol: 'NotifyStringValue')
 external void notifyStringValue(String s);
 
 @pragma('vm:entry-point')
@@ -86,7 +87,7 @@ void sendFooMessage() {
   PlatformDispatcher.instance.sendPlatformMessage('foo', null, (ByteData? result) {});
 }
 
-@pragma('vm:external-name', 'NotifyEngineId')
+@Native<Void Function(Handle)>(symbol: 'NotifyEngineId')
 external void notifyEngineId(int? engineId);
 
 @pragma('vm:entry-point')
diff --git a/engine/src/flutter/shell/platform/embedder/embedder.h b/engine/src/flutter/shell/platform/embedder/embedder.h
index e9f3769963b2f..5f6cf7675141d 100644
--- a/engine/src/flutter/shell/platform/embedder/embedder.h
+++ b/engine/src/flutter/shell/platform/embedder/embedder.h
@@ -31,6 +31,8 @@
 // - Instead of array of structures, prefer array of pointers to structures.
 //   This ensures that array indexing does not break if members are added
 //   to the structure.
+// - Structures documented as frozen must not have members added. Introduce a
+//   new versioned structure instead.
 //
 // These changes are allowed:
 // - Adding new struct members at the end of a structure as long as the struct
@@ -392,6 +394,7 @@ typedef struct _FlutterEngine* FLUTTER_API_SYMBOL(FlutterEngine);
 /// opaque to the engine; the engine does not interpret view IDs in any way.
 typedef int64_t FlutterViewId;
 
+// Frozen because adding members would break the ABI of `FlutterSemanticsNode`.
 typedef struct {
   /// horizontal scale factor
   double scaleX;
@@ -645,6 +648,9 @@ typedef struct {
 } FlutterUIntSize;
 
 /// A structure to represent a rectangle.
+///
+// Frozen because adding members would break the ABI of `FlutterSemanticsNode`
+// and `FlutterDamage`.
 typedef struct {
   double left;
   double top;
@@ -653,6 +659,8 @@ typedef struct {
 } FlutterRect;
 
 /// A structure to represent a 2D point.
+///
+// Frozen because adding members would break the ABI of `FlutterLayer`.
 typedef struct {
   double x;
   double y;
@@ -668,6 +676,8 @@ typedef struct {
 } FlutterRoundedRect;
 
 /// A structure to represent a damage region.
+///
+// Frozen because adding members would break the ABI of `FlutterPresentInfo`.
 typedef struct {
   /// The size of this struct. Must be sizeof(FlutterDamage).
   size_t struct_size;
@@ -1582,6 +1592,9 @@ typedef struct {
 ///                 ABI compatibility for existing users, no new fields will be
 ///                 added to this struct. New fields will continue to be added
 ///                 to `FlutterSemanticsNode2`.
+///
+// Frozen because adding members would break the ABI of
+// `FlutterSemanticsUpdate`.
 typedef struct {
   /// The size of this struct. Must be sizeof(FlutterSemanticsNode).
   size_t struct_size;
@@ -1789,6 +1802,9 @@ extern const int32_t kFlutterSemanticsCustomActionIdBatchEnd;
 ///                 preserve ABI compatility for existing users, no new fields
 ///                 will be added to this struct. New fields will continue to
 ///                 be added to `FlutterSemanticsCustomAction2`.
+///
+// Frozen because adding members would break the ABI of
+// `FlutterSemanticsUpdate`.
 typedef struct {
   /// The size of the struct. Must be sizeof(FlutterSemanticsCustomAction).
   size_t struct_size;
diff --git a/engine/src/flutter/shell/platform/embedder/fixtures/main.dart b/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
index 2bafc60c41f64..ef903c5c4fcb9 100644
--- a/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
+++ b/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
@@ -20,7 +20,7 @@ void customEntrypoint() {
   sayHiFromCustomEntrypoint();
 }
 
-@pragma('vm:external-name', 'SayHiFromCustomEntrypoint')
+@ffi.Native<ffi.Void Function()>(symbol: 'SayHiFromCustomEntrypoint')
 external void sayHiFromCustomEntrypoint();
 
 @pragma('vm:entry-point')
@@ -30,11 +30,11 @@ void customEntrypoint1() {
   sayHiFromCustomEntrypoint3();
 }
 
-@pragma('vm:external-name', 'SayHiFromCustomEntrypoint1')
+@ffi.Native<ffi.Void Function()>(symbol: 'SayHiFromCustomEntrypoint1')
 external void sayHiFromCustomEntrypoint1();
-@pragma('vm:external-name', 'SayHiFromCustomEntrypoint2')
+@ffi.Native<ffi.Void Function()>(symbol: 'SayHiFromCustomEntrypoint2')
 external void sayHiFromCustomEntrypoint2();
-@pragma('vm:external-name', 'SayHiFromCustomEntrypoint3')
+@ffi.Native<ffi.Void Function()>(symbol: 'SayHiFromCustomEntrypoint3')
 external void sayHiFromCustomEntrypoint3();
 
 @pragma('vm:entry-point')
@@ -52,9 +52,9 @@ void implicitViewNotNull() {
   notifyBoolValue(PlatformDispatcher.instance.implicitView != null);
 }
 
-@pragma('vm:external-name', 'NotifyStringValue')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'NotifyStringValue')
 external void notifyStringValue(String value);
-@pragma('vm:external-name', 'NotifyBoolValue')
+@ffi.Native<ffi.Void Function(ffi.Bool)>(symbol: 'NotifyBoolValue')
 external void notifyBoolValue(bool value);
 
 @pragma('vm:entry-point')
@@ -104,17 +104,17 @@ Float64List kTestTransform = () {
   return values;
 }();
 
-@pragma('vm:external-name', 'SignalNativeTest')
+@ffi.Native<ffi.Void Function()>(symbol: 'SignalNativeTest')
 external void signalNativeTest();
-@pragma('vm:external-name', 'SignalNativeCount')
+@ffi.Native<ffi.Void Function(ffi.Int64)>(symbol: 'SignalNativeCount')
 external void signalNativeCount(int count);
-@pragma('vm:external-name', 'SignalNativeMessage')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'SignalNativeMessage')
 external void signalNativeMessage(String message);
-@pragma('vm:external-name', 'NotifySemanticsEnabled')
+@ffi.Native<ffi.Void Function(ffi.Bool)>(symbol: 'NotifySemanticsEnabled')
 external void notifySemanticsEnabled(bool enabled);
-@pragma('vm:external-name', 'NotifyAccessibilityFeatures')
+@ffi.Native<ffi.Void Function(ffi.Bool)>(symbol: 'NotifyAccessibilityFeatures')
 external void notifyAccessibilityFeatures(bool reduceMotion);
-@pragma('vm:external-name', 'NotifySemanticsAction')
+@ffi.Native<ffi.Void Function(ffi.Int64, ffi.Int64, ffi.Handle)>(symbol: 'NotifySemanticsAction')
 external void notifySemanticsAction(int nodeId, int action, List<int> data);
 
 @ffi.Native<ffi.Void Function()>(symbol: 'FFISignalNativeTest')
@@ -689,7 +689,7 @@ void can_composite_platform_views_with_platform_layer_on_bottom() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
-@pragma('vm:external-name', 'SignalBeginFrame')
+@ffi.Native<ffi.Void Function()>(symbol: 'SignalBeginFrame')
 // ignore: unreachable_from_main
 external void signalBeginFrame();
 
@@ -772,7 +772,17 @@ Picture createGradientBox(Size size) {
   return baseRecorder.endRecording();
 }
 
-@pragma('vm:external-name', 'EchoKeyEvent')
+@ffi.Native<
+  ffi.Void Function(
+    ffi.Uint64,
+    ffi.Uint64,
+    ffi.Uint64,
+    ffi.Uint64,
+    ffi.Uint64,
+    ffi.Bool,
+    ffi.Uint64,
+  )
+>(symbol: 'EchoKeyEvent')
 external void _echoKeyEvent(
   int change,
   int timestamp,
@@ -1234,7 +1244,7 @@ void scene_builder_with_complex_clips() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
-@pragma('vm:external-name', 'SendObjectToNativeCode')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'SendObjectToNativeCode')
 external void sendObjectToNativeCode(dynamic object);
 
 @pragma('vm:entry-point')
@@ -1312,7 +1322,7 @@ void render_targets_are_in_stable_order() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
-@pragma('vm:external-name', 'NativeArgumentsCallback')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'NativeArgumentsCallback')
 external void nativeArgumentsCallback(List<String> args);
 
 @pragma('vm:entry-point')
@@ -1327,7 +1337,7 @@ void dart_entrypoint_args(List<String> args) {
   nativeArgumentsCallback(args);
 }
 
-@pragma('vm:external-name', 'SnapshotsCallback')
+@ffi.Native<ffi.Void Function(ffi.Handle, ffi.Handle)>(symbol: 'SnapshotsCallback')
 external void snapshotsCallback(Image bigImage, Image smallImage);
 
 @pragma('vm:entry-point')
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
index 743db21a8205a..1e022c5e28bab 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
@@ -20,7 +20,7 @@
 #include "gmock/gmock.h"  // For EXPECT_THAT and matchers
 #include "gtest/gtest.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -109,39 +109,41 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // Called by the Dart text fixture on the UI thread to signal that the C++
   // unittest should resume.
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
-        signal_native_latch.Signal();
-      })));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA(([&signal_native_latch]() {
+                                 signal_native_latch.Signal();
+                               })));
 
   // Called by test fixture on UI thread to pass data back to this test.
-  NativeEntry notify_semantics_enabled_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_semantics_enabled_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsEnabled",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_enabled_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_enabled_callback, nullptr);
-            notify_semantics_enabled_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_enabled_callback](bool enabled) {
+        ASSERT_NE(notify_semantics_enabled_callback, nullptr);
+        notify_semantics_enabled_callback(enabled);
+      })));
 
-  NativeEntry notify_accessibility_features_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_accessibility_features_callback;
+  context.AddFfiNativeCallback(
       "NotifyAccessibilityFeatures",
-      CREATE_NATIVE_ENTRY((
-          [&notify_accessibility_features_callback](Dart_NativeArguments args) {
+      CREATE_FFI_LAMBDA(
+          ([&notify_accessibility_features_callback](bool reduce_motion) {
             ASSERT_NE(notify_accessibility_features_callback, nullptr);
-            notify_accessibility_features_callback(args);
+            notify_accessibility_features_callback(reduce_motion);
           })));
 
-  NativeEntry notify_semantics_action_callback;
-  context.AddNativeCallback(
+  std::function<void(int64_t, int64_t, std::vector<int64_t>)>
+      notify_semantics_action_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsAction",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_action_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_action_callback, nullptr);
-            notify_semantics_action_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_action_callback](
+                             int64_t node_id, int64_t action,
+                             Dart_Handle data_handle) {
+        ASSERT_NE(notify_semantics_action_callback, nullptr);
+        std::vector<int64_t> data =
+            tonic::DartConverter<std::vector<int64_t>>::FromDart(data_handle);
+        notify_semantics_action_callback(node_id, action, data);
+      })));
 
   fml::AutoResetWaitableEvent semantics_update_latch;
   context.SetSemanticsUpdateCallback2(
@@ -185,10 +187,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
@@ -196,20 +195,14 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_FALSE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_FALSE(reduce_motion);
     notify_features_latch.Signal();
   };
 
   // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -222,11 +215,8 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
   fml::AutoResetWaitableEvent notify_features_latch_2;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_TRUE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_TRUE(reduce_motion);
     notify_features_latch_2.Signal();
   };
   result = FlutterEngineUpdateAccessibilityFeatures(
@@ -241,22 +231,15 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
   fml::AutoResetWaitableEvent notify_semantics_action_latch;
-  notify_semantics_action_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    int64_t node_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
-    ASSERT_EQ(42, node_id);
-
-    int64_t action_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
-    ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
-
-    std::vector<int64_t> semantic_args =
-        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
-                                                                    exception);
-    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
-    notify_semantics_action_latch.Signal();
-  };
+  notify_semantics_action_callback =
+      [&](int64_t node_id, int64_t action_id,
+          const std::vector<int64_t>& semantic_args) {
+        ASSERT_EQ(42, node_id);
+        ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap),
+                  action_id);
+        ASSERT_THAT(semantic_args, ElementsAre(2, 1));
+        notify_semantics_action_latch.Signal();
+      };
   std::vector<uint8_t> bytes({2, 1});
   result = FlutterEngineDispatchSemanticsAction(
       engine.get(), 42, kFlutterSemanticsActionTap, &bytes[0], bytes.size());
@@ -265,10 +248,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
 
   // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
@@ -288,11 +268,10 @@ TEST_F(EmbedderA11yTest, A11yStringAttributes) {
 
   // Called by the Dart text fixture on the UI thread to signal that the C++
   // unittest should resume.
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
-        signal_native_latch.Signal();
-      })));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA(([&signal_native_latch]() {
+                                 signal_native_latch.Signal();
+                               })));
 
   fml::AutoResetWaitableEvent semantics_update_latch;
   context.SetSemanticsUpdateCallback2(
@@ -412,39 +391,41 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // Called by the Dart text fixture on the UI thread to signal that the C++
   // unittest should resume.
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
-        signal_native_latch.Signal();
-      })));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA(([&signal_native_latch]() {
+                                 signal_native_latch.Signal();
+                               })));
 
   // Called by test fixture on UI thread to pass data back to this test.
-  NativeEntry notify_semantics_enabled_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_semantics_enabled_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsEnabled",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_enabled_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_enabled_callback, nullptr);
-            notify_semantics_enabled_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_enabled_callback](bool enabled) {
+        ASSERT_NE(notify_semantics_enabled_callback, nullptr);
+        notify_semantics_enabled_callback(enabled);
+      })));
 
-  NativeEntry notify_accessibility_features_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_accessibility_features_callback;
+  context.AddFfiNativeCallback(
       "NotifyAccessibilityFeatures",
-      CREATE_NATIVE_ENTRY((
-          [&notify_accessibility_features_callback](Dart_NativeArguments args) {
+      CREATE_FFI_LAMBDA(
+          ([&notify_accessibility_features_callback](bool reduce_motion) {
             ASSERT_NE(notify_accessibility_features_callback, nullptr);
-            notify_accessibility_features_callback(args);
+            notify_accessibility_features_callback(reduce_motion);
           })));
 
-  NativeEntry notify_semantics_action_callback;
-  context.AddNativeCallback(
+  std::function<void(int64_t, int64_t, std::vector<int64_t>)>
+      notify_semantics_action_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsAction",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_action_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_action_callback, nullptr);
-            notify_semantics_action_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_action_callback](
+                             int64_t node_id, int64_t action,
+                             Dart_Handle data_handle) {
+        ASSERT_NE(notify_semantics_action_callback, nullptr);
+        std::vector<int64_t> data =
+            tonic::DartConverter<std::vector<int64_t>>::FromDart(data_handle);
+        notify_semantics_action_callback(node_id, action, data);
+      })));
 
   fml::AutoResetWaitableEvent semantics_update_latch;
   context.SetSemanticsUpdateCallback([&](const FlutterSemanticsUpdate* update) {
@@ -486,10 +467,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
@@ -497,20 +475,14 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_FALSE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_FALSE(reduce_motion);
     notify_features_latch.Signal();
   };
 
   // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -523,11 +495,8 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
   fml::AutoResetWaitableEvent notify_features_latch_2;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_TRUE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_TRUE(reduce_motion);
     notify_features_latch_2.Signal();
   };
   result = FlutterEngineUpdateAccessibilityFeatures(
@@ -542,22 +511,15 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
   fml::AutoResetWaitableEvent notify_semantics_action_latch;
-  notify_semantics_action_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    int64_t node_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
-    ASSERT_EQ(42, node_id);
-
-    int64_t action_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
-    ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
-
-    std::vector<int64_t> semantic_args =
-        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
-                                                                    exception);
-    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
-    notify_semantics_action_latch.Signal();
-  };
+  notify_semantics_action_callback =
+      [&](int64_t node_id, int64_t action_id,
+          const std::vector<int64_t>& semantic_args) {
+        ASSERT_EQ(42, node_id);
+        ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap),
+                  action_id);
+        ASSERT_THAT(semantic_args, ElementsAre(2, 1));
+        notify_semantics_action_latch.Signal();
+      };
   std::vector<uint8_t> bytes({2, 1});
   result = FlutterEngineDispatchSemanticsAction(
       engine.get(), 42, kFlutterSemanticsActionTap, &bytes[0], bytes.size());
@@ -566,10 +528,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
 
   // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
@@ -589,39 +548,41 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // Called by the Dart text fixture on the UI thread to signal that the C++
   // unittest should resume.
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
-        signal_native_latch.Signal();
-      })));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA(([&signal_native_latch]() {
+                                 signal_native_latch.Signal();
+                               })));
 
   // Called by test fixture on UI thread to pass data back to this test.
-  NativeEntry notify_semantics_enabled_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_semantics_enabled_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsEnabled",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_enabled_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_enabled_callback, nullptr);
-            notify_semantics_enabled_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_enabled_callback](bool enabled) {
+        ASSERT_NE(notify_semantics_enabled_callback, nullptr);
+        notify_semantics_enabled_callback(enabled);
+      })));
 
-  NativeEntry notify_accessibility_features_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_accessibility_features_callback;
+  context.AddFfiNativeCallback(
       "NotifyAccessibilityFeatures",
-      CREATE_NATIVE_ENTRY((
-          [&notify_accessibility_features_callback](Dart_NativeArguments args) {
+      CREATE_FFI_LAMBDA(
+          ([&notify_accessibility_features_callback](bool reduce_motion) {
             ASSERT_NE(notify_accessibility_features_callback, nullptr);
-            notify_accessibility_features_callback(args);
+            notify_accessibility_features_callback(reduce_motion);
           })));
 
-  NativeEntry notify_semantics_action_callback;
-  context.AddNativeCallback(
+  std::function<void(int64_t, int64_t, std::vector<int64_t>)>
+      notify_semantics_action_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsAction",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_action_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_action_callback, nullptr);
-            notify_semantics_action_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_action_callback](
+                             int64_t node_id, int64_t action,
+                             Dart_Handle data_handle) {
+        ASSERT_NE(notify_semantics_action_callback, nullptr);
+        std::vector<int64_t> data =
+            tonic::DartConverter<std::vector<int64_t>>::FromDart(data_handle);
+        notify_semantics_action_callback(node_id, action, data);
+      })));
 
   fml::AutoResetWaitableEvent semantics_node_latch;
   fml::AutoResetWaitableEvent semantics_action_latch;
@@ -683,10 +644,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
@@ -694,20 +652,14 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_FALSE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_FALSE(reduce_motion);
     notify_features_latch.Signal();
   };
 
   // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -720,11 +672,8 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
   fml::AutoResetWaitableEvent notify_features_latch_2;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_TRUE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_TRUE(reduce_motion);
     notify_features_latch_2.Signal();
   };
   result = FlutterEngineUpdateAccessibilityFeatures(
@@ -744,22 +693,15 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
   fml::AutoResetWaitableEvent notify_semantics_action_latch;
-  notify_semantics_action_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    int64_t node_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
-    ASSERT_EQ(42, node_id);
-
-    int64_t action_id =
-        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
-    ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
-
-    std::vector<int64_t> semantic_args =
-        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
-                                                                    exception);
-    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
-    notify_semantics_action_latch.Signal();
-  };
+  notify_semantics_action_callback =
+      [&](int64_t node_id, int64_t action_id,
+          const std::vector<int64_t>& semantic_args) {
+        ASSERT_EQ(42, node_id);
+        ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap),
+                  action_id);
+        ASSERT_THAT(semantic_args, ElementsAre(2, 1));
+        notify_semantics_action_latch.Signal();
+      };
   std::vector<uint8_t> bytes({2, 1});
   result = FlutterEngineDispatchSemanticsAction(
       engine.get(), 42, kFlutterSemanticsActionTap, &bytes[0], bytes.size());
@@ -768,10 +710,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
 
   // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
@@ -791,29 +730,27 @@ TEST_F(EmbedderA11yTest, A11yTreesAreConsistentWithMultipleViews) {
 
   // Called by the Dart text fixture on the UI thread to signal that the C++
   // unittest should resume.
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
-        signal_native_latch.Signal();
-      })));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA(([&signal_native_latch]() {
+                                 signal_native_latch.Signal();
+                               })));
 
   // Called by test fixture on UI thread to pass data back to this test.
-  NativeEntry notify_semantics_enabled_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_semantics_enabled_callback;
+  context.AddFfiNativeCallback(
       "NotifySemanticsEnabled",
-      CREATE_NATIVE_ENTRY(
-          ([&notify_semantics_enabled_callback](Dart_NativeArguments args) {
-            ASSERT_NE(notify_semantics_enabled_callback, nullptr);
-            notify_semantics_enabled_callback(args);
-          })));
+      CREATE_FFI_LAMBDA(([&notify_semantics_enabled_callback](bool enabled) {
+        ASSERT_NE(notify_semantics_enabled_callback, nullptr);
+        notify_semantics_enabled_callback(enabled);
+      })));
 
-  NativeEntry notify_accessibility_features_callback;
-  context.AddNativeCallback(
+  std::function<void(bool)> notify_accessibility_features_callback;
+  context.AddFfiNativeCallback(
       "NotifyAccessibilityFeatures",
-      CREATE_NATIVE_ENTRY((
-          [&notify_accessibility_features_callback](Dart_NativeArguments args) {
+      CREATE_FFI_LAMBDA(
+          ([&notify_accessibility_features_callback](bool reduce_motion) {
             ASSERT_NE(notify_accessibility_features_callback, nullptr);
-            notify_accessibility_features_callback(args);
+            notify_accessibility_features_callback(reduce_motion);
           })));
 
   int num_times_set_semantics_update_callback2_called = 0;
@@ -855,10 +792,7 @@ TEST_F(EmbedderA11yTest, A11yTreesAreConsistentWithMultipleViews) {
 
   // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
@@ -912,20 +846,14 @@ TEST_F(EmbedderA11yTest, A11yTreesAreConsistentWithMultipleViews) {
 
   // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
-  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
-    ASSERT_FALSE(enabled);
+  notify_accessibility_features_callback = [&](bool reduce_motion) {
+    ASSERT_FALSE(reduce_motion);
     notify_features_latch.Signal();
   };
 
   // 4: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -947,10 +875,7 @@ TEST_F(EmbedderA11yTest, A11yTreesAreConsistentWithMultipleViews) {
 
   // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
-  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
-    bool enabled =
-        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  notify_semantics_enabled_callback = [&](bool enabled) {
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_gl_unittests.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_gl_unittests.cc
index 1273b23c6c788..74c0d3a8d36a1 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_gl_unittests.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_gl_unittests.cc
@@ -37,7 +37,7 @@
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter::testing {
@@ -192,10 +192,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -314,10 +312,8 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
         setup.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&setup](Dart_NativeArguments args) { setup.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&setup]() { setup.CountDown(); }));
 
   UniqueEngine engine = builder.LaunchEngine();
 
@@ -401,10 +397,8 @@ TEST_F(EmbedderTest, RasterCacheEnabled) {
         setup.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&setup](Dart_NativeArguments args) { setup.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&setup]() { setup.CountDown(); }));
 
   UniqueEngine engine = builder.LaunchEngine();
 
@@ -531,10 +525,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -653,10 +645,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -861,10 +851,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1021,10 +1009,8 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
 
   builder.SetPlatformTaskRunner(&task_runner_description);
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   platform_task_runner->PostTask([&]() {
     std::scoped_lock lock(engine_mutex);
@@ -1113,10 +1099,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithRootLayerOnly) {
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1238,10 +1222,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithPlatformLayerOnBottom) {
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1462,10 +1444,8 @@ TEST_F(EmbedderTest,
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -2462,11 +2442,10 @@ TEST_F(EmbedderTest,
   constexpr size_t frames_expected = 10;
   fml::CountDownLatch frame_latch(frames_expected);
   std::atomic_size_t frames_seen = 0;
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              frames_seen++;
-                              frame_latch.CountDown();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 frames_seen++;
+                                 frame_latch.CountDown();
+                               }));
   frame_latch.Wait();
 
   ASSERT_GE(frames_seen, frames_expected);
@@ -2503,11 +2482,10 @@ TEST_F(EmbedderTest,
   constexpr size_t frames_expected = 10;
   fml::CountDownLatch frame_latch(frames_expected);
   std::atomic_size_t frames_seen = 0;
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              frames_seen++;
-                              frame_latch.CountDown();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 frames_seen++;
+                                 frame_latch.CountDown();
+                               }));
   frame_latch.Wait();
 
   ASSERT_GE(frames_seen, frames_expected);
@@ -2863,9 +2841,8 @@ TEST_F(EmbedderTest, EmptySceneIsAcceptable) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -2891,9 +2868,8 @@ TEST_F(EmbedderTest, SceneWithNoRootContainerIsAcceptable) {
       EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer);
   builder.SetDartEntrypoint("scene_with_no_container");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -3124,12 +3100,11 @@ TEST_F(EmbedderTest, ObjectsCanBePostedViaPorts) {
   // for inspection.
   FlutterEngineDartPort port = 0;
   fml::AutoResetWaitableEvent event;
-  context.AddNativeCallback("SignalNativeCount",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              port = tonic::DartConverter<int64_t>::FromDart(
-                                  Dart_GetNativeArgument(args, 0));
-                              event.Signal();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeCount",
+                               CREATE_FFI_LAMBDA([&](int64_t count) {
+                                 port = count;
+                                 event.Signal();
+                               }));
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
   event.Wait();
@@ -3138,13 +3113,13 @@ TEST_F(EmbedderTest, ObjectsCanBePostedViaPorts) {
   using Trampoline = std::function<void(Dart_Handle message)>;
   Trampoline trampoline;
 
-  context.AddNativeCallback("SendObjectToNativeCode",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              FML_CHECK(trampoline);
-                              auto trampoline_copy = trampoline;
-                              trampoline = nullptr;
-                              trampoline_copy(Dart_GetNativeArgument(args, 0));
-                            }));
+  context.AddFfiNativeCallback("SendObjectToNativeCode",
+                               CREATE_FFI_LAMBDA([&](Dart_Handle object) {
+                                 FML_CHECK(trampoline);
+                                 auto trampoline_copy = trampoline;
+                                 trampoline = nullptr;
+                                 trampoline_copy(object);
+                               }));
 
   // Check null.
   {
@@ -3422,10 +3397,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsAreRecycled) {
 
   fml::CountDownLatch latch(2);
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              latch.CountDown();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   context.GetCompositor().SetNextPresentCallback(
       [&](FlutterViewId view_id, const FlutterLayer** layers,
@@ -3468,10 +3441,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsAreInStableOrder) {
 
   fml::CountDownLatch latch(2);
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              latch.CountDown();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   size_t frame_count = 0;
   std::vector<void*> first_frame_backing_store_user_data;
@@ -3550,10 +3521,9 @@ TEST_F(EmbedderTest, FrameInfoContainsValidWidthAndHeight) {
 
   static fml::CountDownLatch frame_latch(10);
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              /* Nothing to do. */
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 /* Nothing to do. */
+                               }));
 
   context.SetGLGetFBOCallback([](FlutterFrameInfo frame_info) {
     // width and height are rotated by 90 deg
@@ -3675,10 +3645,9 @@ TEST_F(EmbedderTest, PresentInfoContainsValidFBOId) {
 
   static fml::CountDownLatch frame_latch(10);
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              /* Nothing to do. */
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 /* Nothing to do. */
+                               }));
 
   const uint32_t window_fbo_id = context.GetWindowFBOId();
   context.SetGLPresentCallback(
@@ -3985,10 +3954,9 @@ TEST_F(EmbedderTest, PopulateExistingDamageReceivesInvalidID) {
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              /* Nothing to do. */
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 /* Nothing to do. */
+                               }));
 
   const uint32_t window_fbo_id = context.GetWindowFBOId();
   context.SetGLPopulateExistingDamageCallback(
@@ -4017,9 +3985,8 @@ TEST_F(EmbedderTest, SetSingleDisplayConfigurationWithDisplayId) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4059,9 +4026,8 @@ TEST_F(EmbedderTest, SetSingleDisplayConfigurationWithoutDisplayId) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4101,9 +4067,8 @@ TEST_F(EmbedderTest, SetValidMultiDisplayConfiguration) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4150,9 +4115,8 @@ TEST_F(EmbedderTest, MultipleDisplaysWithSingleDisplayTrueIsInvalid) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4196,9 +4160,8 @@ TEST_F(EmbedderTest, MultipleDisplaysWithSameDisplayIdIsInvalid) {
   builder.SetCompositor();
   builder.SetDartEntrypoint("empty_scene");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4249,10 +4212,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsNotRecycledWhenAvoidsCacheSet) {
   const unsigned num_backing_stores = num_frames * num_engine_layers;
   fml::CountDownLatch latch(1 + num_frames);  // 1 for native test signal.
 
-  context.AddNativeCallback("SignalNativeTest",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              latch.CountDown();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.CountDown(); }));
 
   context.GetCompositor().SetPresentCallback(
       [&](FlutterViewId view_id, const FlutterLayer** layers,
@@ -4298,21 +4259,21 @@ TEST_F(EmbedderTest, SnapshotRenderTargetScalesDownToDriverMax) {
   });
 
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SnapshotsCallback", CREATE_NATIVE_ENTRY(([&](Dart_NativeArguments args) {
-        auto get_arg = [&args](int index) {
-          Dart_Handle dart_image = Dart_GetNativeArgument(args, index);
+  context.AddFfiNativeCallback(
+      "SnapshotsCallback",
+      CREATE_FFI_LAMBDA(([&](Dart_Handle big_handle, Dart_Handle small_handle) {
+        auto get_arg = [](Dart_Handle dart_image) {
           Dart_Handle internal_image =
               Dart_GetField(dart_image, tonic::ToDart("_image"));
           return tonic::DartConverter<flutter::CanvasImage*>::FromDart(
               internal_image);
         };
 
-        CanvasImage* big_image = get_arg(0);
+        CanvasImage* big_image = get_arg(big_handle);
         ASSERT_EQ(big_image->width(), max_size);
         ASSERT_EQ(big_image->height(), max_size / 2);
 
-        CanvasImage* small_image = get_arg(1);
+        CanvasImage* small_image = get_arg(small_handle);
         ASSERT_TRUE(ImageMatchesFixture(
             "snapshot_large_scene.png",
             small_image->image()->asSkiaImage()->skia_image()));
@@ -4337,12 +4298,11 @@ TEST_F(EmbedderTest, ObjectsPostedViaPortsServicedOnSecondaryTaskHeap) {
   // for inspection.
   FlutterEngineDartPort port = 0;
   fml::AutoResetWaitableEvent event;
-  context.AddNativeCallback("SignalNativeCount",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              port = tonic::DartConverter<int64_t>::FromDart(
-                                  Dart_GetNativeArgument(args, 0));
-                              event.Signal();
-                            }));
+  context.AddFfiNativeCallback("SignalNativeCount",
+                               CREATE_FFI_LAMBDA([&](int64_t count) {
+                                 port = count;
+                                 event.Signal();
+                               }));
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
   event.Wait();
@@ -4351,13 +4311,13 @@ TEST_F(EmbedderTest, ObjectsPostedViaPortsServicedOnSecondaryTaskHeap) {
   using Trampoline = std::function<void(Dart_Handle message)>;
   Trampoline trampoline;
 
-  context.AddNativeCallback("SendObjectToNativeCode",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              FML_CHECK(trampoline);
-                              auto trampoline_copy = trampoline;
-                              trampoline = nullptr;
-                              trampoline_copy(Dart_GetNativeArgument(args, 0));
-                            }));
+  context.AddFfiNativeCallback("SendObjectToNativeCode",
+                               CREATE_FFI_LAMBDA([&](Dart_Handle object) {
+                                 FML_CHECK(trampoline);
+                                 auto trampoline_copy = trampoline;
+                                 trampoline = nullptr;
+                                 trampoline_copy(object);
+                               }));
 
   // Send a boolean value and assert that it's received by the right heap.
   {
@@ -4420,10 +4380,8 @@ TEST_F(EmbedderTest, CreateInvalidBackingstoreOpenGLTexture) {
         return true;
       };
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4483,10 +4441,8 @@ TEST_F(EmbedderTest, CreateInvalidBackingstoreOpenGLFramebuffer) {
         return true;
       };
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -4542,10 +4498,8 @@ TEST_F(EmbedderTest, CreateInvalidBackingstoreOpenGLSurface) {
         return true;
       };
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -5022,12 +4976,11 @@ TEST_F(EmbedderTest, ImpellerOpenGLImageSnapshot) {
 
   bool result = false;
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback("NotifyBoolValue",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              result = tonic::DartConverter<bool>::FromDart(
-                                  Dart_GetNativeArgument(args, 0));
-                              latch.Signal();
-                            }));
+  context.AddFfiNativeCallback("NotifyBoolValue",
+                               CREATE_FFI_LAMBDA([&](bool value) {
+                                 result = value;
+                                 latch.Signal();
+                               }));
 
   EmbedderConfigBuilder builder(context);
   builder.AddCommandLineArgument("--enable-impeller");
@@ -5140,10 +5093,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLSurface) {
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -5345,10 +5296,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneToOpenGLSurfaces) {
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_metal_unittests.mm b/engine/src/flutter/shell/platform/embedder/tests/embedder_metal_unittests.mm
index b8482653ebc4d..b064902b01aea 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_metal_unittests.mm
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_metal_unittests.mm
@@ -27,7 +27,7 @@
 #include "third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurface.h"
 #include "third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
@@ -219,9 +219,8 @@
         latch.CountDown();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -487,9 +486,8 @@
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -546,9 +544,8 @@ void Collect() {
         return true;
       };
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -704,9 +701,8 @@ void Collect() {
 
   fml::CountDownLatch latch(3);
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   context.GetCompositor().SetPlatformViewRendererCallback(
       [&](const FlutterLayer& layer, GrDirectContext* context) -> sk_sp<SkImage> {
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.cc
index 4e7c84a664303..14b608438d4de 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.cc
@@ -125,6 +125,11 @@ void EmbedderTestContext::AddNativeCallback(const char* name,
   native_resolver_->AddNativeCallback({name}, function);
 }
 
+void EmbedderTestContext::AddFfiNativeCallback(const char* name,
+                                               void* function) {
+  native_resolver_->AddFfiNativeCallback({name}, function);
+}
+
 void EmbedderTestContext::SetSemanticsUpdateCallback2(
     SemanticsUpdateCallback2 update_semantics_callback) {
   update_semantics_callback2_ = std::move(update_semantics_callback);
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.h b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.h
index acc52a90e0ced..01c659c5070c6 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.h
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_context.h
@@ -85,6 +85,8 @@ class EmbedderTestContext {
 
   void AddNativeCallback(const char* name, Dart_NativeFunction function);
 
+  void AddFfiNativeCallback(const char* name, void* function);
+
   void SetSemanticsNodeCallback(SemanticsNodeCallback update_semantics_node);
 
   void SetSemanticsCustomActionCallback(
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests.cc
index 364764f2e16a9..7c7e6dfe7ddaa 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests.cc
@@ -38,7 +38,7 @@
 #include <pthread.h>
 #endif
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace {
@@ -92,10 +92,9 @@ TEST_F(EmbedderTest, DISABLED_CanLaunchAndShutdownMultipleTimes) {
 TEST_F(EmbedderTest, CanInvokeCustomEntrypoint) {
   auto& context = GetEmbedderContext<EmbedderTestContextSoftware>();
   static fml::AutoResetWaitableEvent latch;
-  Dart_NativeFunction entrypoint = [](Dart_NativeArguments args) {
-    latch.Signal();
-  };
-  context.AddNativeCallback("SayHiFromCustomEntrypoint", entrypoint);
+  auto entrypoint = []() { latch.Signal(); };
+  context.AddFfiNativeCallback("SayHiFromCustomEntrypoint",
+                               reinterpret_cast<void*>(+entrypoint));
   EmbedderConfigBuilder builder(context);
   builder.SetSurface(DlISize(1, 1));
   builder.SetDartEntrypoint("customEntrypoint");
@@ -112,28 +111,27 @@ TEST_F(EmbedderTest, CanInvokeCustomEntrypointMacro) {
   fml::AutoResetWaitableEvent latch3;
 
   // Can be defined separately.
-  auto entry1 = [&latch1](Dart_NativeArguments args) {
+  auto entry1 = [&latch1]() {
     FML_LOG(INFO) << "In Callback 1";
     latch1.Signal();
   };
-  auto native_entry1 = CREATE_NATIVE_ENTRY(entry1);
-  context.AddNativeCallback("SayHiFromCustomEntrypoint1", native_entry1);
+  auto native_entry1 = CREATE_FFI_LAMBDA(entry1);
+  context.AddFfiNativeCallback("SayHiFromCustomEntrypoint1", native_entry1);
 
   // Can be wrapped in the args.
-  auto entry2 = [&latch2](Dart_NativeArguments args) {
+  auto entry2 = [&latch2]() {
     FML_LOG(INFO) << "In Callback 2";
     latch2.Signal();
   };
-  context.AddNativeCallback("SayHiFromCustomEntrypoint2",
-                            CREATE_NATIVE_ENTRY(entry2));
+  context.AddFfiNativeCallback("SayHiFromCustomEntrypoint2",
+                               CREATE_FFI_LAMBDA(entry2));
 
   // Everything can be inline.
-  context.AddNativeCallback(
-      "SayHiFromCustomEntrypoint3",
-      CREATE_NATIVE_ENTRY([&latch3](Dart_NativeArguments args) {
-        FML_LOG(INFO) << "In Callback 3";
-        latch3.Signal();
-      }));
+  context.AddFfiNativeCallback("SayHiFromCustomEntrypoint3",
+                               CREATE_FFI_LAMBDA([&latch3]() {
+                                 FML_LOG(INFO) << "In Callback 3";
+                                 latch3.Signal();
+                               }));
 
   EmbedderConfigBuilder builder(context);
   builder.SetSurface(DlISize(1, 1));
@@ -160,10 +158,10 @@ TEST_F(EmbedderTest, ExecutableNameNotNull) {
   // Supply a callback to Dart for the test fixture to pass Platform.executable
   // back to us.
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "NotifyStringValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        const auto dart_string = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+  context.AddFfiNativeCallback(
+      "NotifyStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle value) {
+        const auto dart_string =
+            tonic::DartConverter<std::string>::FromDart(value);
         EXPECT_EQ("/path/to/binary", dart_string);
         latch.Signal();
       }));
@@ -184,12 +182,11 @@ TEST_F(EmbedderTest, ImplicitViewNotNull) {
 
   bool implicitViewNotNull = false;
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "NotifyBoolValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        implicitViewNotNull = tonic::DartConverter<bool>::FromDart(
-            Dart_GetNativeArgument(args, 0));
-        latch.Signal();
-      }));
+  context.AddFfiNativeCallback("NotifyBoolValue",
+                               CREATE_FFI_LAMBDA([&](bool value) {
+                                 implicitViewNotNull = value;
+                                 latch.Signal();
+                               }));
 
   EmbedderConfigBuilder builder(context);
   builder.SetSurface(DlISize(1, 1));
@@ -245,8 +242,8 @@ TEST_F(EmbedderTest, CanSpecifyCustomUITaskRunner) {
   fml::AutoResetWaitableEvent signal_latch_ui;
   fml::AutoResetWaitableEvent signal_latch_platform;
 
-  context.AddNativeCallback(
-      "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
         // Assert that the UI isolate is running on platform thread.
         ASSERT_TRUE(ui_task_runner->RunsTasksOnCurrentThread());
         signal_latch_ui.Signal();
@@ -370,8 +367,8 @@ TEST_F(EmbedderTest, MergedPlatformUIThread) {
   fml::AutoResetWaitableEvent signal_latch_ui;
   fml::AutoResetWaitableEvent signal_latch_platform;
 
-  context.AddNativeCallback(
-      "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
         // Assert that the UI isolate is running on platform thread.
         ASSERT_TRUE(task_runner->RunsTasksOnCurrentThread());
         signal_latch_ui.Signal();
@@ -420,8 +417,8 @@ TEST_F(EmbedderTest, UITaskRunnerFlushesMicrotasks) {
 
   fml::AutoResetWaitableEvent signal_latch;
 
-  context.AddNativeCallback(
-      "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
         ASSERT_TRUE(ui_task_runner->RunsTasksOnCurrentThread());
         signal_latch.Signal();
       }));
@@ -586,9 +583,7 @@ TEST_F(EmbedderTest, CanCreateAndCollectCallbacks) {
   EmbedderConfigBuilder builder(context);
   builder.SetSurface(DlISize(1, 1));
   builder.SetDartEntrypoint("platform_messages_response");
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([](Dart_NativeArguments args) {}));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([]() {}));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -626,10 +621,8 @@ TEST_F(EmbedderTest, PlatformMessagesCanReceiveResponse) {
     builder.SetDartEntrypoint("platform_messages_response");
 
     fml::AutoResetWaitableEvent ready;
-    context.AddNativeCallback(
-        "SignalNativeTest",
-        CREATE_NATIVE_ENTRY(
-            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+    context.AddFfiNativeCallback(
+        "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
 
     auto engine = builder.LaunchEngine();
     ASSERT_TRUE(engine.is_valid());
@@ -684,19 +677,16 @@ TEST_F(EmbedderTest, PlatformMessagesCanBeSentWithoutResponseHandles) {
   const std::string message_data = "Hello but don't call me back.";
 
   fml::AutoResetWaitableEvent ready, message;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready](Dart_NativeArguments args) { ready.Signal(); }));
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY(
-          ([&message, &message_data](Dart_NativeArguments args) {
-            auto received_message = tonic::DartConverter<std::string>::FromDart(
-                Dart_GetNativeArgument(args, 0));
-            ASSERT_EQ(received_message, message_data);
-            message.Signal();
-          })));
+      CREATE_FFI_LAMBDA(([&message, &message_data](Dart_Handle message_handle) {
+        auto received_message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
+        ASSERT_EQ(received_message, message_data);
+        message.Signal();
+      })));
 
   auto engine = builder.LaunchEngine();
 
@@ -727,15 +717,13 @@ TEST_F(EmbedderTest, NullPlatformMessagesCanBeSent) {
   builder.SetDartEntrypoint("null_platform_messages");
 
   fml::AutoResetWaitableEvent ready, message;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready](Dart_NativeArguments args) { ready.Signal(); }));
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY(([&message](Dart_NativeArguments args) {
-        auto received_message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA(([&message](Dart_Handle message_handle) {
+        auto received_message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         ASSERT_EQ("true", received_message);
         message.Signal();
       })));
@@ -855,15 +843,13 @@ TEST_F(EmbedderTest, DartEntrypointArgs) {
   fml::AutoResetWaitableEvent callback_latch;
   std::vector<std::string> callback_args;
   auto nativeArgumentsCallback = [&callback_args,
-                                  &callback_latch](Dart_NativeArguments args) {
-    Dart_Handle exception = nullptr;
+                                  &callback_latch](Dart_Handle args) {
     callback_args =
-        tonic::DartConverter<std::vector<std::string>>::FromArguments(
-            args, 0, exception);
+        tonic::DartConverter<std::vector<std::string>>::FromDart(args);
     callback_latch.Signal();
   };
-  context.AddNativeCallback("NativeArgumentsCallback",
-                            CREATE_NATIVE_ENTRY(nativeArgumentsCallback));
+  context.AddFfiNativeCallback("NativeArgumentsCallback",
+                               CREATE_FFI_LAMBDA(nativeArgumentsCallback));
   auto engine = builder.LaunchEngine();
   callback_latch.Wait();
   ASSERT_EQ(callback_args[0], "foo");
@@ -1157,10 +1143,8 @@ TEST_F(EmbedderTest,
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1288,10 +1272,8 @@ TEST_F(EmbedderTest, NoLayerCreatedForTransparentOverlayOnTopOfPlatformLayer) {
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1425,10 +1407,8 @@ TEST_F(EmbedderTest, NoLayerCreatedForNoOverlayOnTopOfPlatformLayer) {
         return surface->makeImageSnapshot();
       });
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.CountDown(); }));
 
   auto engine = builder.LaunchEngine();
 
@@ -1528,19 +1508,16 @@ TEST_F(EmbedderTest, CanAddView) {
   builder.SetDartEntrypoint("window_metrics_event_all_view_ids");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   std::string message;
-  context.AddNativeCallback("SignalNativeMessage",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              message =
-                                  tonic::DartConverter<std::string>::FromDart(
-                                      Dart_GetNativeArgument(args, 0));
-                              message_latch.Signal();
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        message = tonic::DartConverter<std::string>::FromDart(message_handle);
+        message_latch.Signal();
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -1575,16 +1552,13 @@ TEST_F(EmbedderTest, AddViewSchedulesFrame) {
   builder.SetSurface(DlISize(1, 1));
   builder.SetDartEntrypoint("add_view_schedules_frame");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   fml::AutoResetWaitableEvent check_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeCount",
-      CREATE_NATIVE_ENTRY(
-          [&check_latch](Dart_NativeArguments args) { check_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&check_latch](int count) { check_latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -1621,19 +1595,16 @@ TEST_F(EmbedderTest, CanRemoveView) {
   builder.SetDartEntrypoint("window_metrics_event_all_view_ids");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   std::string message;
-  context.AddNativeCallback("SignalNativeMessage",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              message =
-                                  tonic::DartConverter<std::string>::FromDart(
-                                      Dart_GetNativeArgument(args, 0));
-                              message_latch.Signal();
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        message = tonic::DartConverter<std::string>::FromDart(message_handle);
+        message_latch.Signal();
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -1693,10 +1664,9 @@ TEST_F(EmbedderTest, RemoveViewCallbackIsInvokedAfterRasterThreadIsDone) {
       &render_task_runner.GetFlutterTaskRunnerDescription());
 
   fml::AutoResetWaitableEvent ready_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   {
     std::scoped_lock lock(engine_mutex);
@@ -1798,19 +1768,16 @@ TEST_F(EmbedderTest, CannotAddDuplicateViews) {
   builder.SetDartEntrypoint("window_metrics_event_all_view_ids");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   std::string message;
-  context.AddNativeCallback("SignalNativeMessage",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              message =
-                                  tonic::DartConverter<std::string>::FromDart(
-                                      Dart_GetNativeArgument(args, 0));
-                              message_latch.Signal();
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        message = tonic::DartConverter<std::string>::FromDart(message_handle);
+        message_latch.Signal();
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -1870,19 +1837,16 @@ TEST_F(EmbedderTest, CanReuseViewIds) {
   builder.SetDartEntrypoint("window_metrics_event_all_view_ids");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   std::string message;
-  context.AddNativeCallback("SignalNativeMessage",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              message =
-                                  tonic::DartConverter<std::string>::FromDart(
-                                      Dart_GetNativeArgument(args, 0));
-                              message_latch.Signal();
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        message = tonic::DartConverter<std::string>::FromDart(message_handle);
+        message_latch.Signal();
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -1961,16 +1925,15 @@ TEST_F(EmbedderTest, ViewOperationsOrdered) {
   builder.SetDartEntrypoint("window_metrics_event_all_view_ids");
 
   fml::AutoResetWaitableEvent ready_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
   std::atomic<int> message_count = 0;
-  context.AddNativeCallback("SignalNativeMessage",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              message_count.fetch_add(1);
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeMessage", CREATE_FFI_LAMBDA([&](Dart_Handle message_handle) {
+        message_count.fetch_add(1);
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -2235,18 +2198,15 @@ TEST_F(EmbedderTest, CanSendViewFocusEvent) {
   fml::AutoResetWaitableEvent latch;
   std::string last_event;
 
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
-  context.AddNativeCallback("NotifyStringValue",
-                            CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-                              const auto message_from_dart =
-                                  tonic::DartConverter<std::string>::FromDart(
-                                      Dart_GetNativeArgument(args, 0));
-                              last_event = message_from_dart;
-                              latch.Signal();
-                            }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "NotifyStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle value) {
+        const auto message_from_dart =
+            tonic::DartConverter<std::string>::FromDart(value);
+        last_event = message_from_dart;
+        latch.Signal();
+      }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -2458,20 +2418,15 @@ TEST_F(EmbedderTest, CanUpdateLocales) {
   builder.SetSurface(DlISize(1, 1));
   builder.SetDartEntrypoint("can_receive_locale_updates");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   fml::AutoResetWaitableEvent check_latch;
-  context.AddNativeCallback(
-      "SignalNativeCount",
-      CREATE_NATIVE_ENTRY([&check_latch](Dart_NativeArguments args) {
-        ASSERT_EQ(tonic::DartConverter<int>::FromDart(
-                      Dart_GetNativeArgument(args, 0)),
-                  2);
-        check_latch.Signal();
-      }));
+  context.AddFfiNativeCallback("SignalNativeCount",
+                               CREATE_FFI_LAMBDA([&check_latch](int count) {
+                                 ASSERT_EQ(count, 2);
+                                 check_latch.Signal();
+                               }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -3466,24 +3421,17 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
   FlutterKeyEvent echoed_event;
   echoed_event.struct_size = sizeof(FlutterKeyEvent);
 
-  auto native_echo_event = [&](Dart_NativeArguments args) {
-    echoed_event.type =
-        UnserializeKeyEventType(tonic::DartConverter<uint64_t>::FromDart(
-            Dart_GetNativeArgument(args, 0)));
-    echoed_event.timestamp =
-        static_cast<double>(tonic::DartConverter<uint64_t>::FromDart(
-            Dart_GetNativeArgument(args, 1)));
-    echoed_event.physical = tonic::DartConverter<uint64_t>::FromDart(
-        Dart_GetNativeArgument(args, 2));
-    echoed_event.logical = tonic::DartConverter<uint64_t>::FromDart(
-        Dart_GetNativeArgument(args, 3));
-    echoed_char = tonic::DartConverter<uint64_t>::FromDart(
-        Dart_GetNativeArgument(args, 4));
-    echoed_event.synthesized =
-        tonic::DartConverter<bool>::FromDart(Dart_GetNativeArgument(args, 5));
-    echoed_event.device_type =
-        UnserializeKeyEventDeviceType(tonic::DartConverter<uint64_t>::FromDart(
-            Dart_GetNativeArgument(args, 6)));
+  auto native_echo_event = [&](uint64_t change, uint64_t timestamp,
+                               uint64_t physical, uint64_t logical,
+                               uint64_t char_code, bool synthesized,
+                               uint64_t device_type) {
+    echoed_event.type = UnserializeKeyEventType(change);
+    echoed_event.timestamp = static_cast<double>(timestamp);
+    echoed_event.physical = physical;
+    echoed_event.logical = logical;
+    echoed_char = char_code;
+    echoed_event.synthesized = synthesized;
+    echoed_event.device_type = UnserializeKeyEventDeviceType(device_type);
 
     message_latch->Signal();
   };
@@ -3502,13 +3450,11 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
           FlutterEngineSendPlatformMessageResponse(
               engine.get(), message->response_handle, nullptr, 0);
         });
-    context.AddNativeCallback(
-        "SignalNativeTest",
-        CREATE_NATIVE_ENTRY(
-            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+    context.AddFfiNativeCallback(
+        "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
 
-    context.AddNativeCallback("EchoKeyEvent",
-                              CREATE_NATIVE_ENTRY(native_echo_event));
+    context.AddFfiNativeCallback("EchoKeyEvent",
+                                 CREATE_FFI_LAMBDA(native_echo_event));
 
     engine = builder.LaunchEngine();
     ASSERT_TRUE(engine.is_valid());
@@ -3587,23 +3533,17 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   std::vector<FlutterKeyEvent> echoed_events;
 
-  auto native_echo_event = [&](Dart_NativeArguments args) {
+  auto native_echo_event = [&](uint64_t change, uint64_t timestamp,
+                               uint64_t physical, uint64_t logical,
+                               uint64_t char_code, bool synthesized,
+                               uint64_t device_type) {
     echoed_events.push_back(FlutterKeyEvent{
-        .timestamp =
-            static_cast<double>(tonic::DartConverter<uint64_t>::FromDart(
-                Dart_GetNativeArgument(args, 1))),
-        .type =
-            UnserializeKeyEventType(tonic::DartConverter<uint64_t>::FromDart(
-                Dart_GetNativeArgument(args, 0))),
-        .physical = tonic::DartConverter<uint64_t>::FromDart(
-            Dart_GetNativeArgument(args, 2)),
-        .logical = tonic::DartConverter<uint64_t>::FromDart(
-            Dart_GetNativeArgument(args, 3)),
-        .synthesized = tonic::DartConverter<bool>::FromDart(
-            Dart_GetNativeArgument(args, 5)),
-        .device_type = UnserializeKeyEventDeviceType(
-            tonic::DartConverter<uint64_t>::FromDart(
-                Dart_GetNativeArgument(args, 6))),
+        .timestamp = static_cast<double>(timestamp),
+        .type = UnserializeKeyEventType(change),
+        .physical = physical,
+        .logical = logical,
+        .synthesized = synthesized,
+        .device_type = UnserializeKeyEventDeviceType(device_type),
     });
 
     message_latch->Signal();
@@ -3623,13 +3563,11 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
           FlutterEngineSendPlatformMessageResponse(
               engine.get(), message->response_handle, nullptr, 0);
         });
-    context.AddNativeCallback(
-        "SignalNativeTest",
-        CREATE_NATIVE_ENTRY(
-            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+    context.AddFfiNativeCallback(
+        "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
 
-    context.AddNativeCallback("EchoKeyEvent",
-                              CREATE_NATIVE_ENTRY(native_echo_event));
+    context.AddFfiNativeCallback("EchoKeyEvent",
+                                 CREATE_FFI_LAMBDA(native_echo_event));
 
     engine = builder.LaunchEngine();
     ASSERT_TRUE(engine.is_valid());
@@ -3718,12 +3656,14 @@ TEST_F(EmbedderTest, KeyDataResponseIsCorrectlyInvoked) {
     EmbedderConfigBuilder builder(context);
     builder.SetSurface(DlISize(1, 1));
     builder.SetDartEntrypoint("key_data_echo");
-    context.AddNativeCallback(
-        "SignalNativeTest",
-        CREATE_NATIVE_ENTRY(
-            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
-    context.AddNativeCallback(
-        "EchoKeyEvent", CREATE_NATIVE_ENTRY([](Dart_NativeArguments args) {}));
+    context.AddFfiNativeCallback(
+        "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
+    context.AddFfiNativeCallback(
+        "EchoKeyEvent",
+        CREATE_FFI_LAMBDA([](uint64_t change, uint64_t timestamp,
+                             uint64_t physical, uint64_t logical,
+                             uint64_t char_code, bool synthesized,
+                             uint64_t device_type) {}));
 
     engine = builder.LaunchEngine();
     ASSERT_TRUE(engine.is_valid());
@@ -3791,13 +3731,15 @@ TEST_F(EmbedderTest, BackToBackKeyEventResponsesCorrectlyInvoked) {
     EmbedderConfigBuilder builder(context);
     builder.SetSurface(DlISize(1, 1));
     builder.SetDartEntrypoint("key_data_echo");
-    context.AddNativeCallback(
-        "SignalNativeTest",
-        CREATE_NATIVE_ENTRY(
-            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+    context.AddFfiNativeCallback(
+        "SignalNativeTest", CREATE_FFI_LAMBDA([&ready]() { ready.Signal(); }));
 
-    context.AddNativeCallback(
-        "EchoKeyEvent", CREATE_NATIVE_ENTRY([](Dart_NativeArguments args) {}));
+    context.AddFfiNativeCallback(
+        "EchoKeyEvent",
+        CREATE_FFI_LAMBDA([](uint64_t change, uint64_t timestamp,
+                             uint64_t physical, uint64_t logical,
+                             uint64_t char_code, bool synthesized,
+                             uint64_t device_type) {}));
 
     engine = builder.LaunchEngine();
     ASSERT_TRUE(engine.is_valid());
@@ -3880,10 +3822,9 @@ TEST_F(EmbedderTest, VsyncCallbackPostedIntoFuture) {
         vsync_latch.Signal();
       });
     });
-    context.AddNativeCallback(
-        "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-          present_latch.Signal();
-        }));
+    context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                   present_latch.Signal();
+                                 }));
 
     EmbedderConfigBuilder builder(context);
     builder.SetSurface(DlISize(1, 1));
@@ -3920,16 +3861,13 @@ TEST_F(EmbedderTest, CanScheduleFrame) {
   builder.SetSurface(DlISize(1, 1));
   builder.SetDartEntrypoint("can_schedule_frame");
   fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+  context.AddFfiNativeCallback(
+      "SignalNativeTest", CREATE_FFI_LAMBDA([&latch]() { latch.Signal(); }));
 
   fml::AutoResetWaitableEvent check_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeCount",
-      CREATE_NATIVE_ENTRY(
-          [&check_latch](Dart_NativeArguments args) { check_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&check_latch](int count) { check_latch.Signal(); }));
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
@@ -4036,23 +3974,19 @@ TEST_F(EmbedderTest, CanSendPointer) {
   builder.SetDartEntrypoint("pointer_data_packet");
 
   fml::AutoResetWaitableEvent ready_latch, count_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
-  context.AddNativeCallback(
-      "SignalNativeCount",
-      CREATE_NATIVE_ENTRY([&count_latch](Dart_NativeArguments args) {
-        int count = tonic::DartConverter<int>::FromDart(
-            Dart_GetNativeArgument(args, 0));
-        ASSERT_EQ(count, 1);
-        count_latch.Signal();
-      }));
-  context.AddNativeCallback(
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeCount",
+                               CREATE_FFI_LAMBDA([&count_latch](int count) {
+                                 ASSERT_EQ(count, 1);
+                                 count_latch.Signal();
+                               }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
-        auto message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA([&message_latch](Dart_Handle message_handle) {
+        auto message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         ASSERT_EQ("PointerData(viewId: 0, x: 123.0, y: 456.0)", message);
         message_latch.Signal();
       }));
@@ -4086,23 +4020,19 @@ TEST_F(EmbedderTest, CanSendStylusPointerButtons) {
   builder.SetDartEntrypoint("pointer_data_packet_stylus_buttons");
 
   fml::AutoResetWaitableEvent ready_latch, count_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
-  context.AddNativeCallback(
-      "SignalNativeCount",
-      CREATE_NATIVE_ENTRY([&count_latch](Dart_NativeArguments args) {
-        int count = tonic::DartConverter<int>::FromDart(
-            Dart_GetNativeArgument(args, 0));
-        EXPECT_EQ(count, 1);
-        count_latch.Signal();
-      }));
-  context.AddNativeCallback(
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeCount",
+                               CREATE_FFI_LAMBDA([&count_latch](int count) {
+                                 EXPECT_EQ(count, 1);
+                                 count_latch.Signal();
+                               }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
-        auto message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA([&message_latch](Dart_Handle message_handle) {
+        auto message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         EXPECT_EQ("buttons: 3", message);
         message_latch.Signal();
       }));
@@ -4140,15 +4070,14 @@ TEST_F(EmbedderTest, CanSendPointerEventWithViewId) {
   builder.SetDartEntrypoint("pointer_data_packet_view_id");
 
   fml::AutoResetWaitableEvent ready_latch, add_view_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
-  context.AddNativeCallback(
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
-        auto message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA([&message_latch](Dart_Handle message_handle) {
+        auto message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         ASSERT_EQ("ViewID: 2", message);
         message_latch.Signal();
       }));
@@ -4202,15 +4131,14 @@ TEST_F(EmbedderTest, WindowMetricsEventDefaultsToImplicitView) {
   builder.SetDartEntrypoint("window_metrics_event_view_id");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
-  context.AddNativeCallback(
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
-        auto message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA([&message_latch](Dart_Handle message_handle) {
+        auto message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         ASSERT_EQ("Changed: [0]", message);
         message_latch.Signal();
       }));
@@ -4243,16 +4171,15 @@ TEST_F(EmbedderTest, IgnoresWindowMetricsEventForUnknownView) {
   builder.SetDartEntrypoint("window_metrics_event_view_id");
 
   fml::AutoResetWaitableEvent ready_latch, message_latch;
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+      CREATE_FFI_LAMBDA([&ready_latch]() { ready_latch.Signal(); }));
 
-  context.AddNativeCallback(
+  context.AddFfiNativeCallback(
       "SignalNativeMessage",
-      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
-        auto message = tonic::DartConverter<std::string>::FromDart(
-            Dart_GetNativeArgument(args, 0));
+      CREATE_FFI_LAMBDA([&message_latch](Dart_Handle message_handle) {
+        auto message =
+            tonic::DartConverter<std::string>::FromDart(message_handle);
         // Message latch should only be signaled once as the bad
         // view metric should be dropped by the engine.
         ASSERT_FALSE(message_latch.IsSignaledForTest());
@@ -4298,9 +4225,8 @@ TEST_F(EmbedderTest, RegisterChannelListener) {
   fml::AutoResetWaitableEvent latch;
   fml::AutoResetWaitableEvent latch2;
   bool listening = false;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments) { latch.Signal(); }));
+  context.AddFfiNativeCallback("SignalNativeTest",
+                               CREATE_FFI_LAMBDA([&]() { latch.Signal(); }));
   context.SetChannelUpdateCallback([&](const FlutterChannelUpdate* update) {
     EXPECT_STREQ(update->channel, "test/listen");
     EXPECT_TRUE(update->listening);
@@ -4344,10 +4270,10 @@ TEST_F(EmbedderTest, PlatformThreadIsolatesWithCustomPlatformTaskRunner) {
   // The test's Dart code will call this native function which overrides the
   // FFI resolver.  After that, the Dart code will invoke the FFI function
   // using runOnPlatformThread.
-  context.AddNativeCallback(
-      "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        Dart_SetFfiNativeResolver(Dart_RootLibrary(), ffi_resolver);
-      }));
+  context.AddFfiNativeCallback("SignalNativeTest", CREATE_FFI_LAMBDA([&]() {
+                                 Dart_SetFfiNativeResolver(Dart_RootLibrary(),
+                                                           ffi_resolver);
+                               }));
 
   auto platform_task_runner = CreateNewThread("test_platform_thread");
 
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_vk_unittests.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_vk_unittests.cc
index f1a4a0d5ff88c..f8737da4e5765 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_vk_unittests.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_vk_unittests.cc
@@ -18,7 +18,7 @@
 #include "flutter/shell/platform/embedder/tests/embedder_unittests_util.h"
 #include "flutter/testing/testing.h"
 
-// CREATE_NATIVE_ENTRY is leaky by design
+// CREATE_FFI_LAMBDA is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 namespace flutter {
diff --git a/engine/src/flutter/shell/platform/linux/fl_dart_project.cc b/engine/src/flutter/shell/platform/linux/fl_dart_project.cc
index 43d98070a8906..6c626c61105a1 100644
--- a/engine/src/flutter/shell/platform/linux/fl_dart_project.cc
+++ b/engine/src/flutter/shell/platform/linux/fl_dart_project.cc
@@ -16,6 +16,7 @@ struct _FlDartProject {
 
   FlUIThreadPolicy ui_thread_policy;
   gboolean enable_impeller;
+  gboolean enable_flutter_gpu;
 };
 
 G_DEFINE_TYPE(FlDartProject, fl_dart_project, G_TYPE_OBJECT)
@@ -145,3 +146,16 @@ gboolean fl_dart_project_get_enable_impeller(FlDartProject* project) {
   g_return_val_if_fail(FL_IS_DART_PROJECT(project), FALSE);
   return project->enable_impeller;
 }
+
+G_MODULE_EXPORT
+void fl_dart_project_set_enable_flutter_gpu(FlDartProject* project,
+                                            gboolean enable_flutter_gpu) {
+  g_return_if_fail(FL_IS_DART_PROJECT(project));
+  project->enable_flutter_gpu = enable_flutter_gpu;
+}
+
+G_MODULE_EXPORT
+gboolean fl_dart_project_get_enable_flutter_gpu(FlDartProject* project) {
+  g_return_val_if_fail(FL_IS_DART_PROJECT(project), FALSE);
+  return project->enable_flutter_gpu;
+}
diff --git a/engine/src/flutter/shell/platform/linux/fl_dart_project_test.cc b/engine/src/flutter/shell/platform/linux/fl_dart_project_test.cc
index dc0d1d2a9498b..93e570e535e79 100644
--- a/engine/src/flutter/shell/platform/linux/fl_dart_project_test.cc
+++ b/engine/src/flutter/shell/platform/linux/fl_dart_project_test.cc
@@ -80,3 +80,13 @@ TEST_F(FlDartProjectTest, EnableImpeller) {
   fl_dart_project_set_enable_impeller(project, TRUE);
   EXPECT_TRUE(fl_dart_project_get_enable_impeller(project));
 }
+
+TEST_F(FlDartProjectTest, EnableFlutterGpu) {
+  EXPECT_FALSE(fl_dart_project_get_enable_flutter_gpu(project));
+
+  fl_dart_project_set_enable_flutter_gpu(project, TRUE);
+  EXPECT_TRUE(fl_dart_project_get_enable_flutter_gpu(project));
+
+  fl_dart_project_set_enable_flutter_gpu(project, FALSE);
+  EXPECT_FALSE(fl_dart_project_get_enable_flutter_gpu(project));
+}
diff --git a/engine/src/flutter/shell/platform/linux/fl_engine.cc b/engine/src/flutter/shell/platform/linux/fl_engine.cc
index 6c7b6d2ae3ccf..f88d08cb05f47 100644
--- a/engine/src/flutter/shell/platform/linux/fl_engine.cc
+++ b/engine/src/flutter/shell/platform/linux/fl_engine.cc
@@ -812,9 +812,12 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
       break;
   }
 
+  const std::vector<std::string> env_switches =
+      flutter::GetSwitchesFromEnvironment();
+
   gboolean enable_impeller = fl_dart_project_get_enable_impeller(self->project);
   gboolean has_enable_impeller = FALSE;
-  for (const auto& env_switch : flutter::GetSwitchesFromEnvironment()) {
+  for (const auto& env_switch : env_switches) {
     if (env_switch == "--enable-impeller" ||
         env_switch == "--enable-impeller=true") {
       enable_impeller = TRUE;
@@ -828,7 +831,7 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
   g_autoptr(GPtrArray) command_line_args =
       g_ptr_array_new_with_free_func(g_free);
   g_ptr_array_insert(command_line_args, 0, g_strdup("flutter"));
-  for (const auto& env_switch : flutter::GetSwitchesFromEnvironment()) {
+  for (const auto& env_switch : env_switches) {
     g_ptr_array_add(command_line_args, g_strdup(env_switch.c_str()));
   }
   // Linux (and other desktop platforms) always uses SDFs.
@@ -838,6 +841,23 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
     g_ptr_array_add(command_line_args, g_strdup("--enable-impeller"));
   }
 
+  // Forward the project's Flutter GPU setting unless an environment switch
+  // already carries it (the switch is presence based, so it is only ever
+  // added, never negated).
+  if (fl_dart_project_get_enable_flutter_gpu(self->project)) {
+    gboolean has_enable_flutter_gpu = FALSE;
+    for (const auto& env_switch : env_switches) {
+      if (env_switch == "--enable-flutter-gpu" ||
+          env_switch == "--enable-flutter-gpu=true") {
+        has_enable_flutter_gpu = TRUE;
+        break;
+      }
+    }
+    if (!has_enable_flutter_gpu) {
+      g_ptr_array_add(command_line_args, g_strdup("--enable-flutter-gpu"));
+    }
+  }
+
   gchar** dart_entrypoint_args =
       fl_dart_project_get_dart_entrypoint_arguments(self->project);
 
diff --git a/engine/src/flutter/shell/platform/linux/fl_engine_test.cc b/engine/src/flutter/shell/platform/linux/fl_engine_test.cc
index 2e32e301a84bc..dd2528e248223 100644
--- a/engine/src/flutter/shell/platform/linux/fl_engine_test.cc
+++ b/engine/src/flutter/shell/platform/linux/fl_engine_test.cc
@@ -1008,6 +1008,58 @@ TEST_F(FlEngineTest, DisableImpeller) {
   EXPECT_TRUE(called);
 }
 
+TEST_F(FlEngineTest, EnableFlutterGpuDefault) {
+  bool called = false;
+  fl_engine_get_embedder_api(engine)->Initialize = MOCK_ENGINE_PROC(
+      Initialize,
+      ([&called](size_t version, const FlutterRendererConfig* config,
+                 const FlutterProjectArgs* args, void* user_data,
+                 FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) {
+        called = true;
+        bool has_flutter_gpu_switch = false;
+        for (int i = 0; i < args->command_line_argc; i++) {
+          if (strcmp(args->command_line_argv[i], "--enable-flutter-gpu") == 0) {
+            has_flutter_gpu_switch = true;
+          }
+        }
+        EXPECT_FALSE(has_flutter_gpu_switch);
+        return kSuccess;
+      }));
+  fl_engine_get_embedder_api(engine)->RunInitialized =
+      MOCK_ENGINE_PROC(RunInitialized, ([](auto engine) { return kSuccess; }));
+
+  StartEngine();
+  EXPECT_TRUE(called);
+}
+
+TEST_F(FlEngineTest, EnableFlutterGpu) {
+  fl_dart_project_set_enable_flutter_gpu(project, TRUE);
+
+  bool called = false;
+  fl_engine_get_embedder_api(engine)->Initialize = MOCK_ENGINE_PROC(
+      Initialize,
+      ([&called](size_t version, const FlutterRendererConfig* config,
+                 const FlutterProjectArgs* args, void* user_data,
+                 FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) {
+        called = true;
+        bool has_flutter_gpu_switch = false;
+        for (int i = 0; i < args->command_line_argc; i++) {
+          if (strcmp(args->command_line_argv[i], "--enable-flutter-gpu") == 0) {
+            has_flutter_gpu_switch = true;
+          }
+        }
+        EXPECT_TRUE(has_flutter_gpu_switch);
+        return kSuccess;
+      }));
+  fl_engine_get_embedder_api(engine)->RunInitialized =
+      MOCK_ENGINE_PROC(RunInitialized, ([](auto engine) { return kSuccess; }));
+
+  g_autoptr(GError) error = nullptr;
+  EXPECT_TRUE(fl_engine_start(engine, &error));
+  EXPECT_EQ(error, nullptr);
+  EXPECT_TRUE(called);
+}
+
 TEST_F(FlEngineTest, ChildObjects) {
   // Check objects exist before engine started.
   EXPECT_NE(fl_engine_get_binary_messenger(engine), nullptr);
diff --git a/engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h b/engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h
index 0b50eac76024b..4b83173a3557d 100644
--- a/engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h
+++ b/engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h
@@ -178,6 +178,25 @@ void fl_dart_project_set_enable_impeller(FlDartProject* project,
  */
 gboolean fl_dart_project_get_enable_impeller(FlDartProject* project);
 
+/**
+ * fl_dart_project_set_enable_flutter_gpu:
+ * @project: an #FlDartProject.
+ * @enable_flutter_gpu: whether to enable the Flutter GPU API.
+ *
+ * Sets whether the Flutter GPU API (package:flutter_gpu) should be enabled.
+ * Flutter GPU requires the Impeller renderer.
+ */
+void fl_dart_project_set_enable_flutter_gpu(FlDartProject* project,
+                                            gboolean enable_flutter_gpu);
+
+/**
+ * fl_dart_project_get_enable_flutter_gpu:
+ * @project: an #FlDartProject.
+ *
+ * Returns: %TRUE if the Flutter GPU API is enabled.
+ */
+gboolean fl_dart_project_get_enable_flutter_gpu(FlDartProject* project);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_DART_PROJECT_H_
diff --git a/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows.cc b/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows.cc
index 085397060edca..412dbb2ae46cd 100644
--- a/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows.cc
+++ b/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows.cc
@@ -103,6 +103,11 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
       DispatchWinAccessibilityEvent(win_delegate,
                                     ax::mojom::Event::kStateChanged);
       break;
+    case ui::AXEventGenerator::Event::ENABLED_CHANGED:
+    case ui::AXEventGenerator::Event::READONLY_CHANGED:
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kStateChanged);
+      break;
     case ui::AXEventGenerator::Event::ACCESS_KEY_CHANGED:
     case ui::AXEventGenerator::Event::ACTIVE_DESCENDANT_CHANGED:
     case ui::AXEventGenerator::Event::ATK_TEXT_OBJECT_ATTRIBUTE_CHANGED:
@@ -116,7 +121,6 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
     case ui::AXEventGenerator::Event::DESCRIPTION_CHANGED:
     case ui::AXEventGenerator::Event::DOCUMENT_TITLE_CHANGED:
     case ui::AXEventGenerator::Event::DROPEFFECT_CHANGED:
-    case ui::AXEventGenerator::Event::ENABLED_CHANGED:
     case ui::AXEventGenerator::Event::EXPANDED:
     case ui::AXEventGenerator::Event::FLOW_FROM_CHANGED:
     case ui::AXEventGenerator::Event::FLOW_TO_CHANGED:
@@ -142,7 +146,6 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
     case ui::AXEventGenerator::Event::PLACEHOLDER_CHANGED:
     case ui::AXEventGenerator::Event::PORTAL_ACTIVATED:
     case ui::AXEventGenerator::Event::POSITION_IN_SET_CHANGED:
-    case ui::AXEventGenerator::Event::READONLY_CHANGED:
     case ui::AXEventGenerator::Event::RELATED_NODE_CHANGED:
     case ui::AXEventGenerator::Event::REQUIRED_STATE_CHANGED:
     case ui::AXEventGenerator::Event::ROLE_CHANGED:
diff --git a/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc b/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc
index 3f7ff3d21a3ba..ee6eb6cf0e36f 100644
--- a/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc
@@ -403,5 +403,15 @@ TEST(AccessibilityBridgeWindows, OnDocumentSelectionChanged) {
       ax::mojom::Event::kDocumentSelectionChanged, 2);
 }
 
+TEST(AccessibilityBridgeWindows, OnAccessibilityEnabledChanged) {
+  ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::ENABLED_CHANGED,
+                            ax::mojom::Event::kStateChanged);
+}
+
+TEST(AccessibilityBridgeWindows, OnAccessibilityReadOnlyChanged) {
+  ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::READONLY_CHANGED,
+                            ax::mojom::Event::kStateChanged);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc b/engine/src/flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc
index bfc151947f673..e2a8746bb20a4 100644
--- a/engine/src/flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc
@@ -55,4 +55,15 @@ TEST_F(DartProjectTest, DartEntrypointArguments) {
   EXPECT_EQ(returned_arguments[2], "arg3");
 }
 
+TEST_F(DartProjectTest, EnableFlutterGpu) {
+  DartProject project(L"test");
+  EXPECT_FALSE(project.enable_flutter_gpu());
+
+  project.set_enable_flutter_gpu(true);
+  EXPECT_TRUE(project.enable_flutter_gpu());
+
+  project.set_enable_flutter_gpu(false);
+  EXPECT_FALSE(project.enable_flutter_gpu());
+}
+
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/windows/client_wrapper/flutter_engine.cc b/engine/src/flutter/shell/platform/windows/client_wrapper/flutter_engine.cc
index f5340fc558ea8..fb2a31ddf5761 100644
--- a/engine/src/flutter/shell/platform/windows/client_wrapper/flutter_engine.cc
+++ b/engine/src/flutter/shell/platform/windows/client_wrapper/flutter_engine.cc
@@ -27,6 +27,7 @@ FlutterEngine::FlutterEngine(const DartProject& project) {
           project.accessibility_mode());
   c_engine_properties.impeller_switch =
       static_cast<FlutterDesktopImpellerSwitch>(project.impeller_switch());
+  c_engine_properties.enable_flutter_gpu = project.enable_flutter_gpu();
 
   const std::vector<std::string>& entrypoint_args =
       project.dart_entrypoint_arguments();
diff --git a/engine/src/flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h b/engine/src/flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h
index 4a2e830cafb57..2dc37d201fbc9 100644
--- a/engine/src/flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h
+++ b/engine/src/flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h
@@ -153,6 +153,16 @@ class DartProject {
   // Defaults to ImpellerSwitch::Default.
   ImpellerSwitch impeller_switch() const { return impeller_switch_; }
 
+  // Sets whether the Flutter GPU API (package:flutter_gpu) is enabled.
+  // Flutter GPU requires the Impeller renderer.
+  void set_enable_flutter_gpu(bool enable_flutter_gpu) {
+    enable_flutter_gpu_ = enable_flutter_gpu;
+  }
+
+  // Returns whether the Flutter GPU API is enabled.
+  // Defaults to false.
+  bool enable_flutter_gpu() const { return enable_flutter_gpu_; }
+
  private:
   // Accessors for internals are private, so that they can be changed if more
   // flexible options for project structures are needed later without it
@@ -185,6 +195,8 @@ class DartProject {
   AccessibilityMode accessibility_mode_ = AccessibilityMode::Default;
   // The Impeller enablement switch.
   ImpellerSwitch impeller_switch_ = ImpellerSwitch::Default;
+  // Whether the Flutter GPU API is enabled.
+  bool enable_flutter_gpu_ = false;
 };
 
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/windows/compositor_opengl.cc b/engine/src/flutter/shell/platform/windows/compositor_opengl.cc
index 33f87711668e2..d1b1f5bc71a9f 100644
--- a/engine/src/flutter/shell/platform/windows/compositor_opengl.cc
+++ b/engine/src/flutter/shell/platform/windows/compositor_opengl.cc
@@ -5,6 +5,7 @@
 #include "flutter/shell/platform/windows/compositor_opengl.h"
 
 #include "GLES3/gl3.h"
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 
@@ -18,6 +19,7 @@ constexpr uint32_t kWindowFrameBufferId = 0;
 struct FramebufferBackingStore {
   uint32_t framebuffer_id = 0;
   uint32_t texture_id = 0;
+  uint32_t color_renderbuffer_id = 0;
   uint32_t depth_stencil_id = 0;
 };
 
@@ -51,48 +53,94 @@ bool CompositorOpenGL::CreateBackingStore(
 
   auto store = std::make_unique<FramebufferBackingStore>();
 
-  gl_->GenTextures(1, &store->texture_id);
   gl_->GenFramebuffers(1, &store->framebuffer_id);
-
   gl_->BindFramebuffer(GL_FRAMEBUFFER, store->framebuffer_id);
 
-  gl_->BindTexture(GL_TEXTURE_2D, store->texture_id);
-  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  gl_->TexImage2D(GL_TEXTURE_2D, 0, format_.general_format, config.size.width,
-                  config.size.height, 0, format_.general_format,
-                  GL_UNSIGNED_BYTE, nullptr);
-  gl_->BindTexture(GL_TEXTURE_2D, 0);
-
   if (enable_impeller_) {
     if (supports_implicit_msaa_) {
+      gl_->GenTextures(1, &store->texture_id);
+      gl_->BindTexture(GL_TEXTURE_2D, store->texture_id);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+      gl_->TexImage2D(GL_TEXTURE_2D, 0, format_.sized_format, config.size.width,
+                      config.size.height, 0, format_.general_format,
+                      GL_UNSIGNED_BYTE, nullptr);
+      gl_->BindTexture(GL_TEXTURE_2D, 0);
+
       // MSAA color attachment
       gl_->FramebufferTexture2DMultisampleEXT(
           GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
           store->texture_id, 0, 4);
-    } else {
-      gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                GL_TEXTURE_2D, store->texture_id, 0);
-    }
 
-    // Impeller always requires depth/stencil attachment.
-    gl_->GenRenderbuffers(1, &store->depth_stencil_id);
-    gl_->BindRenderbuffer(GL_RENDERBUFFER, store->depth_stencil_id);
-    if (supports_implicit_msaa_) {
+      // Impeller always requires depth/stencil attachment.
+      gl_->GenRenderbuffers(1, &store->depth_stencil_id);
+      gl_->BindRenderbuffer(GL_RENDERBUFFER, store->depth_stencil_id);
       gl_->RenderbufferStorageMultisampleEXT(
           GL_RENDERBUFFER, 4, GL_DEPTH24_STENCIL8, config.size.width,
           config.size.height);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
+    } else if (supports_offscreen_msaa_) {
+      // MSAA color renderbuffer attachment
+      gl_->GenRenderbuffers(1, &store->color_renderbuffer_id);
+      gl_->BindRenderbuffer(GL_RENDERBUFFER, store->color_renderbuffer_id);
+      gl_->RenderbufferStorageMultisample(
+          GL_RENDERBUFFER, 4, format_.sized_format, config.size.width,
+          config.size.height);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                   GL_RENDERBUFFER,
+                                   store->color_renderbuffer_id);
+
+      // MSAA depth/stencil attachment
+      gl_->GenRenderbuffers(1, &store->depth_stencil_id);
+      gl_->BindRenderbuffer(GL_RENDERBUFFER, store->depth_stencil_id);
+      gl_->RenderbufferStorageMultisample(
+          GL_RENDERBUFFER, 4, GL_DEPTH24_STENCIL8, config.size.width,
+          config.size.height);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
     } else {
+      gl_->GenTextures(1, &store->texture_id);
+      gl_->BindTexture(GL_TEXTURE_2D, store->texture_id);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+      gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+      gl_->TexImage2D(GL_TEXTURE_2D, 0, format_.sized_format, config.size.width,
+                      config.size.height, 0, format_.general_format,
+                      GL_UNSIGNED_BYTE, nullptr);
+      gl_->BindTexture(GL_TEXTURE_2D, 0);
+
+      gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                GL_TEXTURE_2D, store->texture_id, 0);
+
+      gl_->GenRenderbuffers(1, &store->depth_stencil_id);
+      gl_->BindRenderbuffer(GL_RENDERBUFFER, store->depth_stencil_id);
       gl_->RenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8,
                                config.size.width, config.size.height);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
+      gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                   GL_RENDERBUFFER, store->depth_stencil_id);
     }
-    gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                 GL_RENDERBUFFER, store->depth_stencil_id);
-    gl_->FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                 GL_RENDERBUFFER, store->depth_stencil_id);
   } else {
+    gl_->GenTextures(1, &store->texture_id);
+    gl_->BindTexture(GL_TEXTURE_2D, store->texture_id);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl_->TexImage2D(GL_TEXTURE_2D, 0, format_.sized_format, config.size.width,
+                    config.size.height, 0, format_.general_format,
+                    GL_UNSIGNED_BYTE, nullptr);
+    gl_->BindTexture(GL_TEXTURE_2D, 0);
+
     gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, store->texture_id, 0);
   }
@@ -118,8 +166,12 @@ bool CompositorOpenGL::CollectBackingStore(const FlutterBackingStore* store) {
       store->open_gl.framebuffer.user_data);
 
   gl_->DeleteFramebuffers(1, &user_data->framebuffer_id);
-  gl_->DeleteTextures(1, &user_data->texture_id);
-
+  if (user_data->texture_id != 0) {
+    gl_->DeleteTextures(1, &user_data->texture_id);
+  }
+  if (user_data->color_renderbuffer_id != 0) {
+    gl_->DeleteRenderbuffers(1, &user_data->color_renderbuffer_id);
+  }
   if (user_data->depth_stencil_id != 0) {
     gl_->DeleteRenderbuffers(1, &user_data->depth_stencil_id);
   }
@@ -237,6 +289,15 @@ bool CompositorOpenGL::Initialize() {
 
   supports_implicit_msaa_ =
       gl_->GetCapabilities()->SupportsImplicitResolvingMSAA();
+  supports_offscreen_msaa_ = gl_->GetCapabilities()->SupportsOffscreenMSAA();
+
+  if (enable_impeller_ && !supports_implicit_msaa_ &&
+      !supports_offscreen_msaa_) {
+    // TODO(190362): I suspect this branch is never taken since ANGLE will
+    // support offscreen MSAA. We should investigate removing this branch and
+    // the implicit MSAA branch in the rendering functions.
+    FML_LOG(WARNING) << "Rendering without MSAA.";
+  }
 
   is_initialized_ = true;
   return true;
diff --git a/engine/src/flutter/shell/platform/windows/compositor_opengl.h b/engine/src/flutter/shell/platform/windows/compositor_opengl.h
index eaf702c2065b4..0304d168d4287 100644
--- a/engine/src/flutter/shell/platform/windows/compositor_opengl.h
+++ b/engine/src/flutter/shell/platform/windows/compositor_opengl.h
@@ -66,6 +66,9 @@ class CompositorOpenGL : public Compositor {
   // Whether the OpenGL context supports implicit MSAA.
   bool supports_implicit_msaa_ = false;
 
+  // Whether the OpenGL context supports offscreen MSAA.
+  bool supports_offscreen_msaa_ = false;
+
   // Initialize the compositor. This must run on the raster thread.
   bool Initialize();
 
diff --git a/engine/src/flutter/shell/platform/windows/compositor_opengl_unittests.cc b/engine/src/flutter/shell/platform/windows/compositor_opengl_unittests.cc
index 97fb7bd934b48..14c2d9adcbcf7 100644
--- a/engine/src/flutter/shell/platform/windows/compositor_opengl_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/compositor_opengl_unittests.cc
@@ -104,6 +104,39 @@ const impeller::ProcTableGLES::Resolver kMockResolverWithMSAA =
       return kMockResolver(name);
     };
 
+void MockGetIntegervWithOffscreenMSAA(GLenum name, int* value) {
+  if (name == GL_NUM_EXTENSIONS) {
+    *value = 1;
+  } else if (name == GL_MAX_SAMPLES) {
+    *value = 4;
+  } else {
+    *value = 0;
+  }
+}
+
+const unsigned char* MockGetStringWithOffscreenMSAA(GLenum name) {
+  switch (name) {
+    case GL_VERSION:
+      return reinterpret_cast<const unsigned char*>("OpenGL ES 3.0");
+    case GL_SHADING_LANGUAGE_VERSION:
+      return reinterpret_cast<const unsigned char*>("OpenGL ES GLSL ES 3.0");
+    default:
+      return reinterpret_cast<const unsigned char*>("");
+  }
+}
+
+const impeller::ProcTableGLES::Resolver kMockResolverWithOffscreenMSAA =
+    [](const char* name) -> void* {
+  std::string_view function_name{name};
+
+  if (function_name == "glGetString") {
+    return reinterpret_cast<void*>(&MockGetStringWithOffscreenMSAA);
+  } else if (function_name == "glGetIntegerv") {
+    return reinterpret_cast<void*>(&MockGetIntegervWithOffscreenMSAA);
+  }
+  return kMockResolver(name);
+};
+
 class CompositorOpenGLTest : public WindowsTest {
  public:
   CompositorOpenGLTest() = default;
@@ -254,6 +287,90 @@ TEST_F(CompositorOpenGLTest, CreateBackingStoreImpellerMSAA) {
   ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
 }
 
+// Verifies that when implicit MSAA is unsupported but offscreen MSAA is
+// supported (OpenGL ES 3.0+ with GL_MAX_SAMPLES >= 4), CompositorOpenGL
+// creates 4x MSAA color and depth/stencil renderbuffers.
+TEST_F(CompositorOpenGLTest, CreateBackingStoreImpellerOffscreenMSAA) {
+  UseHeadlessEngine();
+
+  static int framebuffer_texture2d_calls = 0;
+  static int framebuffer_texture2d_multisample_calls = 0;
+  static int renderbuffer_storage_multisample_calls = 0;
+  static int renderbuffer_storage_multisample_samples = 0;
+  static int framebuffer_renderbuffer_calls = 0;
+  static int delete_renderbuffers_calls = 0;
+  static int delete_textures_calls = 0;
+
+  framebuffer_texture2d_calls = 0;
+  framebuffer_texture2d_multisample_calls = 0;
+  renderbuffer_storage_multisample_calls = 0;
+  renderbuffer_storage_multisample_samples = 0;
+  framebuffer_renderbuffer_calls = 0;
+  delete_renderbuffers_calls = 0;
+  delete_textures_calls = 0;
+
+  const impeller::ProcTableGLES::Resolver resolver =
+      [](const char* name) -> void* {
+    std::string_view function_name{name};
+    if (function_name == "glFramebufferTexture2D") {
+      return reinterpret_cast<void*>(
+          +[](GLenum, GLenum, GLenum, GLuint, GLint) {
+            framebuffer_texture2d_calls++;
+          });
+    } else if (function_name == "glFramebufferTexture2DMultisampleEXT") {
+      return reinterpret_cast<void*>(
+          +[](GLenum, GLenum, GLenum, GLuint, GLint, GLsizei) {
+            framebuffer_texture2d_multisample_calls++;
+          });
+    } else if (function_name == "glGenRenderbuffers") {
+      return reinterpret_cast<void*>(+[](GLsizei n, GLuint* renderbuffers) {
+        static GLuint next_id = 1;
+        for (GLsizei i = 0; i < n; i++) {
+          renderbuffers[i] = next_id++;
+        }
+      });
+    } else if (function_name == "glRenderbufferStorageMultisample") {
+      return reinterpret_cast<void*>(+[](GLenum target, GLsizei samples,
+                                         GLenum internalformat, GLsizei width,
+                                         GLsizei height) {
+        renderbuffer_storage_multisample_calls++;
+        renderbuffer_storage_multisample_samples = samples;
+      });
+    } else if (function_name == "glFramebufferRenderbuffer") {
+      return reinterpret_cast<void*>(+[](GLenum, GLenum, GLenum, GLuint) {
+        framebuffer_renderbuffer_calls++;
+      });
+    } else if (function_name == "glDeleteRenderbuffers") {
+      return reinterpret_cast<void*>(
+          +[](GLsizei n, const GLuint* renderbuffers) {
+            delete_renderbuffers_calls += n;
+          });
+    } else if (function_name == "glDeleteTextures") {
+      return reinterpret_cast<void*>(+[](GLsizei n, const GLuint* textures) {
+        delete_textures_calls += n;
+      });
+    }
+    return kMockResolverWithOffscreenMSAA(name);
+  };
+
+  auto compositor =
+      CompositorOpenGL{engine(), resolver, /*enable_impeller=*/true};
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+  EXPECT_EQ(framebuffer_texture2d_calls, 0);
+  EXPECT_EQ(framebuffer_texture2d_multisample_calls, 0);
+  EXPECT_EQ(renderbuffer_storage_multisample_calls, 2);
+  EXPECT_EQ(renderbuffer_storage_multisample_samples, 4);
+  EXPECT_EQ(framebuffer_renderbuffer_calls, 3);
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+  EXPECT_EQ(delete_renderbuffers_calls, 2);
+  EXPECT_EQ(delete_textures_calls, 0);
+}
+
 TEST_F(CompositorOpenGLTest, InitializationFailure) {
   UseHeadlessEngine();
 
diff --git a/engine/src/flutter/shell/platform/windows/fixtures/main.dart b/engine/src/flutter/shell/platform/windows/fixtures/main.dart
index 85f4bf0c07d46..4a83ad15c8cbf 100644
--- a/engine/src/flutter/shell/platform/windows/fixtures/main.dart
+++ b/engine/src/flutter/shell/platform/windows/fixtures/main.dart
@@ -4,28 +4,29 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:ffi' as ffi;
 import 'dart:io' as io;
 import 'dart:typed_data' show ByteData, Float64List, Int32List, Uint8List;
 import 'dart:ui' as ui;
 
 // Signals a waiting latch in the native test.
-@pragma('vm:external-name', 'Signal')
+@ffi.Native<ffi.Void Function()>(symbol: 'Signal')
 external void signal();
 
 // Signals a waiting latch in the native test, passing a boolean value.
-@pragma('vm:external-name', 'SignalBoolValue')
+@ffi.Native<ffi.Void Function(ffi.Bool)>(symbol: 'SignalBoolValue')
 external void signalBoolValue(bool value);
 
 // Signals a waiting latch in the native test, passing a string value.
-@pragma('vm:external-name', 'SignalStringValue')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'SignalStringValue')
 external void signalStringValue(String value);
 
 // Signals a waiting latch in the native test, which returns a value to the fixture.
-@pragma('vm:external-name', 'SignalBoolReturn')
+@ffi.Native<ffi.Bool Function()>(symbol: 'SignalBoolReturn')
 external bool signalBoolReturn();
 
 // Notify the native test that the first frame has been scheduled.
-@pragma('vm:external-name', 'NotifyFirstFrameScheduled')
+@ffi.Native<ffi.Void Function()>(symbol: 'NotifyFirstFrameScheduled')
 external void notifyFirstFrameScheduled();
 
 void main() {}
@@ -399,7 +400,7 @@ void mergedUIThread() {
   signal();
 }
 
-@pragma('vm:external-name', 'NotifyEngineId')
+@ffi.Native<ffi.Void Function(ffi.Handle)>(symbol: 'NotifyEngineId')
 external void notifyEngineId(int? handle);
 
 @pragma('vm:entry-point')
diff --git a/engine/src/flutter/shell/platform/windows/flutter_project_bundle.cc b/engine/src/flutter/shell/platform/windows/flutter_project_bundle.cc
index 03f20fb586976..63cfead0e0d64 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_project_bundle.cc
+++ b/engine/src/flutter/shell/platform/windows/flutter_project_bundle.cc
@@ -42,6 +42,8 @@ FlutterProjectBundle::FlutterProjectBundle(
   impeller_switch_ =
       static_cast<FlutterImpellerSwitch>(properties.impeller_switch);
 
+  enable_flutter_gpu_ = properties.enable_flutter_gpu;
+
   // Resolve any relative paths.
   if (assets_path_.is_relative() || icu_path_.is_relative() ||
       (!aot_library_path_.empty() && aot_library_path_.is_relative())) {
diff --git a/engine/src/flutter/shell/platform/windows/flutter_project_bundle.h b/engine/src/flutter/shell/platform/windows/flutter_project_bundle.h
index 59f7041d39da3..f504ea8555687 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_project_bundle.h
+++ b/engine/src/flutter/shell/platform/windows/flutter_project_bundle.h
@@ -97,6 +97,9 @@ class FlutterProjectBundle {
   // Returns the Impeller enablement switch.
   FlutterImpellerSwitch impeller_switch() const { return impeller_switch_; }
 
+  // Returns whether the Flutter GPU API is enabled.
+  bool enable_flutter_gpu() const { return enable_flutter_gpu_; }
+
  private:
   std::filesystem::path assets_path_;
   std::filesystem::path icu_path_;
@@ -124,6 +127,9 @@ class FlutterProjectBundle {
 
   // The Impeller enablement switch.
   FlutterImpellerSwitch impeller_switch_ = FlutterImpellerSwitch::Default;
+
+  // Whether the Flutter GPU API is enabled.
+  bool enable_flutter_gpu_ = false;
 };
 
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/windows/flutter_project_bundle_unittests.cc b/engine/src/flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
index 607d1cc707d99..c30d7f1ee8a4d 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
@@ -34,6 +34,19 @@ TEST(FlutterProjectBundle, BasicPropertiesRelativePaths) {
   EXPECT_EQ(project.icu_path().filename().string(), "icudtl.dat");
 }
 
+TEST(FlutterProjectBundle, EnableFlutterGpu) {
+  FlutterDesktopEngineProperties properties = {};
+  properties.assets_path = L"foo\\flutter_assets";
+  properties.icu_data_path = L"foo\\icudtl.dat";
+
+  FlutterProjectBundle default_project(properties);
+  EXPECT_FALSE(default_project.enable_flutter_gpu());
+
+  properties.enable_flutter_gpu = true;
+  FlutterProjectBundle project(properties);
+  EXPECT_TRUE(project.enable_flutter_gpu());
+}
+
 TEST(FlutterProjectBundle, SwitchesEmpty) {
   FlutterDesktopEngineProperties properties = {};
   properties.assets_path = L"foo\\flutter_assets";
diff --git a/engine/src/flutter/shell/platform/windows/flutter_windows_engine.cc b/engine/src/flutter/shell/platform/windows/flutter_windows_engine.cc
index 5275e5b612424..d9f797ca257ba 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_windows_engine.cc
+++ b/engine/src/flutter/shell/platform/windows/flutter_windows_engine.cc
@@ -326,6 +326,16 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
       switches.push_back("--enable-impeller=false");
     }
   }
+  if (project_->enable_flutter_gpu()) {
+    if (std::find(switches.begin(), switches.end(), "--enable-flutter-gpu") ==
+            switches.end() &&
+        std::find(switches.begin(), switches.end(),
+                  "--enable-flutter-gpu=true") == switches.end()) {
+      // Flutter GPU was enabled programmatically, so forward the switch to
+      // the engine.
+      switches.push_back("--enable-flutter-gpu");
+    }
+  }
   std::transform(
       switches.begin(), switches.end(), std::back_inserter(argv),
       [](const std::string& arg) -> const char* { return arg.c_str(); });
diff --git a/engine/src/flutter/shell/platform/windows/flutter_windows_engine_unittests.cc b/engine/src/flutter/shell/platform/windows/flutter_windows_engine_unittests.cc
index 23daedc82ed14..81a7e02fd28ae 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_windows_engine_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/flutter_windows_engine_unittests.cc
@@ -534,6 +534,115 @@ TEST_F(FlutterWindowsEngineTest, RunWithProjectFlagEnableImpeller) {
   modifier.ReleaseEGLManager();
 }
 
+TEST_F(FlutterWindowsEngineTest, RunWithProjectFlagEnableFlutterGpu) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetEnableFlutterGpu(true);
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
+  EngineModifier modifier(engine.get());
+
+  modifier.embedder_api().NotifyDisplayUpdate =
+      MOCK_ENGINE_PROC(NotifyDisplayUpdate,
+                       ([](FLUTTER_API_SYMBOL(FlutterEngine) raw_engine,
+                           const FlutterEngineDisplaysUpdateType update_type,
+                           const FlutterEngineDisplay* embedder_displays,
+                           size_t display_count) { return kSuccess; }));
+
+  modifier.embedder_api().UpdateAccessibilityFeatures = MOCK_ENGINE_PROC(
+      UpdateAccessibilityFeatures,
+      [](FLUTTER_API_SYMBOL(FlutterEngine) engine,
+         FlutterAccessibilityFeature flags) { return kSuccess; });
+
+  modifier.embedder_api().UpdateLocales = MOCK_ENGINE_PROC(
+      UpdateLocales, ([](auto engine, const FlutterLocale** locales,
+                         size_t locales_count) { return kSuccess; }));
+
+  modifier.embedder_api().SendPlatformMessage =
+      MOCK_ENGINE_PROC(SendPlatformMessage,
+                       ([](auto engine, auto message) { return kSuccess; }));
+
+  bool run_called = false;
+  modifier.embedder_api().Run = MOCK_ENGINE_PROC(
+      Run, ([&run_called](size_t version, const FlutterRendererConfig* config,
+                          const FlutterProjectArgs* args, void* user_data,
+                          FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) {
+        run_called = true;
+        *engine_out = reinterpret_cast<FLUTTER_API_SYMBOL(FlutterEngine)>(1);
+
+        bool has_flutter_gpu_switch = false;
+        for (int i = 0; i < args->command_line_argc; ++i) {
+          if (strcmp(args->command_line_argv[i], "--enable-flutter-gpu") == 0) {
+            has_flutter_gpu_switch = true;
+          }
+        }
+        EXPECT_TRUE(has_flutter_gpu_switch);
+        return kSuccess;
+      }));
+
+  // Set the EGL manager to !nullptr to test ANGLE rendering.
+  modifier.SetEGLManager(std::make_unique<egl::MockManager>());
+
+  engine->Run();
+
+  EXPECT_TRUE(run_called);
+
+  modifier.embedder_api().Shutdown = [](auto engine) { return kSuccess; };
+  modifier.ReleaseEGLManager();
+}
+
+TEST_F(FlutterWindowsEngineTest, RunWithoutProjectFlagEnableFlutterGpu) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
+  EngineModifier modifier(engine.get());
+
+  modifier.embedder_api().NotifyDisplayUpdate =
+      MOCK_ENGINE_PROC(NotifyDisplayUpdate,
+                       ([](FLUTTER_API_SYMBOL(FlutterEngine) raw_engine,
+                           const FlutterEngineDisplaysUpdateType update_type,
+                           const FlutterEngineDisplay* embedder_displays,
+                           size_t display_count) { return kSuccess; }));
+
+  modifier.embedder_api().UpdateAccessibilityFeatures = MOCK_ENGINE_PROC(
+      UpdateAccessibilityFeatures,
+      [](FLUTTER_API_SYMBOL(FlutterEngine) engine,
+         FlutterAccessibilityFeature flags) { return kSuccess; });
+
+  modifier.embedder_api().UpdateLocales = MOCK_ENGINE_PROC(
+      UpdateLocales, ([](auto engine, const FlutterLocale** locales,
+                         size_t locales_count) { return kSuccess; }));
+
+  modifier.embedder_api().SendPlatformMessage =
+      MOCK_ENGINE_PROC(SendPlatformMessage,
+                       ([](auto engine, auto message) { return kSuccess; }));
+
+  bool run_called = false;
+  modifier.embedder_api().Run = MOCK_ENGINE_PROC(
+      Run, ([&run_called](size_t version, const FlutterRendererConfig* config,
+                          const FlutterProjectArgs* args, void* user_data,
+                          FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) {
+        run_called = true;
+        *engine_out = reinterpret_cast<FLUTTER_API_SYMBOL(FlutterEngine)>(1);
+
+        bool has_flutter_gpu_switch = false;
+        for (int i = 0; i < args->command_line_argc; ++i) {
+          if (strcmp(args->command_line_argv[i], "--enable-flutter-gpu") == 0) {
+            has_flutter_gpu_switch = true;
+          }
+        }
+        EXPECT_FALSE(has_flutter_gpu_switch);
+        return kSuccess;
+      }));
+
+  // Set the EGL manager to !nullptr to test ANGLE rendering.
+  modifier.SetEGLManager(std::make_unique<egl::MockManager>());
+
+  engine->Run();
+
+  EXPECT_TRUE(run_called);
+
+  modifier.embedder_api().Shutdown = [](auto engine) { return kSuccess; };
+  modifier.ReleaseEGLManager();
+}
+
 TEST_F(FlutterWindowsEngineTest, RunWithProjectFlagDisableImpeller) {
   FlutterWindowsEngineBuilder builder{GetContext()};
   builder.SetImpellerSwitch(DisabledImpeller);
@@ -1023,9 +1132,8 @@ TEST_F(FlutterWindowsEngineTest, AccessibilityAnnouncement) {
   builder.SetDartEntrypoint("sendAccessibilityAnnouncement");
 
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   EnginePtr engine{builder.RunHeadless()};
   ASSERT_NE(engine, nullptr);
@@ -1061,9 +1169,8 @@ TEST_F(FlutterWindowsEngineTest, AccessibilityAnnouncementHeadless) {
   builder.SetDartEntrypoint("sendAccessibilityAnnouncement");
 
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   EnginePtr engine{builder.RunHeadless()};
   ASSERT_NE(engine, nullptr);
@@ -1087,9 +1194,8 @@ TEST_F(FlutterWindowsEngineTest, AccessibilityTooltip) {
   builder.SetDartEntrypoint("sendAccessibilityTooltipEvent");
 
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
@@ -1701,10 +1807,9 @@ TEST_F(FlutterWindowsEngineTest, MergedUIThread) {
 
   std::optional<std::thread::id> ui_thread_id;
 
-  auto native_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-    ui_thread_id = std::this_thread::get_id();
-  });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry =
+      CREATE_FFI_LAMBDA([&]() { ui_thread_id = std::this_thread::get_id(); });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   EnginePtr engine{builder.RunHeadless()};
   while (!ui_thread_id) {
@@ -1737,9 +1842,8 @@ TEST_F(FlutterWindowsEngineTest, UpdateSemanticsMultiView) {
 
   // Setup: a signal for when we have send out all of our semantics updates
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   // Setup: Create the engine and two views + enable semantics
   EnginePtr engine{builder.RunHeadless()};
diff --git a/engine/src/flutter/shell/platform/windows/flutter_windows_unittests.cc b/engine/src/flutter/shell/platform/windows/flutter_windows_unittests.cc
index 14ede56af18ac..79ed380ffa6d9 100644
--- a/engine/src/flutter/shell/platform/windows/flutter_windows_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/flutter_windows_unittests.cc
@@ -133,9 +133,8 @@ TEST_F(WindowsTest, LaunchHeadlessEngine) {
 
   std::string view_ids;
   bool signaled = false;
-  context.AddNativeFunction(
-      "SignalStringValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto handle = Dart_GetNativeArgument(args, 0);
+  context.AddFfiNativeFunction(
+      "SignalStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle handle) {
         ASSERT_FALSE(Dart_IsError(handle));
         view_ids = tonic::DartConverter<std::string>::FromDart(handle);
         signaled = true;
@@ -219,9 +218,8 @@ TEST_F(WindowsTest, VerifyNativeFunction) {
   builder.SetDartEntrypoint("verifyNativeFunction");
 
   bool signaled = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { signaled = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { signaled = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
@@ -241,12 +239,11 @@ TEST_F(WindowsTest, VerifyNativeFunctionWithParameters) {
 
   bool bool_value = false;
   bool signaled = false;
-  auto native_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &bool_value);
-    ASSERT_FALSE(Dart_IsError(handle));
+  auto native_entry = CREATE_FFI_LAMBDA([&](bool value) {
+    bool_value = value;
     signaled = true;
   });
-  context.AddNativeFunction("SignalBoolValue", native_entry);
+  context.AddFfiNativeFunction("SignalBoolValue", native_entry);
 
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
@@ -266,13 +263,12 @@ TEST_F(WindowsTest, PlatformExecutable) {
 
   std::string executable_name;
   bool signaled = false;
-  auto native_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-    auto handle = Dart_GetNativeArgument(args, 0);
+  auto native_entry = CREATE_FFI_LAMBDA([&](Dart_Handle handle) {
     ASSERT_FALSE(Dart_IsError(handle));
     executable_name = tonic::DartConverter<std::string>::FromDart(handle);
     signaled = true;
   });
-  context.AddNativeFunction("SignalStringValue", native_entry);
+  context.AddFfiNativeFunction("SignalStringValue", native_entry);
 
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
@@ -293,19 +289,18 @@ TEST_F(WindowsTest, VerifyNativeFunctionWithReturn) {
 
   bool bool_value_to_return = true;
   int count = 2;
-  auto bool_return_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-    Dart_SetBooleanReturnValue(args, bool_value_to_return);
+  auto bool_return_entry = CREATE_FFI_LAMBDA([&]() {
     --count;
+    return bool_value_to_return;
   });
-  context.AddNativeFunction("SignalBoolReturn", bool_return_entry);
+  context.AddFfiNativeFunction("SignalBoolReturn", bool_return_entry);
 
   bool bool_value_passed = false;
-  auto bool_pass_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &bool_value_passed);
-    ASSERT_FALSE(Dart_IsError(handle));
+  auto bool_pass_entry = CREATE_FFI_LAMBDA([&](bool value) {
+    bool_value_passed = value;
     --count;
   });
-  context.AddNativeFunction("SignalBoolValue", bool_pass_entry);
+  context.AddFfiNativeFunction("SignalBoolValue", bool_pass_entry);
 
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
@@ -334,10 +329,9 @@ TEST_F(WindowsTest, NextFrameCallback) {
     WindowsConfigBuilder builder(context);
     builder.SetDartEntrypoint("drawHelloWorld");
 
-    auto native_entry = CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-      captures.frame_scheduled_latch.Signal();
-    });
-    context.AddNativeFunction("NotifyFirstFrameScheduled", native_entry);
+    auto native_entry =
+        CREATE_FFI_LAMBDA([&]() { captures.frame_scheduled_latch.Signal(); });
+    context.AddFfiNativeFunction("NotifyFirstFrameScheduled", native_entry);
 
     ViewControllerPtr controller{builder.Run()};
     EXPECT_NE(controller, nullptr);
@@ -814,9 +808,8 @@ TEST_F(WindowsTest, GetKeyboardStateHeadless) {
   builder.SetDartEntrypoint("sendGetKeyboardState");
 
   std::atomic<bool> done = false;
-  context.AddNativeFunction(
-      "SignalStringValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto handle = Dart_GetNativeArgument(args, 0);
+  context.AddFfiNativeFunction(
+      "SignalStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle handle) {
         ASSERT_FALSE(Dart_IsError(handle));
         auto value = tonic::DartConverter<std::string>::FromDart(handle);
         EXPECT_EQ(value, "Success");
@@ -843,13 +836,11 @@ TEST_F(WindowsTest, AddRemoveView) {
   builder.SetDartEntrypoint("onMetricsChangedSignalViewIds");
 
   bool ready = false;
-  context.AddNativeFunction(
-      "Signal",
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { ready = true; }));
+  context.AddFfiNativeFunction("Signal",
+                               CREATE_FFI_LAMBDA([&]() { ready = true; }));
 
-  context.AddNativeFunction(
-      "SignalStringValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto handle = Dart_GetNativeArgument(args, 0);
+  context.AddFfiNativeFunction(
+      "SignalStringValue", CREATE_FFI_LAMBDA([&](Dart_Handle handle) {
         ASSERT_FALSE(Dart_IsError(handle));
 
         std::scoped_lock lock{mutex};
@@ -901,9 +892,8 @@ TEST_F(WindowsTest, EngineId) {
   builder.SetDartEntrypoint("testEngineId");
 
   std::optional<int64_t> engineId;
-  context.AddNativeFunction(
-      "NotifyEngineId", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        const auto argument = Dart_GetNativeArgument(args, 0);
+  context.AddFfiNativeFunction(
+      "NotifyEngineId", CREATE_FFI_LAMBDA([&](Dart_Handle argument) {
         if (!Dart_IsNull(argument)) {
           const auto handle = tonic::DartConverter<int64_t>::FromDart(argument);
           engineId = handle;
@@ -930,9 +920,8 @@ TEST_F(WindowsTest, EnableIAccessible) {
 
   // Setup: a signal for when we have send out all of our semantics updates
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   // Setup: Create a view
   ViewControllerPtr controller{builder.Run()};
@@ -978,9 +967,8 @@ TEST_F(WindowsTest, EnableIAccessibleEx) {
 
   // Setup: a signal for when we have send out all of our semantics updates
   bool done = false;
-  auto native_entry =
-      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
-  context.AddNativeFunction("Signal", native_entry);
+  auto native_entry = CREATE_FFI_LAMBDA([&]() { done = true; });
+  context.AddFfiNativeFunction("Signal", native_entry);
 
   // Setup: Create a view
   ViewControllerPtr controller{builder.Run()};
diff --git a/engine/src/flutter/shell/platform/windows/public/flutter_windows.h b/engine/src/flutter/shell/platform/windows/public/flutter_windows.h
index 54954042f47cd..2194cca17201b 100644
--- a/engine/src/flutter/shell/platform/windows/public/flutter_windows.h
+++ b/engine/src/flutter/shell/platform/windows/public/flutter_windows.h
@@ -128,6 +128,11 @@ typedef struct {
 
   // Policy for enabling the Impeller renderer.
   FlutterDesktopImpellerSwitch impeller_switch;
+
+  // Whether to enable the Flutter GPU API (package:flutter_gpu).
+  // Flutter GPU requires the Impeller renderer.
+  // If not set defaults to false.
+  bool enable_flutter_gpu;
 } FlutterDesktopEngineProperties;
 
 // ========== View Controller ==========
diff --git a/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.cc b/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.cc
index 62c1a407ff2e8..28a302a2d6e82 100644
--- a/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.cc
+++ b/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.cc
@@ -75,6 +75,10 @@ void FlutterWindowsEngineBuilder::SetImpellerSwitch(
   properties_.impeller_switch = impeller_switch;
 }
 
+void FlutterWindowsEngineBuilder::SetEnableFlutterGpu(bool enable_flutter_gpu) {
+  properties_.enable_flutter_gpu = enable_flutter_gpu;
+}
+
 void FlutterWindowsEngineBuilder::SetCreateKeyboardHandlerCallbacks(
     KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
     KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan) {
diff --git a/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h b/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h
index a10d11394d7ae..2f2ef89ea7df1 100644
--- a/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h
+++ b/engine/src/flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h
@@ -33,6 +33,8 @@ class FlutterWindowsEngineBuilder {
 
   void SetImpellerSwitch(FlutterDesktopImpellerSwitch impeller_switch);
 
+  void SetEnableFlutterGpu(bool enable_flutter_gpu);
+
   void SetWindowsProcTable(
       std::shared_ptr<WindowsProcTable> windows_proc_table);
 
diff --git a/engine/src/flutter/shell/platform/windows/testing/windows_test_context.cc b/engine/src/flutter/shell/platform/windows/testing/windows_test_context.cc
index 30b62b59d7dbe..b0c3b07bfbb5c 100644
--- a/engine/src/flutter/shell/platform/windows/testing/windows_test_context.cc
+++ b/engine/src/flutter/shell/platform/windows/testing/windows_test_context.cc
@@ -40,6 +40,11 @@ void WindowsTestContext::AddNativeFunction(std::string_view name,
   native_resolver_->AddNativeCallback(std::string{name}, function);
 }
 
+void WindowsTestContext::AddFfiNativeFunction(std::string_view name,
+                                              void* function) {
+  native_resolver_->AddFfiNativeCallback(std::string{name}, function);
+}
+
 fml::closure WindowsTestContext::GetRootIsolateCallback() {
   return [this]() {
     for (auto closure : this->isolate_create_callbacks_) {
diff --git a/engine/src/flutter/shell/platform/windows/testing/windows_test_context.h b/engine/src/flutter/shell/platform/windows/testing/windows_test_context.h
index f6e37ba2b49c0..14fb1b81fbbdb 100644
--- a/engine/src/flutter/shell/platform/windows/testing/windows_test_context.h
+++ b/engine/src/flutter/shell/platform/windows/testing/windows_test_context.h
@@ -44,6 +44,15 @@ class WindowsTestContext {
   // where `IdentifyingName` matches the |name| parameter to this method.
   void AddNativeFunction(std::string_view name, Dart_NativeFunction function);
 
+  // Registers an FFI function callable from Dart code in test fixtures. In
+  // the Dart test fixture, the associated function can be declared as:
+  //
+  //   @Native<ReturnType Function()>(symbol: 'IdentifyingName')
+  //   external ReturnType functionName();
+  //
+  // where `IdentifyingName` matches the |name| parameter to this method.
+  void AddFfiNativeFunction(std::string_view name, void* function);
+
   // Returns the root isolate create callback to register with the Flutter
   // runtime.
   fml::closure GetRootIsolateCallback();
diff --git a/engine/src/flutter/shell/platform/windows/window_manager.cc b/engine/src/flutter/shell/platform/windows/window_manager.cc
index 3ef1416c96c2c..ba1d9f839d68b 100644
--- a/engine/src/flutter/shell/platform/windows/window_manager.cc
+++ b/engine/src/flutter/shell/platform/windows/window_manager.cc
@@ -87,19 +87,23 @@ FlutterViewId WindowManager::CreatePopupWindow(
 }
 
 void WindowManager::OnEngineShutdown() {
-  // Don't send any more messages to isolate.
-  on_message_ = nullptr;
   std::vector<HWND> active_handles;
   active_handles.reserve(active_windows_.size());
   for (auto& [hwnd, window] : active_windows_) {
     active_handles.push_back(hwnd);
   }
+  // Destroy the windows before clearing |on_message_| so the WM_DESTROY
+  // round-trip reaches the isolate. Otherwise per-view Dart controllers
+  // never observe destruction and may issue follow-up FFI calls (e.g.
+  // updatePosition) with stale handles after the engine is torn down.
   for (auto hwnd : active_handles) {
     // This will destroy the window, which will in turn remove the
     // HostWindow from map when handling WM_NCDESTROY inside
     // HandleMessage.
     InternalFlutterWindows_WindowManager_OnDestroyWindow(hwnd);
   }
+  // Don't send any more messages to isolate.
+  on_message_ = nullptr;
 }
 
 std::optional<LRESULT> WindowManager::HandleMessage(HWND hwnd,
diff --git a/engine/src/flutter/shell/platform/windows/window_manager_unittests.cc b/engine/src/flutter/shell/platform/windows/window_manager_unittests.cc
index f813e36664d7a..55c255ab737d0 100644
--- a/engine/src/flutter/shell/platform/windows/window_manager_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/window_manager_unittests.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
+#include <vector>
+
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 #include "flutter/shell/platform/windows/testing/egl/mock_context.h"
 #include "flutter/shell/platform/windows/testing/egl/mock_manager.h"
@@ -52,11 +55,10 @@ class WindowManagerTest : public WindowsTest {
     ASSERT_TRUE(engine_->Run("testWindowController"));
 
     bool signalled = false;
-    context.AddNativeFunction(
-        "Signal", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-          isolate_ = flutter::Isolate::Current();
-          signalled = true;
-        }));
+    context.AddFfiNativeFunction("Signal", CREATE_FFI_LAMBDA([&]() {
+                                   isolate_ = flutter::Isolate::Current();
+                                   signalled = true;
+                                 }));
     while (!signalled) {
       engine_->task_runner()->ProcessTasks();
     }
@@ -1142,5 +1144,107 @@ TEST_F(WindowManagerTest,
   EXPECT_EQ(style & WS_THICKFRAME, 0L);
 }
 
+// Verifies that |OnEngineShutdown| destroys popup windows BEFORE clearing
+// |on_message_|, so the WM_DESTROY round-trip reaches the isolate. Without
+// this, |PopupWindowControllerWin32._destroyed| would never be set during
+// engine shutdown and queued FFI calls (e.g. updatePosition) would
+// dereference stale HostWindow pointers.
+TEST_F(WindowManagerTest, OnEngineShutdownDispatchesWmDestroyForPopupWindow) {
+  IsolateScope isolate_scope(isolate());
+
+  static std::vector<UINT> received_messages;
+  received_messages.clear();
+  WindowingInitRequest init_request{.on_message = [](WindowsMessage* message) {
+    received_messages.push_back(message->message);
+  }};
+  InternalFlutterWindows_WindowManager_Initialize(engine_id(), &init_request);
+
+  const int64_t parent_view_id =
+      InternalFlutterWindows_WindowManager_CreateRegularWindow(
+          engine_id(), regular_creation_request());
+  const HWND parent_window_handle =
+      InternalFlutterWindows_WindowManager_GetTopLevelWindowHandle(
+          engine_id(), parent_view_id);
+
+  auto position_callback = [](const WindowSize& child_size,
+                              const WindowRect& parent_rect,
+                              const WindowRect& output_rect) -> WindowRect* {
+    WindowRect* rect = static_cast<WindowRect*>(malloc(sizeof(WindowRect)));
+    rect->left = parent_rect.left + 10;
+    rect->top = parent_rect.top + 10;
+    rect->width = child_size.width;
+    rect->height = child_size.height;
+    return rect;
+  };
+
+  PopupWindowCreationRequest creation_request{
+      .preferred_constraints = {.has_view_constraints = true,
+                                .view_min_width = 100,
+                                .view_min_height = 50,
+                                .view_max_width = 300,
+                                .view_max_height = 200},
+      .parent = parent_window_handle,
+      .get_position_callback = position_callback};
+
+  InternalFlutterWindows_WindowManager_CreatePopupWindow(engine_id(),
+                                                         &creation_request);
+
+  received_messages.clear();
+  engine()->window_manager()->OnEngineShutdown();
+
+  EXPECT_NE(std::find(received_messages.begin(), received_messages.end(),
+                      static_cast<UINT>(WM_DESTROY)),
+            received_messages.end());
+}
+
+// Same as above for tooltips.
+TEST_F(WindowManagerTest, OnEngineShutdownDispatchesWmDestroyForTooltipWindow) {
+  IsolateScope isolate_scope(isolate());
+
+  static std::vector<UINT> received_messages;
+  received_messages.clear();
+  WindowingInitRequest init_request{.on_message = [](WindowsMessage* message) {
+    received_messages.push_back(message->message);
+  }};
+  InternalFlutterWindows_WindowManager_Initialize(engine_id(), &init_request);
+
+  const int64_t parent_view_id =
+      InternalFlutterWindows_WindowManager_CreateRegularWindow(
+          engine_id(), regular_creation_request());
+  const HWND parent_window_handle =
+      InternalFlutterWindows_WindowManager_GetTopLevelWindowHandle(
+          engine_id(), parent_view_id);
+
+  auto position_callback = [](const WindowSize& child_size,
+                              const WindowRect& parent_rect,
+                              const WindowRect& output_rect) -> WindowRect* {
+    WindowRect* rect = static_cast<WindowRect*>(malloc(sizeof(WindowRect)));
+    rect->left = parent_rect.left + 10;
+    rect->top = parent_rect.top + 10;
+    rect->width = child_size.width;
+    rect->height = child_size.height;
+    return rect;
+  };
+
+  TooltipWindowCreationRequest creation_request{
+      .preferred_constraints = {.has_view_constraints = true,
+                                .view_min_width = 100,
+                                .view_min_height = 50,
+                                .view_max_width = 300,
+                                .view_max_height = 200},
+      .parent = parent_window_handle,
+      .get_position_callback = position_callback};
+
+  InternalFlutterWindows_WindowManager_CreateTooltipWindow(engine_id(),
+                                                           &creation_request);
+
+  received_messages.clear();
+  engine()->window_manager()->OnEngineShutdown();
+
+  EXPECT_NE(std::find(received_messages.begin(), received_messages.end(),
+                      static_cast<UINT>(WM_DESTROY)),
+            received_messages.end());
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/engine/src/flutter/skwasm/animated_image.cc b/engine/src/flutter/skwasm/animated_image.cc
index 1fc62ecd2184b..e7f309fdf1f69 100644
--- a/engine/src/flutter/skwasm/animated_image.cc
+++ b/engine/src/flutter/skwasm/animated_image.cc
@@ -47,10 +47,11 @@ SKWASM_EXPORT SkAnimatedImage* animatedImage_create(SkData* data,
     return SkAnimatedImage::Make(std::move(android_codec)).release();
   }
 
-  return SkAnimatedImage::Make(
-             std::move(android_codec),
-             SkImageInfo::MakeUnknown(target_width, target_height),
-             SkIRect::MakeWH(target_width, target_height), nullptr)
+  SkImageInfo info = android_codec->getInfo();
+  info = info.makeWH(target_width, target_height);
+  return SkAnimatedImage::Make(std::move(android_codec), info,
+                               SkIRect::MakeWH(target_width, target_height),
+                               nullptr)
       .release();
 }
 
diff --git a/engine/src/flutter/skwasm/library_skwasm_support.js b/engine/src/flutter/skwasm/library_skwasm_support.js
index 5d23456261782..c6d9488b8f1ae 100644
--- a/engine/src/flutter/skwasm/library_skwasm_support.js
+++ b/engine/src/flutter/skwasm/library_skwasm_support.js
@@ -161,6 +161,9 @@ mergeInto(LibraryManager.library, {
               data.callbackId,
             );
             return;
+          case 'setResourceCacheLimit':
+            _surface_setResourceCacheLimitOnWorker(data.surface, data.bytes);
+            return;
           default:
             console.warn(`unrecognized skwasm message: ${skwasmMessage}`);
         }
@@ -210,11 +213,10 @@ mergeInto(LibraryManager.library, {
         callbackId,
       }, [canvas], threadId);
     };
-    _skwasm_reportInitialized = function (surfaceHandle, contextLostCallbackId, callbackId) {
+    _skwasm_reportInitialized = function (surfaceHandle, callbackId) {
       skwasm_postMessage({
         skwasmMessage: 'onInitialized',
         surface: surfaceHandle,
-        contextLostCallbackId,
         callbackId,
       }, []);
     };
@@ -290,6 +292,15 @@ mergeInto(LibraryManager.library, {
       });
     }
 
+    // Resource Cache
+    _skwasm_dispatchSetResourceCacheLimit = function(threadId, surface, bytes) {
+      skwasm_postMessage({
+        skwasmMessage: 'setResourceCacheLimit',
+        surface,
+        bytes,
+      }, [], threadId);
+    };
+
     // Context Loss
     _skwasm_dispatchTriggerContextLoss = function (threadId, surfaceHandle, callbackId) {
       skwasm_postMessage({
@@ -421,6 +432,8 @@ mergeInto(LibraryManager.library, {
   skwasm_createGlTextureFromTextureSource__deps: ['$skwasm_support_setup'],
   skwasm_dispatchDisposeSurface: function() {},
   skwasm_dispatchDisposeSurface__deps: ['$skwasm_support_setup'],
+  skwasm_dispatchSetResourceCacheLimit: function() {},
+  skwasm_dispatchSetResourceCacheLimit__deps: ['$skwasm_support_setup'],
   skwasm_dispatchRasterizeImage: function() {},
   skwasm_dispatchRasterizeImage__deps: ['$skwasm_support_setup'],
   skwasm_postRasterizeResult: function() {},
diff --git a/engine/src/flutter/skwasm/skwasm_support.h b/engine/src/flutter/skwasm/skwasm_support.h
index ab13ca9df8271..d7f3150ff6c6d 100644
--- a/engine/src/flutter/skwasm/skwasm_support.h
+++ b/engine/src/flutter/skwasm/skwasm_support.h
@@ -39,8 +39,7 @@ extern uint32_t skwasm_getGlContextForCanvas(SkwasmObject canvas,
                                              bool antialias,
                                              Skwasm::Surface* surface);
 extern void skwasm_reportInitialized(Skwasm::Surface* surface,
-                                     uint32_t callback_id,
-                                     uint32_t context_lost_callback_id);
+                                     uint32_t callback_id);
 extern void skwasm_reportResizeComplete(Skwasm::Surface* surface,
                                         uint32_t callback_id);
 extern void skwasm_dispatchResizeSurface(unsigned long thread_id,
@@ -76,6 +75,9 @@ extern void skwasm_dispatchTransferCanvas(unsigned long thread_id,
                                           uint32_t callback_id);
 extern void skwasm_dispatchDisposeSurface(unsigned long thread_id,
                                           Skwasm::Surface* surface);
+extern void skwasm_dispatchSetResourceCacheLimit(unsigned long thread_id,
+                                                 Skwasm::Surface* surface,
+                                                 int bytes);
 extern void skwasm_dispatchRasterizeImage(unsigned long thread_id,
                                           Skwasm::Surface* surface,
                                           flutter::DlImage* image,
diff --git a/engine/src/flutter/skwasm/surface.cc b/engine/src/flutter/skwasm/surface.cc
index 6bf56ad4b3615..65f6d9de09e23 100644
--- a/engine/src/flutter/skwasm/surface.cc
+++ b/engine/src/flutter/skwasm/surface.cc
@@ -41,6 +41,16 @@
 //    the Dart code, which will complete the future that was returned by the
 //    original Dart method call.
 
+// See https://github.com/flutter/flutter/pull/190048
+extern bool
+    gSkUseThreadLocalStrikeCaches_IAcknowledgeThisIsIncrediblyExperimental;
+
+namespace {
+__attribute__((constructor)) void UseThreadLocalStrikeCaches() {
+  gSkUseThreadLocalStrikeCaches_IAcknowledgeThisIsIncrediblyExperimental = true;
+}
+}  // namespace
+
 unsigned long Skwasm::GetRasterThread() {
   static unsigned long thread = []() {
     if (skwasm_isSingleThreaded()) {
@@ -86,6 +96,11 @@ void Skwasm::Surface::Dispose() {
 uint32_t Skwasm::Surface::SetCanvas(SkwasmObject canvas) {
   assert(emscripten_is_main_browser_thread());
   uint32_t callback_id = ++current_callback_id_;
+
+  // Allocated here instead of on the worker so that current_callback_id_ is
+  // only ever modified on the main thread.
+  context_lost_callback_id_ = ++current_callback_id_;
+
   skwasm_dispatchTransferCanvas(GetRasterThread(), this, canvas, callback_id);
   return callback_id;
 }
@@ -129,9 +144,11 @@ void Skwasm::Surface::ReceiveCanvasOnWorker(SkwasmObject canvas,
   render_context_ = Skwasm::RenderContext::Make(sample_count, stencil);
   render_context_->Resize(canvas_width_, canvas_height_);
 
-  context_lost_callback_id_ = ++current_callback_id_;
+  if (resource_cache_limit_) {
+    render_context_->SetResourceCacheLimit(*resource_cache_limit_);
+  }
 
-  skwasm_reportInitialized(this, context_lost_callback_id_, callback_id);
+  skwasm_reportInitialized(this, callback_id);
 }
 
 // Resizing
@@ -288,8 +305,20 @@ void Skwasm::Surface::OnContextLost() {
 
 // Other
 
+// Main thread only
 void Skwasm::Surface::SetResourceCacheLimit(int bytes) {
-  render_context_->SetResourceCacheLimit(bytes);
+  assert(emscripten_is_main_browser_thread());
+  skwasm_dispatchSetResourceCacheLimit(GetRasterThread(), this, bytes);
+}
+
+// Worker thread only
+void Skwasm::Surface::SetResourceCacheLimitOnWorker(int bytes) {
+  // Always stored so ReceiveCanvasOnWorker can reapply it whenever the
+  // render context is (re)created.
+  resource_cache_limit_ = bytes;
+  if (render_context_) {
+    render_context_->SetResourceCacheLimit(bytes);
+  }
 }
 
 std::unique_ptr<Skwasm::TextureSourceWrapper>
@@ -410,9 +439,16 @@ SKWASM_EXPORT void surface_dispose(Skwasm::Surface* surface) {
 
 SKWASM_EXPORT void surface_setResourceCacheLimitBytes(Skwasm::Surface* surface,
                                                       int bytes) {
+  // Dispatch to the worker, which owns the render context.
   surface->SetResourceCacheLimit(bytes);
 }
 
+SKWASM_EXPORT void surface_setResourceCacheLimitOnWorker(
+    Skwasm::Surface* surface,
+    int bytes) {
+  surface->SetResourceCacheLimitOnWorker(bytes);
+}
+
 SKWASM_EXPORT uint32_t surface_renderPictures(Skwasm::Surface* surface,
                                               flutter::DisplayList** pictures,
                                               int count) {
diff --git a/engine/src/flutter/skwasm/surface.h b/engine/src/flutter/skwasm/surface.h
index 9306b288532c6..56cb23def0e3b 100644
--- a/engine/src/flutter/skwasm/surface.h
+++ b/engine/src/flutter/skwasm/surface.h
@@ -12,6 +12,7 @@
 #include <emscripten/threading.h>
 #include <webgl/webgl1.h>
 #include <cassert>
+#include <optional>
 #include "export.h"
 #include "render_context.h"
 #include "wrappers.h"
@@ -80,6 +81,7 @@ class Surface {
 
   // Other
   void SetResourceCacheLimit(int bytes);
+  void SetResourceCacheLimitOnWorker(int bytes);
   std::unique_ptr<TextureSourceWrapper> CreateTextureSourceWrapper(
       SkwasmObject textureSource);
 
@@ -89,6 +91,8 @@ class Surface {
   void RecreateSurface();
 
   CallbackHandler* callback_handler_ = nullptr;
+
+  // Main thread only
   uint32_t current_callback_id_ = 0;
 
   int canvas_width_ = 0;
@@ -98,6 +102,10 @@ class Surface {
   std::unique_ptr<RenderContext> render_context_;
   uint32_t context_lost_callback_id_ = 0;
 
+  // Worker thread only: the desired resource cache limit for the surface,
+  // reapplied whenever the render context is (re)created.
+  std::optional<int> resource_cache_limit_;
+
   bool is_initialized_ = false;
 };
 }  // namespace Skwasm
diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE
index 88f05bfe30c20..ff82575ac2026 100644
--- a/engine/src/flutter/sky/packages/sky_engine/LICENSE
+++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE
@@ -15937,12 +15937,6 @@ glfw
 
 Copyright 2014-2022 The Khronos Group Inc.
 
-SPDX-License-Identifier: Apache-2.0
---------------------------------------------------------------------------------
-swiftshader
-
-Copyright 2014-2025 The Khronos Group Inc.
-
 SPDX-License-Identifier: Apache-2.0
 --------------------------------------------------------------------------------
 vulkan
@@ -18194,6 +18188,13 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+skia
+
+Copyright 2026 Google LLC.
+
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+--------------------------------------------------------------------------------
 angle
 
 Copyright 2026 The ANGLE Project Authors. All rights reserved.
diff --git a/engine/src/flutter/testing/dart/gpu_test.dart b/engine/src/flutter/testing/dart/gpu_test.dart
index b31d0ce8c4687..311eada0e940f 100644
--- a/engine/src/flutter/testing/dart/gpu_test.dart
+++ b/engine/src/flutter/testing/dart/gpu_test.dart
@@ -73,6 +73,16 @@ Future<gpu.RenderPipeline> createUnlitRenderPipeline() async {
   return gpu.gpuContext.createRenderPipeline(vertex!, fragment!);
 }
 
+Future<gpu.RenderPipeline> createOptimizedOutSamplerRenderPipeline() async {
+  final gpu.ShaderLibrary? library = await gpu.ShaderLibrary.fromAsset('test.shaderbundle');
+  assert(library != null);
+  final gpu.Shader? vertex = library!['UnlitVertex'];
+  assert(vertex != null);
+  final gpu.Shader? fragment = library['OptimizedOutSamplerFragment'];
+  assert(fragment != null);
+  return gpu.gpuContext.createRenderPipeline(vertex!, fragment!);
+}
+
 Future<gpu.RenderPipeline> createTextureRenderPipeline() async {
   final gpu.ShaderLibrary? library = await gpu.ShaderLibrary.fromAsset('test.shaderbundle');
   assert(library != null);
@@ -1198,6 +1208,35 @@ void main() async {
     }
   }, skip: !(impellerEnabled && flutterGpuEnabled));
 
+  test('Binding a dead-code-eliminated sampler does not crash', () async {
+    final RenderPassState state = createSimpleRenderPass();
+    final gpu.RenderPipeline pipeline = await createOptimizedOutSamplerRenderPipeline();
+    state.renderPass.bindPipeline(pipeline);
+
+    final gpu.HostBuffer transients = gpu.gpuContext.createHostBuffer();
+    final gpu.BufferView vertices = transients.emplace(
+      float32(<double>[-0.5, -0.5, 0.5, -0.5, 0.0, 0.5]),
+    );
+    state.renderPass.bindVertexBuffer(vertices);
+    state.renderPass.bindUniform(
+      pipeline.vertexShader.getUniformSlot('VertInfo'),
+      transients.emplace(unlitUBO(Matrix4.identity(), Colors.lime)),
+    );
+
+    // `tex` is optimized out. Binding it used to crash; now it either binds or
+    // is skipped, and either way the pass must draw.
+    final gpu.Texture texture = gpu.gpuContext.createTexture(gpu.StorageMode.devicePrivate, 1, 1);
+    try {
+      state.renderPass.bindTexture(pipeline.fragmentShader.getUniformSlot('tex'), texture);
+    } on Exception {
+      // Optimized out; binding it is a no-op.
+    }
+
+    state.renderPass.draw(3);
+    state.commandBuffer.submit();
+    expect(state.renderTexture.asImage(), isNotNull);
+  }, skip: !(impellerEnabled && flutterGpuEnabled));
+
   test('RenderPass.bindTexture throws for deviceTransient Textures', () async {
     final RenderPassState state = createSimpleRenderPass();
 
diff --git a/engine/src/flutter/testing/ios/IosUnitTests/App/Info.plist b/engine/src/flutter/testing/ios/IosUnitTests/App/Info.plist
index e87b8d51863b9..6e8e327f945e4 100644
--- a/engine/src/flutter/testing/ios/IosUnitTests/App/Info.plist
+++ b/engine/src/flutter/testing/ios/IosUnitTests/App/Info.plist
@@ -20,6 +20,27 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
diff --git a/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.h b/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.h
new file mode 100644
index 0000000000000..301f3cb92f5ec
--- /dev/null
+++ b/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.h
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_SCENEDELEGATE_H_
+#define FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_SCENEDELEGATE_H_
+
+#import <UIKit/UIKit.h>
+
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property(nonatomic, strong, nullable) UIWindow* window;
+
+@end
+
+#endif  // FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_SCENEDELEGATE_H_
diff --git a/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.m b/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.m
new file mode 100644
index 0000000000000..281ab38c4332a
--- /dev/null
+++ b/engine/src/flutter/testing/ios/IosUnitTests/App/SceneDelegate.m
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "SceneDelegate.h"
+
+@implementation SceneDelegate
+
+// The window is created from the Main storyboard and attached to the scene by UIKit.
+
+@end
diff --git a/engine/src/flutter/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj b/engine/src/flutter/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
index 6d35550aee0cf..719d93bbf4746 100644
--- a/engine/src/flutter/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
+++ b/engine/src/flutter/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		0D6AB6BE22BB05E200EEE540 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0D6AB6BD22BB05E200EEE540 /* Assets.xcassets */; };
 		0D6AB6C122BB05E200EEE540 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0D6AB6BF22BB05E200EEE540 /* LaunchScreen.storyboard */; };
 		0D6AB6C422BB05E200EEE540 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D6AB6C322BB05E200EEE540 /* main.m */; };
+		0D5CE1A22E4A000100AA0003 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D5CE1A12E4A000100AA0002 /* SceneDelegate.m */; };
 		F7521D7826BB68BC005F15C5 /* libios_test_flutter.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = F7521D7226BB671E005F15C5 /* libios_test_flutter.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F7521D7926BB68BC005F15C5 /* libocmock_shared.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = F7521D7526BB673E005F15C5 /* libocmock_shared.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F77E081926FA9CE6003E6E4C /* Flutter.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = F77E081726FA9CE6003E6E4C /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -61,6 +62,8 @@
 		0D6AB6B122BB05E100EEE540 /* IosUnitTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IosUnitTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0D6AB6B422BB05E100EEE540 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		0D6AB6B522BB05E100EEE540 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		0D5CE1A02E4A000100AA0001 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		0D5CE1A12E4A000100AA0002 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		0D6AB6B722BB05E100EEE540 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		0D6AB6B822BB05E100EEE540 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		0D6AB6BB22BB05E100EEE540 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -164,6 +167,8 @@
 			children = (
 				0D6AB6B422BB05E100EEE540 /* AppDelegate.h */,
 				0D6AB6B522BB05E100EEE540 /* AppDelegate.m */,
+				0D5CE1A02E4A000100AA0001 /* SceneDelegate.h */,
+				0D5CE1A12E4A000100AA0002 /* SceneDelegate.m */,
 				0D6AB6B722BB05E100EEE540 /* ViewController.h */,
 				0D6AB6B822BB05E100EEE540 /* ViewController.m */,
 				0D6AB6BA22BB05E100EEE540 /* Main.storyboard */,
@@ -302,6 +307,7 @@
 				0D6AB6B922BB05E100EEE540 /* ViewController.m in Sources */,
 				0D6AB6C422BB05E200EEE540 /* main.m in Sources */,
 				0D6AB6B622BB05E100EEE540 /* AppDelegate.m in Sources */,
+				0D5CE1A22E4A000100AA0003 /* SceneDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/engine/src/flutter/testing/ios_scenario_app/bin/run_ios_tests.dart b/engine/src/flutter/testing/ios_scenario_app/bin/run_ios_tests.dart
index 8b0309385990e..1e3243a269ebe 100644
--- a/engine/src/flutter/testing/ios_scenario_app/bin/run_ios_tests.dart
+++ b/engine/src/flutter/testing/ios_scenario_app/bin/run_ios_tests.dart
@@ -18,7 +18,9 @@ void main(List<String> args) async {
     return;
   }
 
-  final Engine? engine = Engine.tryFindWithin();
+  // Search from this script's own location rather than the current directory,
+  // so the script can be run from anywhere.
+  final Engine? engine = Engine.tryFindWithin(path.dirname(path.fromUri(io.Platform.script)));
   if (engine == null) {
     io.stderr.writeln('Must be run from within the engine repository.');
     io.exitCode = 1;
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info_Skia.plist b/engine/src/flutter/testing/ios_scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info_Skia.plist
deleted file mode 100644
index aaf5a18cf86c7..0000000000000
--- a/engine/src/flutter/testing/ios_scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info_Skia.plist
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--Dummy plist file to make the Skia version of scenario test happy-->
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<!--This flag does not do anything, it only makes the xcodebuild command happy-->
-	<key>FLTEnableImpeller</key>
-	<false/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/README.md b/engine/src/flutter/testing/ios_scenario_app/ios/README.md
index 2c68562ddf0e7..46cd9de1834e6 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/README.md
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/README.md
@@ -8,17 +8,18 @@ For example, after building `ios_debug_sim_unopt` (to run on Intel Macs) or `ios
 run:
 
 ```sh
-# From the root of the engine repository
-$ ./testing/ios_scenario_app/run_ios_tests.sh ios_debug_sim_unopt
+$ engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh ios_debug_sim_unopt
 ```
 
 or:
 
 ```sh
-# From the root of the engine repository
-$ ./testing/ios_scenario_app/run_ios_tests.sh ios_debug_sim_unopt_arm64
+$ engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh ios_debug_sim_unopt_arm64
 ```
 
+The paths above are relative to the root of the checkout, but the script
+resolves everything from its own location, so it can be run from any directory.
+
 To run or debug in Xcode, open the xcodeproj file located in
 `<engine_out_dir>/ios_debug_sim_unopt/ios_scenario_app/Scenarios/Scenarios.xcodeproj`.
 
@@ -29,10 +30,12 @@ grep for `run_ios_tests.sh`.
 
 ## iOS Platform View Tests
 
-For PlatformView tests on iOS, edit the dictionaries in
-[AppDelegate.m](Scenarios/Scenarios/AppDelegate.m) and
-[GoldenTestManager.m](Scenarios/ScenariosUITests/GoldenTestManager.m) so that
-the correct golden image can be found. Also, add a
+For PlatformView tests on iOS, register the scenario in
+[scenarios.dart](../lib/src/scenarios.dart) and add its launch argument to
+`scenarioArguments` in
+[SceneDelegate.m](Scenarios/Scenarios/SceneDelegate.m). The golden identifier
+is derived from the launch argument -- drop the leading `--` and swap `-` for
+`_` -- so it does not need to be registered anywhere else. Also, add a
 [GoldenPlatformViewTests](Scenarios/ScenariosUITests/GoldenPlatformViewTests.h)
 in [PlatformViewUITests.m](Scenarios/ScenariosUITests/PlatformViewUITests.m).
 
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
index b10e571497114..21ade5f52dda0 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
 		246B4E4222E3B5F700073EBF /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 246B4E4122E3B5F700073EBF /* App.framework */; };
 		246B4E4622E3B61000073EBF /* ../../Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 246B4E4522E3B61000073EBF /* ../../Flutter.xcframework */; };
 		248D76CC22E388370012F0C1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 248D76CB22E388370012F0C1 /* AppDelegate.m */; };
+		0D5CE1B22E4A000200AA0003 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D5CE1B12E4A000200AA0002 /* SceneDelegate.m */; };
 		248D76D422E388380012F0C1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 248D76D322E388380012F0C1 /* Assets.xcassets */; };
 		248D76DA22E388380012F0C1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 248D76D922E388380012F0C1 /* main.m */; };
 		248D76EF22E388380012F0C1 /* PlatformViewUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 248D76EE22E388380012F0C1 /* PlatformViewUITests.m */; };
@@ -60,6 +61,8 @@
 		ACA6436FAE2CC58E937F6474 /* golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 128C0818EE2178D3BA3B0F59 /* golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
 		A4BAEBB40F17121B1C245691 /* golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = FDCFFA56528B863D5A009BB6 /* golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
 		AE63A2E21A061413502E8802 /* golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = E94D88641E8692D6CA754665 /* golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
+		88F7CFED6991CDC3FA1372E6 /* golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 74D42C7F457635DB1EC6D034 /* golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
+		BD5589685904671FA2FF24D4 /* golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = EA7AA97891F556E64D056229 /* golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
 		C6A83A6354E040BD4CD665C6 /* golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = A908293A2041E5C40AF4375C /* golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
 		9910D126B2261FAAB97A44E7 /* golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F2029E1BBD358EE9D69051C6 /* golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
 		6BE1A09C122A7646184D351E /* golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F2C12F613F8121176E6B4E3 /* golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */; };
@@ -199,6 +202,8 @@
 		248D76C722E388370012F0C1 /* Scenarios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Scenarios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		248D76CA22E388370012F0C1 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		248D76CB22E388370012F0C1 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		0D5CE1B02E4A000200AA0001 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		0D5CE1B12E4A000200AA0002 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		248D76D322E388380012F0C1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		248D76D822E388380012F0C1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		248D76D922E388380012F0C1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -231,7 +236,6 @@
 		68D4017B2564859300ECD91A /* ContinuousTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContinuousTexture.h; sourceTree = "<group>"; };
 		68D4017C2564859300ECD91A /* ContinuousTexture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContinuousTexture.m; sourceTree = "<group>"; };
 		F26F15B7268B6B5500EC54D3 /* iPadGestureTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iPadGestureTests.m; sourceTree = "<group>"; };
-		F72114B628EF99F500184A2D /* Info_Skia.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_Skia.plist; sourceTree = "<group>"; };
 		21C15BDB794F61D0706DF179 /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_bogus_font_text_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		AAD032C50FB93A4D46C467D6 /* golden_darwin_system_font_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_darwin_system_font_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		5BA530B25CC9089C12F2A472 /* golden_non_full_screen_flutter_view_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_non_full_screen_flutter_view_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
@@ -246,6 +250,8 @@
 		128C0818EE2178D3BA3B0F59 /* golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		FDCFFA56528B863D5A009BB6 /* golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		E94D88641E8692D6CA754665 /* golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
+		74D42C7F457635DB1EC6D034 /* golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
+		EA7AA97891F556E64D056229 /* golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		A908293A2041E5C40AF4375C /* golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		F2029E1BBD358EE9D69051C6 /* golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
 		4F2C12F613F8121176E6B4E3 /* golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png"; sourceTree = "<group>"; };
@@ -339,9 +345,10 @@
 				24F1FB87230B4579005ACE7C /* TextPlatformView.m */,
 				248D76CA22E388370012F0C1 /* AppDelegate.h */,
 				248D76CB22E388370012F0C1 /* AppDelegate.m */,
+				0D5CE1B02E4A000200AA0001 /* SceneDelegate.h */,
+				0D5CE1B12E4A000200AA0002 /* SceneDelegate.m */,
 				248D76D322E388380012F0C1 /* Assets.xcassets */,
 				248D76D822E388380012F0C1 /* Info.plist */,
-				F72114B628EF99F500184A2D /* Info_Skia.plist */,
 				248D76D922E388380012F0C1 /* main.m */,
 				0A57B3BB2323C4BD00DD9521 /* ScreenBeforeFlutter.h */,
 				0A57B3BC2323C4BD00DD9521 /* ScreenBeforeFlutter.m */,
@@ -437,6 +444,8 @@
 				128C0818EE2178D3BA3B0F59 /* golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
 				FDCFFA56528B863D5A009BB6 /* golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
 				E94D88641E8692D6CA754665 /* golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
+				74D42C7F457635DB1EC6D034 /* golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
+				EA7AA97891F556E64D056229 /* golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
 				A908293A2041E5C40AF4375C /* golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
 				F2029E1BBD358EE9D69051C6 /* golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
 				4F2C12F613F8121176E6B4E3 /* golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png */,
@@ -643,6 +652,8 @@
 				ACA6436FAE2CC58E937F6474 /* golden_platform_view_cliprect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
 				A4BAEBB40F17121B1C245691 /* golden_platform_view_cliprect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
 				AE63A2E21A061413502E8802 /* golden_platform_view_cliprrect_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
+				88F7CFED6991CDC3FA1372E6 /* golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
+				BD5589685904671FA2FF24D4 /* golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
 				C6A83A6354E040BD4CD665C6 /* golden_platform_view_cliprrect_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
 				9910D126B2261FAAB97A44E7 /* golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
 				6BE1A09C122A7646184D351E /* golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png in Resources */,
@@ -688,6 +699,7 @@
 				68D4017D2564859300ECD91A /* ContinuousTexture.m in Sources */,
 				24F1FB89230B4579005ACE7C /* TextPlatformView.m in Sources */,
 				248D76CC22E388370012F0C1 /* AppDelegate.m in Sources */,
+				0D5CE1B22E4A000200AA0003 /* SceneDelegate.m in Sources */,
 				0A57B3BF2323C74200DD9521 /* FlutterEngine+ScenariosTest.m in Sources */,
 				0A57B3BD2323C4BD00DD9521 /* ScreenBeforeFlutter.m in Sources */,
 			);
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/AppDelegate.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
index 41d032c6d8f1d..3b03bdbaef48c 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
@@ -5,37 +5,6 @@
 #import "AppDelegate.h"
 
 #import "ContinuousTexture.h"
-#import "FlutterEngine+ScenariosTest.h"
-#import "ScreenBeforeFlutter.h"
-#import "TextPlatformView.h"
-
-// A UIViewController that sets YES for its preferedStatusBarHidden property.
-// StatusBar includes current time, which is non-deterministic. This ViewController
-// removes the StatusBar to make the screenshot deterministic.
-@interface NoStatusBarViewController : UIViewController
-
-@end
-
-@interface FlutterEngine ()
-@property(nonatomic, strong) FlutterMethodChannel* statusBarChannel;
-@end
-
-@implementation NoStatusBarViewController
-- (BOOL)prefersStatusBarHidden {
-  return YES;
-}
-@end
-
-// The FlutterViewController version of NoStatusBarViewController
-@interface NoStatusBarFlutterViewController : FlutterViewController
-
-@end
-
-@implementation NoStatusBarFlutterViewController
-- (BOOL)prefersStatusBarHidden {
-  return YES;
-}
-@end
 
 @implementation AppDelegate
 
@@ -46,104 +15,7 @@ - (BOOL)application:(UIApplication*)application
     @throw @"--enable-software-rendering is unsupported in iOS scenario tests";
   }
 
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-  if ([processArguments containsObject:@"--maskview-blocking"]) {
-    self.window.tintColor = UIColor.systemPinkColor;
-  }
-  NSDictionary<NSString*, NSString*>* launchArgsMap = @{
-    // The golden test args should match `GoldenTestManager`.
-    @"--locale-initialization" : @"locale_initialization",
-    @"--platform-view" : @"platform_view",
-    @"--platform-view-no-overlay-intersection" : @"platform_view_no_overlay_intersection",
-    @"--platform-view-two-intersecting-overlays" : @"platform_view_two_intersecting_overlays",
-    @"--platform-view-partial-intersection" : @"platform_view_partial_intersection",
-    @"--platform-view-one-overlay-two-intersecting-overlays" :
-        @"platform_view_one_overlay_two_intersecting_overlays",
-    @"--platform-view-multiple-without-overlays" : @"platform_view_multiple_without_overlays",
-    @"--platform-view-max-overlays" : @"platform_view_max_overlays",
-    @"--platform-view-surrounding-layers-fractional-coordinate" :
-        @"platform_view_surrounding_layers_fractional_coordinate",
-    @"--platform-view-partial-intersection-fractional-coordinate" :
-        @"platform_view_partial_intersection_fractional_coordinate",
-    @"--platform-view-multiple" : @"platform_view_multiple",
-    @"--platform-view-multiple-background-foreground" :
-        @"platform_view_multiple_background_foreground",
-    @"--platform-view-cliprect" : @"platform_view_cliprect",
-    @"--platform-view-cliprect-multiple-clips" : @"platform_view_cliprect_multiple_clips",
-    @"--platform-view-cliprrect" : @"platform_view_cliprrect",
-    @"--platform-view-cliprrect-multiple-clips" : @"platform_view_cliprrect_multiple_clips",
-    @"--platform-view-large-cliprrect" : @"platform_view_large_cliprrect",
-    @"--platform-view-large-cliprrect-multiple-clips" :
-        @"platform_view_large_cliprrect_multiple_clips",
-    @"--platform-view-clippath" : @"platform_view_clippath",
-    @"--platform-view-clippath-multiple-clips" : @"platform_view_clippath_multiple_clips",
-    @"--platform-view-cliprrect-with-transform" : @"platform_view_cliprrect_with_transform",
-    @"--platform-view-cliprrect-with-transform-multiple-clips" :
-        @"platform_view_cliprrect_with_transform_multiple_clips",
-    @"--platform-view-large-cliprrect-with-transform" :
-        @"platform_view_large_cliprrect_with_transform",
-    @"--platform-view-large-cliprrect-with-transform-multiple-clips" :
-        @"platform_view_large_cliprrect_with_transform_multiple_clips",
-    @"--platform-view-cliprect-with-transform" : @"platform_view_cliprect_with_transform",
-    @"--platform-view-cliprect-with-transform-multiple-clips" :
-        @"platform_view_cliprect_with_transform_multiple_clips",
-    @"--platform-view-clippath-with-transform" : @"platform_view_clippath_with_transform",
-    @"--platform-view-clippath-with-transform-multiple-clips" :
-        @"platform_view_clippath_with_transform_multiple_clips",
-    @"--platform-view-transform" : @"platform_view_transform",
-    @"--platform-view-opacity" : @"platform_view_opacity",
-    @"--platform-view-with-other-backdrop-filter" : @"platform_view_with_other_backdrop_filter",
-    @"--two-platform-views-with-other-backdrop-filter" :
-        @"two_platform_views_with_other_backdrop_filter",
-    @"--platform-view-with-negative-backdrop-filter" :
-        @"platform_view_with_negative_backdrop_filter",
-    @"--platform-view-rotate" : @"platform_view_rotate",
-    @"--non-full-screen-flutter-view-platform-view" : @"non_full_screen_flutter_view_platform_view",
-    @"--gesture-reject-after-touches-ended" : @"platform_view_gesture_reject_after_touches_ended",
-    @"--gesture-reject-eager" : @"platform_view_gesture_reject_eager",
-    @"--gesture-accept" : @"platform_view_gesture_accept",
-    @"--gesture-accept-with-overlapping-platform-views" :
-        @"platform_view_gesture_accept_with_overlapping_platform_views",
-    @"--tap-status-bar" : @"tap_status_bar",
-    @"--animated-color-square" : @"animated_color_square",
-    @"--solid-blue" : @"solid_blue",
-    @"--platform-view-with-continuous-texture" : @"platform_view_with_continuous_texture",
-    @"--bogus-font-text" : @"bogus_font_text",
-    @"--spawn-engine-works" : @"spawn_engine_works",
-    @"--pointer-events" : @"pointer_events",
-    @"--platform-view-scrolling-under-widget" : @"platform_view_scrolling_under_widget",
-    @"--platform-views-with-clips-scrolling" : @"platform_views_with_clips_scrolling",
-    @"--platform-views-with-clips-scrolling-multiple-clips" :
-        @"platform_views_with_clips_scrolling_multiple_clips",
-    @"--platform-view-cliprect-after-moved" : @"platform_view_cliprect_after_moved",
-    @"--platform-view-cliprect-after-moved-multiple-clips" :
-        @"platform_view_cliprect_after_moved_multiple_clips",
-    @"--two-platform-view-clip-rect" : @"two_platform_view_clip_rect",
-    @"--two-platform-view-clip-rect-multiple-clips" : @"two_platform_view_clip_rect_multiple_clips",
-    @"--two-platform-view-clip-rrect" : @"two_platform_view_clip_rrect",
-    @"--two-platform-view-clip-rrect-multiple-clips" :
-        @"two_platform_view_clip_rrect_multiple_clips",
-    @"--two-platform-view-clip-path" : @"two_platform_view_clip_path",
-    @"--two-platform-view-clip-path-multiple-clips" : @"two_platform_view_clip_path_multiple_clips",
-    @"--darwin-system-font" : @"darwin_system_font",
-  };
-  __block NSString* flutterViewControllerTestName = nil;
-  [launchArgsMap
-      enumerateKeysAndObjectsUsingBlock:^(NSString* argument, NSString* testName, BOOL* stop) {
-        if ([processArguments containsObject:argument]) {
-          flutterViewControllerTestName = testName;
-          *stop = YES;
-        }
-      }];
-  if (flutterViewControllerTestName) {
-    [self setupFlutterViewControllerTest:flutterViewControllerTestName];
-  } else if ([processArguments containsObject:@"--screen-before-flutter"]) {
-    self.window.rootViewController = [[ScreenBeforeFlutter alloc] initWithEngineRunCompletion:nil];
-  } else {
-    self.window.rootViewController = [[UIViewController alloc] init];
-  }
-
-  [self.window makeKeyAndVisible];
+  // The window and its root view controller are set up by SceneDelegate.
   if ([processArguments containsObject:@"--with-continuous-texture"]) {
     [ContinuousTexture
         registerWithRegistrar:[self registrarForPlugin:@"com.constant.firing.texture"]];
@@ -151,94 +23,4 @@ - (BOOL)application:(UIApplication*)application
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
-- (FlutterEngine*)engineForTest:(NSString*)scenarioIdentifier {
-  if ([scenarioIdentifier isEqualToString:@"spawn_engine_works"]) {
-    FlutterEngine* spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
-                                                         project:nil];
-    [spawner run];
-    return [spawner spawnWithEntrypoint:nil libraryURI:nil initialRoute:nil entrypointArgs:nil];
-  } else {
-    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
-                                                        project:nil];
-    [engine run];
-    return engine;
-  }
-}
-
-- (FlutterViewController*)flutterViewControllerForTest:(NSString*)scenarioIdentifier
-                                            withEngine:(FlutterEngine*)engine {
-  if ([scenarioIdentifier isEqualToString:@"tap_status_bar"]) {
-    return [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
-  } else {
-    return [[NoStatusBarFlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
-  }
-}
-
-- (void)setupFlutterViewControllerTest:(NSString*)scenarioIdentifier {
-  FlutterEngine* engine = [self engineForTest:scenarioIdentifier];
-  FlutterViewController* flutterViewController =
-      [self flutterViewControllerForTest:scenarioIdentifier withEngine:engine];
-  flutterViewController.view.accessibilityIdentifier = @"flutter_view";
-
-  [engine.binaryMessenger
-      setMessageHandlerOnChannel:@"waiting_for_status"
-            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
-              FlutterMethodChannel* channel = [FlutterMethodChannel
-                  methodChannelWithName:@"driver"
-                        binaryMessenger:engine.binaryMessenger
-                                  codec:[FlutterJSONMethodCodec sharedInstance]];
-              [channel invokeMethod:@"set_scenario" arguments:@{@"name" : scenarioIdentifier}];
-            }];
-  // Can be used to synchronize timing in the test for a signal from Dart.
-  [engine.binaryMessenger
-      setMessageHandlerOnChannel:@"display_data"
-            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
-              NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:message
-                                                                   options:0
-                                                                     error:nil];
-              UITextField* text = [[UITextField alloc] initWithFrame:CGRectMake(0, 400, 300, 100)];
-              text.text = dict[@"data"];
-              [flutterViewController.view addSubview:text];
-            }];
-
-  TextPlatformViewFactory* textPlatformViewFactory =
-      [[TextPlatformViewFactory alloc] initWithMessenger:engine.binaryMessenger];
-  NSObject<FlutterPluginRegistrar>* registrar =
-      [engine registrarForPlugin:@"scenarios/TextPlatformViewPlugin"];
-  [registrar registerViewFactory:textPlatformViewFactory
-                                withId:@"scenarios/textPlatformView"
-      gestureRecognizersBlockingPolicy:FlutterPlatformViewGestureRecognizersBlockingPolicyEager];
-  [registrar registerViewFactory:textPlatformViewFactory
-                                withId:@"scenarios/textPlatformView_blockPolicyUntilTouchesEnded"
-      gestureRecognizersBlockingPolicy:
-          FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded];
-
-  UIViewController* rootViewController = flutterViewController;
-  if ([scenarioIdentifier isEqualToString:@"non_full_screen_flutter_view_platform_view"]) {
-    // Make Flutter View's origin x/y not 0.
-    rootViewController = [[NoStatusBarViewController alloc] init];
-    [rootViewController.view addSubview:flutterViewController.view];
-    flutterViewController.view.frame = CGRectMake(150, 150, 500, 500);
-  } else if ([scenarioIdentifier isEqualToString:@"tap_status_bar"]) {
-    [engine.binaryMessenger
-        setMessageHandlerOnChannel:@"flutter/status_bar"
-              binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
-                NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:message
-                                                                     options:0
-                                                                       error:nil];
-                FlutterBasicMessageChannel* channel = [[FlutterBasicMessageChannel alloc]
-                       initWithName:@"display_data"
-                    binaryMessenger:engine.binaryMessenger
-                              codec:[FlutterJSONMessageCodec sharedInstance]];
-                [channel sendMessage:@{@"data" : dict}];
-                UITextField* text =
-                    [[UITextField alloc] initWithFrame:CGRectMake(0, 400, 300, 100)];
-                text.text = dict[@"method"];
-                [flutterViewController.view addSubview:text];
-              }];
-  }
-
-  self.window.rootViewController = rootViewController;
-}
-
 @end
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info.plist b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info.plist
index 798a798b4766e..4cd2a97364c9b 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info.plist
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info.plist
@@ -20,6 +20,25 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -41,7 +60,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>FLTEnableImpeller</key>
-	<true/>
 </dict>
 </plist>
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info_Skia.plist b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info_Skia.plist
deleted file mode 100644
index 0605d9602d839..0000000000000
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/Info_Skia.plist
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>FLTEnableImpeller</key>
-	<false/>
-</dict>
-</plist>
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.h b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.h
new file mode 100644
index 0000000000000..6f2a0943c8786
--- /dev/null
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.h
@@ -0,0 +1,24 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_IOS_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCENEDELEGATE_H_
+#define FLUTTER_TESTING_IOS_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCENEDELEGATE_H_
+
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+
+@interface SceneDelegate : FlutterSceneDelegate
+
+/**
+ * The main window of the first connected scene, or nil if no scene is connected.
+ *
+ * Under the UIScene life cycle a window belongs to a scene rather than to the application
+ * delegate, and a single scene delegate may serve more than one scene. The scenario app only
+ * ever has one scene, so tests use this to reach its root view controller.
+ */
+@property(class, nonatomic, readonly, nullable) UIWindow* mainWindowOfFirstConnectedScene;
+
+@end
+
+#endif  // FLUTTER_TESTING_IOS_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCENEDELEGATE_H_
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.m
new file mode 100644
index 0000000000000..feb0116a40302
--- /dev/null
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/Scenarios/SceneDelegate.m
@@ -0,0 +1,250 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "SceneDelegate.h"
+
+#import "FlutterEngine+ScenariosTest.h"
+#import "ScreenBeforeFlutter.h"
+#import "TextPlatformView.h"
+
+// A UIViewController that sets YES for its preferedStatusBarHidden property.
+// StatusBar includes current time, which is non-deterministic. This ViewController
+// removes the StatusBar to make the screenshot deterministic.
+@interface NoStatusBarViewController : UIViewController
+
+@end
+
+@interface FlutterEngine ()
+@property(nonatomic, strong) FlutterMethodChannel* statusBarChannel;
+@end
+
+@implementation NoStatusBarViewController
+- (BOOL)prefersStatusBarHidden {
+  return YES;
+}
+@end
+
+// The FlutterViewController version of NoStatusBarViewController
+@interface NoStatusBarFlutterViewController : FlutterViewController
+
+@end
+
+@implementation NoStatusBarFlutterViewController
+- (BOOL)prefersStatusBarHidden {
+  return YES;
+}
+@end
+
+@implementation SceneDelegate
+
++ (UIWindow*)mainWindowOfFirstConnectedScene {
+  for (UIScene* scene in UIApplication.sharedApplication.connectedScenes) {
+    if ([scene.delegate isKindOfClass:[SceneDelegate class]]) {
+      return ((SceneDelegate*)scene.delegate).window;
+    }
+  }
+  return nil;
+}
+
+- (void)scene:(UIScene*)scene
+    willConnectToSession:(UISceneSession*)session
+                 options:(UISceneConnectionOptions*)connectionOptions {
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
+
+  NSArray<NSString*>* processArguments = NSProcessInfo.processInfo.arguments;
+  if ([processArguments containsObject:@"--maskview-blocking"]) {
+    self.window.tintColor = UIColor.systemPinkColor;
+  }
+  NSSet<NSString*>* scenarioArguments = [NSSet setWithArray:@[
+    @"--animated-color-square",
+    @"--bogus-font-text",
+    @"--darwin-system-font",
+    @"--locale-initialization",
+    @"--non-full-screen-flutter-view-platform-view",
+    @"--platform-view",
+    @"--platform-view-clip-rsuperellipse",
+    @"--platform-view-clip-rsuperellipse-multiple-clips",
+    @"--platform-view-clippath",
+    @"--platform-view-clippath-multiple-clips",
+    @"--platform-view-clippath-with-transform",
+    @"--platform-view-clippath-with-transform-multiple-clips",
+    @"--platform-view-cliprect",
+    @"--platform-view-cliprect-after-moved",
+    @"--platform-view-cliprect-after-moved-multiple-clips",
+    @"--platform-view-cliprect-multiple-clips",
+    @"--platform-view-cliprect-with-transform",
+    @"--platform-view-cliprect-with-transform-multiple-clips",
+    @"--platform-view-cliprrect",
+    @"--platform-view-cliprrect-multiple-clips",
+    @"--platform-view-cliprrect-with-transform",
+    @"--platform-view-cliprrect-with-transform-multiple-clips",
+    @"--platform-view-gesture-accept",
+    @"--platform-view-gesture-accept-with-overlapping-platform-views",
+    @"--platform-view-gesture-reject-after-touches-ended",
+    @"--platform-view-gesture-reject-eager",
+    @"--platform-view-large-cliprrect",
+    @"--platform-view-large-cliprrect-multiple-clips",
+    @"--platform-view-large-cliprrect-with-transform",
+    @"--platform-view-large-cliprrect-with-transform-multiple-clips",
+    @"--platform-view-max-overlays",
+    @"--platform-view-multiple",
+    @"--platform-view-multiple-background-foreground",
+    @"--platform-view-multiple-without-overlays",
+    @"--platform-view-no-overlay-intersection",
+    @"--platform-view-one-overlay-two-intersecting-overlays",
+    @"--platform-view-opacity",
+    @"--platform-view-partial-intersection",
+    @"--platform-view-partial-intersection-fractional-coordinate",
+    @"--platform-view-rotate",
+    @"--platform-view-scrolling-under-widget",
+    @"--platform-view-surrounding-layers-fractional-coordinate",
+    @"--platform-view-transform",
+    @"--platform-view-two-intersecting-overlays",
+    @"--platform-view-with-continuous-texture",
+    @"--platform-view-with-negative-backdrop-filter",
+    @"--platform-view-with-other-backdrop-filter",
+    @"--platform-views-with-clips-scrolling",
+    @"--platform-views-with-clips-scrolling-multiple-clips",
+    @"--pointer-events",
+    @"--solid-blue",
+    @"--spawn-engine-works",
+    @"--tap-status-bar",
+    @"--two-platform-view-clip-path",
+    @"--two-platform-view-clip-path-multiple-clips",
+    @"--two-platform-view-clip-rect",
+    @"--two-platform-view-clip-rect-multiple-clips",
+    @"--two-platform-view-clip-rrect",
+    @"--two-platform-view-clip-rrect-multiple-clips",
+    @"--two-platform-views-with-other-backdrop-filter",
+  ]];
+
+  // We derive the Dart scenario name from the launch argument:
+  // * drop the leading "--"
+  // * swap "-" for "_"
+  // The GoldenTestManager golden name is derived exactly the same way.
+  NSString* flutterViewControllerTestName = nil;
+  for (NSString* argument in processArguments) {
+    if ([scenarioArguments containsObject:argument]) {
+      flutterViewControllerTestName =
+          [[argument substringFromIndex:2] stringByReplacingOccurrencesOfString:@"-"
+                                                                     withString:@"_"];
+      break;
+    }
+  }
+  if (flutterViewControllerTestName) {
+    [self setupFlutterViewControllerTest:flutterViewControllerTestName];
+  } else if ([processArguments containsObject:@"--screen-before-flutter"]) {
+    self.window.rootViewController = [[ScreenBeforeFlutter alloc] initWithEngineRunCompletion:nil];
+  } else {
+    // No scenario was selected.
+    // Bail out immediately on any unrecognized `--` argument and let the user know how to register
+    // a new scenario.
+    for (NSString* argument in processArguments) {
+      if ([argument hasPrefix:@"--"]) {
+        [NSException raise:NSInvalidArgumentException
+                    format:@"Unrecognised scenario argument \"%@\". Add it to scenarioArguments in "
+                           @"SceneDelegate.m, and register the scenario in scenarios.dart.",
+                           argument];
+      }
+    }
+    self.window.rootViewController = [[UIViewController alloc] init];
+  }
+
+  [self.window makeKeyAndVisible];
+
+  [super scene:scene willConnectToSession:session options:connectionOptions];
+}
+
+- (FlutterEngine*)engineForTest:(NSString*)scenarioIdentifier {
+  if ([scenarioIdentifier isEqualToString:@"spawn_engine_works"]) {
+    FlutterEngine* spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
+                                                         project:nil];
+    [spawner run];
+    return [spawner spawnWithEntrypoint:nil libraryURI:nil initialRoute:nil entrypointArgs:nil];
+  } else {
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
+                                                        project:nil];
+    [engine run];
+    return engine;
+  }
+}
+
+- (FlutterViewController*)flutterViewControllerForTest:(NSString*)scenarioIdentifier
+                                            withEngine:(FlutterEngine*)engine {
+  if ([scenarioIdentifier isEqualToString:@"tap_status_bar"]) {
+    return [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  } else {
+    return [[NoStatusBarFlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  }
+}
+
+- (void)setupFlutterViewControllerTest:(NSString*)scenarioIdentifier {
+  FlutterEngine* engine = [self engineForTest:scenarioIdentifier];
+  FlutterViewController* flutterViewController =
+      [self flutterViewControllerForTest:scenarioIdentifier withEngine:engine];
+  flutterViewController.view.accessibilityIdentifier = @"flutter_view";
+
+  [engine.binaryMessenger
+      setMessageHandlerOnChannel:@"waiting_for_status"
+            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
+              FlutterMethodChannel* channel = [FlutterMethodChannel
+                  methodChannelWithName:@"driver"
+                        binaryMessenger:engine.binaryMessenger
+                                  codec:[FlutterJSONMethodCodec sharedInstance]];
+              [channel invokeMethod:@"set_scenario" arguments:@{@"name" : scenarioIdentifier}];
+            }];
+  // Can be used to synchronize timing in the test for a signal from Dart.
+  [engine.binaryMessenger
+      setMessageHandlerOnChannel:@"display_data"
+            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
+              NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:message
+                                                                   options:0
+                                                                     error:nil];
+              UITextField* text = [[UITextField alloc] initWithFrame:CGRectMake(0, 400, 300, 100)];
+              text.text = dict[@"data"];
+              [flutterViewController.view addSubview:text];
+            }];
+
+  TextPlatformViewFactory* textPlatformViewFactory =
+      [[TextPlatformViewFactory alloc] initWithMessenger:engine.binaryMessenger];
+  NSObject<FlutterPluginRegistrar>* registrar =
+      [engine registrarForPlugin:@"scenarios/TextPlatformViewPlugin"];
+  [registrar registerViewFactory:textPlatformViewFactory
+                                withId:@"scenarios/textPlatformView"
+      gestureRecognizersBlockingPolicy:FlutterPlatformViewGestureRecognizersBlockingPolicyEager];
+  [registrar registerViewFactory:textPlatformViewFactory
+                                withId:@"scenarios/textPlatformView_blockPolicyUntilTouchesEnded"
+      gestureRecognizersBlockingPolicy:
+          FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded];
+
+  UIViewController* rootViewController = flutterViewController;
+  if ([scenarioIdentifier isEqualToString:@"non_full_screen_flutter_view_platform_view"]) {
+    // Make Flutter View's origin x/y not 0.
+    rootViewController = [[NoStatusBarViewController alloc] init];
+    [rootViewController.view addSubview:flutterViewController.view];
+    flutterViewController.view.frame = CGRectMake(150, 150, 500, 500);
+  } else if ([scenarioIdentifier isEqualToString:@"tap_status_bar"]) {
+    [engine.binaryMessenger
+        setMessageHandlerOnChannel:@"flutter/status_bar"
+              binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
+                NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:message
+                                                                     options:0
+                                                                       error:nil];
+                FlutterBasicMessageChannel* channel = [[FlutterBasicMessageChannel alloc]
+                       initWithName:@"display_data"
+                    binaryMessenger:engine.binaryMessenger
+                              codec:[FlutterJSONMessageCodec sharedInstance]];
+                [channel sendMessage:@{@"data" : dict}];
+                UITextField* text =
+                    [[UITextField alloc] initWithFrame:CGRectMake(0, 400, 300, 100)];
+                text.text = dict[@"method"];
+                [flutterViewController.view addSubview:text];
+              }];
+  }
+
+  self.window.rootViewController = rootViewController;
+}
+
+@end
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m
index b6ca5a9d9eae2..86b44e1cbe3f4 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m
@@ -5,6 +5,7 @@
 #import <Flutter/Flutter.h>
 #import <XCTest/XCTest.h>
 
+#import "SceneDelegate.h"
 #import "ScreenBeforeFlutter.h"
 
 FLUTTER_ASSERT_ARC
@@ -71,8 +72,9 @@ - (void)skip_testDismissedFlutterViewControllerNotRespondingToApplicationLifecyc
   }];
   [self waitForExpectationsWithTimeout:5 handler:nil];
 
-  UIApplication* application = UIApplication.sharedApplication;
-  application.delegate.window.rootViewController = rootVC;
+  UIWindow* window = SceneDelegate.mainWindowOfFirstConnectedScene;
+  XCTAssertNotNil(window, @"The host app must have a connected scene for test");
+  window.rootViewController = rootVC;
   FlutterEngine* engine = rootVC.engine;
 
   NSMutableArray* lifecycleExpectations = [NSMutableArray arrayWithCapacity:10];
@@ -208,8 +210,9 @@ - (void)skip_testFlutterViewControllerDetachingSendsApplicationLifecycle {
 
   [self waitForExpectationsWithTimeout:5 handler:nil];
 
-  UIApplication* application = UIApplication.sharedApplication;
-  application.delegate.window.rootViewController = rootVC;
+  UIWindow* window = SceneDelegate.mainWindowOfFirstConnectedScene;
+  XCTAssertNotNil(window, @"The host app must have a connected scene for test");
+  window.rootViewController = rootVC;
   FlutterEngine* engine = rootVC.engine;
 
   NSMutableArray* lifecycleExpectations = [NSMutableArray arrayWithCapacity:10];
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerInitialRouteTest.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerInitialRouteTest.m
index 50f70f2a4635a..0de37005dd092 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerInitialRouteTest.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerInitialRouteTest.m
@@ -5,7 +5,7 @@
 #import <Flutter/Flutter.h>
 #import <XCTest/XCTest.h>
 
-#import "AppDelegate.h"
+#import "SceneDelegate.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -72,8 +72,9 @@ - (void)testSettingInitialRoute {
                                }
                              }];
 
-  AppDelegate* appDelegate = (AppDelegate*)UIApplication.sharedApplication.delegate;
-  UIViewController* rootVC = appDelegate.window.rootViewController;
+  UIWindow* window = SceneDelegate.mainWindowOfFirstConnectedScene;
+  XCTAssertNotNil(window, @"The host app must have a connected scene for test");
+  UIViewController* rootVC = window.rootViewController;
   [rootVC presentViewController:self.flutterViewController animated:NO completion:nil];
 
   [self waitForExpectationsWithTimeout:30.0 handler:nil];
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
index 339e0d7c002b8..2040d54ef7a4b 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
@@ -5,7 +5,7 @@
 #import <Flutter/Flutter.h>
 #import <XCTest/XCTest.h>
 
-#import "AppDelegate.h"
+#import "SceneDelegate.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -53,8 +53,9 @@ - (void)testFirstFrameCallback {
     [firstFrameRendered fulfill];
   }];
 
-  AppDelegate* appDelegate = (AppDelegate*)UIApplication.sharedApplication.delegate;
-  UIViewController* rootVC = appDelegate.window.rootViewController;
+  UIWindow* window = SceneDelegate.mainWindowOfFirstConnectedScene;
+  XCTAssertNotNil(window, @"The host app must have a connected scene for test");
+  UIViewController* rootVC = window.rootViewController;
   [rootVC presentViewController:self.flutterViewController animated:NO completion:nil];
 
   [self waitForExpectationsWithTimeout:30.0 handler:nil];
@@ -86,8 +87,9 @@ - (void)testDrawLayer {
     [firstFrameRendered fulfill];
   }];
 
-  AppDelegate* appDelegate = (AppDelegate*)UIApplication.sharedApplication.delegate;
-  UIViewController* rootVC = appDelegate.window.rootViewController;
+  UIWindow* window = SceneDelegate.mainWindowOfFirstConnectedScene;
+  XCTAssertNotNil(window, @"The host app must have a connected scene for test");
+  UIViewController* rootVC = window.rootViewController;
   [rootVC presentViewController:self.flutterViewController animated:NO completion:nil];
 
   CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB();
@@ -96,7 +98,7 @@ - (void)testDrawLayer {
     CGContextRef context =
         CGBitmapContextCreate(nil, width, width, 8, 4 * width, color_space,
                               kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst);
-    [appDelegate.window.layer renderInContext:context];
+    [window.layer renderInContext:context];
     uint32_t* image_data = (uint32_t*)CGBitmapContextGetData(context);
     if (image_data[20] == 0xFF0000FF) {
       [imageRendered fulfill];
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m
index 140368cc0fbfb..d9ba800189c4b 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #import <XCTest/XCTest.h>
-#import "GoldenTestManager.h"
 
 @interface AppExtensionTests : XCTestCase
 @property(nonatomic, strong) XCUIApplication* hostApplication;
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
index 4fd156d4b0589..521a674870a01 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
@@ -11,7 +11,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSDictionary* launchArgsMap;
 const extern double kDefaultRmseThreshold;
 
 // Manages a `GoldenPlatformViewTests`.
@@ -24,9 +23,10 @@ const extern double kDefaultRmseThreshold;
 @property(readonly, copy, nonatomic) NSString* identifier;
 @property(readonly, copy, nonatomic) NSString* launchArg;
 
-// Initilize with launchArg.
+// Initialize with a launch argument.
 //
-// Crahes if the launchArg is not mapped in `Appdelegate.launchArgsMap`.
+// The golden identifier is derived from `launchArg` by dropping the leading "--" and
+// replacing "-" with "_"; `SceneDelegate` derives the scenario name the same way.
 - (instancetype)initWithLaunchArg:(NSString*)launchArg;
 
 // Take a sceenshot of the test app and check it has the same pixels with
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
index a0333c3073f77..b8b225445d6a1 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
@@ -13,84 +13,19 @@ @interface GoldenTestManager ()
 
 @implementation GoldenTestManager
 
-NSDictionary* launchArgsMap;
 const double kDefaultRmseThreshold = 0.5;
 
 - (instancetype)initWithLaunchArg:(NSString*)launchArg {
   self = [super init];
   if (self) {
-    // The launchArgsMap should match the one in the `PlatformVieGoldenTestManager`.
-    static NSDictionary<NSString*, NSString*>* launchArgsMap;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-      launchArgsMap = @{
-        @"--platform-view" : @"platform_view",
-        @"--platform-view-multiple" : @"platform_view_multiple",
-        @"--platform-view-multiple-background-foreground" :
-            @"platform_view_multiple_background_foreground",
-        @"--platform-view-cliprect" : @"platform_view_cliprect",
-        @"--platform-view-cliprect-multiple-clips" : @"platform_view_cliprect_multiple_clips",
-        @"--platform-view-cliprrect" : @"platform_view_cliprrect",
-        @"--platform-view-cliprrect-multiple-clips" : @"platform_view_cliprrect_multiple_clips",
-        @"--platform-view-large-cliprrect" : @"platform_view_large_cliprrect",
-        @"--platform-view-large-cliprrect-multiple-clips" :
-            @"platform_view_large_cliprrect_multiple_clips",
-        @"--platform-view-clippath" : @"platform_view_clippath",
-        @"--platform-view-clippath-multiple-clips" : @"platform_view_clippath_multiple_clips",
-        @"--platform-view-cliprrect-with-transform" : @"platform_view_cliprrect_with_transform",
-        @"--platform-view-cliprrect-with-transform-multiple-clips" :
-            @"platform_view_cliprrect_with_transform_multiple_clips",
-        @"--platform-view-large-cliprrect-with-transform" :
-            @"platform_view_large_cliprrect_with_transform",
-        @"--platform-view-large-cliprrect-with-transform-multiple-clips" :
-            @"platform_view_large_cliprrect_with_transform_multiple_clips",
-        @"--platform-view-cliprect-with-transform" : @"platform_view_cliprect_with_transform",
-        @"--platform-view-cliprect-with-transform-multiple-clips" :
-            @"platform_view_cliprect_with_transform_multiple_clips",
-        @"--platform-view-clippath-with-transform" : @"platform_view_clippath_with_transform",
-        @"--platform-view-clippath-with-transform-multiple-clips" :
-            @"platform_view_clippath_with_transform_multiple_clips",
-        @"--platform-view-transform" : @"platform_view_transform",
-        @"--platform-view-opacity" : @"platform_view_opacity",
-        @"--platform-view-with-other-backdrop-filter" : @"platform_view_with_other_backdrop_filter",
-        @"--two-platform-views-with-other-backdrop-filter" :
-            @"two_platform_views_with_other_backdrop_filter",
-        @"--platform-view-with-negative-backdrop-filter" :
-            @"platform_view_with_negative_backdrop_filter",
-        @"--platform-view-rotate" : @"platform_view_rotate",
-        @"--non-full-screen-flutter-view-platform-view" :
-            @"non_full_screen_flutter_view_platform_view",
-        @"--bogus-font-text" : @"bogus_font_text",
-        @"--spawn-engine-works" : @"spawn_engine_works",
-        @"--platform-view-cliprect-after-moved" : @"platform_view_cliprect_after_moved",
-        @"--platform-view-cliprect-after-moved-multiple-clips" :
-            @"platform_view_cliprect_after_moved_multiple_clips",
-        @"--two-platform-view-clip-rect" : @"two_platform_view_clip_rect",
-        @"--two-platform-view-clip-rect-multiple-clips" :
-            @"two_platform_view_clip_rect_multiple_clips",
-        @"--two-platform-view-clip-rrect" : @"two_platform_view_clip_rrect",
-        @"--two-platform-view-clip-rrect-multiple-clips" :
-            @"two_platform_view_clip_rrect_multiple_clips",
-        @"--two-platform-view-clip-path" : @"two_platform_view_clip_path",
-        @"--two-platform-view-clip-path-multiple-clips" :
-            @"two_platform_view_clip_path_multiple_clips",
-        @"--app-extension" : @"app_extension",
-        @"--darwin-system-font" : @"darwin_system_font",
-      };
-    });
-    _identifier = launchArgsMap[launchArg];
-
-    NSString* impeller = @"impeller_";
-    NSNumber* enableImpeller = [[NSBundle bundleWithIdentifier:@"dev.flutter.Scenarios"]
-        objectForInfoDictionaryKey:@"FLTEnableImpeller"];
-    if (enableImpeller != nil && !enableImpeller.boolValue) {
-      impeller = @"";
-      NSLog(@"Testing Skia: FLTEnableImpeller is NO");
-    } else {
-      NSLog(@"Testing Impeller");
-    }
-
-    NSString* prefix = [NSString stringWithFormat:@"golden_%@_%@", _identifier, impeller];
+    // We derive the golden identifier from the launch argument:
+    // * drop the leading "--"
+    // * swap "-" for "_"
+    // The SceneDelegate Dart scenario name is derived exactly the same way.
+    _identifier = [[launchArg substringFromIndex:2] stringByReplacingOccurrencesOfString:@"-"
+                                                                              withString:@"_"];
+
+    NSString* prefix = [NSString stringWithFormat:@"golden_%@_impeller_", _identifier];
     _goldenImage = [[GoldenImage alloc] initWithGoldenNamePrefix:prefix];
     _launchArg = launchArg;
   }
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
index a0196b9b3b038..65112fa311a71 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
@@ -26,15 +26,20 @@ - (void)testNoLocalePrepend {
   NSTimeInterval timeout = 10.0;
 
   // The locales received by dart:ui are exposed onBeginFrame via semantics label.
-  // There should only be one locale. The list should consist of the default
-  // locale provided by the iOS app.
-  NSArray<NSString*>* preferredLocales = [NSLocale preferredLanguages];
-  XCTAssertEqual(preferredLocales.count, 1);
-  // Dart connects the locale parts with `_` while iOS connects them with `-`.
-  // Converts to dart format before comparing.
-  NSString* localeDart = [preferredLocales.firstObject stringByReplacingOccurrencesOfString:@"-"
-                                                                                 withString:@"_"];
-  NSString* expectedIdentifier = [NSString stringWithFormat:@"[%@]", localeDart];
+  // The list should consist of the default system locale(s) provided by iOS.
+  //
+  // The locales iOS reports are of the form `en-CA`. `dart:ui` reports locales
+  // in the form `en_CA` and formats them as a list `[first, second, ...]`.
+  //
+  // Since this test is sensitive to device locale setup, we can't assume any
+  // particular locale, or any particular number of locales.
+  NSMutableArray<NSString*>* dartLocales = [NSMutableArray array];
+  for (NSString* localeIdentifier in [NSLocale preferredLanguages]) {
+    [dartLocales addObject:[localeIdentifier stringByReplacingOccurrencesOfString:@"-"
+                                                                       withString:@"_"]];
+  }
+  NSString* expectedIdentifier =
+      [NSString stringWithFormat:@"[%@]", [dartLocales componentsJoinedByString:@", "]];
   XCUIElement* textInputSemanticsObject =
       [self.application.textFields matchingIdentifier:expectedIdentifier].element;
   XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:timeout]);
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
index 5bd831f0948b5..756053fd249e5 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
@@ -18,7 +18,7 @@ - (void)setUp {
 
 - (void)testRejectPolicyUtilTouchesEnded {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments = @[ @"--gesture-reject-after-touches-ended" ];
+  app.launchArguments = @[ @"--platform-view-gesture-reject-after-touches-ended" ];
   [app launch];
 
   NSPredicate* predicateToFindPlatformView =
@@ -50,7 +50,7 @@ - (void)testRejectPolicyUtilTouchesEnded {
 
 - (void)testRejectPolicyEager {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments = @[ @"--gesture-reject-eager" ];
+  app.launchArguments = @[ @"--platform-view-gesture-reject-eager" ];
   [app launch];
 
   NSPredicate* predicateToFindPlatformView =
@@ -86,7 +86,7 @@ - (void)testRejectPolicyEager {
 
 - (void)testAccept {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments = @[ @"--gesture-accept" ];
+  app.launchArguments = @[ @"--platform-view-gesture-accept" ];
   [app launch];
 
   NSPredicate* predicateToFindPlatformView =
@@ -121,7 +121,7 @@ - (void)testAccept {
 
 - (void)testGestureWithMaskViewBlockingPlatformView {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments = @[ @"--gesture-accept", @"--maskview-blocking" ];
+  app.launchArguments = @[ @"--platform-view-gesture-accept", @"--maskview-blocking" ];
   [app launch];
 
   NSPredicate* predicateToFindPlatformView =
@@ -166,7 +166,7 @@ - (XCUICoordinate*)getNormalizedCoordinate:(XCUIApplication*)app point:(CGVector
 
 - (void)testGestureWithOverlappingPlatformViews {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments = @[ @"--gesture-accept-with-overlapping-platform-views" ];
+  app.launchArguments = @[ @"--platform-view-gesture-accept-with-overlapping-platform-views" ];
   [app launch];
 
   XCUIElement* foreground = app.otherElements[@"platform_view[0]"];
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
index e1c4532107e43..be9e9796ecc44 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
@@ -213,6 +213,42 @@ - (void)testPlatformView {
 
 @end
 
+@interface PlatformViewMutationClipRSuperellipseTests : GoldenPlatformViewTests
+
+@end
+
+@implementation PlatformViewMutationClipRSuperellipseTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--platform-view-clip-rsuperellipse"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  [self checkPlatformViewGolden];
+}
+
+@end
+
+@interface PlatformViewMutationClipRSuperellipseMultipleClipsTests : GoldenPlatformViewTests
+
+@end
+
+@implementation PlatformViewMutationClipRSuperellipseMultipleClipsTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager = [[GoldenTestManager alloc]
+      initWithLaunchArg:@"--platform-view-clip-rsuperellipse-multiple-clips"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  [self checkPlatformViewGolden];
+}
+
+@end
+
 @interface PlatformViewMutationLargeClipRRectTests : GoldenPlatformViewTests
 
 @end
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/README.md b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/README.md
index 9e6d9a25942b0..e50ae7280fde6 100644
--- a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/README.md
+++ b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/README.md
@@ -6,8 +6,8 @@ to communicate with the app. For instance, you won't have access to
 the view controller or engine instances from within the test code.
 
 For this reason, the test code typically uses **launch arguments** to configure
-the app (for example, use [launchArgsMap](../Scenarios/AppDelegate.m) to inform
-the app which `Scenario` to load), and use UIKit UI components to collect test
+the app (for example, use [scenarioArguments](../Scenarios/SceneDelegate.m) to
+inform the app which `Scenario` to load), and use UIKit UI components to collect test
 results (for example, every messsage received on the `display_data` channel adds
 a new `UITextField` to the app, which will be visible to the test code. See [touches_scenario.dart](../../../lib/src/touches_scenario.dart) for an example).
 
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png
new file mode 100644
index 0000000000000..8f7a1b805fb2e
Binary files /dev/null and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png
new file mode 100644
index 0000000000000..435e38d9b2754
Binary files /dev/null and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clip_rsuperellipse_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 3447128ba4b76..f83029665cbe9 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 1180dff87bbbc..4d818e2723b98 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 5460a36248dce..d9500e26249bb 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 8789c8efce86f..9906864189ea3 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 942e365387c4d..13b165c7b66e5 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 209b70322eac4..35cce33971b40 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index be06ca4e2249d..405c208e1459d 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 5637c4d93eb42..1522242a18298 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png
index 02c112d28a8c3..45c2924fabb63 100644
Binary files a/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png and b/engine/src/flutter/testing/ios_scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_multiple_clips_impeller_iPhone SE (3rd generation)_26.2_simulator.png differ
diff --git a/engine/src/flutter/testing/ios_scenario_app/lib/src/platform_view.dart b/engine/src/flutter/testing/ios_scenario_app/lib/src/platform_view.dart
index 2d7308922786d..a7a9705b85f2e 100644
--- a/engine/src/flutter/testing/ios_scenario_app/lib/src/platform_view.dart
+++ b/engine/src/flutter/testing/ios_scenario_app/lib/src/platform_view.dart
@@ -544,7 +544,7 @@ class PlatformViewClipRectScenario extends Scenario with _BasePlatformViewScenar
 /// Platform view with clip rect, with multiple clips.
 class PlatformViewClipRectMultipleClipsScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
-  /// Constructs a platform view with clip rect scenario.
+  /// Constructs a platform view with clip rect and multiple clips.
   PlatformViewClipRectMultipleClipsScenario(super.view, {required this.id});
 
   /// The platform view identifier.
@@ -616,7 +616,7 @@ class PlatformViewClipRectAfterMovedScenario extends Scenario with _BasePlatform
 /// The clip rect moves with the same transform matrix with the PlatformView.
 class PlatformViewClipRectAfterMovedMultipleClipsScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
-  /// Constructs a platform view with clip rect scenario.
+  /// Constructs a platform view with clip rect after moved and multiple clips.
   PlatformViewClipRectAfterMovedMultipleClipsScenario(super.view, {required this.id});
 
   /// The platform view identifier.
@@ -690,7 +690,7 @@ class PlatformViewClipRRectScenario extends PlatformViewScenario {
 
 /// Platform view with clip rrect, with multiple clips.
 class PlatformViewClipRRectMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with clip rrect scenario.
+  /// Constructs a platform view with clip rrect and multiple clips.
   PlatformViewClipRRectMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -716,6 +716,56 @@ class PlatformViewClipRRectMultipleClipsScenario extends PlatformViewScenario {
   }
 }
 
+/// Platform view with clip rsuperellipse.
+///
+/// Rounded superellipse clipped natively with `cornerCurve` set to
+/// `kCACornerCurveContinuous`, rather than by the circular corner curve used
+/// for a plain rrect.
+class PlatformViewClipRSuperellipseScenario extends PlatformViewScenario {
+  /// Constructs a platform view with clip rsuperellipse scenario.
+  PlatformViewClipRSuperellipseScenario(super.view, {super.id = 0});
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final builder = SceneBuilder();
+    // Uniform radii on purpose.
+    //
+    // iOS renders a rounded-superellipse clip by setting `CALayer.cornerCurve`
+    // to `kCACornerCurveContinuous`, which only applies when the clip can be
+    // expressed as a single `cornerRadius`. Asymmetric radii fall back to a
+    // mask path that renders identically to a plain rrect, so they would not
+    // exercise the superellipse at all.
+    builder.pushClipRSuperellipse(
+      RSuperellipse.fromRectXY(const Rect.fromLTRB(100, 100, 400, 400), 50, 50),
+    );
+
+    addPlatformView(id, dispatcher: view.platformDispatcher, sceneBuilder: builder);
+
+    finishBuilder(builder);
+  }
+}
+
+/// Platform view with clip rsuperellipse, with multiple clips.
+class PlatformViewClipRSuperellipseMultipleClipsScenario extends PlatformViewScenario {
+  /// Constructs a platform view with clip rsuperellipse and multiple clips.
+  PlatformViewClipRSuperellipseMultipleClipsScenario(super.view, {super.id = 0});
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final builder = SceneBuilder();
+    // See `PlatformViewClipRSuperellipseScenario` for why the radii are uniform.
+    builder
+      ..pushClipRSuperellipse(
+        RSuperellipse.fromRectXY(const Rect.fromLTRB(100, 100, 400, 400), 50, 50),
+      )
+      ..pushClipRect(const Rect.fromLTRB(200, 0, 600, 600));
+
+    addPlatformView(id, dispatcher: view.platformDispatcher, sceneBuilder: builder);
+
+    finishBuilder(builder);
+  }
+}
+
 /// Platform view with clip rrect.
 /// The bounding rect of the rrect is the same as PlatformView and only the corner radii clips the PlatformView.
 class PlatformViewLargeClipRRectScenario extends PlatformViewScenario {
@@ -746,7 +796,7 @@ class PlatformViewLargeClipRRectScenario extends PlatformViewScenario {
 /// Platform view with clip rrect, with multiple clips.
 /// The bounding rect of the rrect is the same as PlatformView and only the corner radii clips the PlatformView.
 class PlatformViewLargeClipRRectMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with large clip rrect scenario.
+  /// Constructs a platform view with large clip rrect and multiple clips.
   PlatformViewLargeClipRRectMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -794,7 +844,7 @@ class PlatformViewClipPathScenario extends PlatformViewScenario {
 
 /// Platform view with clip path, with multiple clips.
 class PlatformViewClipPathMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with clip path scenario.
+  /// Constructs a platform view with clip path and multiple clips.
   PlatformViewClipPathMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -845,7 +895,7 @@ class PlatformViewClipRectWithTransformScenario extends PlatformViewScenario {
 
 /// Platform view with clip rect after transformed, with multiple clips.
 class PlatformViewClipRectWithTransformMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with clip rect with transform scenario.
+  /// Constructs a platform view with clip rect with transform and multiple clips.
   PlatformViewClipRectWithTransformMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -912,7 +962,7 @@ class PlatformViewClipRRectWithTransformScenario extends PlatformViewScenario {
 
 /// Platform view with clip rrect after transformed, with multiple clips.
 class PlatformViewClipRRectWithTransformMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with clip rrect with transform scenario.
+  /// Constructs a platform view with clip rrect with transform and multiple clips.
   PlatformViewClipRRectWithTransformMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -991,7 +1041,7 @@ class PlatformViewLargeClipRRectWithTransformScenario extends PlatformViewScenar
 /// Platform view with clip rrect after transformed, with multiple clips.
 /// The bounding rect of the rrect is the same as PlatformView and only the corner radii clips the PlatformView.
 class PlatformViewLargeClipRRectWithTransformMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with large clip rrect with transform scenario.
+  /// Constructs a platform view with large clip rrect with transform and multiple clips.
   PlatformViewLargeClipRRectWithTransformMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
@@ -1065,7 +1115,7 @@ class PlatformViewClipPathWithTransformScenario extends PlatformViewScenario {
 
 /// Platform view with clip path after transformed, with multiple clips.
 class PlatformViewClipPathWithTransformMultipleClipsScenario extends PlatformViewScenario {
-  /// Constructs a platform view with clip path with transform scenario.
+  /// Constructs a platform view with clip path with transform and multiple clips.
   PlatformViewClipPathWithTransformMultipleClipsScenario(super.view, {super.id = 0});
 
   @override
diff --git a/engine/src/flutter/testing/ios_scenario_app/lib/src/scenarios.dart b/engine/src/flutter/testing/ios_scenario_app/lib/src/scenarios.dart
index 01ffcf3e1e525..6b99709413606 100644
--- a/engine/src/flutter/testing/ios_scenario_app/lib/src/scenarios.dart
+++ b/engine/src/flutter/testing/ios_scenario_app/lib/src/scenarios.dart
@@ -61,6 +61,10 @@ Map<String, _ScenarioFactory> _scenarios = <String, _ScenarioFactory>{
       PlatformViewClipRRectScenario(view, id: _viewId++),
   'platform_view_cliprrect_multiple_clips': (FlutterView view) =>
       PlatformViewClipRRectMultipleClipsScenario(view, id: _viewId++),
+  'platform_view_clip_rsuperellipse': (FlutterView view) =>
+      PlatformViewClipRSuperellipseScenario(view, id: _viewId++),
+  'platform_view_clip_rsuperellipse_multiple_clips': (FlutterView view) =>
+      PlatformViewClipRSuperellipseMultipleClipsScenario(view, id: _viewId++),
   'platform_view_large_cliprrect': (FlutterView view) =>
       PlatformViewLargeClipRRectScenario(view, id: _viewId++),
   'platform_view_large_cliprrect_multiple_clips': (FlutterView view) =>
diff --git a/engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh b/engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh
index 68e1ecab652cf..dc30de34ff093 100755
--- a/engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh
+++ b/engine/src/flutter/testing/ios_scenario_app/run_ios_tests.sh
@@ -44,5 +44,5 @@ DART="${DART_BIN}/dart"
 
 "$DART" \
   --disable-dart-dev \
-  testing/ios_scenario_app/bin/run_ios_tests.dart \
+  "$SCRIPT_DIR/bin/run_ios_tests.dart" \
   "$@"
diff --git a/engine/src/flutter/testing/run_tests.py b/engine/src/flutter/testing/run_tests.py
index df89a48384fef..3b5c4b0ad6c39 100755
--- a/engine/src/flutter/testing/run_tests.py
+++ b/engine/src/flutter/testing/run_tests.py
@@ -164,12 +164,6 @@ def is_aarm64() -> bool:
   return aarm64
 
 
-def mac_hardware_model() -> str:
-  assert is_mac()
-  output = subprocess.check_output(['sysctl', '-n', 'hw.model'])
-  return output.decode('utf-8').strip()
-
-
 def is_linux() -> bool:
   return sys_platform.startswith('linux')
 
@@ -574,14 +568,8 @@ def make_test(
       )
     extra_env = metal_validation_env()
     extra_env.update(vulkan_validation_env(build_dir))
-    if mac_hardware_model() == 'Macmini9,1':
-      # For the Mac Minis used on CI, limit the number of Impeller test cases run in parallel
-      # in order to reduce the risk of resource exhaustion errors.
-      workers_flag = ['--workers=%d' % (os.cpu_count() - 2)]
-    else:
-      workers_flag = []
-    mac_impeller_unittests_flags = repeat_flags + workers_flag + [
-        '--gtest_filter=-*OpenGLES',  # These are covered in the golden tests.
+    mac_impeller_unittests_flags = repeat_flags + [
+        '--gtest_filter=-*OpenGLES:*OpenGLESSDF',  # These are covered in the golden tests.
         '--',
         '--enable_vulkan_validation',
     ]
@@ -856,7 +844,9 @@ def run_android_tests(
 
 
 def run_objc_tests(
-    ios_variant: str = 'ios_debug_sim_unopt', test_filter: typing.Optional[str] = None
+    ios_variant: str = 'ios_debug_sim_unopt',
+    test_filter: typing.Optional[str] = None,
+    ios_runtime: typing.Optional[str] = None,
 ) -> None:
   """Runs Objective-C XCTest unit tests for the iOS embedding"""
   assert_expected_xcode_version()
@@ -870,12 +860,15 @@ def run_objc_tests(
   delete_simulator(new_simulator_name)
 
   create_simulator = [
-      'xcrun '
-      'simctl '
-      'create '
-      f'{new_simulator_name} com.apple.CoreSimulator.SimDeviceType.iPhone-11'
+      'xcrun',
+      'simctl',
+      'create',
+      new_simulator_name,
+      'com.apple.CoreSimulator.SimDeviceType.iPhone-11',
   ]
-  run_cmd(create_simulator, shell=True)
+  if ios_runtime is not None:
+    create_simulator.append(ios_runtime)
+  simulator_id = subprocess.check_output(create_simulator, text=True).strip()
 
   try:
     ios_unit_test_dir = os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'ios', 'IosUnitTests')
@@ -892,7 +885,7 @@ def run_objc_tests(
           '-sdk iphonesimulator '
           '-scheme IosUnitTests '
           '-resultBundlePath ' + result_bundle_path + ' '
-          '-destination name=' + new_simulator_name + ' '
+          f'-destination id={simulator_id} '
           'test '
           'FLUTTER_ENGINE=' + ios_variant
       ]
@@ -1324,6 +1317,14 @@ def main() -> int:
       default='ios_debug_sim_unopt',
       help='The engine build variant to run objective-c tests for'
   )
+  parser.add_argument(
+      '--ios-runtime',
+      dest='ios_runtime',
+      action='store',
+      default=None,
+      help='The iOS simulator runtime to run tests on '
+      '(example: "com.apple.CoreSimulator.SimRuntime.iOS-26-5")'
+  )
   parser.add_argument(
       '--verbose-dart-snapshot',
       dest='verbose_dart_snapshot',
@@ -1490,7 +1491,7 @@ def main() -> int:
 
   if 'objc' in types:
     assert is_mac(), 'iOS embedding tests can only be run on macOS.'
-    run_objc_tests(args.ios_variant, args.objc_filter)
+    run_objc_tests(args.ios_variant, args.objc_filter, args.ios_runtime)
 
   # https://github.com/flutter/flutter/issues/36300
   if 'benchmarks' in types and not is_windows():
diff --git a/engine/src/flutter/testing/symbols/verify_exported.dart b/engine/src/flutter/testing/symbols/verify_exported.dart
index 8e25e67b0e3e6..0be61adb67751 100644
--- a/engine/src/flutter/testing/symbols/verify_exported.dart
+++ b/engine/src/flutter/testing/symbols/verify_exported.dart
@@ -13,14 +13,9 @@ import 'package:path/path.dart' as p;
 // Android binaries (libflutter.so) should only export one symbol "JNI_OnLoad"
 // of type "T".
 //
-// Ideally, iOS binaries (Flutter.framework/Flutter) should only export
-// Objective-C Symbols from the Flutter namespace, of type "(__DATA,__common)" or
-// "(__DATA,__objc_data)". However, to allow Swift symbols to be exported in
-// an Objective-C bridging header, they must be public or open. The framework
-// uses these types internally and never publishes these types in a public header.
-// Like `_InternalFlutter` Obj-C symbols, we allow `InternalFlutterSwift` and
-// `InternalFlutterSwiftCommon` symbols, as they are clearly marked as internal
-// in the name.
+// The iOS binaries (Flutter.framework/Flutter) should only export Objective-C
+// Symbols from the Flutter namespace, of type "(__DATA,__common)" or
+// "(__DATA,__objc_data)".
 
 /// Takes the path to the out directory as the first argument, and the path to
 /// the buildtools directory as the second argument.
@@ -106,50 +101,10 @@ int _checkIos(String outPath, String nmPath, Iterable<String> builds) {
       failures++;
       continue;
     }
-    final swiftEntries = <NmEntry>[];
-    final unexpectedEntries = <NmEntry>[];
-
-    for (final NmEntry entry in NmEntry.parse(nmResult.stdout as String)) {
-      if (entry.isCInternalSymbol || entry.isAllowedCSymbol || entry.isAllowedObjCSymbol) {
-        continue;
-      }
-      final bool isSwiftSymbol = switch (entry.type) {
-        '(__TEXT,__text)' ||
-        '(__TEXT,__const)' ||
-        '(__TEXT,__constg_swiftt)' ||
-        '(__DATA_CONST,__const)' ||
-        '(__DATA,__data)' ||
-        '(__DATA,__objc_data)' ||
-        '(__DATA,__common)' => entry.name.startsWith(r'_$s'),
-        _ => false,
-      };
-
-      if (isSwiftSymbol) {
-        swiftEntries.add(entry);
-      } else {
-        unexpectedEntries.add(entry);
-      }
-    }
-
-    final Map<String, String?>? symbolToModuleNameMap = _demangleSymbols(
-      swiftEntries.map((NmEntry entry) => entry.name),
+    final Iterable<NmEntry> unexpectedEntries = NmEntry.parse(nmResult.stdout as String).where(
+      (NmEntry entry) =>
+          !entry.isCInternalSymbol && !entry.isAllowedCSymbol && !entry.isAllowedObjCSymbol,
     );
-
-    if (symbolToModuleNameMap == null) {
-      print('ERROR: failed to execute "swift demangle"');
-      failures++;
-      return failures;
-    }
-
-    unexpectedEntries.addAll(
-      swiftEntries.where(
-        (NmEntry entry) => switch (symbolToModuleNameMap[entry.name]) {
-          'InternalFlutterSwiftCommon' || 'InternalFlutterSwift' => false,
-          _ => true,
-        },
-      ),
-    );
-
     if (unexpectedEntries.isNotEmpty) {
       print('ERROR: $libFlutter exports unexpected symbols:');
       print(
@@ -285,58 +240,3 @@ final class NmEntry {
   @override
   String toString() => '$name: $type';
 }
-
-final RegExp moduleLinePattern = RegExp(r'kind=Module, text="(.+)"');
-// Demangles the given `symbols` and maps each mangled name to its Swift module name.
-//
-// Returns null if the `swift demangle` command failed entirely.
-// Individual map values may be null if a symbol failed to demangle or did not belong to a Swift module.
-Map<String, String?>? _demangleSymbols(Iterable<String> symbols) {
-  if (symbols.isEmpty) {
-    return <String, String?>{};
-  }
-  final ProcessResult demangledResult = Process.runSync('swift', <String>[
-    'demangle',
-    '--tree-only',
-    ...symbols,
-  ]);
-  if (demangledResult.exitCode != 0) {
-    return null;
-  }
-
-  final symbolToModule = <String, String?>{};
-  final output = demangledResult.stdout as String;
-
-  String trim(String string) => string.trim();
-
-  for (final String symbolTree in output.split('Demangling for ').map(trim)) {
-    final List<String> lines = LineSplitter.split(symbolTree).toList();
-    if (lines.isEmpty) {
-      continue;
-    }
-    final String mangledName = lines.first;
-
-    // Parses the output from `swift demangle --tree-only` and extracts the module
-    // name of a single entry.
-    //
-    // Example `swift demangle --tree-only` output:
-    //
-    // Demangling for _$s26InternalFlutterSwiftCommon8LogLevelOSYAAMc
-    // kind=Global
-    //   kind=ProtocolConformanceDescriptor
-    //     kind=ProtocolConformance
-    //       kind=Type
-    //         kind=Enum
-    //           kind=Module, text="InternalFlutterSwiftCommon"
-    //           kind=Identifier, text="LogLevel"
-    //       kind=Type
-    //         kind=Protocol
-    //           kind=Module, text="Swift"
-    //           kind=Identifier, text="RawRepresentable"
-    //       kind=Module, text="InternalFlutterSwiftCommon"
-    final String? moduleName = moduleLinePattern.firstMatch(symbolTree)?.group(1);
-
-    symbolToModule[mangledName] = moduleName;
-  }
-  return symbolToModule;
-}
diff --git a/engine/src/flutter/testing/test_dart_native_resolver.h b/engine/src/flutter/testing/test_dart_native_resolver.h
index 87174379f2309..c847cad1d6191 100644
--- a/engine/src/flutter/testing/test_dart_native_resolver.h
+++ b/engine/src/flutter/testing/test_dart_native_resolver.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "flutter/fml/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
@@ -23,6 +24,19 @@
     return entrypoint;                                                      \
   })()
 
+/// A macro that converts a lambda into a function pointer that can be called
+/// through Dart FFI.
+///
+/// Note: The lambda is stored in a global static variable. To avoid memory
+/// leaks and teardown crashes, the lambda should only capture variables by
+/// reference.
+#define CREATE_FFI_LAMBDA(lambda)                                       \
+  ([&]() {                                                              \
+    using FfiWrapper = ::flutter::testing::FfiLambda<decltype(lambda)>; \
+    FfiWrapper::function = (lambda);                                    \
+    return reinterpret_cast<void*>(FfiWrapper::FfiFunction);            \
+  })()
+
 namespace flutter::testing {
 
 using NativeEntry = std::function<void(Dart_NativeArguments)>;
@@ -55,6 +69,22 @@ class TestDartNativeResolver
   FML_DISALLOW_COPY_AND_ASSIGN(TestDartNativeResolver);
 };
 
+template <typename T>
+struct FfiLambdaFunction {};
+
+/// Wraps a lambda in a function pointer that can be called through Dart FFI.
+template <typename ReturnType, typename ClassType, typename... Args>
+struct FfiLambdaFunction<ReturnType (ClassType::*)(Args...) const> {
+  inline static std::function<ReturnType(Args...)> function;
+
+  static ReturnType FfiFunction(Args... args) {
+    return function(std::forward<Args>(args)...);
+  }
+};
+
+template <typename LambdaType>
+using FfiLambda = FfiLambdaFunction<decltype(&LambdaType::operator())>;
+
 }  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_TEST_DART_NATIVE_RESOLVER_H_
diff --git a/engine/src/flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc b/engine/src/flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc
index 8a2ff0401863e..4c8918337065f 100644
--- a/engine/src/flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc
+++ b/engine/src/flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc
@@ -2599,7 +2599,8 @@ IFACEMETHODIMP AXPlatformNodeWin::QueryService(REFGUID guidService,
                                                void** object) {
   COM_OBJECT_VALIDATE_1_ARG(object);
 
-  if (guidService == IID_IAccessible || (guidService == IID_IAccessibleEx && delegate_->IsIAccessibleExEnabled())) {
+  if (guidService == IID_IAccessible || (guidService == IID_IAccessibleEx &&
+                                         delegate_->IsIAccessibleExEnabled())) {
     return QueryInterface(riid, object);
   }
 
@@ -5313,6 +5314,8 @@ std::optional<PROPERTYID> AXPlatformNodeWin::MojoEventToUIAProperty(
         return UIA_ToggleToggleStatePropertyId;
       }
       return std::nullopt;
+    case ax::mojom::Event::kStateChanged:
+      return UIA_IsEnabledPropertyId;
     default:
       return std::nullopt;
   }
diff --git a/examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj b/examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
index ec0f531456d7e..04fd6c81a8fae 100644
--- a/examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
+++ b/examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		2DE332E71E55C6D800393FD5 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DE332E61E55C6D800393FD5 /* MainViewController.m */; };
 		3B3967051E83383D004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967041E83383D004F5970 /* AppFrameworkInfo.plist */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
+		A1B2C3D4E5F6000100000001 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D4E5F6000100000003 /* SceneDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -41,6 +42,8 @@
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		A1B2C3D4E5F6000100000002 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		A1B2C3D4E5F6000100000003 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -96,6 +99,8 @@
 				2DD8945E1E5B87AF0010574F /* ic_add.png */,
 				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
 				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
+				A1B2C3D4E5F6000100000002 /* SceneDelegate.h */,
+				A1B2C3D4E5F6000100000003 /* SceneDelegate.m */,
 				2DE332E81E55C6F100393FD5 /* MainViewController.h */,
 				2DE332E61E55C6D800393FD5 /* MainViewController.m */,
 				2D4B11261E55A15A00FF14DB /* NativeViewController.m */,
@@ -228,6 +233,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
+				A1B2C3D4E5F6000100000001 /* SceneDelegate.m in Sources */,
 				97C146F31CF9000F007C117D /* main.m in Sources */,
 				2D4B11271E55A15A00FF14DB /* NativeViewController.m in Sources */,
 				2DE332E71E55C6D800393FD5 /* MainViewController.m in Sources */,
diff --git a/examples/flutter_view/ios/Runner/AppDelegate.m b/examples/flutter_view/ios/Runner/AppDelegate.m
index b3fa342f04a00..6ce3705c80edf 100644
--- a/examples/flutter_view/ios/Runner/AppDelegate.m
+++ b/examples/flutter_view/ios/Runner/AppDelegate.m
@@ -12,4 +12,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
+#pragma mark - UISceneSession lifecycle
+
+- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options {
+  return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
+}
+
+- (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet<UISceneSession *> *)sceneSessions {
+}
+
 @end
diff --git a/examples/flutter_view/ios/Runner/Info.plist b/examples/flutter_view/ios/Runner/Info.plist
index e8267951bd6ec..a70b5eb485496 100644
--- a/examples/flutter_view/ios/Runner/Info.plist
+++ b/examples/flutter_view/ios/Runner/Info.plist
@@ -43,5 +43,24 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/examples/flutter_view/ios/Runner/SceneDelegate.h b/examples/flutter_view/ios/Runner/SceneDelegate.h
new file mode 100644
index 0000000000000..ce1caaaaf194a
--- /dev/null
+++ b/examples/flutter_view/ios/Runner/SceneDelegate.h
@@ -0,0 +1,11 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <UIKit/UIKit.h>
+
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property (strong, nonatomic) UIWindow * window;
+
+@end
diff --git a/examples/flutter_view/ios/Runner/SceneDelegate.m b/examples/flutter_view/ios/Runner/SceneDelegate.m
new file mode 100644
index 0000000000000..a05f3eb127f62
--- /dev/null
+++ b/examples/flutter_view/ios/Runner/SceneDelegate.m
@@ -0,0 +1,28 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "SceneDelegate.h"
+
+@implementation SceneDelegate
+
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions {
+  // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
+}
+
+- (void)sceneDidDisconnect:(UIScene *)scene {
+}
+
+- (void)sceneDidBecomeActive:(UIScene *)scene {
+}
+
+- (void)sceneWillResignActive:(UIScene *)scene {
+}
+
+- (void)sceneWillEnterForeground:(UIScene *)scene {
+}
+
+- (void)sceneDidEnterBackground:(UIScene *)scene {
+}
+
+@end
diff --git a/examples/flutter_view/lib/main.dart b/examples/flutter_view/lib/main.dart
index 3ca4b56b71d5c..d5b8e880178b2 100644
--- a/examples/flutter_view/lib/main.dart
+++ b/examples/flutter_view/lib/main.dart
@@ -3,8 +3,14 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'package:flutter/material.dart';
+
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+
+const Color _grey = Color(0xFF9E9E9E);
+const Color _white = Color(0xFFFFFFFF);
+const Color _black = Color(0xFF000000);
+const Color _blue = Color(0xFF2196F3);
 
 void main() {
   runApp(const FlutterView());
@@ -15,9 +21,23 @@ class FlutterView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return WidgetsApp(
       title: 'Flutter View',
-      theme: ThemeData(primarySwatch: Colors.grey),
+      color: _grey,
+      textStyle: const TextStyle(color: _black, decoration: TextDecoration.none),
+      pageRouteBuilder: <T>(RouteSettings settings, WidgetBuilder builder) {
+        return PageRouteBuilder<T>(
+          settings: settings,
+          pageBuilder:
+              (
+                BuildContext context,
+                Animation<double> animation,
+                Animation<double> secondaryAnimation,
+              ) {
+                return builder(context);
+              },
+        );
+      },
       home: const MyHomePage(),
     );
   }
@@ -60,32 +80,64 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+    return ColoredBox(
+      color: _white,
+      child: Stack(
         children: <Widget>[
-          Expanded(
-            child: Center(
-              child: Text(
-                'Platform button tapped $_counter time${_counter == 1 ? '' : 's'}.',
-                style: const TextStyle(fontSize: 17.0),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Expanded(
+                child: Center(
+                  child: Text(
+                    'Platform button tapped $_counter time${_counter == 1 ? '' : 's'}.',
+                    style: const TextStyle(fontSize: 17.0),
+                  ),
+                ),
               ),
-            ),
+              Container(
+                padding: const EdgeInsets.only(bottom: 15.0, left: 5.0),
+                child: Row(
+                  children: <Widget>[
+                    Image.asset('assets/flutter-mark-square-64.png', scale: 1.5),
+                    const Text('Flutter', style: TextStyle(fontSize: 30.0)),
+                  ],
+                ),
+              ),
+            ],
           ),
-          Container(
-            padding: const EdgeInsets.only(bottom: 15.0, left: 5.0),
-            child: Row(
-              children: <Widget>[
-                Image.asset('assets/flutter-mark-square-64.png', scale: 1.5),
-                const Text('Flutter', style: TextStyle(fontSize: 30.0)),
-              ],
+          Positioned(
+            bottom: 16.0,
+            right: 16.0,
+            child: _Button(
+              onPressed: _sendFlutterIncrement,
+              icon: const Text(
+                '+',
+                style: TextStyle(color: _white, fontSize: 28.0, fontWeight: FontWeight.bold),
+              ),
             ),
           ),
         ],
       ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _sendFlutterIncrement,
-        child: const Icon(Icons.add),
+    );
+  }
+}
+
+class _Button extends StatelessWidget {
+  const _Button({required this.onPressed, required this.icon});
+
+  final VoidCallback onPressed;
+  final Widget icon;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onPressed,
+      child: Container(
+        width: 56.0,
+        height: 56.0,
+        decoration: const BoxDecoration(color: _blue, shape: BoxShape.circle),
+        child: Center(child: icon),
       ),
     );
   }
diff --git a/examples/flutter_view/pubspec.yaml b/examples/flutter_view/pubspec.yaml
index 7ba4d4117af75..564760d123a01 100644
--- a/examples/flutter_view/pubspec.yaml
+++ b/examples/flutter_view/pubspec.yaml
@@ -12,7 +12,6 @@ dependencies:
 
 
 flutter:
-  uses-material-design: true
   assets:
     - assets/flutter-mark-square-64.png
 
diff --git a/examples/image_list/lib/main.dart b/examples/image_list/lib/main.dart
index 14b64e71a6391..3860145280f8e 100644
--- a/examples/image_list/lib/main.dart
+++ b/examples/image_list/lib/main.dart
@@ -5,8 +5,9 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
-import 'package:flutter/material.dart';
+
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// An example that sets up local http server for serving single
 /// image, creates single flutter widget with five copies of requested
diff --git a/examples/image_list/pubspec.yaml b/examples/image_list/pubspec.yaml
index 44cf49c558544..b7a95ee951c05 100644
--- a/examples/image_list/pubspec.yaml
+++ b/examples/image_list/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
 
 
+  material_ui: ^0.0.2
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -37,4 +38,4 @@ flutter:
   assets:
    - images/coast.jpg
 
-# PUBSPEC CHECKSUM: 60tfp7
+# PUBSPEC CHECKSUM: oescuq
diff --git a/examples/layers/analysis_options.yaml b/examples/layers/analysis_options.yaml
index e7421706f6bdc..0de174ab6c98c 100644
--- a/examples/layers/analysis_options.yaml
+++ b/examples/layers/analysis_options.yaml
@@ -11,6 +11,10 @@ analyzer:
     - linux/**
 include: ../../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+
 linter:
   rules:
     # Samples want to print things pretty often.
diff --git a/examples/layers/test/analysis_options.yaml b/examples/layers/test/analysis_options.yaml
index 60222f820cd28..95a296bb20bd1 100644
--- a/examples/layers/test/analysis_options.yaml
+++ b/examples/layers/test/analysis_options.yaml
@@ -1,5 +1,9 @@
 include: ../../../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../../dev/flutter_analyzer_plugin
+
 linter:
   rules:
     only_throw_errors: false # We are more flexible for tests.
diff --git a/examples/multiple_windows/lib/app/window_settings_dialog.dart b/examples/multiple_windows/lib/app/window_settings_dialog.dart
index d32803604bf0a..84f02d3699c66 100644
--- a/examples/multiple_windows/lib/app/window_settings_dialog.dart
+++ b/examples/multiple_windows/lib/app/window_settings_dialog.dart
@@ -103,7 +103,7 @@ class _WindowSettingsEditorState extends State<_WindowSettingsEditor> {
                     _buildDivider(),
                     _buildDialogEditor(),
                     _buildDivider(),
-                    _buildTooltipEditor(),
+                    _buildTooltipAndPopupEditor(),
                   ],
                 ),
               ),
@@ -207,10 +207,10 @@ class _WindowSettingsEditorState extends State<_WindowSettingsEditor> {
     );
   }
 
-  Widget _buildTooltipEditor() {
+  Widget _buildTooltipAndPopupEditor() {
     return ListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-      title: const Text('Tooltip'),
+      title: const Text('Tooltips and Popups'),
       subtitle: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
diff --git a/examples/platform_view/lib/main.dart b/examples/platform_view/lib/main.dart
index d57ed3abbc789..2957fd40f9c5c 100644
--- a/examples/platform_view/lib/main.dart
+++ b/examples/platform_view/lib/main.dart
@@ -4,8 +4,8 @@
 
 import 'dart:async';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(const PlatformView());
diff --git a/examples/platform_view/pubspec.yaml b/examples/platform_view/pubspec.yaml
index 8775a81f849c8..09307118be879 100644
--- a/examples/platform_view/pubspec.yaml
+++ b/examples/platform_view/pubspec.yaml
@@ -8,6 +8,7 @@ resolution: workspace
 dependencies:
   flutter:
     sdk: flutter
+  material_ui: ^0.0.2
 
 
 flutter:
@@ -16,4 +17,4 @@ flutter:
   assets:
     - assets/flutter-mark-square-64.png
 
-# PUBSPEC CHECKSUM: h86dcv
+# PUBSPEC CHECKSUM: dmrod6
diff --git a/examples/splash/lib/main.dart b/examples/splash/lib/main.dart
index 6062b6cb4d8ad..921be96c4dd34 100644
--- a/examples/splash/lib/main.dart
+++ b/examples/splash/lib/main.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 void main() {
   runApp(
diff --git a/examples/splash/pubspec.yaml b/examples/splash/pubspec.yaml
index 7e4601d1e97f7..e804c61870f72 100644
--- a/examples/splash/pubspec.yaml
+++ b/examples/splash/pubspec.yaml
@@ -8,6 +8,7 @@ resolution: workspace
 dependencies:
   flutter:
     sdk: flutter
+  material_ui: ^0.0.2
 
 
 dev_dependencies:
@@ -15,4 +16,4 @@ dev_dependencies:
     sdk: flutter
 
 
-# PUBSPEC CHECKSUM: 60tfp7
+# PUBSPEC CHECKSUM: oescuq
diff --git a/examples/splash/test/splash_test.dart b/examples/splash/test/splash_test.dart
index 96363b8ffb93a..9cf112e5d486a 100644
--- a/examples/splash/test/splash_test.dart
+++ b/examples/splash/test/splash_test.dart
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-
+import 'package:material_ui/material_ui.dart';
 import 'package:splash/main.dart' as entrypoint;
 
 void main() {
diff --git a/examples/api/.gitignore b/packages/flutter/examples/api/.gitignore
similarity index 100%
rename from examples/api/.gitignore
rename to packages/flutter/examples/api/.gitignore
diff --git a/examples/api/.metadata b/packages/flutter/examples/api/.metadata
similarity index 100%
rename from examples/api/.metadata
rename to packages/flutter/examples/api/.metadata
diff --git a/examples/api/README.md b/packages/flutter/examples/api/README.md
similarity index 100%
rename from examples/api/README.md
rename to packages/flutter/examples/api/README.md
diff --git a/examples/api/analysis_options.yaml b/packages/flutter/examples/api/analysis_options.yaml
similarity index 100%
rename from examples/api/analysis_options.yaml
rename to packages/flutter/examples/api/analysis_options.yaml
diff --git a/examples/api/lib/animation/animation_controller/animated_digit.0.dart b/packages/flutter/examples/api/lib/animation/animation_controller/animated_digit.0.dart
similarity index 100%
rename from examples/api/lib/animation/animation_controller/animated_digit.0.dart
rename to packages/flutter/examples/api/lib/animation/animation_controller/animated_digit.0.dart
diff --git a/examples/api/lib/animation/curves/curve2_d.0.dart b/packages/flutter/examples/api/lib/animation/curves/curve2_d.0.dart
similarity index 100%
rename from examples/api/lib/animation/curves/curve2_d.0.dart
rename to packages/flutter/examples/api/lib/animation/curves/curve2_d.0.dart
diff --git a/examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart b/packages/flutter/examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart
rename to packages/flutter/examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart
diff --git a/examples/api/lib/cupertino/activity_indicator/cupertino_linear_activity_indicator.0.dart b/packages/flutter/examples/api/lib/cupertino/activity_indicator/cupertino_linear_activity_indicator.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/activity_indicator/cupertino_linear_activity_indicator.0.dart
rename to packages/flutter/examples/api/lib/cupertino/activity_indicator/cupertino_linear_activity_indicator.0.dart
diff --git a/examples/api/lib/cupertino/bottom_tab_bar/cupertino_tab_bar.0.dart b/packages/flutter/examples/api/lib/cupertino/bottom_tab_bar/cupertino_tab_bar.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/bottom_tab_bar/cupertino_tab_bar.0.dart
rename to packages/flutter/examples/api/lib/cupertino/bottom_tab_bar/cupertino_tab_bar.0.dart
diff --git a/examples/api/lib/cupertino/button/cupertino_button.0.dart b/packages/flutter/examples/api/lib/cupertino/button/cupertino_button.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/button/cupertino_button.0.dart
rename to packages/flutter/examples/api/lib/cupertino/button/cupertino_button.0.dart
diff --git a/examples/api/lib/cupertino/checkbox/cupertino_checkbox.0.dart b/packages/flutter/examples/api/lib/cupertino/checkbox/cupertino_checkbox.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/checkbox/cupertino_checkbox.0.dart
rename to packages/flutter/examples/api/lib/cupertino/checkbox/cupertino_checkbox.0.dart
diff --git a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart b/packages/flutter/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart
rename to packages/flutter/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart
diff --git a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart b/packages/flutter/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart
rename to packages/flutter/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart
diff --git a/examples/api/lib/cupertino/date_picker/cupertino_date_picker.0.dart b/packages/flutter/examples/api/lib/cupertino/date_picker/cupertino_date_picker.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/date_picker/cupertino_date_picker.0.dart
rename to packages/flutter/examples/api/lib/cupertino/date_picker/cupertino_date_picker.0.dart
diff --git a/examples/api/lib/cupertino/date_picker/cupertino_timer_picker.0.dart b/packages/flutter/examples/api/lib/cupertino/date_picker/cupertino_timer_picker.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/date_picker/cupertino_timer_picker.0.dart
rename to packages/flutter/examples/api/lib/cupertino/date_picker/cupertino_timer_picker.0.dart
diff --git a/examples/api/lib/cupertino/dialog/cupertino_action_sheet.0.dart b/packages/flutter/examples/api/lib/cupertino/dialog/cupertino_action_sheet.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/dialog/cupertino_action_sheet.0.dart
rename to packages/flutter/examples/api/lib/cupertino/dialog/cupertino_action_sheet.0.dart
diff --git a/examples/api/lib/cupertino/dialog/cupertino_alert_dialog.0.dart b/packages/flutter/examples/api/lib/cupertino/dialog/cupertino_alert_dialog.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/dialog/cupertino_alert_dialog.0.dart
rename to packages/flutter/examples/api/lib/cupertino/dialog/cupertino_alert_dialog.0.dart
diff --git a/examples/api/lib/cupertino/dialog/cupertino_popup_surface.0.dart b/packages/flutter/examples/api/lib/cupertino/dialog/cupertino_popup_surface.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/dialog/cupertino_popup_surface.0.dart
rename to packages/flutter/examples/api/lib/cupertino/dialog/cupertino_popup_surface.0.dart
diff --git a/examples/api/lib/cupertino/expansion_tile/cupertino_expansion_tile.0.dart b/packages/flutter/examples/api/lib/cupertino/expansion_tile/cupertino_expansion_tile.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/expansion_tile/cupertino_expansion_tile.0.dart
rename to packages/flutter/examples/api/lib/cupertino/expansion_tile/cupertino_expansion_tile.0.dart
diff --git a/examples/api/lib/cupertino/form_row/cupertino_form_row.0.dart b/packages/flutter/examples/api/lib/cupertino/form_row/cupertino_form_row.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/form_row/cupertino_form_row.0.dart
rename to packages/flutter/examples/api/lib/cupertino/form_row/cupertino_form_row.0.dart
diff --git a/examples/api/lib/cupertino/list_section/list_section_base.0.dart b/packages/flutter/examples/api/lib/cupertino/list_section/list_section_base.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/list_section/list_section_base.0.dart
rename to packages/flutter/examples/api/lib/cupertino/list_section/list_section_base.0.dart
diff --git a/examples/api/lib/cupertino/list_section/list_section_inset.0.dart b/packages/flutter/examples/api/lib/cupertino/list_section/list_section_inset.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/list_section/list_section_inset.0.dart
rename to packages/flutter/examples/api/lib/cupertino/list_section/list_section_inset.0.dart
diff --git a/examples/api/lib/cupertino/list_tile/cupertino_list_tile.0.dart b/packages/flutter/examples/api/lib/cupertino/list_tile/cupertino_list_tile.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/list_tile/cupertino_list_tile.0.dart
rename to packages/flutter/examples/api/lib/cupertino/list_tile/cupertino_list_tile.0.dart
diff --git a/examples/api/lib/cupertino/magnifier/cupertino_magnifier.0.dart b/packages/flutter/examples/api/lib/cupertino/magnifier/cupertino_magnifier.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/magnifier/cupertino_magnifier.0.dart
rename to packages/flutter/examples/api/lib/cupertino/magnifier/cupertino_magnifier.0.dart
diff --git a/examples/api/lib/cupertino/magnifier/cupertino_text_magnifier.0.dart b/packages/flutter/examples/api/lib/cupertino/magnifier/cupertino_text_magnifier.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/magnifier/cupertino_text_magnifier.0.dart
rename to packages/flutter/examples/api/lib/cupertino/magnifier/cupertino_text_magnifier.0.dart
diff --git a/examples/api/lib/cupertino/menu_anchor/menu_anchor.0.dart b/packages/flutter/examples/api/lib/cupertino/menu_anchor/menu_anchor.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/menu_anchor/menu_anchor.0.dart
rename to packages/flutter/examples/api/lib/cupertino/menu_anchor/menu_anchor.0.dart
diff --git a/examples/api/lib/cupertino/menu_anchor/menu_anchor.1.dart b/packages/flutter/examples/api/lib/cupertino/menu_anchor/menu_anchor.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/menu_anchor/menu_anchor.1.dart
rename to packages/flutter/examples/api/lib/cupertino/menu_anchor/menu_anchor.1.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.0.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.0.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.0.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.1.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.1.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.1.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.2.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.2.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.2.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_navigation_bar.2.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.0.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.0.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.0.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.1.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.1.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.1.dart
diff --git a/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.2.dart b/packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.2.dart
similarity index 100%
rename from examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.2.dart
rename to packages/flutter/examples/api/lib/cupertino/nav_bar/cupertino_sliver_nav_bar.2.dart
diff --git a/examples/api/lib/cupertino/page_scaffold/cupertino_page_scaffold.0.dart b/packages/flutter/examples/api/lib/cupertino/page_scaffold/cupertino_page_scaffold.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/page_scaffold/cupertino_page_scaffold.0.dart
rename to packages/flutter/examples/api/lib/cupertino/page_scaffold/cupertino_page_scaffold.0.dart
diff --git a/examples/api/lib/cupertino/picker/cupertino_picker.0.dart b/packages/flutter/examples/api/lib/cupertino/picker/cupertino_picker.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/picker/cupertino_picker.0.dart
rename to packages/flutter/examples/api/lib/cupertino/picker/cupertino_picker.0.dart
diff --git a/examples/api/lib/cupertino/radio/cupertino_radio.0.dart b/packages/flutter/examples/api/lib/cupertino/radio/cupertino_radio.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/radio/cupertino_radio.0.dart
rename to packages/flutter/examples/api/lib/cupertino/radio/cupertino_radio.0.dart
diff --git a/examples/api/lib/cupertino/radio/cupertino_radio.toggleable.0.dart b/packages/flutter/examples/api/lib/cupertino/radio/cupertino_radio.toggleable.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/radio/cupertino_radio.toggleable.0.dart
rename to packages/flutter/examples/api/lib/cupertino/radio/cupertino_radio.toggleable.0.dart
diff --git a/examples/api/lib/cupertino/refresh/cupertino_sliver_refresh_control.0.dart b/packages/flutter/examples/api/lib/cupertino/refresh/cupertino_sliver_refresh_control.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/refresh/cupertino_sliver_refresh_control.0.dart
rename to packages/flutter/examples/api/lib/cupertino/refresh/cupertino_sliver_refresh_control.0.dart
diff --git a/examples/api/lib/cupertino/route/show_cupertino_dialog.0.dart b/packages/flutter/examples/api/lib/cupertino/route/show_cupertino_dialog.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/route/show_cupertino_dialog.0.dart
rename to packages/flutter/examples/api/lib/cupertino/route/show_cupertino_dialog.0.dart
diff --git a/examples/api/lib/cupertino/route/show_cupertino_modal_popup.0.dart b/packages/flutter/examples/api/lib/cupertino/route/show_cupertino_modal_popup.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/route/show_cupertino_modal_popup.0.dart
rename to packages/flutter/examples/api/lib/cupertino/route/show_cupertino_modal_popup.0.dart
diff --git a/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.0.dart b/packages/flutter/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.0.dart
rename to packages/flutter/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.0.dart
diff --git a/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.1.dart b/packages/flutter/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.1.dart
rename to packages/flutter/examples/api/lib/cupertino/scrollbar/cupertino_scrollbar.1.dart
diff --git a/examples/api/lib/cupertino/search_field/cupertino_search_field.0.dart b/packages/flutter/examples/api/lib/cupertino/search_field/cupertino_search_field.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/search_field/cupertino_search_field.0.dart
rename to packages/flutter/examples/api/lib/cupertino/search_field/cupertino_search_field.0.dart
diff --git a/examples/api/lib/cupertino/search_field/cupertino_search_field.1.dart b/packages/flutter/examples/api/lib/cupertino/search_field/cupertino_search_field.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/search_field/cupertino_search_field.1.dart
rename to packages/flutter/examples/api/lib/cupertino/search_field/cupertino_search_field.1.dart
diff --git a/examples/api/lib/cupertino/segmented_control/cupertino_segmented_control.0.dart b/packages/flutter/examples/api/lib/cupertino/segmented_control/cupertino_segmented_control.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/segmented_control/cupertino_segmented_control.0.dart
rename to packages/flutter/examples/api/lib/cupertino/segmented_control/cupertino_segmented_control.0.dart
diff --git a/examples/api/lib/cupertino/segmented_control/cupertino_sliding_segmented_control.0.dart b/packages/flutter/examples/api/lib/cupertino/segmented_control/cupertino_sliding_segmented_control.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/segmented_control/cupertino_sliding_segmented_control.0.dart
rename to packages/flutter/examples/api/lib/cupertino/segmented_control/cupertino_sliding_segmented_control.0.dart
diff --git a/examples/api/lib/cupertino/sheet/cupertino_sheet.0.dart b/packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/sheet/cupertino_sheet.0.dart
rename to packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.0.dart
diff --git a/examples/api/lib/cupertino/sheet/cupertino_sheet.1.dart b/packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/sheet/cupertino_sheet.1.dart
rename to packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.1.dart
diff --git a/examples/api/lib/cupertino/sheet/cupertino_sheet.2.dart b/packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.2.dart
similarity index 100%
rename from examples/api/lib/cupertino/sheet/cupertino_sheet.2.dart
rename to packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.2.dart
diff --git a/examples/api/lib/cupertino/sheet/cupertino_sheet.3.dart b/packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.3.dart
similarity index 100%
rename from examples/api/lib/cupertino/sheet/cupertino_sheet.3.dart
rename to packages/flutter/examples/api/lib/cupertino/sheet/cupertino_sheet.3.dart
diff --git a/examples/api/lib/cupertino/slider/cupertino_slider.0.dart b/packages/flutter/examples/api/lib/cupertino/slider/cupertino_slider.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/slider/cupertino_slider.0.dart
rename to packages/flutter/examples/api/lib/cupertino/slider/cupertino_slider.0.dart
diff --git a/examples/api/lib/cupertino/switch/cupertino_switch.0.dart b/packages/flutter/examples/api/lib/cupertino/switch/cupertino_switch.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/switch/cupertino_switch.0.dart
rename to packages/flutter/examples/api/lib/cupertino/switch/cupertino_switch.0.dart
diff --git a/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_controller.0.dart b/packages/flutter/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_controller.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/tab_scaffold/cupertino_tab_controller.0.dart
rename to packages/flutter/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_controller.0.dart
diff --git a/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_scaffold.0.dart b/packages/flutter/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_scaffold.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/tab_scaffold/cupertino_tab_scaffold.0.dart
rename to packages/flutter/examples/api/lib/cupertino/tab_scaffold/cupertino_tab_scaffold.0.dart
diff --git a/examples/api/lib/cupertino/text_field/cupertino_text_field.0.dart b/packages/flutter/examples/api/lib/cupertino/text_field/cupertino_text_field.0.dart
similarity index 100%
rename from examples/api/lib/cupertino/text_field/cupertino_text_field.0.dart
rename to packages/flutter/examples/api/lib/cupertino/text_field/cupertino_text_field.0.dart
diff --git a/examples/api/lib/cupertino/text_form_field_row/cupertino_text_form_field_row.1.dart b/packages/flutter/examples/api/lib/cupertino/text_form_field_row/cupertino_text_form_field_row.1.dart
similarity index 100%
rename from examples/api/lib/cupertino/text_form_field_row/cupertino_text_form_field_row.1.dart
rename to packages/flutter/examples/api/lib/cupertino/text_form_field_row/cupertino_text_form_field_row.1.dart
diff --git a/examples/api/lib/foundation/key/value_key.0.dart b/packages/flutter/examples/api/lib/foundation/key/value_key.0.dart
similarity index 100%
rename from examples/api/lib/foundation/key/value_key.0.dart
rename to packages/flutter/examples/api/lib/foundation/key/value_key.0.dart
diff --git a/examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart b/packages/flutter/examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart
similarity index 100%
rename from examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart
rename to packages/flutter/examples/api/lib/gestures/pointer_signal_resolver/pointer_signal_resolver.0.dart
diff --git a/examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart b/packages/flutter/examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart
similarity index 100%
rename from examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart
rename to packages/flutter/examples/api/lib/gestures/tap_and_drag/tap_and_drag.0.dart
diff --git a/examples/api/lib/material/about/about_list_tile.0.dart b/packages/flutter/examples/api/lib/material/about/about_list_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/about/about_list_tile.0.dart
rename to packages/flutter/examples/api/lib/material/about/about_list_tile.0.dart
diff --git a/examples/api/lib/material/action_buttons/action_icon_theme.0.dart b/packages/flutter/examples/api/lib/material/action_buttons/action_icon_theme.0.dart
similarity index 100%
rename from examples/api/lib/material/action_buttons/action_icon_theme.0.dart
rename to packages/flutter/examples/api/lib/material/action_buttons/action_icon_theme.0.dart
diff --git a/examples/api/lib/material/action_chip/action_chip.0.dart b/packages/flutter/examples/api/lib/material/action_chip/action_chip.0.dart
similarity index 100%
rename from examples/api/lib/material/action_chip/action_chip.0.dart
rename to packages/flutter/examples/api/lib/material/action_chip/action_chip.0.dart
diff --git a/examples/api/lib/material/animated_icon/animated_icon.0.dart b/packages/flutter/examples/api/lib/material/animated_icon/animated_icon.0.dart
similarity index 100%
rename from examples/api/lib/material/animated_icon/animated_icon.0.dart
rename to packages/flutter/examples/api/lib/material/animated_icon/animated_icon.0.dart
diff --git a/examples/api/lib/material/animated_icon/animated_icons_data.0.dart b/packages/flutter/examples/api/lib/material/animated_icon/animated_icons_data.0.dart
similarity index 100%
rename from examples/api/lib/material/animated_icon/animated_icons_data.0.dart
rename to packages/flutter/examples/api/lib/material/animated_icon/animated_icons_data.0.dart
diff --git a/examples/api/lib/material/app/app.0.dart b/packages/flutter/examples/api/lib/material/app/app.0.dart
similarity index 100%
rename from examples/api/lib/material/app/app.0.dart
rename to packages/flutter/examples/api/lib/material/app/app.0.dart
diff --git a/examples/api/lib/material/app_bar/app_bar.0.dart b/packages/flutter/examples/api/lib/material/app_bar/app_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/app_bar.0.dart
rename to packages/flutter/examples/api/lib/material/app_bar/app_bar.0.dart
diff --git a/examples/api/lib/material/app_bar/app_bar.1.dart b/packages/flutter/examples/api/lib/material/app_bar/app_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/app_bar.1.dart
rename to packages/flutter/examples/api/lib/material/app_bar/app_bar.1.dart
diff --git a/examples/api/lib/material/app_bar/app_bar.2.dart b/packages/flutter/examples/api/lib/material/app_bar/app_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/app_bar.2.dart
rename to packages/flutter/examples/api/lib/material/app_bar/app_bar.2.dart
diff --git a/examples/api/lib/material/app_bar/app_bar.3.dart b/packages/flutter/examples/api/lib/material/app_bar/app_bar.3.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/app_bar.3.dart
rename to packages/flutter/examples/api/lib/material/app_bar/app_bar.3.dart
diff --git a/examples/api/lib/material/app_bar/app_bar.4.dart b/packages/flutter/examples/api/lib/material/app_bar/app_bar.4.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/app_bar.4.dart
rename to packages/flutter/examples/api/lib/material/app_bar/app_bar.4.dart
diff --git a/examples/api/lib/material/app_bar/sliver_app_bar.1.dart b/packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/sliver_app_bar.1.dart
rename to packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.1.dart
diff --git a/examples/api/lib/material/app_bar/sliver_app_bar.2.dart b/packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/sliver_app_bar.2.dart
rename to packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.2.dart
diff --git a/examples/api/lib/material/app_bar/sliver_app_bar.3.dart b/packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.3.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/sliver_app_bar.3.dart
rename to packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.3.dart
diff --git a/examples/api/lib/material/app_bar/sliver_app_bar.4.dart b/packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.4.dart
similarity index 100%
rename from examples/api/lib/material/app_bar/sliver_app_bar.4.dart
rename to packages/flutter/examples/api/lib/material/app_bar/sliver_app_bar.4.dart
diff --git a/examples/api/lib/material/autocomplete/autocomplete.0.dart b/packages/flutter/examples/api/lib/material/autocomplete/autocomplete.0.dart
similarity index 100%
rename from examples/api/lib/material/autocomplete/autocomplete.0.dart
rename to packages/flutter/examples/api/lib/material/autocomplete/autocomplete.0.dart
diff --git a/examples/api/lib/material/autocomplete/autocomplete.1.dart b/packages/flutter/examples/api/lib/material/autocomplete/autocomplete.1.dart
similarity index 100%
rename from examples/api/lib/material/autocomplete/autocomplete.1.dart
rename to packages/flutter/examples/api/lib/material/autocomplete/autocomplete.1.dart
diff --git a/examples/api/lib/material/autocomplete/autocomplete.2.dart b/packages/flutter/examples/api/lib/material/autocomplete/autocomplete.2.dart
similarity index 100%
rename from examples/api/lib/material/autocomplete/autocomplete.2.dart
rename to packages/flutter/examples/api/lib/material/autocomplete/autocomplete.2.dart
diff --git a/examples/api/lib/material/autocomplete/autocomplete.3.dart b/packages/flutter/examples/api/lib/material/autocomplete/autocomplete.3.dart
similarity index 100%
rename from examples/api/lib/material/autocomplete/autocomplete.3.dart
rename to packages/flutter/examples/api/lib/material/autocomplete/autocomplete.3.dart
diff --git a/examples/api/lib/material/autocomplete/autocomplete.4.dart b/packages/flutter/examples/api/lib/material/autocomplete/autocomplete.4.dart
similarity index 100%
rename from examples/api/lib/material/autocomplete/autocomplete.4.dart
rename to packages/flutter/examples/api/lib/material/autocomplete/autocomplete.4.dart
diff --git a/examples/api/lib/material/badge/badge.0.dart b/packages/flutter/examples/api/lib/material/badge/badge.0.dart
similarity index 100%
rename from examples/api/lib/material/badge/badge.0.dart
rename to packages/flutter/examples/api/lib/material/badge/badge.0.dart
diff --git a/examples/api/lib/material/banner/material_banner.0.dart b/packages/flutter/examples/api/lib/material/banner/material_banner.0.dart
similarity index 100%
rename from examples/api/lib/material/banner/material_banner.0.dart
rename to packages/flutter/examples/api/lib/material/banner/material_banner.0.dart
diff --git a/examples/api/lib/material/banner/material_banner.1.dart b/packages/flutter/examples/api/lib/material/banner/material_banner.1.dart
similarity index 100%
rename from examples/api/lib/material/banner/material_banner.1.dart
rename to packages/flutter/examples/api/lib/material/banner/material_banner.1.dart
diff --git a/examples/api/lib/material/bottom_app_bar/bottom_app_bar.1.dart b/packages/flutter/examples/api/lib/material/bottom_app_bar/bottom_app_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/bottom_app_bar/bottom_app_bar.1.dart
rename to packages/flutter/examples/api/lib/material/bottom_app_bar/bottom_app_bar.1.dart
diff --git a/examples/api/lib/material/bottom_app_bar/bottom_app_bar.2.dart b/packages/flutter/examples/api/lib/material/bottom_app_bar/bottom_app_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/bottom_app_bar/bottom_app_bar.2.dart
rename to packages/flutter/examples/api/lib/material/bottom_app_bar/bottom_app_bar.2.dart
diff --git a/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.0.dart b/packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.0.dart
rename to packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.0.dart
diff --git a/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.1.dart b/packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.1.dart
rename to packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.1.dart
diff --git a/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.2.dart b/packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.2.dart
rename to packages/flutter/examples/api/lib/material/bottom_navigation_bar/bottom_navigation_bar.2.dart
diff --git a/examples/api/lib/material/bottom_sheet/show_bottom_sheet.0.dart b/packages/flutter/examples/api/lib/material/bottom_sheet/show_bottom_sheet.0.dart
similarity index 100%
rename from examples/api/lib/material/bottom_sheet/show_bottom_sheet.0.dart
rename to packages/flutter/examples/api/lib/material/bottom_sheet/show_bottom_sheet.0.dart
diff --git a/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.0.dart b/packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.0.dart
similarity index 100%
rename from examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.0.dart
rename to packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.0.dart
diff --git a/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.1.dart b/packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.1.dart
similarity index 100%
rename from examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.1.dart
rename to packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.1.dart
diff --git a/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.2.dart b/packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.2.dart
similarity index 100%
rename from examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.2.dart
rename to packages/flutter/examples/api/lib/material/bottom_sheet/show_modal_bottom_sheet.2.dart
diff --git a/examples/api/lib/material/button_style/button_style.0.dart b/packages/flutter/examples/api/lib/material/button_style/button_style.0.dart
similarity index 100%
rename from examples/api/lib/material/button_style/button_style.0.dart
rename to packages/flutter/examples/api/lib/material/button_style/button_style.0.dart
diff --git a/examples/api/lib/material/card/card.0.dart b/packages/flutter/examples/api/lib/material/card/card.0.dart
similarity index 100%
rename from examples/api/lib/material/card/card.0.dart
rename to packages/flutter/examples/api/lib/material/card/card.0.dart
diff --git a/examples/api/lib/material/card/card.1.dart b/packages/flutter/examples/api/lib/material/card/card.1.dart
similarity index 100%
rename from examples/api/lib/material/card/card.1.dart
rename to packages/flutter/examples/api/lib/material/card/card.1.dart
diff --git a/examples/api/lib/material/card/card.2.dart b/packages/flutter/examples/api/lib/material/card/card.2.dart
similarity index 100%
rename from examples/api/lib/material/card/card.2.dart
rename to packages/flutter/examples/api/lib/material/card/card.2.dart
diff --git a/examples/api/lib/material/carousel/carousel.0.dart b/packages/flutter/examples/api/lib/material/carousel/carousel.0.dart
similarity index 100%
rename from examples/api/lib/material/carousel/carousel.0.dart
rename to packages/flutter/examples/api/lib/material/carousel/carousel.0.dart
diff --git a/examples/api/lib/material/carousel/carousel.1.dart b/packages/flutter/examples/api/lib/material/carousel/carousel.1.dart
similarity index 100%
rename from examples/api/lib/material/carousel/carousel.1.dart
rename to packages/flutter/examples/api/lib/material/carousel/carousel.1.dart
diff --git a/examples/api/lib/material/checkbox/checkbox.0.dart b/packages/flutter/examples/api/lib/material/checkbox/checkbox.0.dart
similarity index 100%
rename from examples/api/lib/material/checkbox/checkbox.0.dart
rename to packages/flutter/examples/api/lib/material/checkbox/checkbox.0.dart
diff --git a/examples/api/lib/material/checkbox/checkbox.1.dart b/packages/flutter/examples/api/lib/material/checkbox/checkbox.1.dart
similarity index 100%
rename from examples/api/lib/material/checkbox/checkbox.1.dart
rename to packages/flutter/examples/api/lib/material/checkbox/checkbox.1.dart
diff --git a/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.0.dart b/packages/flutter/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.0.dart
rename to packages/flutter/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.0.dart
diff --git a/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.1.dart b/packages/flutter/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.1.dart
similarity index 100%
rename from examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.1.dart
rename to packages/flutter/examples/api/lib/material/checkbox_list_tile/checkbox_list_tile.1.dart
diff --git a/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.0.dart b/packages/flutter/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.0.dart
similarity index 100%
rename from examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.0.dart
rename to packages/flutter/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.0.dart
diff --git a/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.1.dart b/packages/flutter/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.1.dart
similarity index 100%
rename from examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.1.dart
rename to packages/flutter/examples/api/lib/material/checkbox_list_tile/custom_labeled_checkbox.1.dart
diff --git a/examples/api/lib/material/chip/chip_attributes.avatar_box_constraints.0.dart b/packages/flutter/examples/api/lib/material/chip/chip_attributes.avatar_box_constraints.0.dart
similarity index 100%
rename from examples/api/lib/material/chip/chip_attributes.avatar_box_constraints.0.dart
rename to packages/flutter/examples/api/lib/material/chip/chip_attributes.avatar_box_constraints.0.dart
diff --git a/examples/api/lib/material/chip/chip_attributes.chip_animation_style.0.dart b/packages/flutter/examples/api/lib/material/chip/chip_attributes.chip_animation_style.0.dart
similarity index 100%
rename from examples/api/lib/material/chip/chip_attributes.chip_animation_style.0.dart
rename to packages/flutter/examples/api/lib/material/chip/chip_attributes.chip_animation_style.0.dart
diff --git a/examples/api/lib/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0.dart b/packages/flutter/examples/api/lib/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0.dart
similarity index 100%
rename from examples/api/lib/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0.dart
rename to packages/flutter/examples/api/lib/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0.dart
diff --git a/examples/api/lib/material/chip/deletable_chip_attributes.on_deleted.0.dart b/packages/flutter/examples/api/lib/material/chip/deletable_chip_attributes.on_deleted.0.dart
similarity index 100%
rename from examples/api/lib/material/chip/deletable_chip_attributes.on_deleted.0.dart
rename to packages/flutter/examples/api/lib/material/chip/deletable_chip_attributes.on_deleted.0.dart
diff --git a/examples/api/lib/material/choice_chip/choice_chip.0.dart b/packages/flutter/examples/api/lib/material/choice_chip/choice_chip.0.dart
similarity index 100%
rename from examples/api/lib/material/choice_chip/choice_chip.0.dart
rename to packages/flutter/examples/api/lib/material/choice_chip/choice_chip.0.dart
diff --git a/examples/api/lib/material/color_scheme/color_scheme.0.dart b/packages/flutter/examples/api/lib/material/color_scheme/color_scheme.0.dart
similarity index 100%
rename from examples/api/lib/material/color_scheme/color_scheme.0.dart
rename to packages/flutter/examples/api/lib/material/color_scheme/color_scheme.0.dart
diff --git a/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart b/packages/flutter/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart
similarity index 100%
rename from examples/api/lib/material/color_scheme/dynamic_content_color.0.dart
rename to packages/flutter/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart
diff --git a/examples/api/lib/material/context_menu/editable_text_toolbar_builder.2.dart b/packages/flutter/examples/api/lib/material/context_menu/editable_text_toolbar_builder.2.dart
similarity index 100%
rename from examples/api/lib/material/context_menu/editable_text_toolbar_builder.2.dart
rename to packages/flutter/examples/api/lib/material/context_menu/editable_text_toolbar_builder.2.dart
diff --git a/examples/api/lib/material/context_menu/selectable_region_toolbar_builder.0.dart b/packages/flutter/examples/api/lib/material/context_menu/selectable_region_toolbar_builder.0.dart
similarity index 100%
rename from examples/api/lib/material/context_menu/selectable_region_toolbar_builder.0.dart
rename to packages/flutter/examples/api/lib/material/context_menu/selectable_region_toolbar_builder.0.dart
diff --git a/examples/api/lib/material/data_table/data_table.0.dart b/packages/flutter/examples/api/lib/material/data_table/data_table.0.dart
similarity index 100%
rename from examples/api/lib/material/data_table/data_table.0.dart
rename to packages/flutter/examples/api/lib/material/data_table/data_table.0.dart
diff --git a/examples/api/lib/material/data_table/data_table.1.dart b/packages/flutter/examples/api/lib/material/data_table/data_table.1.dart
similarity index 100%
rename from examples/api/lib/material/data_table/data_table.1.dart
rename to packages/flutter/examples/api/lib/material/data_table/data_table.1.dart
diff --git a/examples/api/lib/material/date_picker/custom_calendar_date_picker.0.dart b/packages/flutter/examples/api/lib/material/date_picker/custom_calendar_date_picker.0.dart
similarity index 100%
rename from examples/api/lib/material/date_picker/custom_calendar_date_picker.0.dart
rename to packages/flutter/examples/api/lib/material/date_picker/custom_calendar_date_picker.0.dart
diff --git a/examples/api/lib/material/date_picker/date_picker_theme_day_shape.0.dart b/packages/flutter/examples/api/lib/material/date_picker/date_picker_theme_day_shape.0.dart
similarity index 100%
rename from examples/api/lib/material/date_picker/date_picker_theme_day_shape.0.dart
rename to packages/flutter/examples/api/lib/material/date_picker/date_picker_theme_day_shape.0.dart
diff --git a/examples/api/lib/material/date_picker/show_date_picker.0.dart b/packages/flutter/examples/api/lib/material/date_picker/show_date_picker.0.dart
similarity index 100%
rename from examples/api/lib/material/date_picker/show_date_picker.0.dart
rename to packages/flutter/examples/api/lib/material/date_picker/show_date_picker.0.dart
diff --git a/examples/api/lib/material/date_picker/show_date_picker.1.dart b/packages/flutter/examples/api/lib/material/date_picker/show_date_picker.1.dart
similarity index 100%
rename from examples/api/lib/material/date_picker/show_date_picker.1.dart
rename to packages/flutter/examples/api/lib/material/date_picker/show_date_picker.1.dart
diff --git a/examples/api/lib/material/date_picker/show_date_range_picker.0.dart b/packages/flutter/examples/api/lib/material/date_picker/show_date_range_picker.0.dart
similarity index 100%
rename from examples/api/lib/material/date_picker/show_date_range_picker.0.dart
rename to packages/flutter/examples/api/lib/material/date_picker/show_date_range_picker.0.dart
diff --git a/examples/api/lib/material/dialog/adaptive_alert_dialog.0.dart b/packages/flutter/examples/api/lib/material/dialog/adaptive_alert_dialog.0.dart
similarity index 100%
rename from examples/api/lib/material/dialog/adaptive_alert_dialog.0.dart
rename to packages/flutter/examples/api/lib/material/dialog/adaptive_alert_dialog.0.dart
diff --git a/examples/api/lib/material/dialog/alert_dialog.0.dart b/packages/flutter/examples/api/lib/material/dialog/alert_dialog.0.dart
similarity index 100%
rename from examples/api/lib/material/dialog/alert_dialog.0.dart
rename to packages/flutter/examples/api/lib/material/dialog/alert_dialog.0.dart
diff --git a/examples/api/lib/material/dialog/alert_dialog.1.dart b/packages/flutter/examples/api/lib/material/dialog/alert_dialog.1.dart
similarity index 100%
rename from examples/api/lib/material/dialog/alert_dialog.1.dart
rename to packages/flutter/examples/api/lib/material/dialog/alert_dialog.1.dart
diff --git a/examples/api/lib/material/dialog/dialog.0.dart b/packages/flutter/examples/api/lib/material/dialog/dialog.0.dart
similarity index 100%
rename from examples/api/lib/material/dialog/dialog.0.dart
rename to packages/flutter/examples/api/lib/material/dialog/dialog.0.dart
diff --git a/examples/api/lib/material/dialog/show_dialog.0.dart b/packages/flutter/examples/api/lib/material/dialog/show_dialog.0.dart
similarity index 100%
rename from examples/api/lib/material/dialog/show_dialog.0.dart
rename to packages/flutter/examples/api/lib/material/dialog/show_dialog.0.dart
diff --git a/examples/api/lib/material/dialog/show_dialog.1.dart b/packages/flutter/examples/api/lib/material/dialog/show_dialog.1.dart
similarity index 100%
rename from examples/api/lib/material/dialog/show_dialog.1.dart
rename to packages/flutter/examples/api/lib/material/dialog/show_dialog.1.dart
diff --git a/examples/api/lib/material/dialog/show_dialog.2.dart b/packages/flutter/examples/api/lib/material/dialog/show_dialog.2.dart
similarity index 100%
rename from examples/api/lib/material/dialog/show_dialog.2.dart
rename to packages/flutter/examples/api/lib/material/dialog/show_dialog.2.dart
diff --git a/examples/api/lib/material/divider/divider.0.dart b/packages/flutter/examples/api/lib/material/divider/divider.0.dart
similarity index 100%
rename from examples/api/lib/material/divider/divider.0.dart
rename to packages/flutter/examples/api/lib/material/divider/divider.0.dart
diff --git a/examples/api/lib/material/divider/divider.1.dart b/packages/flutter/examples/api/lib/material/divider/divider.1.dart
similarity index 100%
rename from examples/api/lib/material/divider/divider.1.dart
rename to packages/flutter/examples/api/lib/material/divider/divider.1.dart
diff --git a/examples/api/lib/material/divider/vertical_divider.0.dart b/packages/flutter/examples/api/lib/material/divider/vertical_divider.0.dart
similarity index 100%
rename from examples/api/lib/material/divider/vertical_divider.0.dart
rename to packages/flutter/examples/api/lib/material/divider/vertical_divider.0.dart
diff --git a/examples/api/lib/material/divider/vertical_divider.1.dart b/packages/flutter/examples/api/lib/material/divider/vertical_divider.1.dart
similarity index 100%
rename from examples/api/lib/material/divider/vertical_divider.1.dart
rename to packages/flutter/examples/api/lib/material/divider/vertical_divider.1.dart
diff --git a/examples/api/lib/material/drawer/drawer.0.dart b/packages/flutter/examples/api/lib/material/drawer/drawer.0.dart
similarity index 100%
rename from examples/api/lib/material/drawer/drawer.0.dart
rename to packages/flutter/examples/api/lib/material/drawer/drawer.0.dart
diff --git a/examples/api/lib/material/dropdown/dropdown_button.0.dart b/packages/flutter/examples/api/lib/material/dropdown/dropdown_button.0.dart
similarity index 100%
rename from examples/api/lib/material/dropdown/dropdown_button.0.dart
rename to packages/flutter/examples/api/lib/material/dropdown/dropdown_button.0.dart
diff --git a/examples/api/lib/material/dropdown/dropdown_button.selected_item_builder.0.dart b/packages/flutter/examples/api/lib/material/dropdown/dropdown_button.selected_item_builder.0.dart
similarity index 100%
rename from examples/api/lib/material/dropdown/dropdown_button.selected_item_builder.0.dart
rename to packages/flutter/examples/api/lib/material/dropdown/dropdown_button.selected_item_builder.0.dart
diff --git a/examples/api/lib/material/dropdown/dropdown_button.style.0.dart b/packages/flutter/examples/api/lib/material/dropdown/dropdown_button.style.0.dart
similarity index 100%
rename from examples/api/lib/material/dropdown/dropdown_button.style.0.dart
rename to packages/flutter/examples/api/lib/material/dropdown/dropdown_button.style.0.dart
diff --git a/examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart b/packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart
similarity index 100%
rename from examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart
rename to packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart
diff --git a/examples/api/lib/material/dropdown_menu/dropdown_menu.1.dart b/packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.1.dart
similarity index 100%
rename from examples/api/lib/material/dropdown_menu/dropdown_menu.1.dart
rename to packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.1.dart
diff --git a/examples/api/lib/material/dropdown_menu/dropdown_menu.2.dart b/packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.2.dart
similarity index 100%
rename from examples/api/lib/material/dropdown_menu/dropdown_menu.2.dart
rename to packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu.2.dart
diff --git a/examples/api/lib/material/dropdown_menu/dropdown_menu_entry_label_widget.0.dart b/packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu_entry_label_widget.0.dart
similarity index 100%
rename from examples/api/lib/material/dropdown_menu/dropdown_menu_entry_label_widget.0.dart
rename to packages/flutter/examples/api/lib/material/dropdown_menu/dropdown_menu_entry_label_widget.0.dart
diff --git a/examples/api/lib/material/elevated_button/elevated_button.0.dart b/packages/flutter/examples/api/lib/material/elevated_button/elevated_button.0.dart
similarity index 100%
rename from examples/api/lib/material/elevated_button/elevated_button.0.dart
rename to packages/flutter/examples/api/lib/material/elevated_button/elevated_button.0.dart
diff --git a/examples/api/lib/material/expansion_panel/expansion_panel_list.0.dart b/packages/flutter/examples/api/lib/material/expansion_panel/expansion_panel_list.0.dart
similarity index 100%
rename from examples/api/lib/material/expansion_panel/expansion_panel_list.0.dart
rename to packages/flutter/examples/api/lib/material/expansion_panel/expansion_panel_list.0.dart
diff --git a/examples/api/lib/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0.dart b/packages/flutter/examples/api/lib/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0.dart
similarity index 100%
rename from examples/api/lib/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0.dart
rename to packages/flutter/examples/api/lib/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0.dart
diff --git a/examples/api/lib/material/expansion_tile/expansion_tile.0.dart b/packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/expansion_tile/expansion_tile.0.dart
rename to packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.0.dart
diff --git a/examples/api/lib/material/expansion_tile/expansion_tile.1.dart b/packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.1.dart
similarity index 100%
rename from examples/api/lib/material/expansion_tile/expansion_tile.1.dart
rename to packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.1.dart
diff --git a/examples/api/lib/material/expansion_tile/expansion_tile.2.dart b/packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.2.dart
similarity index 100%
rename from examples/api/lib/material/expansion_tile/expansion_tile.2.dart
rename to packages/flutter/examples/api/lib/material/expansion_tile/expansion_tile.2.dart
diff --git a/examples/api/lib/material/filled_button/filled_button.0.dart b/packages/flutter/examples/api/lib/material/filled_button/filled_button.0.dart
similarity index 100%
rename from examples/api/lib/material/filled_button/filled_button.0.dart
rename to packages/flutter/examples/api/lib/material/filled_button/filled_button.0.dart
diff --git a/examples/api/lib/material/filter_chip/filter_chip.0.dart b/packages/flutter/examples/api/lib/material/filter_chip/filter_chip.0.dart
similarity index 100%
rename from examples/api/lib/material/filter_chip/filter_chip.0.dart
rename to packages/flutter/examples/api/lib/material/filter_chip/filter_chip.0.dart
diff --git a/examples/api/lib/material/flexible_space_bar/flexible_space_bar.0.dart b/packages/flutter/examples/api/lib/material/flexible_space_bar/flexible_space_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/flexible_space_bar/flexible_space_bar.0.dart
rename to packages/flutter/examples/api/lib/material/flexible_space_bar/flexible_space_bar.0.dart
diff --git a/examples/api/lib/material/floating_action_button/floating_action_button.0.dart b/packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.0.dart
similarity index 100%
rename from examples/api/lib/material/floating_action_button/floating_action_button.0.dart
rename to packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.0.dart
diff --git a/examples/api/lib/material/floating_action_button/floating_action_button.1.dart b/packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.1.dart
similarity index 100%
rename from examples/api/lib/material/floating_action_button/floating_action_button.1.dart
rename to packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.1.dart
diff --git a/examples/api/lib/material/floating_action_button/floating_action_button.2.dart b/packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.2.dart
similarity index 100%
rename from examples/api/lib/material/floating_action_button/floating_action_button.2.dart
rename to packages/flutter/examples/api/lib/material/floating_action_button/floating_action_button.2.dart
diff --git a/examples/api/lib/material/floating_action_button_location/standard_fab_location.0.dart b/packages/flutter/examples/api/lib/material/floating_action_button_location/standard_fab_location.0.dart
similarity index 100%
rename from examples/api/lib/material/floating_action_button_location/standard_fab_location.0.dart
rename to packages/flutter/examples/api/lib/material/floating_action_button_location/standard_fab_location.0.dart
diff --git a/examples/api/lib/material/icon_alignment/icon_alignment.0.dart b/packages/flutter/examples/api/lib/material/icon_alignment/icon_alignment.0.dart
similarity index 100%
rename from examples/api/lib/material/icon_alignment/icon_alignment.0.dart
rename to packages/flutter/examples/api/lib/material/icon_alignment/icon_alignment.0.dart
diff --git a/examples/api/lib/material/icon_button/icon_button.0.dart b/packages/flutter/examples/api/lib/material/icon_button/icon_button.0.dart
similarity index 100%
rename from examples/api/lib/material/icon_button/icon_button.0.dart
rename to packages/flutter/examples/api/lib/material/icon_button/icon_button.0.dart
diff --git a/examples/api/lib/material/icon_button/icon_button.1.dart b/packages/flutter/examples/api/lib/material/icon_button/icon_button.1.dart
similarity index 100%
rename from examples/api/lib/material/icon_button/icon_button.1.dart
rename to packages/flutter/examples/api/lib/material/icon_button/icon_button.1.dart
diff --git a/examples/api/lib/material/icon_button/icon_button.2.dart b/packages/flutter/examples/api/lib/material/icon_button/icon_button.2.dart
similarity index 100%
rename from examples/api/lib/material/icon_button/icon_button.2.dart
rename to packages/flutter/examples/api/lib/material/icon_button/icon_button.2.dart
diff --git a/examples/api/lib/material/icon_button/icon_button.3.dart b/packages/flutter/examples/api/lib/material/icon_button/icon_button.3.dart
similarity index 100%
rename from examples/api/lib/material/icon_button/icon_button.3.dart
rename to packages/flutter/examples/api/lib/material/icon_button/icon_button.3.dart
diff --git a/examples/api/lib/material/ink/ink.image_clip.0.dart b/packages/flutter/examples/api/lib/material/ink/ink.image_clip.0.dart
similarity index 100%
rename from examples/api/lib/material/ink/ink.image_clip.0.dart
rename to packages/flutter/examples/api/lib/material/ink/ink.image_clip.0.dart
diff --git a/examples/api/lib/material/ink/ink.image_clip.1.dart b/packages/flutter/examples/api/lib/material/ink/ink.image_clip.1.dart
similarity index 100%
rename from examples/api/lib/material/ink/ink.image_clip.1.dart
rename to packages/flutter/examples/api/lib/material/ink/ink.image_clip.1.dart
diff --git a/examples/api/lib/material/ink_well/ink_well.0.dart b/packages/flutter/examples/api/lib/material/ink_well/ink_well.0.dart
similarity index 100%
rename from examples/api/lib/material/ink_well/ink_well.0.dart
rename to packages/flutter/examples/api/lib/material/ink_well/ink_well.0.dart
diff --git a/examples/api/lib/material/input_chip/input_chip.0.dart b/packages/flutter/examples/api/lib/material/input_chip/input_chip.0.dart
similarity index 100%
rename from examples/api/lib/material/input_chip/input_chip.0.dart
rename to packages/flutter/examples/api/lib/material/input_chip/input_chip.0.dart
diff --git a/examples/api/lib/material/input_chip/input_chip.1.dart b/packages/flutter/examples/api/lib/material/input_chip/input_chip.1.dart
similarity index 100%
rename from examples/api/lib/material/input_chip/input_chip.1.dart
rename to packages/flutter/examples/api/lib/material/input_chip/input_chip.1.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.1.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.1.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.1.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.1.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.2.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.2.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.2.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.2.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.3.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.3.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.3.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.3.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.floating_label_style_error.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.floating_label_style_error.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.floating_label_style_error.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.floating_label_style_error.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.helper.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.helper.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.helper.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.helper.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.label.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.label.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.label.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.label.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.label_style_error.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.label_style_error.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.label_style_error.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.label_style_error.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.prefix_icon.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.prefix_icon.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.prefix_icon.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.prefix_icon.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.prefix_icon_constraints.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.prefix_icon_constraints.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.prefix_icon_constraints.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.prefix_icon_constraints.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.suffix_icon.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.suffix_icon.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.suffix_icon.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.suffix_icon.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.suffix_icon_constraints.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.suffix_icon_constraints.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.suffix_icon_constraints.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.suffix_icon_constraints.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.widget_state.0.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.widget_state.0.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.widget_state.0.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.widget_state.0.dart
diff --git a/examples/api/lib/material/input_decorator/input_decoration.widget_state.1.dart b/packages/flutter/examples/api/lib/material/input_decorator/input_decoration.widget_state.1.dart
similarity index 100%
rename from examples/api/lib/material/input_decorator/input_decoration.widget_state.1.dart
rename to packages/flutter/examples/api/lib/material/input_decorator/input_decoration.widget_state.1.dart
diff --git a/examples/api/lib/material/list_tile/custom_list_item.0.dart b/packages/flutter/examples/api/lib/material/list_tile/custom_list_item.0.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/custom_list_item.0.dart
rename to packages/flutter/examples/api/lib/material/list_tile/custom_list_item.0.dart
diff --git a/examples/api/lib/material/list_tile/custom_list_item.1.dart b/packages/flutter/examples/api/lib/material/list_tile/custom_list_item.1.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/custom_list_item.1.dart
rename to packages/flutter/examples/api/lib/material/list_tile/custom_list_item.1.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.0.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.0.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.0.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.1.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.1.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.1.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.1.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.2.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.2.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.2.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.2.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.3.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.3.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.3.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.3.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.4.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.4.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.4.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.4.dart
diff --git a/examples/api/lib/material/list_tile/list_tile.selected.0.dart b/packages/flutter/examples/api/lib/material/list_tile/list_tile.selected.0.dart
similarity index 100%
rename from examples/api/lib/material/list_tile/list_tile.selected.0.dart
rename to packages/flutter/examples/api/lib/material/list_tile/list_tile.selected.0.dart
diff --git a/examples/api/lib/material/material_state/material_state_border_side.0.dart b/packages/flutter/examples/api/lib/material/material_state/material_state_border_side.0.dart
similarity index 100%
rename from examples/api/lib/material/material_state/material_state_border_side.0.dart
rename to packages/flutter/examples/api/lib/material/material_state/material_state_border_side.0.dart
diff --git a/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart b/packages/flutter/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
similarity index 100%
rename from examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
rename to packages/flutter/examples/api/lib/material/material_state/material_state_mouse_cursor.0.dart
diff --git a/examples/api/lib/material/material_state/material_state_property.0.dart b/packages/flutter/examples/api/lib/material/material_state/material_state_property.0.dart
similarity index 100%
rename from examples/api/lib/material/material_state/material_state_property.0.dart
rename to packages/flutter/examples/api/lib/material/material_state/material_state_property.0.dart
diff --git a/examples/api/lib/material/menu_anchor/checkbox_menu_button.0.dart b/packages/flutter/examples/api/lib/material/menu_anchor/checkbox_menu_button.0.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/checkbox_menu_button.0.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/checkbox_menu_button.0.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_accelerator_label.0.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_accelerator_label.0.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_accelerator_label.0.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_accelerator_label.0.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_anchor.0.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.0.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_anchor.0.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.0.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_anchor.1.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.1.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_anchor.1.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.1.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_anchor.2.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.2.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_anchor.2.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.2.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_anchor.3.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.3.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_anchor.3.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_anchor.3.dart
diff --git a/examples/api/lib/material/menu_anchor/menu_bar.0.dart b/packages/flutter/examples/api/lib/material/menu_anchor/menu_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/menu_bar.0.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/menu_bar.0.dart
diff --git a/examples/api/lib/material/menu_anchor/radio_menu_button.0.dart b/packages/flutter/examples/api/lib/material/menu_anchor/radio_menu_button.0.dart
similarity index 100%
rename from examples/api/lib/material/menu_anchor/radio_menu_button.0.dart
rename to packages/flutter/examples/api/lib/material/menu_anchor/radio_menu_button.0.dart
diff --git a/examples/api/lib/material/navigation_bar/navigation_bar.0.dart b/packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/navigation_bar/navigation_bar.0.dart
rename to packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.0.dart
diff --git a/examples/api/lib/material/navigation_bar/navigation_bar.1.dart b/packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/navigation_bar/navigation_bar.1.dart
rename to packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.1.dart
diff --git a/examples/api/lib/material/navigation_bar/navigation_bar.2.dart b/packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/navigation_bar/navigation_bar.2.dart
rename to packages/flutter/examples/api/lib/material/navigation_bar/navigation_bar.2.dart
diff --git a/examples/api/lib/material/navigation_drawer/navigation_drawer.0.dart b/packages/flutter/examples/api/lib/material/navigation_drawer/navigation_drawer.0.dart
similarity index 100%
rename from examples/api/lib/material/navigation_drawer/navigation_drawer.0.dart
rename to packages/flutter/examples/api/lib/material/navigation_drawer/navigation_drawer.0.dart
diff --git a/examples/api/lib/material/navigation_rail/navigation_rail.0.dart b/packages/flutter/examples/api/lib/material/navigation_rail/navigation_rail.0.dart
similarity index 100%
rename from examples/api/lib/material/navigation_rail/navigation_rail.0.dart
rename to packages/flutter/examples/api/lib/material/navigation_rail/navigation_rail.0.dart
diff --git a/examples/api/lib/material/navigation_rail/navigation_rail.extended_animation.0.dart b/packages/flutter/examples/api/lib/material/navigation_rail/navigation_rail.extended_animation.0.dart
similarity index 100%
rename from examples/api/lib/material/navigation_rail/navigation_rail.extended_animation.0.dart
rename to packages/flutter/examples/api/lib/material/navigation_rail/navigation_rail.extended_animation.0.dart
diff --git a/examples/api/lib/material/outlined_button/outlined_button.0.dart b/packages/flutter/examples/api/lib/material/outlined_button/outlined_button.0.dart
similarity index 100%
rename from examples/api/lib/material/outlined_button/outlined_button.0.dart
rename to packages/flutter/examples/api/lib/material/outlined_button/outlined_button.0.dart
diff --git a/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart b/packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart
similarity index 100%
rename from examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart
rename to packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart
diff --git a/examples/api/lib/material/page_transitions_theme/page_transitions_theme.1.dart b/packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.1.dart
similarity index 100%
rename from examples/api/lib/material/page_transitions_theme/page_transitions_theme.1.dart
rename to packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.1.dart
diff --git a/examples/api/lib/material/page_transitions_theme/page_transitions_theme.3.dart b/packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.3.dart
similarity index 100%
rename from examples/api/lib/material/page_transitions_theme/page_transitions_theme.3.dart
rename to packages/flutter/examples/api/lib/material/page_transitions_theme/page_transitions_theme.3.dart
diff --git a/examples/api/lib/material/paginated_data_table/paginated_data_table.0.dart b/packages/flutter/examples/api/lib/material/paginated_data_table/paginated_data_table.0.dart
similarity index 100%
rename from examples/api/lib/material/paginated_data_table/paginated_data_table.0.dart
rename to packages/flutter/examples/api/lib/material/paginated_data_table/paginated_data_table.0.dart
diff --git a/examples/api/lib/material/paginated_data_table/paginated_data_table.1.dart b/packages/flutter/examples/api/lib/material/paginated_data_table/paginated_data_table.1.dart
similarity index 100%
rename from examples/api/lib/material/paginated_data_table/paginated_data_table.1.dart
rename to packages/flutter/examples/api/lib/material/paginated_data_table/paginated_data_table.1.dart
diff --git a/examples/api/lib/material/popup_menu/popup_menu.0.dart b/packages/flutter/examples/api/lib/material/popup_menu/popup_menu.0.dart
similarity index 100%
rename from examples/api/lib/material/popup_menu/popup_menu.0.dart
rename to packages/flutter/examples/api/lib/material/popup_menu/popup_menu.0.dart
diff --git a/examples/api/lib/material/popup_menu/popup_menu.1.dart b/packages/flutter/examples/api/lib/material/popup_menu/popup_menu.1.dart
similarity index 100%
rename from examples/api/lib/material/popup_menu/popup_menu.1.dart
rename to packages/flutter/examples/api/lib/material/popup_menu/popup_menu.1.dart
diff --git a/examples/api/lib/material/popup_menu/popup_menu.2.dart b/packages/flutter/examples/api/lib/material/popup_menu/popup_menu.2.dart
similarity index 100%
rename from examples/api/lib/material/popup_menu/popup_menu.2.dart
rename to packages/flutter/examples/api/lib/material/popup_menu/popup_menu.2.dart
diff --git a/examples/api/lib/material/progress_indicator/circular_progress_indicator.0.dart b/packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.0.dart
similarity index 100%
rename from examples/api/lib/material/progress_indicator/circular_progress_indicator.0.dart
rename to packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.0.dart
diff --git a/examples/api/lib/material/progress_indicator/circular_progress_indicator.1.dart b/packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.1.dart
similarity index 100%
rename from examples/api/lib/material/progress_indicator/circular_progress_indicator.1.dart
rename to packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.1.dart
diff --git a/examples/api/lib/material/progress_indicator/circular_progress_indicator.2.dart b/packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.2.dart
similarity index 100%
rename from examples/api/lib/material/progress_indicator/circular_progress_indicator.2.dart
rename to packages/flutter/examples/api/lib/material/progress_indicator/circular_progress_indicator.2.dart
diff --git a/examples/api/lib/material/progress_indicator/linear_progress_indicator.0.dart b/packages/flutter/examples/api/lib/material/progress_indicator/linear_progress_indicator.0.dart
similarity index 100%
rename from examples/api/lib/material/progress_indicator/linear_progress_indicator.0.dart
rename to packages/flutter/examples/api/lib/material/progress_indicator/linear_progress_indicator.0.dart
diff --git a/examples/api/lib/material/progress_indicator/linear_progress_indicator.1.dart b/packages/flutter/examples/api/lib/material/progress_indicator/linear_progress_indicator.1.dart
similarity index 100%
rename from examples/api/lib/material/progress_indicator/linear_progress_indicator.1.dart
rename to packages/flutter/examples/api/lib/material/progress_indicator/linear_progress_indicator.1.dart
diff --git a/examples/api/lib/material/radio/radio.0.dart b/packages/flutter/examples/api/lib/material/radio/radio.0.dart
similarity index 100%
rename from examples/api/lib/material/radio/radio.0.dart
rename to packages/flutter/examples/api/lib/material/radio/radio.0.dart
diff --git a/examples/api/lib/material/radio/radio.1.dart b/packages/flutter/examples/api/lib/material/radio/radio.1.dart
similarity index 100%
rename from examples/api/lib/material/radio/radio.1.dart
rename to packages/flutter/examples/api/lib/material/radio/radio.1.dart
diff --git a/examples/api/lib/material/radio/radio.toggleable.0.dart b/packages/flutter/examples/api/lib/material/radio/radio.toggleable.0.dart
similarity index 100%
rename from examples/api/lib/material/radio/radio.toggleable.0.dart
rename to packages/flutter/examples/api/lib/material/radio/radio.toggleable.0.dart
diff --git a/examples/api/lib/material/radio_list_tile/custom_labeled_radio.0.dart b/packages/flutter/examples/api/lib/material/radio_list_tile/custom_labeled_radio.0.dart
similarity index 100%
rename from examples/api/lib/material/radio_list_tile/custom_labeled_radio.0.dart
rename to packages/flutter/examples/api/lib/material/radio_list_tile/custom_labeled_radio.0.dart
diff --git a/examples/api/lib/material/radio_list_tile/custom_labeled_radio.1.dart b/packages/flutter/examples/api/lib/material/radio_list_tile/custom_labeled_radio.1.dart
similarity index 100%
rename from examples/api/lib/material/radio_list_tile/custom_labeled_radio.1.dart
rename to packages/flutter/examples/api/lib/material/radio_list_tile/custom_labeled_radio.1.dart
diff --git a/examples/api/lib/material/radio_list_tile/radio_list_tile.0.dart b/packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/radio_list_tile/radio_list_tile.0.dart
rename to packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.0.dart
diff --git a/examples/api/lib/material/radio_list_tile/radio_list_tile.1.dart b/packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.1.dart
similarity index 100%
rename from examples/api/lib/material/radio_list_tile/radio_list_tile.1.dart
rename to packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.1.dart
diff --git a/examples/api/lib/material/radio_list_tile/radio_list_tile.toggleable.0.dart b/packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.toggleable.0.dart
similarity index 100%
rename from examples/api/lib/material/radio_list_tile/radio_list_tile.toggleable.0.dart
rename to packages/flutter/examples/api/lib/material/radio_list_tile/radio_list_tile.toggleable.0.dart
diff --git a/examples/api/lib/material/range_slider/range_slider.0.dart b/packages/flutter/examples/api/lib/material/range_slider/range_slider.0.dart
similarity index 100%
rename from examples/api/lib/material/range_slider/range_slider.0.dart
rename to packages/flutter/examples/api/lib/material/range_slider/range_slider.0.dart
diff --git a/examples/api/lib/material/refresh_indicator/refresh_indicator.0.dart b/packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.0.dart
similarity index 100%
rename from examples/api/lib/material/refresh_indicator/refresh_indicator.0.dart
rename to packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.0.dart
diff --git a/examples/api/lib/material/refresh_indicator/refresh_indicator.1.dart b/packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.1.dart
similarity index 100%
rename from examples/api/lib/material/refresh_indicator/refresh_indicator.1.dart
rename to packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.1.dart
diff --git a/examples/api/lib/material/refresh_indicator/refresh_indicator.2.dart b/packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.2.dart
similarity index 100%
rename from examples/api/lib/material/refresh_indicator/refresh_indicator.2.dart
rename to packages/flutter/examples/api/lib/material/refresh_indicator/refresh_indicator.2.dart
diff --git a/examples/api/lib/material/reorderable_list/reorderable_list_view.0.dart b/packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.0.dart
similarity index 100%
rename from examples/api/lib/material/reorderable_list/reorderable_list_view.0.dart
rename to packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.0.dart
diff --git a/examples/api/lib/material/reorderable_list/reorderable_list_view.1.dart b/packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.1.dart
similarity index 100%
rename from examples/api/lib/material/reorderable_list/reorderable_list_view.1.dart
rename to packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.1.dart
diff --git a/examples/api/lib/material/reorderable_list/reorderable_list_view.2.dart b/packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.2.dart
similarity index 100%
rename from examples/api/lib/material/reorderable_list/reorderable_list_view.2.dart
rename to packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.2.dart
diff --git a/examples/api/lib/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0.dart b/packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0.dart
similarity index 100%
rename from examples/api/lib/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0.dart
rename to packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0.dart
diff --git a/examples/api/lib/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0.dart b/packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0.dart
similarity index 100%
rename from examples/api/lib/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0.dart
rename to packages/flutter/examples/api/lib/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.1.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.1.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.1.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.1.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.2.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.2.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.2.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.2.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.drawer.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.drawer.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.drawer.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.drawer.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.end_drawer.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.end_drawer.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.end_drawer.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.end_drawer.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.floating_action_button_animator.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.floating_action_button_animator.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.floating_action_button_animator.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.floating_action_button_animator.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.of.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.of.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.of.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.of.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold.of.1.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold.of.1.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold.of.1.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold.of.1.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger.of.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.of.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger.of.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.of.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger.of.1.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.of.1.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger.of.1.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger.of.1.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger_state.show_material_banner.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_material_banner.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger_state.show_material_banner.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_material_banner.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.1.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.1.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.1.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.2.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.2.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_messenger_state.show_snack_bar.2.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.0.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.0.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.0.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.0.dart
diff --git a/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.1.dart b/packages/flutter/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.1.dart
similarity index 100%
rename from examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.1.dart
rename to packages/flutter/examples/api/lib/material/scaffold/scaffold_state.show_bottom_sheet.1.dart
diff --git a/examples/api/lib/material/scrollbar/scrollbar.0.dart b/packages/flutter/examples/api/lib/material/scrollbar/scrollbar.0.dart
similarity index 100%
rename from examples/api/lib/material/scrollbar/scrollbar.0.dart
rename to packages/flutter/examples/api/lib/material/scrollbar/scrollbar.0.dart
diff --git a/examples/api/lib/material/scrollbar/scrollbar.1.dart b/packages/flutter/examples/api/lib/material/scrollbar/scrollbar.1.dart
similarity index 100%
rename from examples/api/lib/material/scrollbar/scrollbar.1.dart
rename to packages/flutter/examples/api/lib/material/scrollbar/scrollbar.1.dart
diff --git a/examples/api/lib/material/search_anchor/search_anchor.0.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_anchor.0.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_anchor.0.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_anchor.0.dart
diff --git a/examples/api/lib/material/search_anchor/search_anchor.1.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_anchor.1.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_anchor.1.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_anchor.1.dart
diff --git a/examples/api/lib/material/search_anchor/search_anchor.2.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_anchor.2.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_anchor.2.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_anchor.2.dart
diff --git a/examples/api/lib/material/search_anchor/search_anchor.3.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_anchor.3.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_anchor.3.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_anchor.3.dart
diff --git a/examples/api/lib/material/search_anchor/search_anchor.4.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_anchor.4.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_anchor.4.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_anchor.4.dart
diff --git a/examples/api/lib/material/search_anchor/search_bar.0.dart b/packages/flutter/examples/api/lib/material/search_anchor/search_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/search_anchor/search_bar.0.dart
rename to packages/flutter/examples/api/lib/material/search_anchor/search_bar.0.dart
diff --git a/examples/api/lib/material/segmented_button/segmented_button.0.dart b/packages/flutter/examples/api/lib/material/segmented_button/segmented_button.0.dart
similarity index 100%
rename from examples/api/lib/material/segmented_button/segmented_button.0.dart
rename to packages/flutter/examples/api/lib/material/segmented_button/segmented_button.0.dart
diff --git a/examples/api/lib/material/segmented_button/segmented_button.1.dart b/packages/flutter/examples/api/lib/material/segmented_button/segmented_button.1.dart
similarity index 100%
rename from examples/api/lib/material/segmented_button/segmented_button.1.dart
rename to packages/flutter/examples/api/lib/material/segmented_button/segmented_button.1.dart
diff --git a/examples/api/lib/material/selection_area/selection_area.0.dart b/packages/flutter/examples/api/lib/material/selection_area/selection_area.0.dart
similarity index 100%
rename from examples/api/lib/material/selection_area/selection_area.0.dart
rename to packages/flutter/examples/api/lib/material/selection_area/selection_area.0.dart
diff --git a/examples/api/lib/material/selection_area/selection_area.1.dart b/packages/flutter/examples/api/lib/material/selection_area/selection_area.1.dart
similarity index 100%
rename from examples/api/lib/material/selection_area/selection_area.1.dart
rename to packages/flutter/examples/api/lib/material/selection_area/selection_area.1.dart
diff --git a/examples/api/lib/material/selection_area/selection_area.2.dart b/packages/flutter/examples/api/lib/material/selection_area/selection_area.2.dart
similarity index 100%
rename from examples/api/lib/material/selection_area/selection_area.2.dart
rename to packages/flutter/examples/api/lib/material/selection_area/selection_area.2.dart
diff --git a/examples/api/lib/material/shaped_input_border/shaped_input_border.0.dart b/packages/flutter/examples/api/lib/material/shaped_input_border/shaped_input_border.0.dart
similarity index 100%
rename from examples/api/lib/material/shaped_input_border/shaped_input_border.0.dart
rename to packages/flutter/examples/api/lib/material/shaped_input_border/shaped_input_border.0.dart
diff --git a/examples/api/lib/material/slider/slider.0.dart b/packages/flutter/examples/api/lib/material/slider/slider.0.dart
similarity index 100%
rename from examples/api/lib/material/slider/slider.0.dart
rename to packages/flutter/examples/api/lib/material/slider/slider.0.dart
diff --git a/examples/api/lib/material/slider/slider.1.dart b/packages/flutter/examples/api/lib/material/slider/slider.1.dart
similarity index 100%
rename from examples/api/lib/material/slider/slider.1.dart
rename to packages/flutter/examples/api/lib/material/slider/slider.1.dart
diff --git a/examples/api/lib/material/snack_bar/snack_bar.0.dart b/packages/flutter/examples/api/lib/material/snack_bar/snack_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/snack_bar/snack_bar.0.dart
rename to packages/flutter/examples/api/lib/material/snack_bar/snack_bar.0.dart
diff --git a/examples/api/lib/material/snack_bar/snack_bar.1.dart b/packages/flutter/examples/api/lib/material/snack_bar/snack_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/snack_bar/snack_bar.1.dart
rename to packages/flutter/examples/api/lib/material/snack_bar/snack_bar.1.dart
diff --git a/examples/api/lib/material/snack_bar/snack_bar.2.dart b/packages/flutter/examples/api/lib/material/snack_bar/snack_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/snack_bar/snack_bar.2.dart
rename to packages/flutter/examples/api/lib/material/snack_bar/snack_bar.2.dart
diff --git a/examples/api/lib/material/stepper/step_style.0.dart b/packages/flutter/examples/api/lib/material/stepper/step_style.0.dart
similarity index 100%
rename from examples/api/lib/material/stepper/step_style.0.dart
rename to packages/flutter/examples/api/lib/material/stepper/step_style.0.dart
diff --git a/examples/api/lib/material/stepper/stepper.0.dart b/packages/flutter/examples/api/lib/material/stepper/stepper.0.dart
similarity index 100%
rename from examples/api/lib/material/stepper/stepper.0.dart
rename to packages/flutter/examples/api/lib/material/stepper/stepper.0.dart
diff --git a/examples/api/lib/material/stepper/stepper.controls_builder.0.dart b/packages/flutter/examples/api/lib/material/stepper/stepper.controls_builder.0.dart
similarity index 100%
rename from examples/api/lib/material/stepper/stepper.controls_builder.0.dart
rename to packages/flutter/examples/api/lib/material/stepper/stepper.controls_builder.0.dart
diff --git a/examples/api/lib/material/switch/switch.0.dart b/packages/flutter/examples/api/lib/material/switch/switch.0.dart
similarity index 100%
rename from examples/api/lib/material/switch/switch.0.dart
rename to packages/flutter/examples/api/lib/material/switch/switch.0.dart
diff --git a/examples/api/lib/material/switch/switch.1.dart b/packages/flutter/examples/api/lib/material/switch/switch.1.dart
similarity index 100%
rename from examples/api/lib/material/switch/switch.1.dart
rename to packages/flutter/examples/api/lib/material/switch/switch.1.dart
diff --git a/examples/api/lib/material/switch/switch.2.dart b/packages/flutter/examples/api/lib/material/switch/switch.2.dart
similarity index 100%
rename from examples/api/lib/material/switch/switch.2.dart
rename to packages/flutter/examples/api/lib/material/switch/switch.2.dart
diff --git a/examples/api/lib/material/switch/switch.3.dart b/packages/flutter/examples/api/lib/material/switch/switch.3.dart
similarity index 100%
rename from examples/api/lib/material/switch/switch.3.dart
rename to packages/flutter/examples/api/lib/material/switch/switch.3.dart
diff --git a/examples/api/lib/material/switch/switch.4.dart b/packages/flutter/examples/api/lib/material/switch/switch.4.dart
similarity index 100%
rename from examples/api/lib/material/switch/switch.4.dart
rename to packages/flutter/examples/api/lib/material/switch/switch.4.dart
diff --git a/examples/api/lib/material/switch_list_tile/custom_labeled_switch.0.dart b/packages/flutter/examples/api/lib/material/switch_list_tile/custom_labeled_switch.0.dart
similarity index 100%
rename from examples/api/lib/material/switch_list_tile/custom_labeled_switch.0.dart
rename to packages/flutter/examples/api/lib/material/switch_list_tile/custom_labeled_switch.0.dart
diff --git a/examples/api/lib/material/switch_list_tile/custom_labeled_switch.1.dart b/packages/flutter/examples/api/lib/material/switch_list_tile/custom_labeled_switch.1.dart
similarity index 100%
rename from examples/api/lib/material/switch_list_tile/custom_labeled_switch.1.dart
rename to packages/flutter/examples/api/lib/material/switch_list_tile/custom_labeled_switch.1.dart
diff --git a/examples/api/lib/material/switch_list_tile/switch_list_tile.0.dart b/packages/flutter/examples/api/lib/material/switch_list_tile/switch_list_tile.0.dart
similarity index 100%
rename from examples/api/lib/material/switch_list_tile/switch_list_tile.0.dart
rename to packages/flutter/examples/api/lib/material/switch_list_tile/switch_list_tile.0.dart
diff --git a/examples/api/lib/material/switch_list_tile/switch_list_tile.1.dart b/packages/flutter/examples/api/lib/material/switch_list_tile/switch_list_tile.1.dart
similarity index 100%
rename from examples/api/lib/material/switch_list_tile/switch_list_tile.1.dart
rename to packages/flutter/examples/api/lib/material/switch_list_tile/switch_list_tile.1.dart
diff --git a/examples/api/lib/material/tab_controller/tab_controller.1.dart b/packages/flutter/examples/api/lib/material/tab_controller/tab_controller.1.dart
similarity index 100%
rename from examples/api/lib/material/tab_controller/tab_controller.1.dart
rename to packages/flutter/examples/api/lib/material/tab_controller/tab_controller.1.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.0.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.0.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.0.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.1.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.1.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.1.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.1.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.2.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.2.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.2.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.2.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.3.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.3.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.3.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.3.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.indicator_animation.0.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.indicator_animation.0.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.indicator_animation.0.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.indicator_animation.0.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.onFocusChange.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.onFocusChange.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.onFocusChange.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.onFocusChange.dart
diff --git a/examples/api/lib/material/tabs/tab_bar.onHover.dart b/packages/flutter/examples/api/lib/material/tabs/tab_bar.onHover.dart
similarity index 100%
rename from examples/api/lib/material/tabs/tab_bar.onHover.dart
rename to packages/flutter/examples/api/lib/material/tabs/tab_bar.onHover.dart
diff --git a/examples/api/lib/material/text_button/text_button.0.dart b/packages/flutter/examples/api/lib/material/text_button/text_button.0.dart
similarity index 100%
rename from examples/api/lib/material/text_button/text_button.0.dart
rename to packages/flutter/examples/api/lib/material/text_button/text_button.0.dart
diff --git a/examples/api/lib/material/text_button/text_button.1.dart b/packages/flutter/examples/api/lib/material/text_button/text_button.1.dart
similarity index 100%
rename from examples/api/lib/material/text_button/text_button.1.dart
rename to packages/flutter/examples/api/lib/material/text_button/text_button.1.dart
diff --git a/examples/api/lib/material/text_field/text_field.0.dart b/packages/flutter/examples/api/lib/material/text_field/text_field.0.dart
similarity index 100%
rename from examples/api/lib/material/text_field/text_field.0.dart
rename to packages/flutter/examples/api/lib/material/text_field/text_field.0.dart
diff --git a/examples/api/lib/material/text_field/text_field.1.dart b/packages/flutter/examples/api/lib/material/text_field/text_field.1.dart
similarity index 100%
rename from examples/api/lib/material/text_field/text_field.1.dart
rename to packages/flutter/examples/api/lib/material/text_field/text_field.1.dart
diff --git a/examples/api/lib/material/text_field/text_field.2.dart b/packages/flutter/examples/api/lib/material/text_field/text_field.2.dart
similarity index 100%
rename from examples/api/lib/material/text_field/text_field.2.dart
rename to packages/flutter/examples/api/lib/material/text_field/text_field.2.dart
diff --git a/examples/api/lib/material/text_field/text_field.3.dart b/packages/flutter/examples/api/lib/material/text_field/text_field.3.dart
similarity index 100%
rename from examples/api/lib/material/text_field/text_field.3.dart
rename to packages/flutter/examples/api/lib/material/text_field/text_field.3.dart
diff --git a/examples/api/lib/material/text_form_field/text_form_field.1.dart b/packages/flutter/examples/api/lib/material/text_form_field/text_form_field.1.dart
similarity index 100%
rename from examples/api/lib/material/text_form_field/text_form_field.1.dart
rename to packages/flutter/examples/api/lib/material/text_form_field/text_form_field.1.dart
diff --git a/examples/api/lib/material/text_form_field/text_form_field.2.dart b/packages/flutter/examples/api/lib/material/text_form_field/text_form_field.2.dart
similarity index 100%
rename from examples/api/lib/material/text_form_field/text_form_field.2.dart
rename to packages/flutter/examples/api/lib/material/text_form_field/text_form_field.2.dart
diff --git a/examples/api/lib/material/theme/theme_extension.1.dart b/packages/flutter/examples/api/lib/material/theme/theme_extension.1.dart
similarity index 100%
rename from examples/api/lib/material/theme/theme_extension.1.dart
rename to packages/flutter/examples/api/lib/material/theme/theme_extension.1.dart
diff --git a/examples/api/lib/material/theme_data/theme_data.0.dart b/packages/flutter/examples/api/lib/material/theme_data/theme_data.0.dart
similarity index 100%
rename from examples/api/lib/material/theme_data/theme_data.0.dart
rename to packages/flutter/examples/api/lib/material/theme_data/theme_data.0.dart
diff --git a/examples/api/lib/material/time_picker/show_time_picker.0.dart b/packages/flutter/examples/api/lib/material/time_picker/show_time_picker.0.dart
similarity index 100%
rename from examples/api/lib/material/time_picker/show_time_picker.0.dart
rename to packages/flutter/examples/api/lib/material/time_picker/show_time_picker.0.dart
diff --git a/examples/api/lib/material/toggle_buttons/toggle_buttons.0.dart b/packages/flutter/examples/api/lib/material/toggle_buttons/toggle_buttons.0.dart
similarity index 100%
rename from examples/api/lib/material/toggle_buttons/toggle_buttons.0.dart
rename to packages/flutter/examples/api/lib/material/toggle_buttons/toggle_buttons.0.dart
diff --git a/examples/api/lib/material/toggle_buttons/toggle_buttons.1.dart b/packages/flutter/examples/api/lib/material/toggle_buttons/toggle_buttons.1.dart
similarity index 100%
rename from examples/api/lib/material/toggle_buttons/toggle_buttons.1.dart
rename to packages/flutter/examples/api/lib/material/toggle_buttons/toggle_buttons.1.dart
diff --git a/examples/api/lib/material/tooltip/tooltip.0.dart b/packages/flutter/examples/api/lib/material/tooltip/tooltip.0.dart
similarity index 100%
rename from examples/api/lib/material/tooltip/tooltip.0.dart
rename to packages/flutter/examples/api/lib/material/tooltip/tooltip.0.dart
diff --git a/examples/api/lib/material/tooltip/tooltip.1.dart b/packages/flutter/examples/api/lib/material/tooltip/tooltip.1.dart
similarity index 100%
rename from examples/api/lib/material/tooltip/tooltip.1.dart
rename to packages/flutter/examples/api/lib/material/tooltip/tooltip.1.dart
diff --git a/examples/api/lib/material/tooltip/tooltip.2.dart b/packages/flutter/examples/api/lib/material/tooltip/tooltip.2.dart
similarity index 100%
rename from examples/api/lib/material/tooltip/tooltip.2.dart
rename to packages/flutter/examples/api/lib/material/tooltip/tooltip.2.dart
diff --git a/examples/api/lib/material/tooltip/tooltip.3.dart b/packages/flutter/examples/api/lib/material/tooltip/tooltip.3.dart
similarity index 100%
rename from examples/api/lib/material/tooltip/tooltip.3.dart
rename to packages/flutter/examples/api/lib/material/tooltip/tooltip.3.dart
diff --git a/examples/api/lib/material/widget_state_input_border/widget_state_input_border.0.dart b/packages/flutter/examples/api/lib/material/widget_state_input_border/widget_state_input_border.0.dart
similarity index 100%
rename from examples/api/lib/material/widget_state_input_border/widget_state_input_border.0.dart
rename to packages/flutter/examples/api/lib/material/widget_state_input_border/widget_state_input_border.0.dart
diff --git a/examples/api/lib/painting/axis_direction/axis_direction.0.dart b/packages/flutter/examples/api/lib/painting/axis_direction/axis_direction.0.dart
similarity index 100%
rename from examples/api/lib/painting/axis_direction/axis_direction.0.dart
rename to packages/flutter/examples/api/lib/painting/axis_direction/axis_direction.0.dart
diff --git a/examples/api/lib/painting/borders/border_side.stroke_align.0.dart b/packages/flutter/examples/api/lib/painting/borders/border_side.stroke_align.0.dart
similarity index 100%
rename from examples/api/lib/painting/borders/border_side.stroke_align.0.dart
rename to packages/flutter/examples/api/lib/painting/borders/border_side.stroke_align.0.dart
diff --git a/examples/api/lib/painting/gradient/linear_gradient.0.dart b/packages/flutter/examples/api/lib/painting/gradient/linear_gradient.0.dart
similarity index 100%
rename from examples/api/lib/painting/gradient/linear_gradient.0.dart
rename to packages/flutter/examples/api/lib/painting/gradient/linear_gradient.0.dart
diff --git a/examples/api/lib/painting/image_provider/image_provider.0.dart b/packages/flutter/examples/api/lib/painting/image_provider/image_provider.0.dart
similarity index 100%
rename from examples/api/lib/painting/image_provider/image_provider.0.dart
rename to packages/flutter/examples/api/lib/painting/image_provider/image_provider.0.dart
diff --git a/examples/api/lib/painting/linear_border/linear_border.0.dart b/packages/flutter/examples/api/lib/painting/linear_border/linear_border.0.dart
similarity index 100%
rename from examples/api/lib/painting/linear_border/linear_border.0.dart
rename to packages/flutter/examples/api/lib/painting/linear_border/linear_border.0.dart
diff --git a/examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart b/packages/flutter/examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart
similarity index 100%
rename from examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart
rename to packages/flutter/examples/api/lib/painting/rounded_superellipse_border/rounded_superellipse_border.0.dart
diff --git a/examples/api/lib/painting/star_border/star_border.0.dart b/packages/flutter/examples/api/lib/painting/star_border/star_border.0.dart
similarity index 100%
rename from examples/api/lib/painting/star_border/star_border.0.dart
rename to packages/flutter/examples/api/lib/painting/star_border/star_border.0.dart
diff --git a/examples/api/lib/rendering/box/parent_data.0.dart b/packages/flutter/examples/api/lib/rendering/box/parent_data.0.dart
similarity index 100%
rename from examples/api/lib/rendering/box/parent_data.0.dart
rename to packages/flutter/examples/api/lib/rendering/box/parent_data.0.dart
diff --git a/examples/api/lib/rendering/growth_direction/growth_direction.0.dart b/packages/flutter/examples/api/lib/rendering/growth_direction/growth_direction.0.dart
similarity index 100%
rename from examples/api/lib/rendering/growth_direction/growth_direction.0.dart
rename to packages/flutter/examples/api/lib/rendering/growth_direction/growth_direction.0.dart
diff --git a/examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart b/packages/flutter/examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart
similarity index 100%
rename from examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart
rename to packages/flutter/examples/api/lib/rendering/scroll_direction/scroll_direction.0.dart
diff --git a/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart b/packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart
similarity index 100%
rename from examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart
rename to packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0.dart
diff --git a/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart b/packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart
similarity index 100%
rename from examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart
rename to packages/flutter/examples/api/lib/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1.dart
diff --git a/examples/api/lib/sample_templates/cupertino.0.dart b/packages/flutter/examples/api/lib/sample_templates/cupertino.0.dart
similarity index 100%
rename from examples/api/lib/sample_templates/cupertino.0.dart
rename to packages/flutter/examples/api/lib/sample_templates/cupertino.0.dart
diff --git a/examples/api/lib/sample_templates/material.0.dart b/packages/flutter/examples/api/lib/sample_templates/material.0.dart
similarity index 100%
rename from examples/api/lib/sample_templates/material.0.dart
rename to packages/flutter/examples/api/lib/sample_templates/material.0.dart
diff --git a/examples/api/lib/sample_templates/widgets.0.dart b/packages/flutter/examples/api/lib/sample_templates/widgets.0.dart
similarity index 100%
rename from examples/api/lib/sample_templates/widgets.0.dart
rename to packages/flutter/examples/api/lib/sample_templates/widgets.0.dart
diff --git a/examples/api/lib/services/binding/handle_request_app_exit.0.dart b/packages/flutter/examples/api/lib/services/binding/handle_request_app_exit.0.dart
similarity index 100%
rename from examples/api/lib/services/binding/handle_request_app_exit.0.dart
rename to packages/flutter/examples/api/lib/services/binding/handle_request_app_exit.0.dart
diff --git a/examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart b/packages/flutter/examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart
similarity index 100%
rename from examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart
rename to packages/flutter/examples/api/lib/services/keyboard_key/logical_keyboard_key.0.dart
diff --git a/examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart b/packages/flutter/examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart
similarity index 100%
rename from examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart
rename to packages/flutter/examples/api/lib/services/keyboard_key/physical_keyboard_key.0.dart
diff --git a/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart b/packages/flutter/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
similarity index 100%
rename from examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
rename to packages/flutter/examples/api/lib/services/mouse_cursor/mouse_cursor.0.dart
diff --git a/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart b/packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart
similarity index 100%
rename from examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart
rename to packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0.dart
diff --git a/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart b/packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart
similarity index 100%
rename from examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart
rename to packages/flutter/examples/api/lib/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1.dart
diff --git a/examples/api/lib/services/text_input/text_input_control.0.dart b/packages/flutter/examples/api/lib/services/text_input/text_input_control.0.dart
similarity index 100%
rename from examples/api/lib/services/text_input/text_input_control.0.dart
rename to packages/flutter/examples/api/lib/services/text_input/text_input_control.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_alternative.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_alternative.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_alternative.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_alternative.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_alternative_fractions.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_alternative_fractions.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_alternative_fractions.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_alternative_fractions.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_case_sensitive_forms.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_case_sensitive_forms.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_case_sensitive_forms.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_case_sensitive_forms.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_character_variant.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_character_variant.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_character_variant.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_character_variant.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_contextual_alternates.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_contextual_alternates.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_contextual_alternates.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_contextual_alternates.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_denominator.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_denominator.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_denominator.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_denominator.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_fractions.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_fractions.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_fractions.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_fractions.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_historical_forms.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_historical_forms.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_historical_forms.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_historical_forms.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_historical_ligatures.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_historical_ligatures.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_historical_ligatures.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_historical_ligatures.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_lining_figures.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_lining_figures.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_lining_figures.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_lining_figures.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_locale_aware.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_notational_forms.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_notational_forms.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_notational_forms.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_notational_forms.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_numerators.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_numerators.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_numerators.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_numerators.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_oldstyle_figures.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_oldstyle_figures.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_oldstyle_figures.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_oldstyle_figures.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_ordinal_forms.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_ordinal_forms.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_ordinal_forms.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_ordinal_forms.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_proportional_figures.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_proportional_figures.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_proportional_figures.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_proportional_figures.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_scientific_inferiors.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_scientific_inferiors.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_scientific_inferiors.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_scientific_inferiors.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_slashed_zero.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_slashed_zero.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_slashed_zero.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_slashed_zero.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_stylistic_alternates.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_alternates.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_stylistic_alternates.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_alternates.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.1.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.1.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.1.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_stylistic_set.1.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_subscripts.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_subscripts.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_subscripts.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_subscripts.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_superscripts.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_superscripts.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_superscripts.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_superscripts.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_swash.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_swash.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_swash.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_swash.0.dart
diff --git a/examples/api/lib/ui/text/font_feature.font_feature_tabular_figures.0.dart b/packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_tabular_figures.0.dart
similarity index 100%
rename from examples/api/lib/ui/text/font_feature.font_feature_tabular_figures.0.dart
rename to packages/flutter/examples/api/lib/ui/text/font_feature.font_feature_tabular_figures.0.dart
diff --git a/examples/api/lib/widgets/actions/action.action_overridable.0.dart b/packages/flutter/examples/api/lib/widgets/actions/action.action_overridable.0.dart
similarity index 100%
rename from examples/api/lib/widgets/actions/action.action_overridable.0.dart
rename to packages/flutter/examples/api/lib/widgets/actions/action.action_overridable.0.dart
diff --git a/examples/api/lib/widgets/actions/action_listener.0.dart b/packages/flutter/examples/api/lib/widgets/actions/action_listener.0.dart
similarity index 100%
rename from examples/api/lib/widgets/actions/action_listener.0.dart
rename to packages/flutter/examples/api/lib/widgets/actions/action_listener.0.dart
diff --git a/examples/api/lib/widgets/actions/actions.0.dart b/packages/flutter/examples/api/lib/widgets/actions/actions.0.dart
similarity index 100%
rename from examples/api/lib/widgets/actions/actions.0.dart
rename to packages/flutter/examples/api/lib/widgets/actions/actions.0.dart
diff --git a/examples/api/lib/widgets/actions/focusable_action_detector.0.dart b/packages/flutter/examples/api/lib/widgets/actions/focusable_action_detector.0.dart
similarity index 100%
rename from examples/api/lib/widgets/actions/focusable_action_detector.0.dart
rename to packages/flutter/examples/api/lib/widgets/actions/focusable_action_detector.0.dart
diff --git a/examples/api/lib/widgets/animated_grid/animated_grid.0.dart b/packages/flutter/examples/api/lib/widgets/animated_grid/animated_grid.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_grid/animated_grid.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_grid/animated_grid.0.dart
diff --git a/examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart b/packages/flutter/examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_grid/sliver_animated_grid.0.dart
diff --git a/examples/api/lib/widgets/animated_list/animated_list.0.dart b/packages/flutter/examples/api/lib/widgets/animated_list/animated_list.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_list/animated_list.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_list/animated_list.0.dart
diff --git a/examples/api/lib/widgets/animated_list/animated_list_separated.0.dart b/packages/flutter/examples/api/lib/widgets/animated_list/animated_list_separated.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_list/animated_list_separated.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_list/animated_list_separated.0.dart
diff --git a/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart b/packages/flutter/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_list/sliver_animated_list.0.dart
diff --git a/examples/api/lib/widgets/animated_size/animated_size.0.dart b/packages/flutter/examples/api/lib/widgets/animated_size/animated_size.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_size/animated_size.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_size/animated_size.0.dart
diff --git a/examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart b/packages/flutter/examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart
similarity index 100%
rename from examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart
rename to packages/flutter/examples/api/lib/widgets/animated_switcher/animated_switcher.0.dart
diff --git a/examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart b/packages/flutter/examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart
similarity index 100%
rename from examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart
rename to packages/flutter/examples/api/lib/widgets/app/widgets_app.widgets_app.0.dart
diff --git a/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart b/packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart
similarity index 100%
rename from examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart
rename to packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.0.dart
diff --git a/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart b/packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart
similarity index 100%
rename from examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart
rename to packages/flutter/examples/api/lib/widgets/app_lifecycle_listener/app_lifecycle_listener.1.dart
diff --git a/examples/api/lib/widgets/async/future_builder.0.dart b/packages/flutter/examples/api/lib/widgets/async/future_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/async/future_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/async/future_builder.0.dart
diff --git a/examples/api/lib/widgets/async/stream_builder.0.dart b/packages/flutter/examples/api/lib/widgets/async/stream_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/async/stream_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/async/stream_builder.0.dart
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart b/packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
similarity index 100%
rename from examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
rename to packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.0.dart
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart b/packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
similarity index 100%
rename from examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
rename to packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.1.dart
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart b/packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
similarity index 100%
rename from examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
rename to packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.2.dart
diff --git a/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart b/packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
similarity index 100%
rename from examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
rename to packages/flutter/examples/api/lib/widgets/autocomplete/raw_autocomplete.focus_node.0.dart
diff --git a/examples/api/lib/widgets/autofill/autofill_group.0.dart b/packages/flutter/examples/api/lib/widgets/autofill/autofill_group.0.dart
similarity index 100%
rename from examples/api/lib/widgets/autofill/autofill_group.0.dart
rename to packages/flutter/examples/api/lib/widgets/autofill/autofill_group.0.dart
diff --git a/examples/api/lib/widgets/basic/absorb_pointer.0.dart b/packages/flutter/examples/api/lib/widgets/basic/absorb_pointer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/absorb_pointer.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/absorb_pointer.0.dart
diff --git a/examples/api/lib/widgets/basic/aspect_ratio.0.dart b/packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/aspect_ratio.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.0.dart
diff --git a/examples/api/lib/widgets/basic/aspect_ratio.1.dart b/packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.1.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/aspect_ratio.1.dart
rename to packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.1.dart
diff --git a/examples/api/lib/widgets/basic/aspect_ratio.2.dart b/packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.2.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/aspect_ratio.2.dart
rename to packages/flutter/examples/api/lib/widgets/basic/aspect_ratio.2.dart
diff --git a/examples/api/lib/widgets/basic/clip_rrect.0.dart b/packages/flutter/examples/api/lib/widgets/basic/clip_rrect.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/clip_rrect.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/clip_rrect.0.dart
diff --git a/examples/api/lib/widgets/basic/clip_rrect.1.dart b/packages/flutter/examples/api/lib/widgets/basic/clip_rrect.1.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/clip_rrect.1.dart
rename to packages/flutter/examples/api/lib/widgets/basic/clip_rrect.1.dart
diff --git a/examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart b/packages/flutter/examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/custom_multi_child_layout.0.dart
diff --git a/examples/api/lib/widgets/basic/expanded.0.dart b/packages/flutter/examples/api/lib/widgets/basic/expanded.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/expanded.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/expanded.0.dart
diff --git a/examples/api/lib/widgets/basic/expanded.1.dart b/packages/flutter/examples/api/lib/widgets/basic/expanded.1.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/expanded.1.dart
rename to packages/flutter/examples/api/lib/widgets/basic/expanded.1.dart
diff --git a/examples/api/lib/widgets/basic/fitted_box.0.dart b/packages/flutter/examples/api/lib/widgets/basic/fitted_box.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/fitted_box.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/fitted_box.0.dart
diff --git a/examples/api/lib/widgets/basic/flow.0.dart b/packages/flutter/examples/api/lib/widgets/basic/flow.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/flow.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/flow.0.dart
diff --git a/examples/api/lib/widgets/basic/fractionally_sized_box.0.dart b/packages/flutter/examples/api/lib/widgets/basic/fractionally_sized_box.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/fractionally_sized_box.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/fractionally_sized_box.0.dart
diff --git a/examples/api/lib/widgets/basic/ignore_pointer.0.dart b/packages/flutter/examples/api/lib/widgets/basic/ignore_pointer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/ignore_pointer.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/ignore_pointer.0.dart
diff --git a/examples/api/lib/widgets/basic/indexed_stack.0.dart b/packages/flutter/examples/api/lib/widgets/basic/indexed_stack.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/indexed_stack.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/indexed_stack.0.dart
diff --git a/examples/api/lib/widgets/basic/listener.0.dart b/packages/flutter/examples/api/lib/widgets/basic/listener.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/listener.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/listener.0.dart
diff --git a/examples/api/lib/widgets/basic/mouse_region.0.dart b/packages/flutter/examples/api/lib/widgets/basic/mouse_region.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/mouse_region.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/mouse_region.0.dart
diff --git a/examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart b/packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.0.dart
diff --git a/examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart b/packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart
rename to packages/flutter/examples/api/lib/widgets/basic/mouse_region.on_exit.1.dart
diff --git a/examples/api/lib/widgets/basic/offstage.0.dart b/packages/flutter/examples/api/lib/widgets/basic/offstage.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/offstage.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/offstage.0.dart
diff --git a/examples/api/lib/widgets/basic/overflowbox.0.dart b/packages/flutter/examples/api/lib/widgets/basic/overflowbox.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/overflowbox.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/overflowbox.0.dart
diff --git a/examples/api/lib/widgets/basic/physical_shape.0.dart b/packages/flutter/examples/api/lib/widgets/basic/physical_shape.0.dart
similarity index 100%
rename from examples/api/lib/widgets/basic/physical_shape.0.dart
rename to packages/flutter/examples/api/lib/widgets/basic/physical_shape.0.dart
diff --git a/examples/api/lib/widgets/binding/widget_binding_observer.0.dart b/packages/flutter/examples/api/lib/widgets/binding/widget_binding_observer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/binding/widget_binding_observer.0.dart
rename to packages/flutter/examples/api/lib/widgets/binding/widget_binding_observer.0.dart
diff --git a/examples/api/lib/widgets/color_filter/color_filtered.0.dart b/packages/flutter/examples/api/lib/widgets/color_filter/color_filtered.0.dart
similarity index 100%
rename from examples/api/lib/widgets/color_filter/color_filtered.0.dart
rename to packages/flutter/examples/api/lib/widgets/color_filter/color_filtered.0.dart
diff --git a/examples/api/lib/material/context_menu/context_menu_controller.0.dart b/packages/flutter/examples/api/lib/widgets/context_menu/context_menu_controller.0.dart
similarity index 100%
rename from examples/api/lib/material/context_menu/context_menu_controller.0.dart
rename to packages/flutter/examples/api/lib/widgets/context_menu/context_menu_controller.0.dart
diff --git a/examples/api/lib/material/context_menu/editable_text_toolbar_builder.0.dart b/packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.0.dart
similarity index 89%
rename from examples/api/lib/material/context_menu/editable_text_toolbar_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.0.dart
index 8e7615b395f37..fbe6e9f6ad9aa 100644
--- a/examples/api/lib/material/context_menu/editable_text_toolbar_builder.0.dart
+++ b/packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.0.dart
@@ -22,10 +22,7 @@ class EditableTextToolbarBuilderExampleApp extends StatefulWidget {
 
 class _EditableTextToolbarBuilderExampleAppState
     extends State<EditableTextToolbarBuilderExampleApp> {
-  final TextEditingController _controller = TextEditingController(
-    text:
-        'Right click (desktop) or long press (mobile) to see the menu with custom buttons.',
-  );
+  late final TextEditingController _controller;
 
   @override
   void initState() {
@@ -35,10 +32,15 @@ class _EditableTextToolbarBuilderExampleAppState
     if (kIsWeb) {
       BrowserContextMenu.disableContextMenu();
     }
+    _controller = TextEditingController(
+      text:
+          'Right click (desktop) or long press (mobile) to see the menu with custom buttons.',
+    );
   }
 
   @override
   void dispose() {
+    _controller.dispose();
     if (kIsWeb) {
       BrowserContextMenu.enableContextMenu();
     }
@@ -70,8 +72,8 @@ class _EditableTextToolbarBuilderExampleAppState
                           ContextMenuButtonItem buttonItem,
                         ) {
                           return CupertinoButton(
-                            color: const Color(0xffaaaa00),
-                            disabledColor: const Color(0xffaaaaff),
+                            color: const Color(0xFFAAAA00),
+                            disabledColor: const Color(0xFFAAAAFF),
                             onPressed: buttonItem.onPressed,
                             padding: const .all(10.0),
                             pressedOpacity: 0.7,
diff --git a/examples/api/lib/material/context_menu/editable_text_toolbar_builder.1.dart b/packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.1.dart
similarity index 94%
rename from examples/api/lib/material/context_menu/editable_text_toolbar_builder.1.dart
rename to packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.1.dart
index 5e227460111ce..a21ebeef426f0 100644
--- a/examples/api/lib/material/context_menu/editable_text_toolbar_builder.1.dart
+++ b/packages/flutter/examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.1.dart
@@ -24,7 +24,7 @@ class EditableTextToolbarBuilderExampleApp extends StatefulWidget {
 
 class _EditableTextToolbarBuilderExampleAppState
     extends State<EditableTextToolbarBuilderExampleApp> {
-  final TextEditingController _controller = TextEditingController(text: text);
+  late final TextEditingController _controller;
 
   void _showDialog(BuildContext context) {
     Navigator.of(context).push(
@@ -44,10 +44,12 @@ class _EditableTextToolbarBuilderExampleAppState
     if (kIsWeb) {
       BrowserContextMenu.disableContextMenu();
     }
+    _controller = TextEditingController(text: text);
   }
 
   @override
   void dispose() {
+    _controller.dispose();
     if (kIsWeb) {
       BrowserContextMenu.enableContextMenu();
     }
@@ -75,7 +77,7 @@ class _EditableTextToolbarBuilderExampleAppState
                       // Here we add an "Email" button to the default TextField
                       // context menu for the current platform, but only if an email
                       // address is currently selected.
-                      final TextEditingValue value = _controller.value;
+                      final TextEditingValue value = editableTextState.textEditingValue;
                       if (_isValidEmail(
                         value.selection.textInside(value.text),
                       )) {
diff --git a/examples/api/lib/widgets/dismissible/dismissible.0.dart b/packages/flutter/examples/api/lib/widgets/dismissible/dismissible.0.dart
similarity index 100%
rename from examples/api/lib/widgets/dismissible/dismissible.0.dart
rename to packages/flutter/examples/api/lib/widgets/dismissible/dismissible.0.dart
diff --git a/examples/api/lib/widgets/drag_target/draggable.0.dart b/packages/flutter/examples/api/lib/widgets/drag_target/draggable.0.dart
similarity index 100%
rename from examples/api/lib/widgets/drag_target/draggable.0.dart
rename to packages/flutter/examples/api/lib/widgets/drag_target/draggable.0.dart
diff --git a/examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart b/packages/flutter/examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart
similarity index 100%
rename from examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart
rename to packages/flutter/examples/api/lib/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0.dart
diff --git a/examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart b/packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart
similarity index 100%
rename from examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart
rename to packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_changed.0.dart
diff --git a/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart b/packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart
similarity index 100%
rename from examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart
rename to packages/flutter/examples/api/lib/widgets/editable_text/editable_text.on_content_inserted.0.dart
diff --git a/examples/api/lib/widgets/editable_text/text_editing_controller.0.dart b/packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.0.dart
similarity index 100%
rename from examples/api/lib/widgets/editable_text/text_editing_controller.0.dart
rename to packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.0.dart
diff --git a/examples/api/lib/widgets/editable_text/text_editing_controller.1.dart b/packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.1.dart
similarity index 100%
rename from examples/api/lib/widgets/editable_text/text_editing_controller.1.dart
rename to packages/flutter/examples/api/lib/widgets/editable_text/text_editing_controller.1.dart
diff --git a/examples/api/lib/material/expansible/expansible.0.dart b/packages/flutter/examples/api/lib/widgets/expansible/expansible.0.dart
similarity index 100%
rename from examples/api/lib/material/expansible/expansible.0.dart
rename to packages/flutter/examples/api/lib/widgets/expansible/expansible.0.dart
diff --git a/examples/api/lib/widgets/focus_manager/focus_node.0.dart b/packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.0.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_manager/focus_node.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.0.dart
diff --git a/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart b/packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_manager/focus_node.unfocus.0.dart
diff --git a/examples/api/lib/widgets/focus_scope/focus.0.dart b/packages/flutter/examples/api/lib/widgets/focus_scope/focus.0.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_scope/focus.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_scope/focus.0.dart
diff --git a/examples/api/lib/widgets/focus_scope/focus.1.dart b/packages/flutter/examples/api/lib/widgets/focus_scope/focus.1.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_scope/focus.1.dart
rename to packages/flutter/examples/api/lib/widgets/focus_scope/focus.1.dart
diff --git a/examples/api/lib/widgets/focus_scope/focus.2.dart b/packages/flutter/examples/api/lib/widgets/focus_scope/focus.2.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_scope/focus.2.dart
rename to packages/flutter/examples/api/lib/widgets/focus_scope/focus.2.dart
diff --git a/examples/api/lib/widgets/focus_scope/focus_scope.0.dart b/packages/flutter/examples/api/lib/widgets/focus_scope/focus_scope.0.dart
similarity index 100%
rename from examples/api/lib/widgets/focus_scope/focus_scope.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_scope/focus_scope.0.dart
diff --git a/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart b/packages/flutter/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart
similarity index 82%
rename from examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart
index 2b8d871d85503..0571239db3c18 100644
--- a/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart
+++ b/packages/flutter/examples/api/lib/widgets/focus_traversal/focus_traversal_group.0.dart
@@ -43,10 +43,7 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
   @override
   void initState() {
     super.initState();
-    focusNode = FocusNode(
-      debugLabel: widget.name,
-      canRequestFocus: widget.canRequestFocus,
-    );
+    focusNode = FocusNode(debugLabel: widget.name, canRequestFocus: widget.canRequestFocus);
   }
 
   @override
@@ -70,8 +67,8 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
   @override
   Widget build(BuildContext context) {
     final FocusOrder order = switch (widget.order) {
-      final num number => NumericFocusOrder(number.toDouble()),
-      final Object? object => LexicalFocusOrder(object.toString()),
+      final num number => .numeric(number.toDouble()),
+      final Object? object => .lexical(object.toString()),
     };
 
     return FocusTraversalOrder(
@@ -85,19 +82,13 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
             overlayColor: WidgetStateProperty<Color?>.fromMap(
               // If neither of these states is active, the property will
               // resolve to null, deferring to the default overlay color.
-              <WidgetState, Color>{
-                WidgetState.focused: Colors.red,
-                WidgetState.hovered: Colors.blue,
-              },
+              <WidgetState, Color>{.focused: Colors.red, .hovered: Colors.blue},
             ),
             foregroundColor: WidgetStateProperty<Color?>.fromMap(
               // "WidgetState.focused | WidgetState.hovered" could be used
               // instead of separate map keys, but this setup allows setting
               // the button style to a constant value for improved efficiency.
-              <WidgetState, Color>{
-                WidgetState.focused: Colors.white,
-                WidgetState.hovered: Colors.white,
-              },
+              <WidgetState, Color>{.focused: Colors.white, .hovered: Colors.white},
             ),
           ),
           onPressed: () => _handleOnPressed(),
@@ -141,13 +132,8 @@ class FocusTraversalGroupExample extends StatelessWidget {
                 mainAxisAlignment: .center,
                 children: List<Widget>.generate(3, (int index) {
                   // Order as "C" "B", "A".
-                  final String order = String.fromCharCode(
-                    'A'.codeUnitAt(0) + (2 - index),
-                  );
-                  return OrderedButton<String>(
-                    name: 'String: $order',
-                    order: order,
-                  );
+                  final String order = String.fromCharCode('A'.codeUnitAt(0) + (2 - index));
+                  return OrderedButton<String>(name: 'String: $order', order: order);
                 }),
               ),
             ),
@@ -162,10 +148,7 @@ class FocusTraversalGroupExample extends StatelessWidget {
               child: Row(
                 mainAxisAlignment: .center,
                 children: List<Widget>.generate(3, (int index) {
-                  return OrderedButton<num>(
-                    name: 'ignored num: ${3 - index}',
-                    order: 3 - index,
-                  );
+                  return OrderedButton<num>(name: 'ignored num: ${3 - index}', order: 3 - index);
                 }),
               ),
             ),
diff --git a/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart b/packages/flutter/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart
similarity index 87%
rename from examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart
rename to packages/flutter/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart
index bc07cf2a382e6..cec083faa4478 100644
--- a/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart
+++ b/packages/flutter/examples/api/lib/widgets/focus_traversal/ordered_traversal_policy.0.dart
@@ -23,12 +23,7 @@ class OrderedTraversalPolicyExampleApp extends StatelessWidget {
 }
 
 class DemoButton extends StatelessWidget {
-  const DemoButton({
-    super.key,
-    required this.name,
-    this.autofocus = false,
-    required this.order,
-  });
+  const DemoButton({super.key, required this.name, this.autofocus = false, required this.order});
 
   final String name;
   final bool autofocus;
@@ -42,12 +37,8 @@ class DemoButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FocusTraversalOrder(
-      order: NumericFocusOrder(order),
-      child: TextButton(
-        autofocus: autofocus,
-        onPressed: () => _handleOnPressed(),
-        child: Text(name),
-      ),
+      order: .numeric(order),
+      child: TextButton(autofocus: autofocus, onPressed: () => _handleOnPressed(), child: Text(name)),
     );
   }
 }
diff --git a/examples/api/lib/widgets/form/form.0.dart b/packages/flutter/examples/api/lib/widgets/form/form.0.dart
similarity index 100%
rename from examples/api/lib/widgets/form/form.0.dart
rename to packages/flutter/examples/api/lib/widgets/form/form.0.dart
diff --git a/examples/api/lib/widgets/form/form.1.dart b/packages/flutter/examples/api/lib/widgets/form/form.1.dart
similarity index 100%
rename from examples/api/lib/widgets/form/form.1.dart
rename to packages/flutter/examples/api/lib/widgets/form/form.1.dart
diff --git a/examples/api/lib/widgets/framework/build_owner.0.dart b/packages/flutter/examples/api/lib/widgets/framework/build_owner.0.dart
similarity index 100%
rename from examples/api/lib/widgets/framework/build_owner.0.dart
rename to packages/flutter/examples/api/lib/widgets/framework/build_owner.0.dart
diff --git a/examples/api/lib/widgets/framework/error_widget.0.dart b/packages/flutter/examples/api/lib/widgets/framework/error_widget.0.dart
similarity index 100%
rename from examples/api/lib/widgets/framework/error_widget.0.dart
rename to packages/flutter/examples/api/lib/widgets/framework/error_widget.0.dart
diff --git a/examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart b/packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart
similarity index 100%
rename from examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart
rename to packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.0.dart
diff --git a/examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart b/packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart
similarity index 100%
rename from examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart
rename to packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.1.dart
diff --git a/examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart b/packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart
similarity index 100%
rename from examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart
rename to packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.2.dart
diff --git a/examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart b/packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart
similarity index 100%
rename from examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart
rename to packages/flutter/examples/api/lib/widgets/gesture_detector/gesture_detector.3.dart
diff --git a/examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart b/packages/flutter/examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart
similarity index 100%
rename from examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart
rename to packages/flutter/examples/api/lib/widgets/hardware_keyboard/key_event_manager.0.dart
diff --git a/examples/api/lib/widgets/heroes/hero.0.dart b/packages/flutter/examples/api/lib/widgets/heroes/hero.0.dart
similarity index 100%
rename from examples/api/lib/widgets/heroes/hero.0.dart
rename to packages/flutter/examples/api/lib/widgets/heroes/hero.0.dart
diff --git a/examples/api/lib/widgets/heroes/hero.1.dart b/packages/flutter/examples/api/lib/widgets/heroes/hero.1.dart
similarity index 100%
rename from examples/api/lib/widgets/heroes/hero.1.dart
rename to packages/flutter/examples/api/lib/widgets/heroes/hero.1.dart
diff --git a/examples/api/lib/widgets/image/image.error_builder.0.dart b/packages/flutter/examples/api/lib/widgets/image/image.error_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/image/image.error_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/image/image.error_builder.0.dart
diff --git a/examples/api/lib/widgets/image/image.frame_builder.0.dart b/packages/flutter/examples/api/lib/widgets/image/image.frame_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/image/image.frame_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/image/image.frame_builder.0.dart
diff --git a/examples/api/lib/widgets/image/image.loading_builder.0.dart b/packages/flutter/examples/api/lib/widgets/image/image.loading_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/image/image.loading_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/image/image.loading_builder.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_align.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_align.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_align.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_align.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_container.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_container.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_container.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_container.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_fractionally_sized_box.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_padding.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_padding.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_padding.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_padding.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_positioned.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/animated_slide.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/animated_slide.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/animated_slide.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/animated_slide.0.dart
diff --git a/examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart b/packages/flutter/examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart
similarity index 100%
rename from examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart
rename to packages/flutter/examples/api/lib/widgets/implicit_animations/sliver_animated_opacity.0.dart
diff --git a/examples/api/lib/widgets/inherited_model/inherited_model.0.dart b/packages/flutter/examples/api/lib/widgets/inherited_model/inherited_model.0.dart
similarity index 100%
rename from examples/api/lib/widgets/inherited_model/inherited_model.0.dart
rename to packages/flutter/examples/api/lib/widgets/inherited_model/inherited_model.0.dart
diff --git a/examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart b/packages/flutter/examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart
similarity index 100%
rename from examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart
rename to packages/flutter/examples/api/lib/widgets/inherited_notifier/inherited_notifier.0.dart
diff --git a/examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart b/packages/flutter/examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart
similarity index 100%
rename from examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart
rename to packages/flutter/examples/api/lib/widgets/inherited_theme/inherited_theme.0.dart
diff --git a/examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart b/packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart
rename to packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.0.dart
diff --git a/examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart b/packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.builder.0.dart
diff --git a/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart b/packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart
similarity index 100%
rename from examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart
rename to packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart
diff --git a/examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart b/packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart
similarity index 100%
rename from examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart
rename to packages/flutter/examples/api/lib/widgets/interactive_viewer/interactive_viewer.transformation_controller.0.dart
diff --git a/examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart b/packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart
similarity index 100%
rename from examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart
rename to packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive.0.dart
diff --git a/examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart b/packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart
similarity index 100%
rename from examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart
rename to packages/flutter/examples/api/lib/widgets/keep_alive/automatic_keep_alive_client_mixin.0.dart
diff --git a/examples/api/lib/widgets/keep_alive/keep_alive.0.dart b/packages/flutter/examples/api/lib/widgets/keep_alive/keep_alive.0.dart
similarity index 100%
rename from examples/api/lib/widgets/keep_alive/keep_alive.0.dart
rename to packages/flutter/examples/api/lib/widgets/keep_alive/keep_alive.0.dart
diff --git a/examples/api/lib/widgets/layout_builder/layout_builder.0.dart b/packages/flutter/examples/api/lib/widgets/layout_builder/layout_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/layout_builder/layout_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/layout_builder/layout_builder.0.dart
diff --git a/examples/api/lib/widgets/magnifier/magnifier.0.dart b/packages/flutter/examples/api/lib/widgets/magnifier/magnifier.0.dart
similarity index 100%
rename from examples/api/lib/widgets/magnifier/magnifier.0.dart
rename to packages/flutter/examples/api/lib/widgets/magnifier/magnifier.0.dart
diff --git a/examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart b/packages/flutter/examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart
similarity index 100%
rename from examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart
rename to packages/flutter/examples/api/lib/widgets/media_query/media_query_data.system_gesture_insets.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_and_remove_until.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator.restorable_push_replacement.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_and_remove_until.0.dart
diff --git a/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/navigator_state.restorable_push_replacement.0.dart
diff --git a/examples/api/lib/widgets/navigator/restorable_route_future.0.dart b/packages/flutter/examples/api/lib/widgets/navigator/restorable_route_future.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator/restorable_route_future.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator/restorable_route_future.0.dart
diff --git a/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart b/packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart
rename to packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.0.dart
diff --git a/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart b/packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart
similarity index 100%
rename from examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart
rename to packages/flutter/examples/api/lib/widgets/navigator_pop_handler/navigator_pop_handler.1.dart
diff --git a/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart b/packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart
similarity index 100%
rename from examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart
rename to packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart
diff --git a/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart b/packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart
similarity index 100%
rename from examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart
rename to packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.1.dart
diff --git a/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart b/packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart
similarity index 100%
rename from examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart
rename to packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.2.dart
diff --git a/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart b/packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart
similarity index 100%
rename from examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart
rename to packages/flutter/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view_state.0.dart
diff --git a/examples/api/lib/widgets/notification_listener/notification.0.dart b/packages/flutter/examples/api/lib/widgets/notification_listener/notification.0.dart
similarity index 100%
rename from examples/api/lib/widgets/notification_listener/notification.0.dart
rename to packages/flutter/examples/api/lib/widgets/notification_listener/notification.0.dart
diff --git a/examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart b/packages/flutter/examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart
similarity index 100%
rename from examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart
rename to packages/flutter/examples/api/lib/widgets/overflow_bar/overflow_bar.0.dart
diff --git a/examples/api/lib/widgets/overlay/overlay.0.dart b/packages/flutter/examples/api/lib/widgets/overlay/overlay.0.dart
similarity index 100%
rename from examples/api/lib/widgets/overlay/overlay.0.dart
rename to packages/flutter/examples/api/lib/widgets/overlay/overlay.0.dart
diff --git a/examples/api/lib/widgets/overlay/overlay_portal.0.dart b/packages/flutter/examples/api/lib/widgets/overlay/overlay_portal.0.dart
similarity index 100%
rename from examples/api/lib/widgets/overlay/overlay_portal.0.dart
rename to packages/flutter/examples/api/lib/widgets/overlay/overlay_portal.0.dart
diff --git a/examples/api/lib/widgets/overlay/overlay_portal.1.dart b/packages/flutter/examples/api/lib/widgets/overlay/overlay_portal.1.dart
similarity index 100%
rename from examples/api/lib/widgets/overlay/overlay_portal.1.dart
rename to packages/flutter/examples/api/lib/widgets/overlay/overlay_portal.1.dart
diff --git a/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart b/packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart
similarity index 100%
rename from examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart
rename to packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.0.dart
diff --git a/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart b/packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart
similarity index 100%
rename from examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart
rename to packages/flutter/examples/api/lib/widgets/overscroll_indicator/glowing_overscroll_indicator.1.dart
diff --git a/examples/api/lib/widgets/page/page_can_pop.0.dart b/packages/flutter/examples/api/lib/widgets/page/page_can_pop.0.dart
similarity index 100%
rename from examples/api/lib/widgets/page/page_can_pop.0.dart
rename to packages/flutter/examples/api/lib/widgets/page/page_can_pop.0.dart
diff --git a/examples/api/lib/widgets/page_storage/page_storage.0.dart b/packages/flutter/examples/api/lib/widgets/page_storage/page_storage.0.dart
similarity index 100%
rename from examples/api/lib/widgets/page_storage/page_storage.0.dart
rename to packages/flutter/examples/api/lib/widgets/page_storage/page_storage.0.dart
diff --git a/examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart b/packages/flutter/examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/page_transitions_builder/page_transitions_builder.0.dart
diff --git a/examples/api/lib/widgets/page_view/page_view.0.dart b/packages/flutter/examples/api/lib/widgets/page_view/page_view.0.dart
similarity index 100%
rename from examples/api/lib/widgets/page_view/page_view.0.dart
rename to packages/flutter/examples/api/lib/widgets/page_view/page_view.0.dart
diff --git a/examples/api/lib/widgets/page_view/page_view.1.dart b/packages/flutter/examples/api/lib/widgets/page_view/page_view.1.dart
similarity index 100%
rename from examples/api/lib/widgets/page_view/page_view.1.dart
rename to packages/flutter/examples/api/lib/widgets/page_view/page_view.1.dart
diff --git a/examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart b/packages/flutter/examples/api/lib/widgets/platform_menu_bar/platform_menu_bar.0.dart
similarity index 100%
rename from examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart
rename to packages/flutter/examples/api/lib/widgets/platform_menu_bar/platform_menu_bar.0.dart
diff --git a/examples/api/lib/widgets/pop_scope/pop_scope.0.dart b/packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.0.dart
similarity index 100%
rename from examples/api/lib/widgets/pop_scope/pop_scope.0.dart
rename to packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.0.dart
diff --git a/examples/api/lib/widgets/pop_scope/pop_scope.1.dart b/packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.1.dart
similarity index 100%
rename from examples/api/lib/widgets/pop_scope/pop_scope.1.dart
rename to packages/flutter/examples/api/lib/widgets/pop_scope/pop_scope.1.dart
diff --git a/examples/api/lib/widgets/preferred_size/preferred_size.0.dart b/packages/flutter/examples/api/lib/widgets/preferred_size/preferred_size.0.dart
similarity index 100%
rename from examples/api/lib/widgets/preferred_size/preferred_size.0.dart
rename to packages/flutter/examples/api/lib/widgets/preferred_size/preferred_size.0.dart
diff --git a/examples/api/lib/widgets/radio_group/radio_group.0.dart b/packages/flutter/examples/api/lib/widgets/radio_group/radio_group.0.dart
similarity index 100%
rename from examples/api/lib/widgets/radio_group/radio_group.0.dart
rename to packages/flutter/examples/api/lib/widgets/radio_group/radio_group.0.dart
diff --git a/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart b/packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart
similarity index 100%
rename from examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart
rename to packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.0.dart
diff --git a/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart b/packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart
similarity index 100%
rename from examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart
rename to packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.1.dart
diff --git a/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart b/packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart
similarity index 100%
rename from examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart
rename to packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.2.dart
diff --git a/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart b/packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart
similarity index 100%
rename from examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart
rename to packages/flutter/examples/api/lib/widgets/raw_menu_anchor/raw_menu_anchor.3.dart
diff --git a/examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart b/packages/flutter/examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart
similarity index 100%
rename from examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart
rename to packages/flutter/examples/api/lib/widgets/raw_tooltip/raw_tooltip.0.dart
diff --git a/examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart b/packages/flutter/examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/repeating_animation_builder/repeating_animation_builder.0.dart
diff --git a/examples/api/lib/widgets/restoration/restoration_mixin.0.dart b/packages/flutter/examples/api/lib/widgets/restoration/restoration_mixin.0.dart
similarity index 100%
rename from examples/api/lib/widgets/restoration/restoration_mixin.0.dart
rename to packages/flutter/examples/api/lib/widgets/restoration/restoration_mixin.0.dart
diff --git a/examples/api/lib/widgets/restoration_properties/restorable_value.0.dart b/packages/flutter/examples/api/lib/widgets/restoration_properties/restorable_value.0.dart
similarity index 100%
rename from examples/api/lib/widgets/restoration_properties/restorable_value.0.dart
rename to packages/flutter/examples/api/lib/widgets/restoration_properties/restorable_value.0.dart
diff --git a/examples/api/lib/widgets/routes/flexible_route_transitions.0.dart b/packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.0.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/flexible_route_transitions.0.dart
rename to packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.0.dart
diff --git a/examples/api/lib/widgets/routes/flexible_route_transitions.1.dart b/packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.1.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/flexible_route_transitions.1.dart
rename to packages/flutter/examples/api/lib/widgets/routes/flexible_route_transitions.1.dart
diff --git a/examples/api/lib/widgets/routes/local_history_entry.0.dart b/packages/flutter/examples/api/lib/widgets/routes/local_history_entry.0.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/local_history_entry.0.dart
rename to packages/flutter/examples/api/lib/widgets/routes/local_history_entry.0.dart
diff --git a/examples/api/lib/widgets/routes/popup_route.0.dart b/packages/flutter/examples/api/lib/widgets/routes/popup_route.0.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/popup_route.0.dart
rename to packages/flutter/examples/api/lib/widgets/routes/popup_route.0.dart
diff --git a/examples/api/lib/widgets/routes/route_observer.0.dart b/packages/flutter/examples/api/lib/widgets/routes/route_observer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/route_observer.0.dart
rename to packages/flutter/examples/api/lib/widgets/routes/route_observer.0.dart
diff --git a/examples/api/lib/widgets/routes/show_general_dialog.0.dart b/packages/flutter/examples/api/lib/widgets/routes/show_general_dialog.0.dart
similarity index 100%
rename from examples/api/lib/widgets/routes/show_general_dialog.0.dart
rename to packages/flutter/examples/api/lib/widgets/routes/show_general_dialog.0.dart
diff --git a/examples/api/lib/widgets/safe_area/safe_area.0.dart b/packages/flutter/examples/api/lib/widgets/safe_area/safe_area.0.dart
similarity index 100%
rename from examples/api/lib/widgets/safe_area/safe_area.0.dart
rename to packages/flutter/examples/api/lib/widgets/safe_area/safe_area.0.dart
diff --git a/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.0.dart
diff --git a/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart b/packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart
diff --git a/examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_notification_observer/scroll_notification_observer.0.dart
diff --git a/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart
diff --git a/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart
diff --git a/examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_position/scroll_controller_on_attach.0.dart
diff --git a/examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_position/scroll_metrics_notification.0.dart
diff --git a/examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart b/packages/flutter/examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_view/custom_scroll_view.1.dart
diff --git a/examples/api/lib/widgets/scroll_view/grid_view.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_view/grid_view.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_view/grid_view.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_view/grid_view.0.dart
diff --git a/examples/api/lib/widgets/scroll_view/list_view.0.dart b/packages/flutter/examples/api/lib/widgets/scroll_view/list_view.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_view/list_view.0.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_view/list_view.0.dart
diff --git a/examples/api/lib/widgets/scroll_view/list_view.1.dart b/packages/flutter/examples/api/lib/widgets/scroll_view/list_view.1.dart
similarity index 100%
rename from examples/api/lib/widgets/scroll_view/list_view.1.dart
rename to packages/flutter/examples/api/lib/widgets/scroll_view/list_view.1.dart
diff --git a/examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart b/packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart
rename to packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.0.dart
diff --git a/examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart b/packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart
similarity index 100%
rename from examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart
rename to packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.1.dart
diff --git a/examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart b/packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart
similarity index 100%
rename from examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart
rename to packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.2.dart
diff --git a/examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart b/packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart
rename to packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.desktop.0.dart
diff --git a/examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart b/packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart
similarity index 100%
rename from examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart
rename to packages/flutter/examples/api/lib/widgets/scrollbar/raw_scrollbar.shape.0.dart
diff --git a/examples/api/lib/material/selectable_region/selectable_region.0.dart b/packages/flutter/examples/api/lib/widgets/selectable_region/selectable_region.0.dart
similarity index 100%
rename from examples/api/lib/material/selectable_region/selectable_region.0.dart
rename to packages/flutter/examples/api/lib/widgets/selectable_region/selectable_region.0.dart
diff --git a/examples/api/lib/material/selection_container/selection_container.0.dart b/packages/flutter/examples/api/lib/widgets/selection_container/selection_container.0.dart
similarity index 100%
rename from examples/api/lib/material/selection_container/selection_container.0.dart
rename to packages/flutter/examples/api/lib/widgets/selection_container/selection_container.0.dart
diff --git a/examples/api/lib/material/selection_container/selection_container_disabled.0.dart b/packages/flutter/examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart
similarity index 100%
rename from examples/api/lib/material/selection_container/selection_container_disabled.0.dart
rename to packages/flutter/examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart
diff --git a/examples/api/lib/widgets/sensitive_content/sensitive_content.0.dart b/packages/flutter/examples/api/lib/widgets/sensitive_content/sensitive_content.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sensitive_content/sensitive_content.0.dart
rename to packages/flutter/examples/api/lib/widgets/sensitive_content/sensitive_content.0.dart
diff --git a/examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart b/packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart
rename to packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.0.dart
diff --git a/examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart b/packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart
similarity index 100%
rename from examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart
rename to packages/flutter/examples/api/lib/widgets/shared_app_data/shared_app_data.1.dart
diff --git a/examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/callback_shortcuts.0.dart
diff --git a/examples/api/lib/widgets/shortcuts/character_activator.0.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/character_activator.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/character_activator.0.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/character_activator.0.dart
diff --git a/examples/api/lib/widgets/shortcuts/logical_key_set.0.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/logical_key_set.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/logical_key_set.0.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/logical_key_set.0.dart
diff --git a/examples/api/lib/widgets/shortcuts/shortcuts.0.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/shortcuts.0.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.0.dart
diff --git a/examples/api/lib/widgets/shortcuts/shortcuts.1.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.1.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/shortcuts.1.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/shortcuts.1.dart
diff --git a/examples/api/lib/widgets/shortcuts/single_activator.0.dart b/packages/flutter/examples/api/lib/widgets/shortcuts/single_activator.0.dart
similarity index 100%
rename from examples/api/lib/widgets/shortcuts/single_activator.0.dart
rename to packages/flutter/examples/api/lib/widgets/shortcuts/single_activator.0.dart
diff --git a/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart b/packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart
similarity index 100%
rename from examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart
rename to packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.0.dart
diff --git a/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart b/packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart
similarity index 100%
rename from examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart
rename to packages/flutter/examples/api/lib/widgets/single_child_scroll_view/single_child_scroll_view.1.dart
diff --git a/examples/api/lib/widgets/sliver/decorated_sliver.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/decorated_sliver.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.0.dart
diff --git a/examples/api/lib/widgets/sliver/decorated_sliver.1.dart b/packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.1.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/decorated_sliver.1.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/decorated_sliver.1.dart
diff --git a/examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.0.dart
diff --git a/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart b/packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_constrained_cross_axis.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_cross_axis_group.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_ensure_semantics.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_floating_header.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_floating_header.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_floating_header.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_floating_header.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_list.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_list.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_list.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_list.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_main_axis_group.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_opacity.1.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_opacity.1.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_opacity.1.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_opacity.1.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_resizing_header.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_tree.0.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_tree.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.0.dart
diff --git a/examples/api/lib/widgets/sliver/sliver_tree.1.dart b/packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.1.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver/sliver_tree.1.dart
rename to packages/flutter/examples/api/lib/widgets/sliver/sliver_tree.1.dart
diff --git a/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart b/packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart
rename to packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.0.dart
diff --git a/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart b/packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart
rename to packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.1.dart
diff --git a/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart b/packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart
rename to packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.2.dart
diff --git a/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart b/packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart
similarity index 100%
rename from examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart
rename to packages/flutter/examples/api/lib/widgets/sliver_fill/sliver_fill_remaining.3.dart
diff --git a/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart b/packages/flutter/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart
similarity index 100%
rename from examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart
rename to packages/flutter/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart
diff --git a/examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart b/packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart
similarity index 100%
rename from examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart
rename to packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.0.dart
diff --git a/examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart b/packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart
similarity index 100%
rename from examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart
rename to packages/flutter/examples/api/lib/widgets/system_context_menu/system_context_menu.1.dart
diff --git a/examples/api/lib/widgets/table/table.0.dart b/packages/flutter/examples/api/lib/widgets/table/table.0.dart
similarity index 100%
rename from examples/api/lib/widgets/table/table.0.dart
rename to packages/flutter/examples/api/lib/widgets/table/table.0.dart
diff --git a/examples/api/lib/widgets/tap_region/tap_region.0.dart b/packages/flutter/examples/api/lib/widgets/tap_region/tap_region.0.dart
similarity index 100%
rename from examples/api/lib/widgets/tap_region/tap_region.0.dart
rename to packages/flutter/examples/api/lib/widgets/tap_region/tap_region.0.dart
diff --git a/examples/api/lib/widgets/tap_region/tap_region.1.dart b/packages/flutter/examples/api/lib/widgets/tap_region/tap_region.1.dart
similarity index 100%
rename from examples/api/lib/widgets/tap_region/tap_region.1.dart
rename to packages/flutter/examples/api/lib/widgets/tap_region/tap_region.1.dart
diff --git a/examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart b/packages/flutter/examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart
similarity index 100%
rename from examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart
rename to packages/flutter/examples/api/lib/widgets/tap_region/text_field_tap_region.0.dart
diff --git a/examples/api/lib/widgets/text/text.0.dart b/packages/flutter/examples/api/lib/widgets/text/text.0.dart
similarity index 100%
rename from examples/api/lib/widgets/text/text.0.dart
rename to packages/flutter/examples/api/lib/widgets/text/text.0.dart
diff --git a/examples/api/lib/widgets/text/ui_testing_with_text.dart b/packages/flutter/examples/api/lib/widgets/text/ui_testing_with_text.dart
similarity index 100%
rename from examples/api/lib/widgets/text/ui_testing_with_text.dart
rename to packages/flutter/examples/api/lib/widgets/text/ui_testing_with_text.dart
diff --git a/examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart b/packages/flutter/examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart
similarity index 100%
rename from examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart
rename to packages/flutter/examples/api/lib/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0.dart
diff --git a/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart b/packages/flutter/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart
similarity index 100%
rename from examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart
rename to packages/flutter/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart
diff --git a/examples/api/lib/widgets/transitions/align_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/align_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/align_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/align_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/animated_builder.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/animated_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/animated_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/animated_builder.0.dart
diff --git a/examples/api/lib/widgets/transitions/animated_widget.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/animated_widget.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/animated_widget.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/animated_widget.0.dart
diff --git a/examples/api/lib/widgets/transitions/decorated_box_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/decorated_box_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/decorated_box_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/decorated_box_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/default_text_style_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/default_text_style_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/default_text_style_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/default_text_style_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/fade_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/fade_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/fade_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/fade_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/listenable_builder.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/listenable_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.0.dart
diff --git a/examples/api/lib/widgets/transitions/listenable_builder.1.dart b/packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.1.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/listenable_builder.1.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.1.dart
diff --git a/examples/api/lib/widgets/transitions/listenable_builder.2.dart b/packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.2.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/listenable_builder.2.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.2.dart
diff --git a/examples/api/lib/widgets/transitions/listenable_builder.3.dart b/packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.3.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/listenable_builder.3.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/listenable_builder.3.dart
diff --git a/examples/api/lib/widgets/transitions/matrix_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/matrix_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/matrix_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/matrix_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/positioned_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/positioned_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/positioned_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/positioned_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/relative_positioned_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/rotation_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/rotation_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/rotation_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/rotation_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/scale_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/scale_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/scale_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/scale_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/size_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/size_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/size_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/size_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/slide_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/slide_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/slide_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/slide_transition.0.dart
diff --git a/examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart b/packages/flutter/examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart
similarity index 100%
rename from examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart
rename to packages/flutter/examples/api/lib/widgets/transitions/sliver_fade_transition.0.dart
diff --git a/examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart b/packages/flutter/examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/tween_animation_builder/tween_animation_builder.0.dart
diff --git a/examples/api/lib/widgets/undo_history/undo_history_controller.0.dart b/packages/flutter/examples/api/lib/widgets/undo_history/undo_history_controller.0.dart
similarity index 100%
rename from examples/api/lib/widgets/undo_history/undo_history_controller.0.dart
rename to packages/flutter/examples/api/lib/widgets/undo_history/undo_history_controller.0.dart
diff --git a/examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart b/packages/flutter/examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart
similarity index 100%
rename from examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart
rename to packages/flutter/examples/api/lib/widgets/value_listenable_builder/value_listenable_builder.0.dart
diff --git a/examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart b/packages/flutter/examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart
similarity index 100%
rename from examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart
rename to packages/flutter/examples/api/lib/widgets/widget_state/widget_state_border_side.0.dart
diff --git a/examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart b/packages/flutter/examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart
similarity index 100%
rename from examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart
rename to packages/flutter/examples/api/lib/widgets/widget_state/widget_state_mouse_cursor.0.dart
diff --git a/examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart b/packages/flutter/examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart
similarity index 100%
rename from examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart
rename to packages/flutter/examples/api/lib/widgets/widget_state/widget_state_outlined_border.0.dart
diff --git a/examples/api/lib/widgets/widget_state/widget_state_property.0.dart b/packages/flutter/examples/api/lib/widgets/widget_state/widget_state_property.0.dart
similarity index 100%
rename from examples/api/lib/widgets/widget_state/widget_state_property.0.dart
rename to packages/flutter/examples/api/lib/widgets/widget_state/widget_state_property.0.dart
diff --git a/examples/api/lib/widgets/windows/popup.0.dart b/packages/flutter/examples/api/lib/widgets/windows/popup.0.dart
similarity index 100%
rename from examples/api/lib/widgets/windows/popup.0.dart
rename to packages/flutter/examples/api/lib/widgets/windows/popup.0.dart
diff --git a/examples/api/lib/widgets/windows/satellite.0.dart b/packages/flutter/examples/api/lib/widgets/windows/satellite.0.dart
similarity index 100%
rename from examples/api/lib/widgets/windows/satellite.0.dart
rename to packages/flutter/examples/api/lib/widgets/windows/satellite.0.dart
diff --git a/examples/api/lib/widgets/windows/tooltip.0.dart b/packages/flutter/examples/api/lib/widgets/windows/tooltip.0.dart
similarity index 100%
rename from examples/api/lib/widgets/windows/tooltip.0.dart
rename to packages/flutter/examples/api/lib/widgets/windows/tooltip.0.dart
diff --git a/examples/api/lib/widgets/windows/window_manager.0.dart b/packages/flutter/examples/api/lib/widgets/windows/window_manager.0.dart
similarity index 100%
rename from examples/api/lib/widgets/windows/window_manager.0.dart
rename to packages/flutter/examples/api/lib/widgets/windows/window_manager.0.dart
diff --git a/examples/api/linux/.gitignore b/packages/flutter/examples/api/linux/.gitignore
similarity index 100%
rename from examples/api/linux/.gitignore
rename to packages/flutter/examples/api/linux/.gitignore
diff --git a/examples/api/linux/CMakeLists.txt b/packages/flutter/examples/api/linux/CMakeLists.txt
similarity index 100%
rename from examples/api/linux/CMakeLists.txt
rename to packages/flutter/examples/api/linux/CMakeLists.txt
diff --git a/examples/api/linux/flutter/CMakeLists.txt b/packages/flutter/examples/api/linux/flutter/CMakeLists.txt
similarity index 100%
rename from examples/api/linux/flutter/CMakeLists.txt
rename to packages/flutter/examples/api/linux/flutter/CMakeLists.txt
diff --git a/examples/api/linux/runner/CMakeLists.txt b/packages/flutter/examples/api/linux/runner/CMakeLists.txt
similarity index 100%
rename from examples/api/linux/runner/CMakeLists.txt
rename to packages/flutter/examples/api/linux/runner/CMakeLists.txt
diff --git a/examples/api/linux/runner/main.cc b/packages/flutter/examples/api/linux/runner/main.cc
similarity index 100%
rename from examples/api/linux/runner/main.cc
rename to packages/flutter/examples/api/linux/runner/main.cc
diff --git a/examples/api/linux/runner/my_application.cc b/packages/flutter/examples/api/linux/runner/my_application.cc
similarity index 100%
rename from examples/api/linux/runner/my_application.cc
rename to packages/flutter/examples/api/linux/runner/my_application.cc
diff --git a/examples/api/linux/runner/my_application.h b/packages/flutter/examples/api/linux/runner/my_application.h
similarity index 100%
rename from examples/api/linux/runner/my_application.h
rename to packages/flutter/examples/api/linux/runner/my_application.h
diff --git a/examples/api/macos/.gitignore b/packages/flutter/examples/api/macos/.gitignore
similarity index 100%
rename from examples/api/macos/.gitignore
rename to packages/flutter/examples/api/macos/.gitignore
diff --git a/examples/api/macos/Flutter/Flutter-Debug.xcconfig b/packages/flutter/examples/api/macos/Flutter/Flutter-Debug.xcconfig
similarity index 100%
rename from examples/api/macos/Flutter/Flutter-Debug.xcconfig
rename to packages/flutter/examples/api/macos/Flutter/Flutter-Debug.xcconfig
diff --git a/examples/api/macos/Flutter/Flutter-Release.xcconfig b/packages/flutter/examples/api/macos/Flutter/Flutter-Release.xcconfig
similarity index 100%
rename from examples/api/macos/Flutter/Flutter-Release.xcconfig
rename to packages/flutter/examples/api/macos/Flutter/Flutter-Release.xcconfig
diff --git a/examples/api/macos/Podfile b/packages/flutter/examples/api/macos/Podfile
similarity index 100%
rename from examples/api/macos/Podfile
rename to packages/flutter/examples/api/macos/Podfile
diff --git a/examples/api/macos/Runner.xcodeproj/project.pbxproj b/packages/flutter/examples/api/macos/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from examples/api/macos/Runner.xcodeproj/project.pbxproj
rename to packages/flutter/examples/api/macos/Runner.xcodeproj/project.pbxproj
diff --git a/examples/api/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/examples/api/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from examples/api/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to packages/flutter/examples/api/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/examples/api/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter/examples/api/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from examples/api/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/flutter/examples/api/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/examples/api/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/flutter/examples/api/macos/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from examples/api/macos/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/flutter/examples/api/macos/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/examples/api/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/examples/api/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from examples/api/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to packages/flutter/examples/api/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/examples/api/macos/Runner/AppDelegate.swift b/packages/flutter/examples/api/macos/Runner/AppDelegate.swift
similarity index 100%
rename from examples/api/macos/Runner/AppDelegate.swift
rename to packages/flutter/examples/api/macos/Runner/AppDelegate.swift
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
diff --git a/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
similarity index 100%
rename from examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
rename to packages/flutter/examples/api/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
diff --git a/examples/api/macos/Runner/Base.lproj/MainMenu.xib b/packages/flutter/examples/api/macos/Runner/Base.lproj/MainMenu.xib
similarity index 100%
rename from examples/api/macos/Runner/Base.lproj/MainMenu.xib
rename to packages/flutter/examples/api/macos/Runner/Base.lproj/MainMenu.xib
diff --git a/examples/api/macos/Runner/Configs/AppInfo.xcconfig b/packages/flutter/examples/api/macos/Runner/Configs/AppInfo.xcconfig
similarity index 100%
rename from examples/api/macos/Runner/Configs/AppInfo.xcconfig
rename to packages/flutter/examples/api/macos/Runner/Configs/AppInfo.xcconfig
diff --git a/examples/api/macos/Runner/Configs/Debug.xcconfig b/packages/flutter/examples/api/macos/Runner/Configs/Debug.xcconfig
similarity index 100%
rename from examples/api/macos/Runner/Configs/Debug.xcconfig
rename to packages/flutter/examples/api/macos/Runner/Configs/Debug.xcconfig
diff --git a/examples/api/macos/Runner/Configs/Release.xcconfig b/packages/flutter/examples/api/macos/Runner/Configs/Release.xcconfig
similarity index 100%
rename from examples/api/macos/Runner/Configs/Release.xcconfig
rename to packages/flutter/examples/api/macos/Runner/Configs/Release.xcconfig
diff --git a/examples/api/macos/Runner/Configs/Warnings.xcconfig b/packages/flutter/examples/api/macos/Runner/Configs/Warnings.xcconfig
similarity index 100%
rename from examples/api/macos/Runner/Configs/Warnings.xcconfig
rename to packages/flutter/examples/api/macos/Runner/Configs/Warnings.xcconfig
diff --git a/examples/api/macos/Runner/DebugProfile.entitlements b/packages/flutter/examples/api/macos/Runner/DebugProfile.entitlements
similarity index 100%
rename from examples/api/macos/Runner/DebugProfile.entitlements
rename to packages/flutter/examples/api/macos/Runner/DebugProfile.entitlements
diff --git a/examples/api/macos/Runner/Info.plist b/packages/flutter/examples/api/macos/Runner/Info.plist
similarity index 100%
rename from examples/api/macos/Runner/Info.plist
rename to packages/flutter/examples/api/macos/Runner/Info.plist
diff --git a/examples/api/macos/Runner/MainFlutterWindow.swift b/packages/flutter/examples/api/macos/Runner/MainFlutterWindow.swift
similarity index 100%
rename from examples/api/macos/Runner/MainFlutterWindow.swift
rename to packages/flutter/examples/api/macos/Runner/MainFlutterWindow.swift
diff --git a/examples/api/macos/Runner/Release.entitlements b/packages/flutter/examples/api/macos/Runner/Release.entitlements
similarity index 100%
rename from examples/api/macos/Runner/Release.entitlements
rename to packages/flutter/examples/api/macos/Runner/Release.entitlements
diff --git a/examples/api/pubspec.yaml b/packages/flutter/examples/api/pubspec.yaml
similarity index 100%
rename from examples/api/pubspec.yaml
rename to packages/flutter/examples/api/pubspec.yaml
diff --git a/examples/api/test/animation/animation_controller/animated_digit.0_test.dart b/packages/flutter/examples/api/test/animation/animation_controller/animated_digit.0_test.dart
similarity index 100%
rename from examples/api/test/animation/animation_controller/animated_digit.0_test.dart
rename to packages/flutter/examples/api/test/animation/animation_controller/animated_digit.0_test.dart
diff --git a/examples/api/test/animation/curves/curve2_d.0_test.dart b/packages/flutter/examples/api/test/animation/curves/curve2_d.0_test.dart
similarity index 100%
rename from examples/api/test/animation/curves/curve2_d.0_test.dart
rename to packages/flutter/examples/api/test/animation/curves/curve2_d.0_test.dart
diff --git a/examples/api/test/cupertino/activity_indicator/cupertino_activity_indicator.0_test.dart b/packages/flutter/examples/api/test/cupertino/activity_indicator/cupertino_activity_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/activity_indicator/cupertino_activity_indicator.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/activity_indicator/cupertino_activity_indicator.0_test.dart
diff --git a/examples/api/test/cupertino/activity_indicator/cupertino_linear_activity_indicator.0_test.dart b/packages/flutter/examples/api/test/cupertino/activity_indicator/cupertino_linear_activity_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/activity_indicator/cupertino_linear_activity_indicator.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/activity_indicator/cupertino_linear_activity_indicator.0_test.dart
diff --git a/examples/api/test/cupertino/bottom_tab_bar/cupertino_tab_bar.0_test.dart b/packages/flutter/examples/api/test/cupertino/bottom_tab_bar/cupertino_tab_bar.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/bottom_tab_bar/cupertino_tab_bar.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/bottom_tab_bar/cupertino_tab_bar.0_test.dart
diff --git a/examples/api/test/cupertino/button/cupertino_button.0_test.dart b/packages/flutter/examples/api/test/cupertino/button/cupertino_button.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/button/cupertino_button.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/button/cupertino_button.0_test.dart
diff --git a/examples/api/test/cupertino/checkbox/cupertino_checkbox.0_test.dart b/packages/flutter/examples/api/test/cupertino/checkbox/cupertino_checkbox.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/checkbox/cupertino_checkbox.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/checkbox/cupertino_checkbox.0_test.dart
diff --git a/examples/api/test/cupertino/context_menu/cupertino_context_menu.0_test.dart b/packages/flutter/examples/api/test/cupertino/context_menu/cupertino_context_menu.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/context_menu/cupertino_context_menu.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/context_menu/cupertino_context_menu.0_test.dart
diff --git a/examples/api/test/cupertino/context_menu/cupertino_context_menu.1_test.dart b/packages/flutter/examples/api/test/cupertino/context_menu/cupertino_context_menu.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/context_menu/cupertino_context_menu.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/context_menu/cupertino_context_menu.1_test.dart
diff --git a/examples/api/test/cupertino/date_picker/cupertino_date_picker.0_test.dart b/packages/flutter/examples/api/test/cupertino/date_picker/cupertino_date_picker.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/date_picker/cupertino_date_picker.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/date_picker/cupertino_date_picker.0_test.dart
diff --git a/examples/api/test/cupertino/date_picker/cupertino_timer_picker.0_test.dart b/packages/flutter/examples/api/test/cupertino/date_picker/cupertino_timer_picker.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/date_picker/cupertino_timer_picker.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/date_picker/cupertino_timer_picker.0_test.dart
diff --git a/examples/api/test/cupertino/dialog/cupertino_action_sheet.0_test.dart b/packages/flutter/examples/api/test/cupertino/dialog/cupertino_action_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/dialog/cupertino_action_sheet.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/dialog/cupertino_action_sheet.0_test.dart
diff --git a/examples/api/test/cupertino/dialog/cupertino_alert_dialog.0_test.dart b/packages/flutter/examples/api/test/cupertino/dialog/cupertino_alert_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/dialog/cupertino_alert_dialog.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/dialog/cupertino_alert_dialog.0_test.dart
diff --git a/examples/api/test/cupertino/dialog/cupertino_popup_surface.0_test.dart b/packages/flutter/examples/api/test/cupertino/dialog/cupertino_popup_surface.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/dialog/cupertino_popup_surface.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/dialog/cupertino_popup_surface.0_test.dart
diff --git a/examples/api/test/cupertino/expansion_tile/cupertino_expansion_tile.0_test.dart b/packages/flutter/examples/api/test/cupertino/expansion_tile/cupertino_expansion_tile.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/expansion_tile/cupertino_expansion_tile.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/expansion_tile/cupertino_expansion_tile.0_test.dart
diff --git a/examples/api/test/cupertino/form_row/cupertino_form_row.0_test.dart b/packages/flutter/examples/api/test/cupertino/form_row/cupertino_form_row.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/form_row/cupertino_form_row.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/form_row/cupertino_form_row.0_test.dart
diff --git a/examples/api/test/cupertino/list_section/list_section_base.0_test.dart b/packages/flutter/examples/api/test/cupertino/list_section/list_section_base.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/list_section/list_section_base.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/list_section/list_section_base.0_test.dart
diff --git a/examples/api/test/cupertino/list_section/list_section_inset.0_test.dart b/packages/flutter/examples/api/test/cupertino/list_section/list_section_inset.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/list_section/list_section_inset.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/list_section/list_section_inset.0_test.dart
diff --git a/examples/api/test/cupertino/list_tile/cupertino_list_tile.0_test.dart b/packages/flutter/examples/api/test/cupertino/list_tile/cupertino_list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/list_tile/cupertino_list_tile.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/list_tile/cupertino_list_tile.0_test.dart
diff --git a/examples/api/test/cupertino/magnifier/cupertino_magnifier.0_test.dart b/packages/flutter/examples/api/test/cupertino/magnifier/cupertino_magnifier.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/magnifier/cupertino_magnifier.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/magnifier/cupertino_magnifier.0_test.dart
diff --git a/examples/api/test/cupertino/magnifier/cupertino_text_magnifier.0_test.dart b/packages/flutter/examples/api/test/cupertino/magnifier/cupertino_text_magnifier.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/magnifier/cupertino_text_magnifier.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/magnifier/cupertino_text_magnifier.0_test.dart
diff --git a/examples/api/test/cupertino/menu_anchor/menu_anchor.0_test.dart b/packages/flutter/examples/api/test/cupertino/menu_anchor/menu_anchor.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/menu_anchor/menu_anchor.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/menu_anchor/menu_anchor.0_test.dart
diff --git a/examples/api/test/cupertino/menu_anchor/menu_anchor.1_test.dart b/packages/flutter/examples/api/test/cupertino/menu_anchor/menu_anchor.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/menu_anchor/menu_anchor.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/menu_anchor/menu_anchor.1_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.0_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.0_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.1_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.1_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.2_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.2_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.2_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_navigation_bar.2_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.0_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.0_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.1_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.1_test.dart
diff --git a/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.2_test.dart b/packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.2_test.dart
similarity index 100%
rename from examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.2_test.dart
rename to packages/flutter/examples/api/test/cupertino/nav_bar/cupertino_sliver_nav_bar.2_test.dart
diff --git a/examples/api/test/cupertino/page_scaffold/cupertino_page_scaffold.0_test.dart b/packages/flutter/examples/api/test/cupertino/page_scaffold/cupertino_page_scaffold.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/page_scaffold/cupertino_page_scaffold.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/page_scaffold/cupertino_page_scaffold.0_test.dart
diff --git a/examples/api/test/cupertino/picker/cupertino_picker.0_test.dart b/packages/flutter/examples/api/test/cupertino/picker/cupertino_picker.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/picker/cupertino_picker.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/picker/cupertino_picker.0_test.dart
diff --git a/examples/api/test/cupertino/radio/cupertino_radio.0_test.dart b/packages/flutter/examples/api/test/cupertino/radio/cupertino_radio.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/radio/cupertino_radio.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/radio/cupertino_radio.0_test.dart
diff --git a/examples/api/test/cupertino/radio/cupertino_radio.toggleable.0_test.dart b/packages/flutter/examples/api/test/cupertino/radio/cupertino_radio.toggleable.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/radio/cupertino_radio.toggleable.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/radio/cupertino_radio.toggleable.0_test.dart
diff --git a/examples/api/test/cupertino/refresh/cupertino_sliver_refresh_control.0_test.dart b/packages/flutter/examples/api/test/cupertino/refresh/cupertino_sliver_refresh_control.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/refresh/cupertino_sliver_refresh_control.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/refresh/cupertino_sliver_refresh_control.0_test.dart
diff --git a/examples/api/test/cupertino/route/show_cupertino_dialog.0_test.dart b/packages/flutter/examples/api/test/cupertino/route/show_cupertino_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/route/show_cupertino_dialog.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/route/show_cupertino_dialog.0_test.dart
diff --git a/examples/api/test/cupertino/route/show_cupertino_modal_popup.0_test.dart b/packages/flutter/examples/api/test/cupertino/route/show_cupertino_modal_popup.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/route/show_cupertino_modal_popup.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/route/show_cupertino_modal_popup.0_test.dart
diff --git a/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.0_test.dart b/packages/flutter/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/scrollbar/cupertino_scrollbar.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.0_test.dart
diff --git a/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.1_test.dart b/packages/flutter/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/scrollbar/cupertino_scrollbar.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/scrollbar/cupertino_scrollbar.1_test.dart
diff --git a/examples/api/test/cupertino/search_field/cupertino_search_field.0_test.dart b/packages/flutter/examples/api/test/cupertino/search_field/cupertino_search_field.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/search_field/cupertino_search_field.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/search_field/cupertino_search_field.0_test.dart
diff --git a/examples/api/test/cupertino/search_field/cupertino_search_field.1_test.dart b/packages/flutter/examples/api/test/cupertino/search_field/cupertino_search_field.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/search_field/cupertino_search_field.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/search_field/cupertino_search_field.1_test.dart
diff --git a/examples/api/test/cupertino/segmented_control/cupertino_segmented_control.0_test.dart b/packages/flutter/examples/api/test/cupertino/segmented_control/cupertino_segmented_control.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/segmented_control/cupertino_segmented_control.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/segmented_control/cupertino_segmented_control.0_test.dart
diff --git a/examples/api/test/cupertino/segmented_control/cupertino_sliding_segmented_control.0_test.dart b/packages/flutter/examples/api/test/cupertino/segmented_control/cupertino_sliding_segmented_control.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/segmented_control/cupertino_sliding_segmented_control.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/segmented_control/cupertino_sliding_segmented_control.0_test.dart
diff --git a/examples/api/test/cupertino/sheet/cupertino_sheet.0_test.dart b/packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/sheet/cupertino_sheet.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.0_test.dart
diff --git a/examples/api/test/cupertino/sheet/cupertino_sheet.1_test.dart b/packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/sheet/cupertino_sheet.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.1_test.dart
diff --git a/examples/api/test/cupertino/sheet/cupertino_sheet.2_test.dart b/packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.2_test.dart
similarity index 100%
rename from examples/api/test/cupertino/sheet/cupertino_sheet.2_test.dart
rename to packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.2_test.dart
diff --git a/examples/api/test/cupertino/sheet/cupertino_sheet.3_test.dart b/packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.3_test.dart
similarity index 100%
rename from examples/api/test/cupertino/sheet/cupertino_sheet.3_test.dart
rename to packages/flutter/examples/api/test/cupertino/sheet/cupertino_sheet.3_test.dart
diff --git a/examples/api/test/cupertino/slider/cupertino_slider.0_test.dart b/packages/flutter/examples/api/test/cupertino/slider/cupertino_slider.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/slider/cupertino_slider.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/slider/cupertino_slider.0_test.dart
diff --git a/examples/api/test/cupertino/switch/cupertino_switch.0_test.dart b/packages/flutter/examples/api/test/cupertino/switch/cupertino_switch.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/switch/cupertino_switch.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/switch/cupertino_switch.0_test.dart
diff --git a/examples/api/test/cupertino/tab_scaffold/cupertino_tab_controller.0_test.dart b/packages/flutter/examples/api/test/cupertino/tab_scaffold/cupertino_tab_controller.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/tab_scaffold/cupertino_tab_controller.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/tab_scaffold/cupertino_tab_controller.0_test.dart
diff --git a/examples/api/test/cupertino/tab_scaffold/cupertino_tab_scaffold.0_test.dart b/packages/flutter/examples/api/test/cupertino/tab_scaffold/cupertino_tab_scaffold.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/tab_scaffold/cupertino_tab_scaffold.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/tab_scaffold/cupertino_tab_scaffold.0_test.dart
diff --git a/examples/api/test/cupertino/text_field/cupertino_text_field.0_test.dart b/packages/flutter/examples/api/test/cupertino/text_field/cupertino_text_field.0_test.dart
similarity index 100%
rename from examples/api/test/cupertino/text_field/cupertino_text_field.0_test.dart
rename to packages/flutter/examples/api/test/cupertino/text_field/cupertino_text_field.0_test.dart
diff --git a/examples/api/test/cupertino/text_form_field_row/cupertino_text_form_field_row.1_test.dart b/packages/flutter/examples/api/test/cupertino/text_form_field_row/cupertino_text_form_field_row.1_test.dart
similarity index 100%
rename from examples/api/test/cupertino/text_form_field_row/cupertino_text_form_field_row.1_test.dart
rename to packages/flutter/examples/api/test/cupertino/text_form_field_row/cupertino_text_form_field_row.1_test.dart
diff --git a/examples/api/test/flutter_test_config.dart b/packages/flutter/examples/api/test/flutter_test_config.dart
similarity index 100%
rename from examples/api/test/flutter_test_config.dart
rename to packages/flutter/examples/api/test/flutter_test_config.dart
diff --git a/examples/api/test/foundation/key/value_key.0_test.dart b/packages/flutter/examples/api/test/foundation/key/value_key.0_test.dart
similarity index 100%
rename from examples/api/test/foundation/key/value_key.0_test.dart
rename to packages/flutter/examples/api/test/foundation/key/value_key.0_test.dart
diff --git a/examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart b/packages/flutter/examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart
similarity index 100%
rename from examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart
rename to packages/flutter/examples/api/test/gestures/pointer_signal_resolver/pointer_signal_resolver.0_test.dart
diff --git a/examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart b/packages/flutter/examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart
similarity index 100%
rename from examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart
rename to packages/flutter/examples/api/test/gestures/tap_and_drag/tap_and_drag.0_test.dart
diff --git a/examples/api/test/goldens_io.dart b/packages/flutter/examples/api/test/goldens_io.dart
similarity index 100%
rename from examples/api/test/goldens_io.dart
rename to packages/flutter/examples/api/test/goldens_io.dart
diff --git a/examples/api/test/goldens_web.dart b/packages/flutter/examples/api/test/goldens_web.dart
similarity index 100%
rename from examples/api/test/goldens_web.dart
rename to packages/flutter/examples/api/test/goldens_web.dart
diff --git a/examples/api/test/material/about/about_list_tile.0_test.dart b/packages/flutter/examples/api/test/material/about/about_list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/about/about_list_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/about/about_list_tile.0_test.dart
diff --git a/examples/api/test/material/action_buttons/action_icon_theme.0_test.dart b/packages/flutter/examples/api/test/material/action_buttons/action_icon_theme.0_test.dart
similarity index 100%
rename from examples/api/test/material/action_buttons/action_icon_theme.0_test.dart
rename to packages/flutter/examples/api/test/material/action_buttons/action_icon_theme.0_test.dart
diff --git a/examples/api/test/material/action_chip/action_chip.0_test.dart b/packages/flutter/examples/api/test/material/action_chip/action_chip.0_test.dart
similarity index 100%
rename from examples/api/test/material/action_chip/action_chip.0_test.dart
rename to packages/flutter/examples/api/test/material/action_chip/action_chip.0_test.dart
diff --git a/examples/api/test/material/animated_icon/animated_icon.0_test.dart b/packages/flutter/examples/api/test/material/animated_icon/animated_icon.0_test.dart
similarity index 100%
rename from examples/api/test/material/animated_icon/animated_icon.0_test.dart
rename to packages/flutter/examples/api/test/material/animated_icon/animated_icon.0_test.dart
diff --git a/examples/api/test/material/animated_icon/animated_icons_data.0_test.dart b/packages/flutter/examples/api/test/material/animated_icon/animated_icons_data.0_test.dart
similarity index 100%
rename from examples/api/test/material/animated_icon/animated_icons_data.0_test.dart
rename to packages/flutter/examples/api/test/material/animated_icon/animated_icons_data.0_test.dart
diff --git a/examples/api/test/material/app/app.0_test.dart b/packages/flutter/examples/api/test/material/app/app.0_test.dart
similarity index 100%
rename from examples/api/test/material/app/app.0_test.dart
rename to packages/flutter/examples/api/test/material/app/app.0_test.dart
diff --git a/examples/api/test/material/app_bar/app_bar.0_test.dart b/packages/flutter/examples/api/test/material/app_bar/app_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/app_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/app_bar.0_test.dart
diff --git a/examples/api/test/material/app_bar/app_bar.1_test.dart b/packages/flutter/examples/api/test/material/app_bar/app_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/app_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/app_bar.1_test.dart
diff --git a/examples/api/test/material/app_bar/app_bar.2_test.dart b/packages/flutter/examples/api/test/material/app_bar/app_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/app_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/app_bar.2_test.dart
diff --git a/examples/api/test/material/app_bar/app_bar.3_test.dart b/packages/flutter/examples/api/test/material/app_bar/app_bar.3_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/app_bar.3_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/app_bar.3_test.dart
diff --git a/examples/api/test/material/app_bar/app_bar.4_test.dart b/packages/flutter/examples/api/test/material/app_bar/app_bar.4_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/app_bar.4_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/app_bar.4_test.dart
diff --git a/examples/api/test/material/app_bar/sliver_app_bar.1_test.dart b/packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/sliver_app_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.1_test.dart
diff --git a/examples/api/test/material/app_bar/sliver_app_bar.2_test.dart b/packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/sliver_app_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.2_test.dart
diff --git a/examples/api/test/material/app_bar/sliver_app_bar.3_test.dart b/packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.3_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/sliver_app_bar.3_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.3_test.dart
diff --git a/examples/api/test/material/app_bar/sliver_app_bar.4_test.dart b/packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.4_test.dart
similarity index 100%
rename from examples/api/test/material/app_bar/sliver_app_bar.4_test.dart
rename to packages/flutter/examples/api/test/material/app_bar/sliver_app_bar.4_test.dart
diff --git a/examples/api/test/material/autocomplete/autocomplete.0_test.dart b/packages/flutter/examples/api/test/material/autocomplete/autocomplete.0_test.dart
similarity index 100%
rename from examples/api/test/material/autocomplete/autocomplete.0_test.dart
rename to packages/flutter/examples/api/test/material/autocomplete/autocomplete.0_test.dart
diff --git a/examples/api/test/material/autocomplete/autocomplete.1_test.dart b/packages/flutter/examples/api/test/material/autocomplete/autocomplete.1_test.dart
similarity index 100%
rename from examples/api/test/material/autocomplete/autocomplete.1_test.dart
rename to packages/flutter/examples/api/test/material/autocomplete/autocomplete.1_test.dart
diff --git a/examples/api/test/material/autocomplete/autocomplete.2_test.dart b/packages/flutter/examples/api/test/material/autocomplete/autocomplete.2_test.dart
similarity index 100%
rename from examples/api/test/material/autocomplete/autocomplete.2_test.dart
rename to packages/flutter/examples/api/test/material/autocomplete/autocomplete.2_test.dart
diff --git a/examples/api/test/material/autocomplete/autocomplete.3_test.dart b/packages/flutter/examples/api/test/material/autocomplete/autocomplete.3_test.dart
similarity index 100%
rename from examples/api/test/material/autocomplete/autocomplete.3_test.dart
rename to packages/flutter/examples/api/test/material/autocomplete/autocomplete.3_test.dart
diff --git a/examples/api/test/material/autocomplete/autocomplete.4_test.dart b/packages/flutter/examples/api/test/material/autocomplete/autocomplete.4_test.dart
similarity index 100%
rename from examples/api/test/material/autocomplete/autocomplete.4_test.dart
rename to packages/flutter/examples/api/test/material/autocomplete/autocomplete.4_test.dart
diff --git a/examples/api/test/material/badge/badge.0_test.dart b/packages/flutter/examples/api/test/material/badge/badge.0_test.dart
similarity index 100%
rename from examples/api/test/material/badge/badge.0_test.dart
rename to packages/flutter/examples/api/test/material/badge/badge.0_test.dart
diff --git a/examples/api/test/material/banner/material_banner.0_test.dart b/packages/flutter/examples/api/test/material/banner/material_banner.0_test.dart
similarity index 100%
rename from examples/api/test/material/banner/material_banner.0_test.dart
rename to packages/flutter/examples/api/test/material/banner/material_banner.0_test.dart
diff --git a/examples/api/test/material/banner/material_banner.1_test.dart b/packages/flutter/examples/api/test/material/banner/material_banner.1_test.dart
similarity index 100%
rename from examples/api/test/material/banner/material_banner.1_test.dart
rename to packages/flutter/examples/api/test/material/banner/material_banner.1_test.dart
diff --git a/examples/api/test/material/bottom_app_bar/bottom_app_bar.1_test.dart b/packages/flutter/examples/api/test/material/bottom_app_bar/bottom_app_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_app_bar/bottom_app_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/bottom_app_bar/bottom_app_bar.1_test.dart
diff --git a/examples/api/test/material/bottom_app_bar/bottom_app_bar.2_test.dart b/packages/flutter/examples/api/test/material/bottom_app_bar/bottom_app_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_app_bar/bottom_app_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/bottom_app_bar/bottom_app_bar.2_test.dart
diff --git a/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.0_test.dart b/packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.0_test.dart
diff --git a/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.1_test.dart b/packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.1_test.dart
diff --git a/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.2_test.dart b/packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.2_test.dart
diff --git a/examples/api/test/material/bottom_sheet/show_bottom_sheet.0_test.dart b/packages/flutter/examples/api/test/material/bottom_sheet/show_bottom_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_sheet/show_bottom_sheet.0_test.dart
rename to packages/flutter/examples/api/test/material/bottom_sheet/show_bottom_sheet.0_test.dart
diff --git a/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.0_test.dart b/packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.0_test.dart
rename to packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.0_test.dart
diff --git a/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.1_test.dart b/packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.1_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.1_test.dart
rename to packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.1_test.dart
diff --git a/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.2_test.dart b/packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.2_test.dart
similarity index 100%
rename from examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.2_test.dart
rename to packages/flutter/examples/api/test/material/bottom_sheet/show_modal_bottom_sheet.2_test.dart
diff --git a/examples/api/test/material/button_style/button_style.0_test.dart b/packages/flutter/examples/api/test/material/button_style/button_style.0_test.dart
similarity index 100%
rename from examples/api/test/material/button_style/button_style.0_test.dart
rename to packages/flutter/examples/api/test/material/button_style/button_style.0_test.dart
diff --git a/examples/api/test/material/card/card.0_test.dart b/packages/flutter/examples/api/test/material/card/card.0_test.dart
similarity index 100%
rename from examples/api/test/material/card/card.0_test.dart
rename to packages/flutter/examples/api/test/material/card/card.0_test.dart
diff --git a/examples/api/test/material/card/card.1_test.dart b/packages/flutter/examples/api/test/material/card/card.1_test.dart
similarity index 100%
rename from examples/api/test/material/card/card.1_test.dart
rename to packages/flutter/examples/api/test/material/card/card.1_test.dart
diff --git a/examples/api/test/material/card/card.2_test.dart b/packages/flutter/examples/api/test/material/card/card.2_test.dart
similarity index 100%
rename from examples/api/test/material/card/card.2_test.dart
rename to packages/flutter/examples/api/test/material/card/card.2_test.dart
diff --git a/examples/api/test/material/carousel/carousel.0_test.dart b/packages/flutter/examples/api/test/material/carousel/carousel.0_test.dart
similarity index 100%
rename from examples/api/test/material/carousel/carousel.0_test.dart
rename to packages/flutter/examples/api/test/material/carousel/carousel.0_test.dart
diff --git a/examples/api/test/material/carousel/carousel.1_test.dart b/packages/flutter/examples/api/test/material/carousel/carousel.1_test.dart
similarity index 100%
rename from examples/api/test/material/carousel/carousel.1_test.dart
rename to packages/flutter/examples/api/test/material/carousel/carousel.1_test.dart
diff --git a/examples/api/test/material/checkbox/checkbox.0_test.dart b/packages/flutter/examples/api/test/material/checkbox/checkbox.0_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox/checkbox.0_test.dart
rename to packages/flutter/examples/api/test/material/checkbox/checkbox.0_test.dart
diff --git a/examples/api/test/material/checkbox/checkbox.1_test.dart b/packages/flutter/examples/api/test/material/checkbox/checkbox.1_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox/checkbox.1_test.dart
rename to packages/flutter/examples/api/test/material/checkbox/checkbox.1_test.dart
diff --git a/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.0_test.dart b/packages/flutter/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox_list_tile/checkbox_list_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.0_test.dart
diff --git a/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.1_test.dart b/packages/flutter/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.1_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox_list_tile/checkbox_list_tile.1_test.dart
rename to packages/flutter/examples/api/test/material/checkbox_list_tile/checkbox_list_tile.1_test.dart
diff --git a/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.0_test.dart b/packages/flutter/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.0_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.0_test.dart
rename to packages/flutter/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.0_test.dart
diff --git a/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.1_test.dart b/packages/flutter/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.1_test.dart
similarity index 100%
rename from examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.1_test.dart
rename to packages/flutter/examples/api/test/material/checkbox_list_tile/custom_labeled_checkbox.1_test.dart
diff --git a/examples/api/test/material/chip/chip_attributes.avatar_box_constraints.0_test.dart b/packages/flutter/examples/api/test/material/chip/chip_attributes.avatar_box_constraints.0_test.dart
similarity index 100%
rename from examples/api/test/material/chip/chip_attributes.avatar_box_constraints.0_test.dart
rename to packages/flutter/examples/api/test/material/chip/chip_attributes.avatar_box_constraints.0_test.dart
diff --git a/examples/api/test/material/chip/chip_attributes.chip_animation_style.0_test.dart b/packages/flutter/examples/api/test/material/chip/chip_attributes.chip_animation_style.0_test.dart
similarity index 100%
rename from examples/api/test/material/chip/chip_attributes.chip_animation_style.0_test.dart
rename to packages/flutter/examples/api/test/material/chip/chip_attributes.chip_animation_style.0_test.dart
diff --git a/examples/api/test/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0_test.dart b/packages/flutter/examples/api/test/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0_test.dart
similarity index 100%
rename from examples/api/test/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0_test.dart
rename to packages/flutter/examples/api/test/material/chip/deletable_chip_attributes.delete_icon_box_constraints.0_test.dart
diff --git a/examples/api/test/material/chip/deletable_chip_attributes.on_deleted.0_test.dart b/packages/flutter/examples/api/test/material/chip/deletable_chip_attributes.on_deleted.0_test.dart
similarity index 100%
rename from examples/api/test/material/chip/deletable_chip_attributes.on_deleted.0_test.dart
rename to packages/flutter/examples/api/test/material/chip/deletable_chip_attributes.on_deleted.0_test.dart
diff --git a/examples/api/test/material/choice_chip/choice_chip.0_test.dart b/packages/flutter/examples/api/test/material/choice_chip/choice_chip.0_test.dart
similarity index 100%
rename from examples/api/test/material/choice_chip/choice_chip.0_test.dart
rename to packages/flutter/examples/api/test/material/choice_chip/choice_chip.0_test.dart
diff --git a/examples/api/test/material/color_scheme/color_scheme.0_test.dart b/packages/flutter/examples/api/test/material/color_scheme/color_scheme.0_test.dart
similarity index 100%
rename from examples/api/test/material/color_scheme/color_scheme.0_test.dart
rename to packages/flutter/examples/api/test/material/color_scheme/color_scheme.0_test.dart
diff --git a/examples/api/test/material/color_scheme/dynamic_content_color.0_test.dart b/packages/flutter/examples/api/test/material/color_scheme/dynamic_content_color.0_test.dart
similarity index 100%
rename from examples/api/test/material/color_scheme/dynamic_content_color.0_test.dart
rename to packages/flutter/examples/api/test/material/color_scheme/dynamic_content_color.0_test.dart
diff --git a/examples/api/test/material/context_menu/editable_text_toolbar_builder.2_test.dart b/packages/flutter/examples/api/test/material/context_menu/editable_text_toolbar_builder.2_test.dart
similarity index 100%
rename from examples/api/test/material/context_menu/editable_text_toolbar_builder.2_test.dart
rename to packages/flutter/examples/api/test/material/context_menu/editable_text_toolbar_builder.2_test.dart
diff --git a/examples/api/test/material/context_menu/selectable_region_toolbar_builder.0_test.dart b/packages/flutter/examples/api/test/material/context_menu/selectable_region_toolbar_builder.0_test.dart
similarity index 100%
rename from examples/api/test/material/context_menu/selectable_region_toolbar_builder.0_test.dart
rename to packages/flutter/examples/api/test/material/context_menu/selectable_region_toolbar_builder.0_test.dart
diff --git a/examples/api/test/material/data_table/data_table.0_test.dart b/packages/flutter/examples/api/test/material/data_table/data_table.0_test.dart
similarity index 100%
rename from examples/api/test/material/data_table/data_table.0_test.dart
rename to packages/flutter/examples/api/test/material/data_table/data_table.0_test.dart
diff --git a/examples/api/test/material/data_table/data_table.1_test.dart b/packages/flutter/examples/api/test/material/data_table/data_table.1_test.dart
similarity index 100%
rename from examples/api/test/material/data_table/data_table.1_test.dart
rename to packages/flutter/examples/api/test/material/data_table/data_table.1_test.dart
diff --git a/examples/api/test/material/date_picker/custom_calendar_date_picker.0_test.dart b/packages/flutter/examples/api/test/material/date_picker/custom_calendar_date_picker.0_test.dart
similarity index 100%
rename from examples/api/test/material/date_picker/custom_calendar_date_picker.0_test.dart
rename to packages/flutter/examples/api/test/material/date_picker/custom_calendar_date_picker.0_test.dart
diff --git a/examples/api/test/material/date_picker/date_picker_theme_day_shape.0_test.dart b/packages/flutter/examples/api/test/material/date_picker/date_picker_theme_day_shape.0_test.dart
similarity index 100%
rename from examples/api/test/material/date_picker/date_picker_theme_day_shape.0_test.dart
rename to packages/flutter/examples/api/test/material/date_picker/date_picker_theme_day_shape.0_test.dart
diff --git a/examples/api/test/material/date_picker/show_date_picker.0_test.dart b/packages/flutter/examples/api/test/material/date_picker/show_date_picker.0_test.dart
similarity index 100%
rename from examples/api/test/material/date_picker/show_date_picker.0_test.dart
rename to packages/flutter/examples/api/test/material/date_picker/show_date_picker.0_test.dart
diff --git a/examples/api/test/material/date_picker/show_date_picker.1_test.dart b/packages/flutter/examples/api/test/material/date_picker/show_date_picker.1_test.dart
similarity index 100%
rename from examples/api/test/material/date_picker/show_date_picker.1_test.dart
rename to packages/flutter/examples/api/test/material/date_picker/show_date_picker.1_test.dart
diff --git a/examples/api/test/material/date_picker/show_date_range_picker.0_test.dart b/packages/flutter/examples/api/test/material/date_picker/show_date_range_picker.0_test.dart
similarity index 100%
rename from examples/api/test/material/date_picker/show_date_range_picker.0_test.dart
rename to packages/flutter/examples/api/test/material/date_picker/show_date_range_picker.0_test.dart
diff --git a/examples/api/test/material/dialog/adaptive_alert_dialog.0_test.dart b/packages/flutter/examples/api/test/material/dialog/adaptive_alert_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/adaptive_alert_dialog.0_test.dart
rename to packages/flutter/examples/api/test/material/dialog/adaptive_alert_dialog.0_test.dart
diff --git a/examples/api/test/material/dialog/alert_dialog.0_test.dart b/packages/flutter/examples/api/test/material/dialog/alert_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/alert_dialog.0_test.dart
rename to packages/flutter/examples/api/test/material/dialog/alert_dialog.0_test.dart
diff --git a/examples/api/test/material/dialog/alert_dialog.1_test.dart b/packages/flutter/examples/api/test/material/dialog/alert_dialog.1_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/alert_dialog.1_test.dart
rename to packages/flutter/examples/api/test/material/dialog/alert_dialog.1_test.dart
diff --git a/examples/api/test/material/dialog/dialog.0_test.dart b/packages/flutter/examples/api/test/material/dialog/dialog.0_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/dialog.0_test.dart
rename to packages/flutter/examples/api/test/material/dialog/dialog.0_test.dart
diff --git a/examples/api/test/material/dialog/show_dialog.0_test.dart b/packages/flutter/examples/api/test/material/dialog/show_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/show_dialog.0_test.dart
rename to packages/flutter/examples/api/test/material/dialog/show_dialog.0_test.dart
diff --git a/examples/api/test/material/dialog/show_dialog.1_test.dart b/packages/flutter/examples/api/test/material/dialog/show_dialog.1_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/show_dialog.1_test.dart
rename to packages/flutter/examples/api/test/material/dialog/show_dialog.1_test.dart
diff --git a/examples/api/test/material/dialog/show_dialog.2_test.dart b/packages/flutter/examples/api/test/material/dialog/show_dialog.2_test.dart
similarity index 100%
rename from examples/api/test/material/dialog/show_dialog.2_test.dart
rename to packages/flutter/examples/api/test/material/dialog/show_dialog.2_test.dart
diff --git a/examples/api/test/material/divider/divider.0_test.dart b/packages/flutter/examples/api/test/material/divider/divider.0_test.dart
similarity index 100%
rename from examples/api/test/material/divider/divider.0_test.dart
rename to packages/flutter/examples/api/test/material/divider/divider.0_test.dart
diff --git a/examples/api/test/material/divider/divider.1_test.dart b/packages/flutter/examples/api/test/material/divider/divider.1_test.dart
similarity index 100%
rename from examples/api/test/material/divider/divider.1_test.dart
rename to packages/flutter/examples/api/test/material/divider/divider.1_test.dart
diff --git a/examples/api/test/material/divider/vertical_divider.0_test.dart b/packages/flutter/examples/api/test/material/divider/vertical_divider.0_test.dart
similarity index 100%
rename from examples/api/test/material/divider/vertical_divider.0_test.dart
rename to packages/flutter/examples/api/test/material/divider/vertical_divider.0_test.dart
diff --git a/examples/api/test/material/divider/vertical_divider.1_test.dart b/packages/flutter/examples/api/test/material/divider/vertical_divider.1_test.dart
similarity index 100%
rename from examples/api/test/material/divider/vertical_divider.1_test.dart
rename to packages/flutter/examples/api/test/material/divider/vertical_divider.1_test.dart
diff --git a/examples/api/test/material/drawer/drawer.0_test.dart b/packages/flutter/examples/api/test/material/drawer/drawer.0_test.dart
similarity index 100%
rename from examples/api/test/material/drawer/drawer.0_test.dart
rename to packages/flutter/examples/api/test/material/drawer/drawer.0_test.dart
diff --git a/examples/api/test/material/dropdown/dropdown_button.0_test.dart b/packages/flutter/examples/api/test/material/dropdown/dropdown_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown/dropdown_button.0_test.dart
rename to packages/flutter/examples/api/test/material/dropdown/dropdown_button.0_test.dart
diff --git a/examples/api/test/material/dropdown/dropdown_button.selected_item_builder.0_test.dart b/packages/flutter/examples/api/test/material/dropdown/dropdown_button.selected_item_builder.0_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown/dropdown_button.selected_item_builder.0_test.dart
rename to packages/flutter/examples/api/test/material/dropdown/dropdown_button.selected_item_builder.0_test.dart
diff --git a/examples/api/test/material/dropdown/dropdown_button.style.0_test.dart b/packages/flutter/examples/api/test/material/dropdown/dropdown_button.style.0_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown/dropdown_button.style.0_test.dart
rename to packages/flutter/examples/api/test/material/dropdown/dropdown_button.style.0_test.dart
diff --git a/examples/api/test/material/dropdown_menu/dropdown_menu.0_test.dart b/packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.0_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown_menu/dropdown_menu.0_test.dart
rename to packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.0_test.dart
diff --git a/examples/api/test/material/dropdown_menu/dropdown_menu.1_test.dart b/packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.1_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown_menu/dropdown_menu.1_test.dart
rename to packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.1_test.dart
diff --git a/examples/api/test/material/dropdown_menu/dropdown_menu.2_test.dart b/packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.2_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown_menu/dropdown_menu.2_test.dart
rename to packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu.2_test.dart
diff --git a/examples/api/test/material/dropdown_menu/dropdown_menu_entry_label_widget.0_test.dart b/packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu_entry_label_widget.0_test.dart
similarity index 100%
rename from examples/api/test/material/dropdown_menu/dropdown_menu_entry_label_widget.0_test.dart
rename to packages/flutter/examples/api/test/material/dropdown_menu/dropdown_menu_entry_label_widget.0_test.dart
diff --git a/examples/api/test/material/elevated_button/elevated_button.0_test.dart b/packages/flutter/examples/api/test/material/elevated_button/elevated_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/elevated_button/elevated_button.0_test.dart
rename to packages/flutter/examples/api/test/material/elevated_button/elevated_button.0_test.dart
diff --git a/examples/api/test/material/expansion_panel/expansion_panel_list.0_test.dart b/packages/flutter/examples/api/test/material/expansion_panel/expansion_panel_list.0_test.dart
similarity index 100%
rename from examples/api/test/material/expansion_panel/expansion_panel_list.0_test.dart
rename to packages/flutter/examples/api/test/material/expansion_panel/expansion_panel_list.0_test.dart
diff --git a/examples/api/test/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0_test.dart b/packages/flutter/examples/api/test/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0_test.dart
similarity index 100%
rename from examples/api/test/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0_test.dart
rename to packages/flutter/examples/api/test/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0_test.dart
diff --git a/examples/api/test/material/expansion_tile/expansion_tile.0_test.dart b/packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/expansion_tile/expansion_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.0_test.dart
diff --git a/examples/api/test/material/expansion_tile/expansion_tile.1_test.dart b/packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.1_test.dart
similarity index 100%
rename from examples/api/test/material/expansion_tile/expansion_tile.1_test.dart
rename to packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.1_test.dart
diff --git a/examples/api/test/material/expansion_tile/expansion_tile.2_test.dart b/packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.2_test.dart
similarity index 100%
rename from examples/api/test/material/expansion_tile/expansion_tile.2_test.dart
rename to packages/flutter/examples/api/test/material/expansion_tile/expansion_tile.2_test.dart
diff --git a/examples/api/test/material/filled_button/filled_button.0_test.dart b/packages/flutter/examples/api/test/material/filled_button/filled_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/filled_button/filled_button.0_test.dart
rename to packages/flutter/examples/api/test/material/filled_button/filled_button.0_test.dart
diff --git a/examples/api/test/material/filter_chip/filter_chip.0_test.dart b/packages/flutter/examples/api/test/material/filter_chip/filter_chip.0_test.dart
similarity index 100%
rename from examples/api/test/material/filter_chip/filter_chip.0_test.dart
rename to packages/flutter/examples/api/test/material/filter_chip/filter_chip.0_test.dart
diff --git a/examples/api/test/material/flexible_space_bar/flexible_space_bar.0_test.dart b/packages/flutter/examples/api/test/material/flexible_space_bar/flexible_space_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/flexible_space_bar/flexible_space_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/flexible_space_bar/flexible_space_bar.0_test.dart
diff --git a/examples/api/test/material/floating_action_button/floating_action_button.0_test.dart b/packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/floating_action_button/floating_action_button.0_test.dart
rename to packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.0_test.dart
diff --git a/examples/api/test/material/floating_action_button/floating_action_button.1_test.dart b/packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.1_test.dart
similarity index 100%
rename from examples/api/test/material/floating_action_button/floating_action_button.1_test.dart
rename to packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.1_test.dart
diff --git a/examples/api/test/material/floating_action_button/floating_action_button.2_test.dart b/packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.2_test.dart
similarity index 100%
rename from examples/api/test/material/floating_action_button/floating_action_button.2_test.dart
rename to packages/flutter/examples/api/test/material/floating_action_button/floating_action_button.2_test.dart
diff --git a/examples/api/test/material/floating_action_button_location/standard_fab_location.0_test.dart b/packages/flutter/examples/api/test/material/floating_action_button_location/standard_fab_location.0_test.dart
similarity index 100%
rename from examples/api/test/material/floating_action_button_location/standard_fab_location.0_test.dart
rename to packages/flutter/examples/api/test/material/floating_action_button_location/standard_fab_location.0_test.dart
diff --git a/examples/api/test/material/icon_alignment/icon_alignment.0_test.dart b/packages/flutter/examples/api/test/material/icon_alignment/icon_alignment.0_test.dart
similarity index 100%
rename from examples/api/test/material/icon_alignment/icon_alignment.0_test.dart
rename to packages/flutter/examples/api/test/material/icon_alignment/icon_alignment.0_test.dart
diff --git a/examples/api/test/material/icon_button/icon_button.0_test.dart b/packages/flutter/examples/api/test/material/icon_button/icon_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/icon_button/icon_button.0_test.dart
rename to packages/flutter/examples/api/test/material/icon_button/icon_button.0_test.dart
diff --git a/examples/api/test/material/icon_button/icon_button.1_test.dart b/packages/flutter/examples/api/test/material/icon_button/icon_button.1_test.dart
similarity index 100%
rename from examples/api/test/material/icon_button/icon_button.1_test.dart
rename to packages/flutter/examples/api/test/material/icon_button/icon_button.1_test.dart
diff --git a/examples/api/test/material/icon_button/icon_button.2_test.dart b/packages/flutter/examples/api/test/material/icon_button/icon_button.2_test.dart
similarity index 100%
rename from examples/api/test/material/icon_button/icon_button.2_test.dart
rename to packages/flutter/examples/api/test/material/icon_button/icon_button.2_test.dart
diff --git a/examples/api/test/material/icon_button/icon_button.3_test.dart b/packages/flutter/examples/api/test/material/icon_button/icon_button.3_test.dart
similarity index 100%
rename from examples/api/test/material/icon_button/icon_button.3_test.dart
rename to packages/flutter/examples/api/test/material/icon_button/icon_button.3_test.dart
diff --git a/examples/api/test/material/ink/ink.image_clip.0_test.dart b/packages/flutter/examples/api/test/material/ink/ink.image_clip.0_test.dart
similarity index 100%
rename from examples/api/test/material/ink/ink.image_clip.0_test.dart
rename to packages/flutter/examples/api/test/material/ink/ink.image_clip.0_test.dart
diff --git a/examples/api/test/material/ink/ink.image_clip.1_test.dart b/packages/flutter/examples/api/test/material/ink/ink.image_clip.1_test.dart
similarity index 100%
rename from examples/api/test/material/ink/ink.image_clip.1_test.dart
rename to packages/flutter/examples/api/test/material/ink/ink.image_clip.1_test.dart
diff --git a/examples/api/test/material/ink_well/ink_well.0_test.dart b/packages/flutter/examples/api/test/material/ink_well/ink_well.0_test.dart
similarity index 100%
rename from examples/api/test/material/ink_well/ink_well.0_test.dart
rename to packages/flutter/examples/api/test/material/ink_well/ink_well.0_test.dart
diff --git a/examples/api/test/material/input_chip/input_chip.0_test.dart b/packages/flutter/examples/api/test/material/input_chip/input_chip.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_chip/input_chip.0_test.dart
rename to packages/flutter/examples/api/test/material/input_chip/input_chip.0_test.dart
diff --git a/examples/api/test/material/input_chip/input_chip.1_test.dart b/packages/flutter/examples/api/test/material/input_chip/input_chip.1_test.dart
similarity index 100%
rename from examples/api/test/material/input_chip/input_chip.1_test.dart
rename to packages/flutter/examples/api/test/material/input_chip/input_chip.1_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.1_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.1_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.1_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.1_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.2_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.2_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.2_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.2_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.3_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.3_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.3_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.3_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.floating_label_style_error.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.floating_label_style_error.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.floating_label_style_error.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.floating_label_style_error.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.helper.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.helper.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.helper.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.helper.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.label.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.label.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.label.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.label.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.label_style_error.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.label_style_error.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.label_style_error.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.label_style_error.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.prefix_icon.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.prefix_icon.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.prefix_icon.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.prefix_icon.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.prefix_icon_constraints.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.prefix_icon_constraints.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.prefix_icon_constraints.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.prefix_icon_constraints.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.suffix_icon.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.suffix_icon.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.suffix_icon.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.suffix_icon.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.suffix_icon_constraints.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.suffix_icon_constraints.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.suffix_icon_constraints.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.suffix_icon_constraints.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.widget_state.0_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.widget_state.0_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.widget_state.0_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.widget_state.0_test.dart
diff --git a/examples/api/test/material/input_decorator/input_decoration.widget_state.1_test.dart b/packages/flutter/examples/api/test/material/input_decorator/input_decoration.widget_state.1_test.dart
similarity index 100%
rename from examples/api/test/material/input_decorator/input_decoration.widget_state.1_test.dart
rename to packages/flutter/examples/api/test/material/input_decorator/input_decoration.widget_state.1_test.dart
diff --git a/examples/api/test/material/list_tile/custom_list_item.0_test.dart b/packages/flutter/examples/api/test/material/list_tile/custom_list_item.0_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/custom_list_item.0_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/custom_list_item.0_test.dart
diff --git a/examples/api/test/material/list_tile/custom_list_item.1_test.dart b/packages/flutter/examples/api/test/material/list_tile/custom_list_item.1_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/custom_list_item.1_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/custom_list_item.1_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.0_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.0_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.1_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.1_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.1_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.1_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.2_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.2_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.2_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.2_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.3_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.3_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.3_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.3_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.4_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.4_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.4_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.4_test.dart
diff --git a/examples/api/test/material/list_tile/list_tile.selected.0_test.dart b/packages/flutter/examples/api/test/material/list_tile/list_tile.selected.0_test.dart
similarity index 100%
rename from examples/api/test/material/list_tile/list_tile.selected.0_test.dart
rename to packages/flutter/examples/api/test/material/list_tile/list_tile.selected.0_test.dart
diff --git a/examples/api/test/material/material_state/material_state_border_side.0_test.dart b/packages/flutter/examples/api/test/material/material_state/material_state_border_side.0_test.dart
similarity index 100%
rename from examples/api/test/material/material_state/material_state_border_side.0_test.dart
rename to packages/flutter/examples/api/test/material/material_state/material_state_border_side.0_test.dart
diff --git a/examples/api/test/material/material_state/material_state_mouse_cursor.0_test.dart b/packages/flutter/examples/api/test/material/material_state/material_state_mouse_cursor.0_test.dart
similarity index 100%
rename from examples/api/test/material/material_state/material_state_mouse_cursor.0_test.dart
rename to packages/flutter/examples/api/test/material/material_state/material_state_mouse_cursor.0_test.dart
diff --git a/examples/api/test/material/material_state/material_state_property.0_test.dart b/packages/flutter/examples/api/test/material/material_state/material_state_property.0_test.dart
similarity index 100%
rename from examples/api/test/material/material_state/material_state_property.0_test.dart
rename to packages/flutter/examples/api/test/material/material_state/material_state_property.0_test.dart
diff --git a/examples/api/test/material/menu_anchor/checkbox_menu_button.0_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/checkbox_menu_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/checkbox_menu_button.0_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/checkbox_menu_button.0_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_accelerator_label.0_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_accelerator_label.0_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_accelerator_label.0_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_accelerator_label.0_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_anchor.0_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.0_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_anchor.0_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.0_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_anchor.1_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.1_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_anchor.1_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.1_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_anchor.2_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.2_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_anchor.2_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.2_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_anchor.3_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.3_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_anchor.3_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_anchor.3_test.dart
diff --git a/examples/api/test/material/menu_anchor/menu_bar.0_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/menu_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/menu_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/menu_bar.0_test.dart
diff --git a/examples/api/test/material/menu_anchor/radio_menu_button.0_test.dart b/packages/flutter/examples/api/test/material/menu_anchor/radio_menu_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/menu_anchor/radio_menu_button.0_test.dart
rename to packages/flutter/examples/api/test/material/menu_anchor/radio_menu_button.0_test.dart
diff --git a/examples/api/test/material/navigation_bar/navigation_bar.0_test.dart b/packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_bar/navigation_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.0_test.dart
diff --git a/examples/api/test/material/navigation_bar/navigation_bar.1_test.dart b/packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_bar/navigation_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.1_test.dart
diff --git a/examples/api/test/material/navigation_bar/navigation_bar.2_test.dart b/packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_bar/navigation_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/navigation_bar/navigation_bar.2_test.dart
diff --git a/examples/api/test/material/navigation_drawer/navigation_drawer.0_test.dart b/packages/flutter/examples/api/test/material/navigation_drawer/navigation_drawer.0_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_drawer/navigation_drawer.0_test.dart
rename to packages/flutter/examples/api/test/material/navigation_drawer/navigation_drawer.0_test.dart
diff --git a/examples/api/test/material/navigation_rail/navigation_rail.0_test.dart b/packages/flutter/examples/api/test/material/navigation_rail/navigation_rail.0_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_rail/navigation_rail.0_test.dart
rename to packages/flutter/examples/api/test/material/navigation_rail/navigation_rail.0_test.dart
diff --git a/examples/api/test/material/navigation_rail/navigation_rail.extended_animation.0_test.dart b/packages/flutter/examples/api/test/material/navigation_rail/navigation_rail.extended_animation.0_test.dart
similarity index 100%
rename from examples/api/test/material/navigation_rail/navigation_rail.extended_animation.0_test.dart
rename to packages/flutter/examples/api/test/material/navigation_rail/navigation_rail.extended_animation.0_test.dart
diff --git a/examples/api/test/material/outlined_button/outlined_button.0_test.dart b/packages/flutter/examples/api/test/material/outlined_button/outlined_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/outlined_button/outlined_button.0_test.dart
rename to packages/flutter/examples/api/test/material/outlined_button/outlined_button.0_test.dart
diff --git a/examples/api/test/material/page_transitions_theme/page_transitions_theme.0_test.dart b/packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.0_test.dart
similarity index 100%
rename from examples/api/test/material/page_transitions_theme/page_transitions_theme.0_test.dart
rename to packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.0_test.dart
diff --git a/examples/api/test/material/page_transitions_theme/page_transitions_theme.1_test.dart b/packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.1_test.dart
similarity index 100%
rename from examples/api/test/material/page_transitions_theme/page_transitions_theme.1_test.dart
rename to packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.1_test.dart
diff --git a/examples/api/test/material/page_transitions_theme/page_transitions_theme.3_test.dart b/packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.3_test.dart
similarity index 100%
rename from examples/api/test/material/page_transitions_theme/page_transitions_theme.3_test.dart
rename to packages/flutter/examples/api/test/material/page_transitions_theme/page_transitions_theme.3_test.dart
diff --git a/examples/api/test/material/paginated_data_table/paginated_data_table.0_test.dart b/packages/flutter/examples/api/test/material/paginated_data_table/paginated_data_table.0_test.dart
similarity index 100%
rename from examples/api/test/material/paginated_data_table/paginated_data_table.0_test.dart
rename to packages/flutter/examples/api/test/material/paginated_data_table/paginated_data_table.0_test.dart
diff --git a/examples/api/test/material/paginated_data_table/paginated_data_table.1_test.dart b/packages/flutter/examples/api/test/material/paginated_data_table/paginated_data_table.1_test.dart
similarity index 100%
rename from examples/api/test/material/paginated_data_table/paginated_data_table.1_test.dart
rename to packages/flutter/examples/api/test/material/paginated_data_table/paginated_data_table.1_test.dart
diff --git a/examples/api/test/material/popup_menu/popup_menu.0_test.dart b/packages/flutter/examples/api/test/material/popup_menu/popup_menu.0_test.dart
similarity index 100%
rename from examples/api/test/material/popup_menu/popup_menu.0_test.dart
rename to packages/flutter/examples/api/test/material/popup_menu/popup_menu.0_test.dart
diff --git a/examples/api/test/material/popup_menu/popup_menu.1_test.dart b/packages/flutter/examples/api/test/material/popup_menu/popup_menu.1_test.dart
similarity index 100%
rename from examples/api/test/material/popup_menu/popup_menu.1_test.dart
rename to packages/flutter/examples/api/test/material/popup_menu/popup_menu.1_test.dart
diff --git a/examples/api/test/material/popup_menu/popup_menu.2_test.dart b/packages/flutter/examples/api/test/material/popup_menu/popup_menu.2_test.dart
similarity index 100%
rename from examples/api/test/material/popup_menu/popup_menu.2_test.dart
rename to packages/flutter/examples/api/test/material/popup_menu/popup_menu.2_test.dart
diff --git a/examples/api/test/material/progress_indicator/circular_progress_indicator.0_test.dart b/packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/material/progress_indicator/circular_progress_indicator.0_test.dart
rename to packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.0_test.dart
diff --git a/examples/api/test/material/progress_indicator/circular_progress_indicator.1_test.dart b/packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.1_test.dart
similarity index 100%
rename from examples/api/test/material/progress_indicator/circular_progress_indicator.1_test.dart
rename to packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.1_test.dart
diff --git a/examples/api/test/material/progress_indicator/circular_progress_indicator.2_test.dart b/packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.2_test.dart
similarity index 100%
rename from examples/api/test/material/progress_indicator/circular_progress_indicator.2_test.dart
rename to packages/flutter/examples/api/test/material/progress_indicator/circular_progress_indicator.2_test.dart
diff --git a/examples/api/test/material/progress_indicator/linear_progress_indicator.0_test.dart b/packages/flutter/examples/api/test/material/progress_indicator/linear_progress_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/material/progress_indicator/linear_progress_indicator.0_test.dart
rename to packages/flutter/examples/api/test/material/progress_indicator/linear_progress_indicator.0_test.dart
diff --git a/examples/api/test/material/progress_indicator/linear_progress_indicator.1_test.dart b/packages/flutter/examples/api/test/material/progress_indicator/linear_progress_indicator.1_test.dart
similarity index 100%
rename from examples/api/test/material/progress_indicator/linear_progress_indicator.1_test.dart
rename to packages/flutter/examples/api/test/material/progress_indicator/linear_progress_indicator.1_test.dart
diff --git a/examples/api/test/material/radio/radio.0_test.dart b/packages/flutter/examples/api/test/material/radio/radio.0_test.dart
similarity index 100%
rename from examples/api/test/material/radio/radio.0_test.dart
rename to packages/flutter/examples/api/test/material/radio/radio.0_test.dart
diff --git a/examples/api/test/material/radio/radio.1_test.dart b/packages/flutter/examples/api/test/material/radio/radio.1_test.dart
similarity index 100%
rename from examples/api/test/material/radio/radio.1_test.dart
rename to packages/flutter/examples/api/test/material/radio/radio.1_test.dart
diff --git a/examples/api/test/material/radio/radio.toggleable.0_test.dart b/packages/flutter/examples/api/test/material/radio/radio.toggleable.0_test.dart
similarity index 100%
rename from examples/api/test/material/radio/radio.toggleable.0_test.dart
rename to packages/flutter/examples/api/test/material/radio/radio.toggleable.0_test.dart
diff --git a/examples/api/test/material/radio_list_tile/custom_labeled_radio.0_test.dart b/packages/flutter/examples/api/test/material/radio_list_tile/custom_labeled_radio.0_test.dart
similarity index 100%
rename from examples/api/test/material/radio_list_tile/custom_labeled_radio.0_test.dart
rename to packages/flutter/examples/api/test/material/radio_list_tile/custom_labeled_radio.0_test.dart
diff --git a/examples/api/test/material/radio_list_tile/custom_labeled_radio.1_test.dart b/packages/flutter/examples/api/test/material/radio_list_tile/custom_labeled_radio.1_test.dart
similarity index 100%
rename from examples/api/test/material/radio_list_tile/custom_labeled_radio.1_test.dart
rename to packages/flutter/examples/api/test/material/radio_list_tile/custom_labeled_radio.1_test.dart
diff --git a/examples/api/test/material/radio_list_tile/radio_list_tile.0_test.dart b/packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/radio_list_tile/radio_list_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.0_test.dart
diff --git a/examples/api/test/material/radio_list_tile/radio_list_tile.1_test.dart b/packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.1_test.dart
similarity index 100%
rename from examples/api/test/material/radio_list_tile/radio_list_tile.1_test.dart
rename to packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.1_test.dart
diff --git a/examples/api/test/material/radio_list_tile/radio_list_tile.toggleable.0_test.dart b/packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.toggleable.0_test.dart
similarity index 100%
rename from examples/api/test/material/radio_list_tile/radio_list_tile.toggleable.0_test.dart
rename to packages/flutter/examples/api/test/material/radio_list_tile/radio_list_tile.toggleable.0_test.dart
diff --git a/examples/api/test/material/range_slider/range_slider.0_test.dart b/packages/flutter/examples/api/test/material/range_slider/range_slider.0_test.dart
similarity index 100%
rename from examples/api/test/material/range_slider/range_slider.0_test.dart
rename to packages/flutter/examples/api/test/material/range_slider/range_slider.0_test.dart
diff --git a/examples/api/test/material/refresh_indicator/refresh_indicator.0_test.dart b/packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/material/refresh_indicator/refresh_indicator.0_test.dart
rename to packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.0_test.dart
diff --git a/examples/api/test/material/refresh_indicator/refresh_indicator.1_test.dart b/packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.1_test.dart
similarity index 100%
rename from examples/api/test/material/refresh_indicator/refresh_indicator.1_test.dart
rename to packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.1_test.dart
diff --git a/examples/api/test/material/refresh_indicator/refresh_indicator.2_test.dart b/packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.2_test.dart
similarity index 100%
rename from examples/api/test/material/refresh_indicator/refresh_indicator.2_test.dart
rename to packages/flutter/examples/api/test/material/refresh_indicator/refresh_indicator.2_test.dart
diff --git a/examples/api/test/material/reorderable_list/reorderable_list_view.0_test.dart b/packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.0_test.dart
similarity index 100%
rename from examples/api/test/material/reorderable_list/reorderable_list_view.0_test.dart
rename to packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.0_test.dart
diff --git a/examples/api/test/material/reorderable_list/reorderable_list_view.1_test.dart b/packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.1_test.dart
similarity index 100%
rename from examples/api/test/material/reorderable_list/reorderable_list_view.1_test.dart
rename to packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.1_test.dart
diff --git a/examples/api/test/material/reorderable_list/reorderable_list_view.2_test.dart b/packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.2_test.dart
similarity index 100%
rename from examples/api/test/material/reorderable_list/reorderable_list_view.2_test.dart
rename to packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.2_test.dart
diff --git a/examples/api/test/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0_test.dart b/packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0_test.dart
similarity index 100%
rename from examples/api/test/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0_test.dart
rename to packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.build_default_drag_handles.0_test.dart
diff --git a/examples/api/test/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0_test.dart b/packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0_test.dart
similarity index 100%
rename from examples/api/test/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0_test.dart
rename to packages/flutter/examples/api/test/material/reorderable_list/reorderable_list_view.reorderable_list_view_builder.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.1_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.1_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.1_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.1_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.2_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.2_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.2_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.2_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.drawer.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.drawer.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.drawer.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.drawer.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.end_drawer.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.end_drawer.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.end_drawer.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.end_drawer.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.floating_action_button_animator.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.floating_action_button_animator.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.floating_action_button_animator.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.floating_action_button_animator.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.of.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.of.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.of.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.of.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold.of.1_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold.of.1_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold.of.1_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold.of.1_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger.of.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.of.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger.of.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.of.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger.of.1_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.of.1_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger.of.1_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger.of.1_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger_state.show_material_banner.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_material_banner.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger_state.show_material_banner.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_material_banner.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.1_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.1_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.2_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_messenger_state.show_snack_bar.2_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.0_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.0_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.0_test.dart
diff --git a/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.1_test.dart b/packages/flutter/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.1_test.dart
similarity index 100%
rename from examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.1_test.dart
rename to packages/flutter/examples/api/test/material/scaffold/scaffold_state.show_bottom_sheet.1_test.dart
diff --git a/examples/api/test/material/scrollbar/scrollbar.0_test.dart b/packages/flutter/examples/api/test/material/scrollbar/scrollbar.0_test.dart
similarity index 100%
rename from examples/api/test/material/scrollbar/scrollbar.0_test.dart
rename to packages/flutter/examples/api/test/material/scrollbar/scrollbar.0_test.dart
diff --git a/examples/api/test/material/scrollbar/scrollbar.1_test.dart b/packages/flutter/examples/api/test/material/scrollbar/scrollbar.1_test.dart
similarity index 100%
rename from examples/api/test/material/scrollbar/scrollbar.1_test.dart
rename to packages/flutter/examples/api/test/material/scrollbar/scrollbar.1_test.dart
diff --git a/examples/api/test/material/search_anchor/search_anchor.0_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_anchor.0_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_anchor.0_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_anchor.0_test.dart
diff --git a/examples/api/test/material/search_anchor/search_anchor.1_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_anchor.1_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_anchor.1_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_anchor.1_test.dart
diff --git a/examples/api/test/material/search_anchor/search_anchor.2_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_anchor.2_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_anchor.2_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_anchor.2_test.dart
diff --git a/examples/api/test/material/search_anchor/search_anchor.3_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_anchor.3_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_anchor.3_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_anchor.3_test.dart
diff --git a/examples/api/test/material/search_anchor/search_anchor.4_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_anchor.4_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_anchor.4_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_anchor.4_test.dart
diff --git a/examples/api/test/material/search_anchor/search_bar.0_test.dart b/packages/flutter/examples/api/test/material/search_anchor/search_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/search_anchor/search_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/search_anchor/search_bar.0_test.dart
diff --git a/examples/api/test/material/segmented_button/segmented_button.0_test.dart b/packages/flutter/examples/api/test/material/segmented_button/segmented_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/segmented_button/segmented_button.0_test.dart
rename to packages/flutter/examples/api/test/material/segmented_button/segmented_button.0_test.dart
diff --git a/examples/api/test/material/segmented_button/segmented_button.1_test.dart b/packages/flutter/examples/api/test/material/segmented_button/segmented_button.1_test.dart
similarity index 100%
rename from examples/api/test/material/segmented_button/segmented_button.1_test.dart
rename to packages/flutter/examples/api/test/material/segmented_button/segmented_button.1_test.dart
diff --git a/examples/api/test/material/selection_area/selection_area.0_test.dart b/packages/flutter/examples/api/test/material/selection_area/selection_area.0_test.dart
similarity index 100%
rename from examples/api/test/material/selection_area/selection_area.0_test.dart
rename to packages/flutter/examples/api/test/material/selection_area/selection_area.0_test.dart
diff --git a/examples/api/test/material/selection_area/selection_area.1_test.dart b/packages/flutter/examples/api/test/material/selection_area/selection_area.1_test.dart
similarity index 100%
rename from examples/api/test/material/selection_area/selection_area.1_test.dart
rename to packages/flutter/examples/api/test/material/selection_area/selection_area.1_test.dart
diff --git a/examples/api/test/material/selection_area/selection_area.2_test.dart b/packages/flutter/examples/api/test/material/selection_area/selection_area.2_test.dart
similarity index 100%
rename from examples/api/test/material/selection_area/selection_area.2_test.dart
rename to packages/flutter/examples/api/test/material/selection_area/selection_area.2_test.dart
diff --git a/examples/api/test/material/shaped_input_border/shaped_input_border.0_test.dart b/packages/flutter/examples/api/test/material/shaped_input_border/shaped_input_border.0_test.dart
similarity index 100%
rename from examples/api/test/material/shaped_input_border/shaped_input_border.0_test.dart
rename to packages/flutter/examples/api/test/material/shaped_input_border/shaped_input_border.0_test.dart
diff --git a/examples/api/test/material/slider/slider.0_test.dart b/packages/flutter/examples/api/test/material/slider/slider.0_test.dart
similarity index 100%
rename from examples/api/test/material/slider/slider.0_test.dart
rename to packages/flutter/examples/api/test/material/slider/slider.0_test.dart
diff --git a/examples/api/test/material/slider/slider.1_test.dart b/packages/flutter/examples/api/test/material/slider/slider.1_test.dart
similarity index 100%
rename from examples/api/test/material/slider/slider.1_test.dart
rename to packages/flutter/examples/api/test/material/slider/slider.1_test.dart
diff --git a/examples/api/test/material/snack_bar/snack_bar.0_test.dart b/packages/flutter/examples/api/test/material/snack_bar/snack_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/snack_bar/snack_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/snack_bar/snack_bar.0_test.dart
diff --git a/examples/api/test/material/snack_bar/snack_bar.1_test.dart b/packages/flutter/examples/api/test/material/snack_bar/snack_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/snack_bar/snack_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/snack_bar/snack_bar.1_test.dart
diff --git a/examples/api/test/material/snack_bar/snack_bar.2_test.dart b/packages/flutter/examples/api/test/material/snack_bar/snack_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/snack_bar/snack_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/snack_bar/snack_bar.2_test.dart
diff --git a/examples/api/test/material/stepper/step_style.0_test.dart b/packages/flutter/examples/api/test/material/stepper/step_style.0_test.dart
similarity index 100%
rename from examples/api/test/material/stepper/step_style.0_test.dart
rename to packages/flutter/examples/api/test/material/stepper/step_style.0_test.dart
diff --git a/examples/api/test/material/stepper/stepper.0_test.dart b/packages/flutter/examples/api/test/material/stepper/stepper.0_test.dart
similarity index 100%
rename from examples/api/test/material/stepper/stepper.0_test.dart
rename to packages/flutter/examples/api/test/material/stepper/stepper.0_test.dart
diff --git a/examples/api/test/material/stepper/stepper.controls_builder.0_test.dart b/packages/flutter/examples/api/test/material/stepper/stepper.controls_builder.0_test.dart
similarity index 100%
rename from examples/api/test/material/stepper/stepper.controls_builder.0_test.dart
rename to packages/flutter/examples/api/test/material/stepper/stepper.controls_builder.0_test.dart
diff --git a/examples/api/test/material/switch/switch.0_test.dart b/packages/flutter/examples/api/test/material/switch/switch.0_test.dart
similarity index 100%
rename from examples/api/test/material/switch/switch.0_test.dart
rename to packages/flutter/examples/api/test/material/switch/switch.0_test.dart
diff --git a/examples/api/test/material/switch/switch.1_test.dart b/packages/flutter/examples/api/test/material/switch/switch.1_test.dart
similarity index 100%
rename from examples/api/test/material/switch/switch.1_test.dart
rename to packages/flutter/examples/api/test/material/switch/switch.1_test.dart
diff --git a/examples/api/test/material/switch/switch.2_test.dart b/packages/flutter/examples/api/test/material/switch/switch.2_test.dart
similarity index 100%
rename from examples/api/test/material/switch/switch.2_test.dart
rename to packages/flutter/examples/api/test/material/switch/switch.2_test.dart
diff --git a/examples/api/test/material/switch/switch.3_test.dart b/packages/flutter/examples/api/test/material/switch/switch.3_test.dart
similarity index 100%
rename from examples/api/test/material/switch/switch.3_test.dart
rename to packages/flutter/examples/api/test/material/switch/switch.3_test.dart
diff --git a/examples/api/test/material/switch/switch.4_test.dart b/packages/flutter/examples/api/test/material/switch/switch.4_test.dart
similarity index 100%
rename from examples/api/test/material/switch/switch.4_test.dart
rename to packages/flutter/examples/api/test/material/switch/switch.4_test.dart
diff --git a/examples/api/test/material/switch_list_tile/custom_labeled_switch.0_test.dart b/packages/flutter/examples/api/test/material/switch_list_tile/custom_labeled_switch.0_test.dart
similarity index 100%
rename from examples/api/test/material/switch_list_tile/custom_labeled_switch.0_test.dart
rename to packages/flutter/examples/api/test/material/switch_list_tile/custom_labeled_switch.0_test.dart
diff --git a/examples/api/test/material/switch_list_tile/custom_labeled_switch.1_test.dart b/packages/flutter/examples/api/test/material/switch_list_tile/custom_labeled_switch.1_test.dart
similarity index 100%
rename from examples/api/test/material/switch_list_tile/custom_labeled_switch.1_test.dart
rename to packages/flutter/examples/api/test/material/switch_list_tile/custom_labeled_switch.1_test.dart
diff --git a/examples/api/test/material/switch_list_tile/switch_list_tile.0_test.dart b/packages/flutter/examples/api/test/material/switch_list_tile/switch_list_tile.0_test.dart
similarity index 100%
rename from examples/api/test/material/switch_list_tile/switch_list_tile.0_test.dart
rename to packages/flutter/examples/api/test/material/switch_list_tile/switch_list_tile.0_test.dart
diff --git a/examples/api/test/material/switch_list_tile/switch_list_tile.1_test.dart b/packages/flutter/examples/api/test/material/switch_list_tile/switch_list_tile.1_test.dart
similarity index 100%
rename from examples/api/test/material/switch_list_tile/switch_list_tile.1_test.dart
rename to packages/flutter/examples/api/test/material/switch_list_tile/switch_list_tile.1_test.dart
diff --git a/examples/api/test/material/tab_controller/tab_controller.1_test.dart b/packages/flutter/examples/api/test/material/tab_controller/tab_controller.1_test.dart
similarity index 100%
rename from examples/api/test/material/tab_controller/tab_controller.1_test.dart
rename to packages/flutter/examples/api/test/material/tab_controller/tab_controller.1_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.0_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.0_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.0_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.0_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.1_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.1_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.1_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.1_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.2_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.2_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.2_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.2_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.3_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.3_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.3_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.3_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.indicator_animation.0_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.indicator_animation.0_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.indicator_animation.0_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.indicator_animation.0_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.onFocusChange_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.onFocusChange_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.onFocusChange_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.onFocusChange_test.dart
diff --git a/examples/api/test/material/tabs/tab_bar.onHover_test.dart b/packages/flutter/examples/api/test/material/tabs/tab_bar.onHover_test.dart
similarity index 100%
rename from examples/api/test/material/tabs/tab_bar.onHover_test.dart
rename to packages/flutter/examples/api/test/material/tabs/tab_bar.onHover_test.dart
diff --git a/examples/api/test/material/text_button/text_button.0_test.dart b/packages/flutter/examples/api/test/material/text_button/text_button.0_test.dart
similarity index 100%
rename from examples/api/test/material/text_button/text_button.0_test.dart
rename to packages/flutter/examples/api/test/material/text_button/text_button.0_test.dart
diff --git a/examples/api/test/material/text_button/text_button.1_test.dart b/packages/flutter/examples/api/test/material/text_button/text_button.1_test.dart
similarity index 100%
rename from examples/api/test/material/text_button/text_button.1_test.dart
rename to packages/flutter/examples/api/test/material/text_button/text_button.1_test.dart
diff --git a/examples/api/test/material/text_field/text_field.0_test.dart b/packages/flutter/examples/api/test/material/text_field/text_field.0_test.dart
similarity index 100%
rename from examples/api/test/material/text_field/text_field.0_test.dart
rename to packages/flutter/examples/api/test/material/text_field/text_field.0_test.dart
diff --git a/examples/api/test/material/text_field/text_field.1_test.dart b/packages/flutter/examples/api/test/material/text_field/text_field.1_test.dart
similarity index 100%
rename from examples/api/test/material/text_field/text_field.1_test.dart
rename to packages/flutter/examples/api/test/material/text_field/text_field.1_test.dart
diff --git a/examples/api/test/material/text_field/text_field.2_test.dart b/packages/flutter/examples/api/test/material/text_field/text_field.2_test.dart
similarity index 100%
rename from examples/api/test/material/text_field/text_field.2_test.dart
rename to packages/flutter/examples/api/test/material/text_field/text_field.2_test.dart
diff --git a/examples/api/test/material/text_field/text_field.3_test.dart b/packages/flutter/examples/api/test/material/text_field/text_field.3_test.dart
similarity index 100%
rename from examples/api/test/material/text_field/text_field.3_test.dart
rename to packages/flutter/examples/api/test/material/text_field/text_field.3_test.dart
diff --git a/examples/api/test/material/text_form_field/text_form_field.1_test.dart b/packages/flutter/examples/api/test/material/text_form_field/text_form_field.1_test.dart
similarity index 100%
rename from examples/api/test/material/text_form_field/text_form_field.1_test.dart
rename to packages/flutter/examples/api/test/material/text_form_field/text_form_field.1_test.dart
diff --git a/examples/api/test/material/text_form_field/text_form_field.2_test.dart b/packages/flutter/examples/api/test/material/text_form_field/text_form_field.2_test.dart
similarity index 100%
rename from examples/api/test/material/text_form_field/text_form_field.2_test.dart
rename to packages/flutter/examples/api/test/material/text_form_field/text_form_field.2_test.dart
diff --git a/examples/api/test/material/theme/theme_extension.1_test.dart b/packages/flutter/examples/api/test/material/theme/theme_extension.1_test.dart
similarity index 100%
rename from examples/api/test/material/theme/theme_extension.1_test.dart
rename to packages/flutter/examples/api/test/material/theme/theme_extension.1_test.dart
diff --git a/examples/api/test/material/theme_data/theme_data.0_test.dart b/packages/flutter/examples/api/test/material/theme_data/theme_data.0_test.dart
similarity index 100%
rename from examples/api/test/material/theme_data/theme_data.0_test.dart
rename to packages/flutter/examples/api/test/material/theme_data/theme_data.0_test.dart
diff --git a/examples/api/test/material/time_picker/show_time_picker.0_test.dart b/packages/flutter/examples/api/test/material/time_picker/show_time_picker.0_test.dart
similarity index 100%
rename from examples/api/test/material/time_picker/show_time_picker.0_test.dart
rename to packages/flutter/examples/api/test/material/time_picker/show_time_picker.0_test.dart
diff --git a/examples/api/test/material/toggle_buttons/toggle_buttons.0_test.dart b/packages/flutter/examples/api/test/material/toggle_buttons/toggle_buttons.0_test.dart
similarity index 100%
rename from examples/api/test/material/toggle_buttons/toggle_buttons.0_test.dart
rename to packages/flutter/examples/api/test/material/toggle_buttons/toggle_buttons.0_test.dart
diff --git a/examples/api/test/material/toggle_buttons/toggle_buttons.1_test.dart b/packages/flutter/examples/api/test/material/toggle_buttons/toggle_buttons.1_test.dart
similarity index 100%
rename from examples/api/test/material/toggle_buttons/toggle_buttons.1_test.dart
rename to packages/flutter/examples/api/test/material/toggle_buttons/toggle_buttons.1_test.dart
diff --git a/examples/api/test/material/tooltip/tooltip.0_test.dart b/packages/flutter/examples/api/test/material/tooltip/tooltip.0_test.dart
similarity index 100%
rename from examples/api/test/material/tooltip/tooltip.0_test.dart
rename to packages/flutter/examples/api/test/material/tooltip/tooltip.0_test.dart
diff --git a/examples/api/test/material/tooltip/tooltip.1_test.dart b/packages/flutter/examples/api/test/material/tooltip/tooltip.1_test.dart
similarity index 100%
rename from examples/api/test/material/tooltip/tooltip.1_test.dart
rename to packages/flutter/examples/api/test/material/tooltip/tooltip.1_test.dart
diff --git a/examples/api/test/material/tooltip/tooltip.2_test.dart b/packages/flutter/examples/api/test/material/tooltip/tooltip.2_test.dart
similarity index 100%
rename from examples/api/test/material/tooltip/tooltip.2_test.dart
rename to packages/flutter/examples/api/test/material/tooltip/tooltip.2_test.dart
diff --git a/examples/api/test/material/tooltip/tooltip.3_test.dart b/packages/flutter/examples/api/test/material/tooltip/tooltip.3_test.dart
similarity index 100%
rename from examples/api/test/material/tooltip/tooltip.3_test.dart
rename to packages/flutter/examples/api/test/material/tooltip/tooltip.3_test.dart
diff --git a/examples/api/test/material/widget_state_input_border/widget_state_input_border.0_test.dart b/packages/flutter/examples/api/test/material/widget_state_input_border/widget_state_input_border.0_test.dart
similarity index 100%
rename from examples/api/test/material/widget_state_input_border/widget_state_input_border.0_test.dart
rename to packages/flutter/examples/api/test/material/widget_state_input_border/widget_state_input_border.0_test.dart
diff --git a/examples/api/test/painting/axis_direction/axis_direction.0_test.dart b/packages/flutter/examples/api/test/painting/axis_direction/axis_direction.0_test.dart
similarity index 100%
rename from examples/api/test/painting/axis_direction/axis_direction.0_test.dart
rename to packages/flutter/examples/api/test/painting/axis_direction/axis_direction.0_test.dart
diff --git a/examples/api/test/painting/borders/border_side.stroke_align.0_test.dart b/packages/flutter/examples/api/test/painting/borders/border_side.stroke_align.0_test.dart
similarity index 100%
rename from examples/api/test/painting/borders/border_side.stroke_align.0_test.dart
rename to packages/flutter/examples/api/test/painting/borders/border_side.stroke_align.0_test.dart
diff --git a/examples/api/test/painting/gradient/linear_gradient.0_test.dart b/packages/flutter/examples/api/test/painting/gradient/linear_gradient.0_test.dart
similarity index 88%
rename from examples/api/test/painting/gradient/linear_gradient.0_test.dart
rename to packages/flutter/examples/api/test/painting/gradient/linear_gradient.0_test.dart
index 4e5308b45486f..e3eb4fb92e3e5 100644
--- a/examples/api/test/painting/gradient/linear_gradient.0_test.dart
+++ b/packages/flutter/examples/api/test/painting/gradient/linear_gradient.0_test.dart
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// This file is run as part of a reduced test set in CI on Mac and Windows
+// machines.
+@Tags(<String>['reduced-test-set'])
+library;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_api_samples/painting/gradient/linear_gradient.0.dart'
     as example;
diff --git a/examples/api/test/painting/image_provider/image_provider.0_test.dart b/packages/flutter/examples/api/test/painting/image_provider/image_provider.0_test.dart
similarity index 100%
rename from examples/api/test/painting/image_provider/image_provider.0_test.dart
rename to packages/flutter/examples/api/test/painting/image_provider/image_provider.0_test.dart
diff --git a/examples/api/test/painting/linear_border/linear_border.0_test.dart b/packages/flutter/examples/api/test/painting/linear_border/linear_border.0_test.dart
similarity index 100%
rename from examples/api/test/painting/linear_border/linear_border.0_test.dart
rename to packages/flutter/examples/api/test/painting/linear_border/linear_border.0_test.dart
diff --git a/examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart b/packages/flutter/examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart
similarity index 100%
rename from examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart
rename to packages/flutter/examples/api/test/painting/rounded_superellipse_border/rounded_superellipse_border.0_test.dart
diff --git a/examples/api/test/painting/star_border/star_border.0_test.dart b/packages/flutter/examples/api/test/painting/star_border/star_border.0_test.dart
similarity index 100%
rename from examples/api/test/painting/star_border/star_border.0_test.dart
rename to packages/flutter/examples/api/test/painting/star_border/star_border.0_test.dart
diff --git a/examples/api/test/rendering/box/parent_data.0_test.dart b/packages/flutter/examples/api/test/rendering/box/parent_data.0_test.dart
similarity index 100%
rename from examples/api/test/rendering/box/parent_data.0_test.dart
rename to packages/flutter/examples/api/test/rendering/box/parent_data.0_test.dart
diff --git a/examples/api/test/rendering/growth_direction/growth_direction.0_test.dart b/packages/flutter/examples/api/test/rendering/growth_direction/growth_direction.0_test.dart
similarity index 100%
rename from examples/api/test/rendering/growth_direction/growth_direction.0_test.dart
rename to packages/flutter/examples/api/test/rendering/growth_direction/growth_direction.0_test.dart
diff --git a/examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart b/packages/flutter/examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart
similarity index 100%
rename from examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart
rename to packages/flutter/examples/api/test/rendering/scroll_direction/scroll_direction.0_test.dart
diff --git a/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart b/packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart
similarity index 100%
rename from examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart
rename to packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.0_test.dart
diff --git a/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart b/packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart
similarity index 100%
rename from examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart
rename to packages/flutter/examples/api/test/rendering/sliver_grid/sliver_grid_delegate_with_fixed_cross_axis_count.1_test.dart
diff --git a/examples/api/test/sample_templates/cupertino.0_test.dart b/packages/flutter/examples/api/test/sample_templates/cupertino.0_test.dart
similarity index 100%
rename from examples/api/test/sample_templates/cupertino.0_test.dart
rename to packages/flutter/examples/api/test/sample_templates/cupertino.0_test.dart
diff --git a/examples/api/test/sample_templates/material.0_test.dart b/packages/flutter/examples/api/test/sample_templates/material.0_test.dart
similarity index 100%
rename from examples/api/test/sample_templates/material.0_test.dart
rename to packages/flutter/examples/api/test/sample_templates/material.0_test.dart
diff --git a/examples/api/test/sample_templates/widgets.0_test.dart b/packages/flutter/examples/api/test/sample_templates/widgets.0_test.dart
similarity index 100%
rename from examples/api/test/sample_templates/widgets.0_test.dart
rename to packages/flutter/examples/api/test/sample_templates/widgets.0_test.dart
diff --git a/examples/api/test/services/binding/handle_request_app_exit.0_test.dart b/packages/flutter/examples/api/test/services/binding/handle_request_app_exit.0_test.dart
similarity index 100%
rename from examples/api/test/services/binding/handle_request_app_exit.0_test.dart
rename to packages/flutter/examples/api/test/services/binding/handle_request_app_exit.0_test.dart
diff --git a/examples/api/test/services/keyboard_key/logical_keyboard_key.0_test.dart b/packages/flutter/examples/api/test/services/keyboard_key/logical_keyboard_key.0_test.dart
similarity index 100%
rename from examples/api/test/services/keyboard_key/logical_keyboard_key.0_test.dart
rename to packages/flutter/examples/api/test/services/keyboard_key/logical_keyboard_key.0_test.dart
diff --git a/examples/api/test/services/keyboard_key/physical_keyboard_key.0_test.dart b/packages/flutter/examples/api/test/services/keyboard_key/physical_keyboard_key.0_test.dart
similarity index 100%
rename from examples/api/test/services/keyboard_key/physical_keyboard_key.0_test.dart
rename to packages/flutter/examples/api/test/services/keyboard_key/physical_keyboard_key.0_test.dart
diff --git a/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart b/packages/flutter/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
similarity index 100%
rename from examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
rename to packages/flutter/examples/api/test/services/mouse_cursor/mouse_cursor.0_test.dart
diff --git a/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart b/packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart
similarity index 100%
rename from examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart
rename to packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.0_test.dart
diff --git a/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart b/packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart
similarity index 100%
rename from examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart
rename to packages/flutter/examples/api/test/services/system_chrome/system_chrome.set_system_u_i_overlay_style.1_test.dart
diff --git a/examples/api/test/services/text_input/text_input_control.0_test.dart b/packages/flutter/examples/api/test/services/text_input/text_input_control.0_test.dart
similarity index 100%
rename from examples/api/test/services/text_input/text_input_control.0_test.dart
rename to packages/flutter/examples/api/test/services/text_input/text_input_control.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_alternative_fractions.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_case_sensitive_forms.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_character_variant.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_contextual_alternates.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_denominator.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_fractions.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_forms.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_historical_ligatures.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_lining_figures.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_locale_aware.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_notational_forms.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_numerators.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_oldstyle_figures.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_ordinal_forms.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_proportional_figures.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_scientific_inferiors.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_slashed_zero.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_alternates.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_stylistic_set.1_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_subscripts.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_superscripts.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_swash.0_test.dart
diff --git a/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart b/packages/flutter/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
similarity index 100%
rename from examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
rename to packages/flutter/examples/api/test/ui/text/font_feature.font_feature_tabular_figures.0_test.dart
diff --git a/examples/api/test/widgets/actions/action.action_overridable.0_test.dart b/packages/flutter/examples/api/test/widgets/actions/action.action_overridable.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/actions/action.action_overridable.0_test.dart
rename to packages/flutter/examples/api/test/widgets/actions/action.action_overridable.0_test.dart
diff --git a/examples/api/test/widgets/actions/action_listener.0_test.dart b/packages/flutter/examples/api/test/widgets/actions/action_listener.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/actions/action_listener.0_test.dart
rename to packages/flutter/examples/api/test/widgets/actions/action_listener.0_test.dart
diff --git a/examples/api/test/widgets/actions/actions.0_test.dart b/packages/flutter/examples/api/test/widgets/actions/actions.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/actions/actions.0_test.dart
rename to packages/flutter/examples/api/test/widgets/actions/actions.0_test.dart
diff --git a/examples/api/test/widgets/actions/focusable_action_detector.0_test.dart b/packages/flutter/examples/api/test/widgets/actions/focusable_action_detector.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/actions/focusable_action_detector.0_test.dart
rename to packages/flutter/examples/api/test/widgets/actions/focusable_action_detector.0_test.dart
diff --git a/examples/api/test/widgets/animated_grid/animated_grid.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_grid/animated_grid.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_grid/animated_grid.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_grid/animated_grid.0_test.dart
diff --git a/examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_grid/sliver_animated_grid.0_test.dart
diff --git a/examples/api/test/widgets/animated_list/animated_list.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_list/animated_list.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_list/animated_list.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_list/animated_list.0_test.dart
diff --git a/examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_list/animated_list_separated.0_test.dart
diff --git a/examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_list/sliver_animated_list.0_test.dart
diff --git a/examples/api/test/widgets/animated_size/animated_size.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_size/animated_size.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_size/animated_size.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_size/animated_size.0_test.dart
diff --git a/examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart b/packages/flutter/examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart
rename to packages/flutter/examples/api/test/widgets/animated_switcher/animated_switcher.0_test.dart
diff --git a/examples/api/test/widgets/app/widgets_app.widgets_app.0_test.dart b/packages/flutter/examples/api/test/widgets/app/widgets_app.widgets_app.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/app/widgets_app.widgets_app.0_test.dart
rename to packages/flutter/examples/api/test/widgets/app/widgets_app.widgets_app.0_test.dart
diff --git a/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.0_test.dart b/packages/flutter/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.0_test.dart
rename to packages/flutter/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.0_test.dart
diff --git a/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.1_test.dart b/packages/flutter/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.1_test.dart
rename to packages/flutter/examples/api/test/widgets/app_lifecycle_listener/app_lifecycle_listener.1_test.dart
diff --git a/examples/api/test/widgets/async/future_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/async/future_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/async/future_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/async/future_builder.0_test.dart
diff --git a/examples/api/test/widgets/async/stream_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/async/stream_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/async/stream_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/async/stream_builder.0_test.dart
diff --git a/examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart b/packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart
rename to packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.0_test.dart
diff --git a/examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart b/packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart
rename to packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.1_test.dart
diff --git a/examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart b/packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart
rename to packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.2_test.dart
diff --git a/examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart b/packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart
rename to packages/flutter/examples/api/test/widgets/autocomplete/raw_autocomplete.focus_node.0_test.dart
diff --git a/examples/api/test/widgets/autofill/autofill_group.0_test.dart b/packages/flutter/examples/api/test/widgets/autofill/autofill_group.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/autofill/autofill_group.0_test.dart
rename to packages/flutter/examples/api/test/widgets/autofill/autofill_group.0_test.dart
diff --git a/examples/api/test/widgets/basic/absorb_pointer.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/absorb_pointer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/absorb_pointer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/absorb_pointer.0_test.dart
diff --git a/examples/api/test/widgets/basic/aspect_ratio.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/aspect_ratio.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/aspect_ratio.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/aspect_ratio.0_test.dart
diff --git a/examples/api/test/widgets/basic/aspect_ratio.1_test.dart b/packages/flutter/examples/api/test/widgets/basic/aspect_ratio.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/aspect_ratio.1_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/aspect_ratio.1_test.dart
diff --git a/examples/api/test/widgets/basic/aspect_ratio.2_test.dart b/packages/flutter/examples/api/test/widgets/basic/aspect_ratio.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/aspect_ratio.2_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/aspect_ratio.2_test.dart
diff --git a/examples/api/test/widgets/basic/clip_rrect.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/clip_rrect.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/clip_rrect.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/clip_rrect.0_test.dart
diff --git a/examples/api/test/widgets/basic/clip_rrect.1_test.dart b/packages/flutter/examples/api/test/widgets/basic/clip_rrect.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/clip_rrect.1_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/clip_rrect.1_test.dart
diff --git a/examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/custom_multi_child_layout.0_test.dart
diff --git a/examples/api/test/widgets/basic/expanded.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/expanded.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/expanded.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/expanded.0_test.dart
diff --git a/examples/api/test/widgets/basic/expanded.1_test.dart b/packages/flutter/examples/api/test/widgets/basic/expanded.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/expanded.1_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/expanded.1_test.dart
diff --git a/examples/api/test/widgets/basic/fitted_box.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/fitted_box.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/fitted_box.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/fitted_box.0_test.dart
diff --git a/examples/api/test/widgets/basic/flow.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/flow.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/flow.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/flow.0_test.dart
diff --git a/examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/fractionally_sized_box.0_test.dart
diff --git a/examples/api/test/widgets/basic/ignore_pointer.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/ignore_pointer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/ignore_pointer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/ignore_pointer.0_test.dart
diff --git a/examples/api/test/widgets/basic/indexed_stack.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/indexed_stack.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/indexed_stack.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/indexed_stack.0_test.dart
diff --git a/examples/api/test/widgets/basic/listener.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/listener.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/listener.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/listener.0_test.dart
diff --git a/examples/api/test/widgets/basic/mouse_region.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/mouse_region.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/mouse_region.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/mouse_region.0_test.dart
diff --git a/examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.0_test.dart
diff --git a/examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart b/packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/mouse_region.on_exit.1_test.dart
diff --git a/examples/api/test/widgets/basic/offstage.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/offstage.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/offstage.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/offstage.0_test.dart
diff --git a/examples/api/test/widgets/basic/overflowbox.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/overflowbox.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/overflowbox.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/overflowbox.0_test.dart
diff --git a/examples/api/test/widgets/basic/physical_shape.0_test.dart b/packages/flutter/examples/api/test/widgets/basic/physical_shape.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/basic/physical_shape.0_test.dart
rename to packages/flutter/examples/api/test/widgets/basic/physical_shape.0_test.dart
diff --git a/examples/api/test/widgets/binding/widget_binding_observer.0_test.dart b/packages/flutter/examples/api/test/widgets/binding/widget_binding_observer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/binding/widget_binding_observer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/binding/widget_binding_observer.0_test.dart
diff --git a/examples/api/test/widgets/color_filter/color_filtered.0_test.dart b/packages/flutter/examples/api/test/widgets/color_filter/color_filtered.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/color_filter/color_filtered.0_test.dart
rename to packages/flutter/examples/api/test/widgets/color_filter/color_filtered.0_test.dart
diff --git a/examples/api/test/material/context_menu/context_menu_controller.0_test.dart b/packages/flutter/examples/api/test/widgets/context_menu/context_menu_controller.0_test.dart
similarity index 94%
rename from examples/api/test/material/context_menu/context_menu_controller.0_test.dart
rename to packages/flutter/examples/api/test/widgets/context_menu/context_menu_controller.0_test.dart
index 74abc9b8fd2b7..b3bb824204462 100644
--- a/examples/api/test/material/context_menu/context_menu_controller.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/context_menu/context_menu_controller.0_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_api_samples/material/context_menu/context_menu_controller.0.dart'
+import 'package:flutter_api_samples/widgets/context_menu/context_menu_controller.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/material/context_menu/editable_text_toolbar_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.0_test.dart
similarity index 93%
rename from examples/api/test/material/context_menu/editable_text_toolbar_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.0_test.dart
index 3ea1623f8202f..c5b18d58412d3 100644
--- a/examples/api/test/material/context_menu/editable_text_toolbar_builder.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.0_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_api_samples/material/context_menu/editable_text_toolbar_builder.0.dart'
+import 'package:flutter_api_samples/widgets/context_menu/editable_text_toolbar_builder.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/material/context_menu/editable_text_toolbar_builder.1_test.dart b/packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.1_test.dart
similarity index 96%
rename from examples/api/test/material/context_menu/editable_text_toolbar_builder.1_test.dart
rename to packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.1_test.dart
index 9fcf3956a73c6..5b16a23baa2dd 100644
--- a/examples/api/test/material/context_menu/editable_text_toolbar_builder.1_test.dart
+++ b/packages/flutter/examples/api/test/widgets/context_menu/editable_text_toolbar_builder.1_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_api_samples/material/context_menu/editable_text_toolbar_builder.1.dart'
+import 'package:flutter_api_samples/widgets/context_menu/editable_text_toolbar_builder.1.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/widgets/dismissible/dismissible.0_test.dart b/packages/flutter/examples/api/test/widgets/dismissible/dismissible.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/dismissible/dismissible.0_test.dart
rename to packages/flutter/examples/api/test/widgets/dismissible/dismissible.0_test.dart
diff --git a/examples/api/test/widgets/drag_target/draggable.0_test.dart b/packages/flutter/examples/api/test/widgets/drag_target/draggable.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/drag_target/draggable.0_test.dart
rename to packages/flutter/examples/api/test/widgets/drag_target/draggable.0_test.dart
diff --git a/examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart b/packages/flutter/examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart
rename to packages/flutter/examples/api/test/widgets/draggable_scrollable_sheet/draggable_scrollable_sheet.0_test.dart
diff --git a/examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart b/packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart
rename to packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_changed.0_test.dart
diff --git a/examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart b/packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart
rename to packages/flutter/examples/api/test/widgets/editable_text/editable_text.on_content_inserted.0_test.dart
diff --git a/examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart b/packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart
rename to packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.0_test.dart
diff --git a/examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart b/packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart
rename to packages/flutter/examples/api/test/widgets/editable_text/text_editing_controller.1_test.dart
diff --git a/examples/api/test/material/expansible/expansible.0_test.dart b/packages/flutter/examples/api/test/widgets/expansible/expansible.0_test.dart
similarity index 91%
rename from examples/api/test/material/expansible/expansible.0_test.dart
rename to packages/flutter/examples/api/test/widgets/expansible/expansible.0_test.dart
index bd667a5c1cc4e..b3844558bd16f 100644
--- a/examples/api/test/material/expansible/expansible.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/expansible/expansible.0_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter_api_samples/material/expansible/expansible.0.dart'
+import 'package:flutter_api_samples/widgets/expansible/expansible.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/widgets/focus_manager/focus_node.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_manager/focus_node.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_manager/focus_node.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_manager/focus_node.0_test.dart
diff --git a/examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_manager/focus_node.unfocus.0_test.dart
diff --git a/examples/api/test/widgets/focus_scope/focus.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_scope/focus.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_scope/focus.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_scope/focus.0_test.dart
diff --git a/examples/api/test/widgets/focus_scope/focus.1_test.dart b/packages/flutter/examples/api/test/widgets/focus_scope/focus.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_scope/focus.1_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_scope/focus.1_test.dart
diff --git a/examples/api/test/widgets/focus_scope/focus.2_test.dart b/packages/flutter/examples/api/test/widgets/focus_scope/focus.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_scope/focus.2_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_scope/focus.2_test.dart
diff --git a/examples/api/test/widgets/focus_scope/focus_scope.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_scope/focus_scope.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_scope/focus_scope.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_scope/focus_scope.0_test.dart
diff --git a/examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_traversal/focus_traversal_group.0_test.dart
diff --git a/examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart b/packages/flutter/examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart
rename to packages/flutter/examples/api/test/widgets/focus_traversal/ordered_traversal_policy.0_test.dart
diff --git a/examples/api/test/widgets/form/form.0_test.dart b/packages/flutter/examples/api/test/widgets/form/form.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/form/form.0_test.dart
rename to packages/flutter/examples/api/test/widgets/form/form.0_test.dart
diff --git a/examples/api/test/widgets/form/form.1_test.dart b/packages/flutter/examples/api/test/widgets/form/form.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/form/form.1_test.dart
rename to packages/flutter/examples/api/test/widgets/form/form.1_test.dart
diff --git a/examples/api/test/widgets/framework/build_owner.0_test.dart b/packages/flutter/examples/api/test/widgets/framework/build_owner.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/framework/build_owner.0_test.dart
rename to packages/flutter/examples/api/test/widgets/framework/build_owner.0_test.dart
diff --git a/examples/api/test/widgets/framework/error_widget.0_test.dart b/packages/flutter/examples/api/test/widgets/framework/error_widget.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/framework/error_widget.0_test.dart
rename to packages/flutter/examples/api/test/widgets/framework/error_widget.0_test.dart
diff --git a/examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart b/packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart
rename to packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.0_test.dart
diff --git a/examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart b/packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart
rename to packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.1_test.dart
diff --git a/examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart b/packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart
rename to packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.2_test.dart
diff --git a/examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart b/packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart
similarity index 100%
rename from examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart
rename to packages/flutter/examples/api/test/widgets/gesture_detector/gesture_detector.3_test.dart
diff --git a/examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart b/packages/flutter/examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart
rename to packages/flutter/examples/api/test/widgets/hardware_keyboard/key_event_manager.0_test.dart
diff --git a/examples/api/test/widgets/heroes/hero.0_test.dart b/packages/flutter/examples/api/test/widgets/heroes/hero.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/heroes/hero.0_test.dart
rename to packages/flutter/examples/api/test/widgets/heroes/hero.0_test.dart
diff --git a/examples/api/test/widgets/heroes/hero.1_test.dart b/packages/flutter/examples/api/test/widgets/heroes/hero.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/heroes/hero.1_test.dart
rename to packages/flutter/examples/api/test/widgets/heroes/hero.1_test.dart
diff --git a/examples/api/test/widgets/image/image.error_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/image/image.error_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/image/image.error_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/image/image.error_builder.0_test.dart
diff --git a/examples/api/test/widgets/image/image.frame_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/image/image.frame_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/image/image.frame_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/image/image.frame_builder.0_test.dart
diff --git a/examples/api/test/widgets/image/image.loading_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/image/image.loading_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/image/image.loading_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/image/image.loading_builder.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_align.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_align.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_align.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_align.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_container.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_container.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_container.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_container.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_fractionally_sized_box.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_padding.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_positioned.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/animated_slide.0_test.dart
diff --git a/examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart b/packages/flutter/examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart
rename to packages/flutter/examples/api/test/widgets/implicit_animations/sliver_animated_opacity.0_test.dart
diff --git a/examples/api/test/widgets/inherited_model/inherited_model.0_test.dart b/packages/flutter/examples/api/test/widgets/inherited_model/inherited_model.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/inherited_model/inherited_model.0_test.dart
rename to packages/flutter/examples/api/test/widgets/inherited_model/inherited_model.0_test.dart
diff --git a/examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart b/packages/flutter/examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart
rename to packages/flutter/examples/api/test/widgets/inherited_notifier/inherited_notifier.0_test.dart
diff --git a/examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart b/packages/flutter/examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart
rename to packages/flutter/examples/api/test/widgets/inherited_theme/inherited_theme.0_test.dart
diff --git a/examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart b/packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.0_test.dart
diff --git a/examples/api/test/widgets/interactive_viewer/interactive_viewer.builder.0_test.dart b/packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/interactive_viewer/interactive_viewer.builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.builder.0_test.dart
diff --git a/examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart b/packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart
rename to packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.constrained.0_test.dart
diff --git a/examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart b/packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart
rename to packages/flutter/examples/api/test/widgets/interactive_viewer/interactive_viewer.transformation_controller.0_test.dart
diff --git a/examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart b/packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart
rename to packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive.0_test.dart
diff --git a/examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart b/packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart
rename to packages/flutter/examples/api/test/widgets/keep_alive/automatic_keep_alive_client_mixin.0_test.dart
diff --git a/examples/api/test/widgets/keep_alive/keep_alive.0_test.dart b/packages/flutter/examples/api/test/widgets/keep_alive/keep_alive.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/keep_alive/keep_alive.0_test.dart
rename to packages/flutter/examples/api/test/widgets/keep_alive/keep_alive.0_test.dart
diff --git a/examples/api/test/widgets/layout_builder/layout_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/layout_builder/layout_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/layout_builder/layout_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/layout_builder/layout_builder.0_test.dart
diff --git a/examples/api/test/widgets/magnifier/magnifier.0_test.dart b/packages/flutter/examples/api/test/widgets/magnifier/magnifier.0_test.dart
similarity index 94%
rename from examples/api/test/widgets/magnifier/magnifier.0_test.dart
rename to packages/flutter/examples/api/test/widgets/magnifier/magnifier.0_test.dart
index 8d69c88b4f757..04e39ea6397d6 100644
--- a/examples/api/test/widgets/magnifier/magnifier.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/magnifier/magnifier.0_test.dart
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// This file is run as part of a reduced test set in CI on Mac and Windows
+// machines.
+@Tags(<String>['reduced-test-set'])
+library;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_api_samples/widgets/magnifier/magnifier.0.dart'
     as example;
diff --git a/examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart b/packages/flutter/examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart
rename to packages/flutter/examples/api/test/widgets/media_query/media_query_data.system_gesture_insets.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_and_remove_until.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator.restorable_push_replacement.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_and_remove_until.0_test.dart
diff --git a/examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/navigator_state.restorable_push_replacement.0_test.dart
diff --git a/examples/api/test/widgets/navigator/restorable_route_future.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator/restorable_route_future.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator/restorable_route_future.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator/restorable_route_future.0_test.dart
diff --git a/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart b/packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.0_test.dart
diff --git a/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart b/packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart
rename to packages/flutter/examples/api/test/widgets/navigator_pop_handler/navigator_pop_handler.1_test.dart
diff --git a/examples/api/test/widgets/navigator_utils.dart b/packages/flutter/examples/api/test/widgets/navigator_utils.dart
similarity index 100%
rename from examples/api/test/widgets/navigator_utils.dart
rename to packages/flutter/examples/api/test/widgets/navigator_utils.dart
diff --git a/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart b/packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart
rename to packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.0_test.dart
diff --git a/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart b/packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart
rename to packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.1_test.dart
diff --git a/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart b/packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart
rename to packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view.2_test.dart
diff --git a/examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart b/packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart
rename to packages/flutter/examples/api/test/widgets/nested_scroll_view/nested_scroll_view_state.0_test.dart
diff --git a/examples/api/test/widgets/notification_listener/notification.0_test.dart b/packages/flutter/examples/api/test/widgets/notification_listener/notification.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/notification_listener/notification.0_test.dart
rename to packages/flutter/examples/api/test/widgets/notification_listener/notification.0_test.dart
diff --git a/examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart b/packages/flutter/examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart
rename to packages/flutter/examples/api/test/widgets/overflow_bar/overflow_bar.0_test.dart
diff --git a/examples/api/test/widgets/overlay/overlay.0_test.dart b/packages/flutter/examples/api/test/widgets/overlay/overlay.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/overlay/overlay.0_test.dart
rename to packages/flutter/examples/api/test/widgets/overlay/overlay.0_test.dart
diff --git a/examples/api/test/widgets/overlay/overlay_portal.0_test.dart b/packages/flutter/examples/api/test/widgets/overlay/overlay_portal.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/overlay/overlay_portal.0_test.dart
rename to packages/flutter/examples/api/test/widgets/overlay/overlay_portal.0_test.dart
diff --git a/examples/api/test/widgets/overlay/overlay_portal.1_test.dart b/packages/flutter/examples/api/test/widgets/overlay/overlay_portal.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/overlay/overlay_portal.1_test.dart
rename to packages/flutter/examples/api/test/widgets/overlay/overlay_portal.1_test.dart
diff --git a/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart b/packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart
rename to packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.0_test.dart
diff --git a/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart b/packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart
rename to packages/flutter/examples/api/test/widgets/overscroll_indicator/glowing_overscroll_indicator.1_test.dart
diff --git a/examples/api/test/widgets/page/page_can_pop.0_test.dart b/packages/flutter/examples/api/test/widgets/page/page_can_pop.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/page/page_can_pop.0_test.dart
rename to packages/flutter/examples/api/test/widgets/page/page_can_pop.0_test.dart
diff --git a/examples/api/test/widgets/page_storage/page_storage.0_test.dart b/packages/flutter/examples/api/test/widgets/page_storage/page_storage.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/page_storage/page_storage.0_test.dart
rename to packages/flutter/examples/api/test/widgets/page_storage/page_storage.0_test.dart
diff --git a/examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/page_transitions_builder/page_transitions_builder.0_test.dart
diff --git a/examples/api/test/widgets/page_view/page_view.0_test.dart b/packages/flutter/examples/api/test/widgets/page_view/page_view.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/page_view/page_view.0_test.dart
rename to packages/flutter/examples/api/test/widgets/page_view/page_view.0_test.dart
diff --git a/examples/api/test/widgets/page_view/page_view.1_test.dart b/packages/flutter/examples/api/test/widgets/page_view/page_view.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/page_view/page_view.1_test.dart
rename to packages/flutter/examples/api/test/widgets/page_view/page_view.1_test.dart
diff --git a/examples/api/test/material/platform_menu_bar/platform_menu_bar.0_test.dart b/packages/flutter/examples/api/test/widgets/platform_menu_bar/platform_menu_bar.0_test.dart
similarity index 97%
rename from examples/api/test/material/platform_menu_bar/platform_menu_bar.0_test.dart
rename to packages/flutter/examples/api/test/widgets/platform_menu_bar/platform_menu_bar.0_test.dart
index 93e7a2743e90e..192544ad175c1 100644
--- a/examples/api/test/material/platform_menu_bar/platform_menu_bar.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/platform_menu_bar/platform_menu_bar.0_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_api_samples/material/platform_menu_bar/platform_menu_bar.0.dart'
+import 'package:flutter_api_samples/widgets/platform_menu_bar/platform_menu_bar.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/widgets/pop_scope/pop_scope.0_test.dart b/packages/flutter/examples/api/test/widgets/pop_scope/pop_scope.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/pop_scope/pop_scope.0_test.dart
rename to packages/flutter/examples/api/test/widgets/pop_scope/pop_scope.0_test.dart
diff --git a/examples/api/test/widgets/pop_scope/pop_scope.1_test.dart b/packages/flutter/examples/api/test/widgets/pop_scope/pop_scope.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/pop_scope/pop_scope.1_test.dart
rename to packages/flutter/examples/api/test/widgets/pop_scope/pop_scope.1_test.dart
diff --git a/examples/api/test/widgets/preferred_size/preferred_size.0_test.dart b/packages/flutter/examples/api/test/widgets/preferred_size/preferred_size.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/preferred_size/preferred_size.0_test.dart
rename to packages/flutter/examples/api/test/widgets/preferred_size/preferred_size.0_test.dart
diff --git a/examples/api/test/widgets/radio_group/radio_group.0_test.dart b/packages/flutter/examples/api/test/widgets/radio_group/radio_group.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/radio_group/radio_group.0_test.dart
rename to packages/flutter/examples/api/test/widgets/radio_group/radio_group.0_test.dart
diff --git a/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart b/packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart
rename to packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.0_test.dart
diff --git a/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.1_test.dart b/packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.1_test.dart
rename to packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.1_test.dart
diff --git a/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart b/packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart
rename to packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.2_test.dart
diff --git a/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart b/packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart
similarity index 100%
rename from examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart
rename to packages/flutter/examples/api/test/widgets/raw_menu_anchor/raw_menu_anchor.3_test.dart
diff --git a/examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart b/packages/flutter/examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart
rename to packages/flutter/examples/api/test/widgets/raw_tooltip/raw_tooltip.0_test.dart
diff --git a/examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/repeating_animation_builder/repeating_animation_builder.0_test.dart
diff --git a/examples/api/test/widgets/restoration/restoration_mixin.0_test.dart b/packages/flutter/examples/api/test/widgets/restoration/restoration_mixin.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/restoration/restoration_mixin.0_test.dart
rename to packages/flutter/examples/api/test/widgets/restoration/restoration_mixin.0_test.dart
diff --git a/examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart b/packages/flutter/examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart
rename to packages/flutter/examples/api/test/widgets/restoration_properties/restorable_value.0_test.dart
diff --git a/examples/api/test/widgets/routes/flexible_route_transitions.0_test.dart b/packages/flutter/examples/api/test/widgets/routes/flexible_route_transitions.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/flexible_route_transitions.0_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/flexible_route_transitions.0_test.dart
diff --git a/examples/api/test/widgets/routes/flexible_route_transitions.1_test.dart b/packages/flutter/examples/api/test/widgets/routes/flexible_route_transitions.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/flexible_route_transitions.1_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/flexible_route_transitions.1_test.dart
diff --git a/examples/api/test/widgets/routes/local_history_entry.0_test.dart b/packages/flutter/examples/api/test/widgets/routes/local_history_entry.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/local_history_entry.0_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/local_history_entry.0_test.dart
diff --git a/examples/api/test/widgets/routes/popup_route.0_test.dart b/packages/flutter/examples/api/test/widgets/routes/popup_route.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/popup_route.0_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/popup_route.0_test.dart
diff --git a/examples/api/test/widgets/routes/route_observer.0_test.dart b/packages/flutter/examples/api/test/widgets/routes/route_observer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/route_observer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/route_observer.0_test.dart
diff --git a/examples/api/test/widgets/routes/show_general_dialog.0_test.dart b/packages/flutter/examples/api/test/widgets/routes/show_general_dialog.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/routes/show_general_dialog.0_test.dart
rename to packages/flutter/examples/api/test/widgets/routes/show_general_dialog.0_test.dart
diff --git a/examples/api/test/widgets/safe_area/safe_area.0_test.dart b/packages/flutter/examples/api/test/widgets/safe_area/safe_area.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/safe_area/safe_area.0_test.dart
rename to packages/flutter/examples/api/test/widgets/safe_area/safe_area.0_test.dart
diff --git a/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.0_test.dart
diff --git a/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart b/packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart
diff --git a/examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_notification_observer/scroll_notification_observer.0_test.dart
diff --git a/examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_position/is_scrolling_listener.0_test.dart
diff --git a/examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_notification.0_test.dart
diff --git a/examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_position/scroll_controller_on_attach.0_test.dart
diff --git a/examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_position/scroll_metrics_notification.0_test.dart
diff --git a/examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart b/packages/flutter/examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_view/custom_scroll_view.1_test.dart
diff --git a/examples/api/test/widgets/scroll_view/grid_view.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_view/grid_view.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_view/grid_view.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_view/grid_view.0_test.dart
diff --git a/examples/api/test/widgets/scroll_view/list_view.0_test.dart b/packages/flutter/examples/api/test/widgets/scroll_view/list_view.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_view/list_view.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_view/list_view.0_test.dart
diff --git a/examples/api/test/widgets/scroll_view/list_view.1_test.dart b/packages/flutter/examples/api/test/widgets/scroll_view/list_view.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/scroll_view/list_view.1_test.dart
rename to packages/flutter/examples/api/test/widgets/scroll_view/list_view.1_test.dart
diff --git a/examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart b/packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.0_test.dart
diff --git a/examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart b/packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart
rename to packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.1_test.dart
diff --git a/examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart b/packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart
rename to packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.2_test.dart
diff --git a/examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart b/packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.desktop.0_test.dart
diff --git a/examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart b/packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart
rename to packages/flutter/examples/api/test/widgets/scrollbar/raw_scrollbar.shape.0_test.dart
diff --git a/examples/api/test/material/selectable_region/selectable_region.0_test.dart b/packages/flutter/examples/api/test/widgets/selectable_region/selectable_region.0_test.dart
similarity index 95%
rename from examples/api/test/material/selectable_region/selectable_region.0_test.dart
rename to packages/flutter/examples/api/test/widgets/selectable_region/selectable_region.0_test.dart
index 2bc72a892cf05..3fc827f219e66 100644
--- a/examples/api/test/material/selectable_region/selectable_region.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/selectable_region/selectable_region.0_test.dart
@@ -5,7 +5,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_api_samples/material/selectable_region/selectable_region.0.dart'
+import 'package:flutter_api_samples/widgets/selectable_region/selectable_region.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/material/selection_container/selection_container.0_test.dart b/packages/flutter/examples/api/test/widgets/selection_container/selection_container.0_test.dart
similarity index 95%
rename from examples/api/test/material/selection_container/selection_container.0_test.dart
rename to packages/flutter/examples/api/test/widgets/selection_container/selection_container.0_test.dart
index 23a5531f614eb..79655771b89ce 100644
--- a/examples/api/test/material/selection_container/selection_container.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/selection_container/selection_container.0_test.dart
@@ -5,7 +5,7 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_api_samples/material/selection_container/selection_container.0.dart'
+import 'package:flutter_api_samples/widgets/selection_container/selection_container.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/material/selection_container/selection_container_disabled.0_test.dart b/packages/flutter/examples/api/test/widgets/selection_container/selection_container_disabled.0_test.dart
similarity index 96%
rename from examples/api/test/material/selection_container/selection_container_disabled.0_test.dart
rename to packages/flutter/examples/api/test/widgets/selection_container/selection_container_disabled.0_test.dart
index 673b32cb94269..a9a9b8809f21d 100644
--- a/examples/api/test/material/selection_container/selection_container_disabled.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/selection_container/selection_container_disabled.0_test.dart
@@ -5,7 +5,7 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_api_samples/material/selection_container/selection_container_disabled.0.dart'
+import 'package:flutter_api_samples/widgets/selection_container/selection_container_disabled.0.dart'
     as example;
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/examples/api/test/widgets/sensitive_content/sensitive_content.0_test.dart b/packages/flutter/examples/api/test/widgets/sensitive_content/sensitive_content.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sensitive_content/sensitive_content.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sensitive_content/sensitive_content.0_test.dart
diff --git a/examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart b/packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.0_test.dart
diff --git a/examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart b/packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart
rename to packages/flutter/examples/api/test/widgets/shared_app_data/shared_app_data.1_test.dart
diff --git a/examples/api/test/widgets/shortcuts/callback_shortcuts.0_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/callback_shortcuts.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/callback_shortcuts.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/callback_shortcuts.0_test.dart
diff --git a/examples/api/test/widgets/shortcuts/character_activator.0_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/character_activator.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/character_activator.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/character_activator.0_test.dart
diff --git a/examples/api/test/widgets/shortcuts/logical_key_set.0_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/logical_key_set.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/logical_key_set.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/logical_key_set.0_test.dart
diff --git a/examples/api/test/widgets/shortcuts/shortcuts.0_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/shortcuts.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/shortcuts.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/shortcuts.0_test.dart
diff --git a/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/shortcuts.1_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart
diff --git a/examples/api/test/widgets/shortcuts/single_activator.0_test.dart b/packages/flutter/examples/api/test/widgets/shortcuts/single_activator.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/shortcuts/single_activator.0_test.dart
rename to packages/flutter/examples/api/test/widgets/shortcuts/single_activator.0_test.dart
diff --git a/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.0_test.dart b/packages/flutter/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.0_test.dart
rename to packages/flutter/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.0_test.dart
diff --git a/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.1_test.dart b/packages/flutter/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.1_test.dart
rename to packages/flutter/examples/api/test/widgets/single_child_scroll_view/single_child_scroll_view.1_test.dart
diff --git a/examples/api/test/widgets/sliver/decorated_sliver.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/decorated_sliver.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.0_test.dart
diff --git a/examples/api/test/widgets/sliver/decorated_sliver.1_test.dart b/packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/decorated_sliver.1_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/decorated_sliver.1_test.dart
diff --git a/examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.0_test.dart
diff --git a/examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart b/packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/pinned_header_sliver.1_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_constrained_cross_axis.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_cross_axis_group.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_ensure_semantics.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_ensure_semantics.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_ensure_semantics.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_ensure_semantics.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_floating_header.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_list.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_list.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_list.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_list.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_main_axis_group.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_opacity.1_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_opacity.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_opacity.1_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_opacity.1_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_resizing_header.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_tree.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_tree.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_tree.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_tree.0_test.dart
diff --git a/examples/api/test/widgets/sliver/sliver_tree.1_test.dart b/packages/flutter/examples/api/test/widgets/sliver/sliver_tree.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver/sliver_tree.1_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver/sliver_tree.1_test.dart
diff --git a/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart b/packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.0_test.dart
diff --git a/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart b/packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.1_test.dart
diff --git a/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart b/packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.2_test.dart
diff --git a/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart b/packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart
similarity index 100%
rename from examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart
rename to packages/flutter/examples/api/test/widgets/sliver_fill/sliver_fill_remaining.3_test.dart
diff --git a/examples/api/test/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0_test.dart b/packages/flutter/examples/api/test/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0_test.dart
rename to packages/flutter/examples/api/test/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0_test.dart
diff --git a/examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart b/packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart
rename to packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.0_test.dart
diff --git a/examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart b/packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart
rename to packages/flutter/examples/api/test/widgets/system_context_menu/system_context_menu.1_test.dart
diff --git a/examples/api/test/widgets/table/table.0_test.dart b/packages/flutter/examples/api/test/widgets/table/table.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/table/table.0_test.dart
rename to packages/flutter/examples/api/test/widgets/table/table.0_test.dart
diff --git a/examples/api/test/widgets/tap_region/tap_region.0_test.dart b/packages/flutter/examples/api/test/widgets/tap_region/tap_region.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/tap_region/tap_region.0_test.dart
rename to packages/flutter/examples/api/test/widgets/tap_region/tap_region.0_test.dart
diff --git a/examples/api/test/widgets/tap_region/tap_region.1_test.dart b/packages/flutter/examples/api/test/widgets/tap_region/tap_region.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/tap_region/tap_region.1_test.dart
rename to packages/flutter/examples/api/test/widgets/tap_region/tap_region.1_test.dart
diff --git a/examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart b/packages/flutter/examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart
rename to packages/flutter/examples/api/test/widgets/tap_region/text_field_tap_region.0_test.dart
diff --git a/examples/api/test/widgets/text/text.0_test.dart b/packages/flutter/examples/api/test/widgets/text/text.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/text/text.0_test.dart
rename to packages/flutter/examples/api/test/widgets/text/text.0_test.dart
diff --git a/examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart b/packages/flutter/examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart
rename to packages/flutter/examples/api/test/widgets/text_editing_intents/editable_text_tap_up_outside_intent.0_test.dart
diff --git a/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart b/packages/flutter/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart
similarity index 96%
rename from examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart
rename to packages/flutter/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart
index 9335e6af7c88c..e2da420a604b0 100644
--- a/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart
+++ b/packages/flutter/examples/api/test/widgets/text_magnifier/text_magnifier.0_test.dart
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// This file is run as part of a reduced test set in CI on Mac and Windows
+// machines.
+@Tags(<String>['reduced-test-set'])
+library;
+
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_api_samples/widgets/text_magnifier/text_magnifier.0.dart'
diff --git a/examples/api/test/widgets/transitions/align_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/align_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/align_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/align_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/animated_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/animated_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/animated_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/animated_builder.0_test.dart
diff --git a/examples/api/test/widgets/transitions/animated_widget.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/animated_widget.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/animated_widget.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/animated_widget.0_test.dart
diff --git a/examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/decorated_box_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/default_text_style_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/fade_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/fade_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/fade_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/fade_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/listenable_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/listenable_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/listenable_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/listenable_builder.0_test.dart
diff --git a/examples/api/test/widgets/transitions/listenable_builder.1_test.dart b/packages/flutter/examples/api/test/widgets/transitions/listenable_builder.1_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/listenable_builder.1_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/listenable_builder.1_test.dart
diff --git a/examples/api/test/widgets/transitions/listenable_builder.2_test.dart b/packages/flutter/examples/api/test/widgets/transitions/listenable_builder.2_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/listenable_builder.2_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/listenable_builder.2_test.dart
diff --git a/examples/api/test/widgets/transitions/listenable_builder.3_test.dart b/packages/flutter/examples/api/test/widgets/transitions/listenable_builder.3_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/listenable_builder.3_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/listenable_builder.3_test.dart
diff --git a/examples/api/test/widgets/transitions/matrix_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/matrix_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/matrix_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/matrix_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/positioned_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/positioned_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/positioned_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/positioned_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/relative_positioned_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/rotation_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/rotation_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/rotation_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/rotation_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/scale_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/scale_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/scale_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/scale_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/size_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/size_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/size_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/size_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/slide_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/slide_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/slide_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/slide_transition.0_test.dart
diff --git a/examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart b/packages/flutter/examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart
rename to packages/flutter/examples/api/test/widgets/transitions/sliver_fade_transition.0_test.dart
diff --git a/examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/tween_animation_builder/tween_animation_builder.0_test.dart
diff --git a/examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart b/packages/flutter/examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart
rename to packages/flutter/examples/api/test/widgets/undo_history/undo_history_controller.0_test.dart
diff --git a/examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart b/packages/flutter/examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart
rename to packages/flutter/examples/api/test/widgets/value_listenable_builder/value_listenable_builder.0_test.dart
diff --git a/examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart b/packages/flutter/examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart
rename to packages/flutter/examples/api/test/widgets/widget_state/widget_state_border_side.0_test.dart
diff --git a/examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart b/packages/flutter/examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart
rename to packages/flutter/examples/api/test/widgets/widget_state/widget_state_mouse_cursor.0_test.dart
diff --git a/examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart b/packages/flutter/examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart
rename to packages/flutter/examples/api/test/widgets/widget_state/widget_state_outlined_border.0_test.dart
diff --git a/examples/api/test/widgets/widget_state/widget_state_property.0_test.dart b/packages/flutter/examples/api/test/widgets/widget_state/widget_state_property.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/widget_state/widget_state_property.0_test.dart
rename to packages/flutter/examples/api/test/widgets/widget_state/widget_state_property.0_test.dart
diff --git a/examples/api/test/widgets/windows/popup.0_test.dart b/packages/flutter/examples/api/test/widgets/windows/popup.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/windows/popup.0_test.dart
rename to packages/flutter/examples/api/test/widgets/windows/popup.0_test.dart
diff --git a/examples/api/test/widgets/windows/satellite.0_test.dart b/packages/flutter/examples/api/test/widgets/windows/satellite.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/windows/satellite.0_test.dart
rename to packages/flutter/examples/api/test/widgets/windows/satellite.0_test.dart
diff --git a/examples/api/test/widgets/windows/tooltip.0_test.dart b/packages/flutter/examples/api/test/widgets/windows/tooltip.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/windows/tooltip.0_test.dart
rename to packages/flutter/examples/api/test/widgets/windows/tooltip.0_test.dart
diff --git a/examples/api/test/widgets/windows/window_manager.0_test.dart b/packages/flutter/examples/api/test/widgets/windows/window_manager.0_test.dart
similarity index 100%
rename from examples/api/test/widgets/windows/window_manager.0_test.dart
rename to packages/flutter/examples/api/test/widgets/windows/window_manager.0_test.dart
diff --git a/examples/api/test_driver/integration_test.dart b/packages/flutter/examples/api/test_driver/integration_test.dart
similarity index 100%
rename from examples/api/test_driver/integration_test.dart
rename to packages/flutter/examples/api/test_driver/integration_test.dart
diff --git a/examples/api/web/favicon.png b/packages/flutter/examples/api/web/favicon.png
similarity index 100%
rename from examples/api/web/favicon.png
rename to packages/flutter/examples/api/web/favicon.png
diff --git a/examples/api/web/icons/Icon-192.png b/packages/flutter/examples/api/web/icons/Icon-192.png
similarity index 100%
rename from examples/api/web/icons/Icon-192.png
rename to packages/flutter/examples/api/web/icons/Icon-192.png
diff --git a/examples/api/web/icons/Icon-512.png b/packages/flutter/examples/api/web/icons/Icon-512.png
similarity index 100%
rename from examples/api/web/icons/Icon-512.png
rename to packages/flutter/examples/api/web/icons/Icon-512.png
diff --git a/examples/api/web/index.html b/packages/flutter/examples/api/web/index.html
similarity index 100%
rename from examples/api/web/index.html
rename to packages/flutter/examples/api/web/index.html
diff --git a/examples/api/web/manifest.json b/packages/flutter/examples/api/web/manifest.json
similarity index 100%
rename from examples/api/web/manifest.json
rename to packages/flutter/examples/api/web/manifest.json
diff --git a/examples/api/windows/.gitignore b/packages/flutter/examples/api/windows/.gitignore
similarity index 100%
rename from examples/api/windows/.gitignore
rename to packages/flutter/examples/api/windows/.gitignore
diff --git a/examples/api/windows/CMakeLists.txt b/packages/flutter/examples/api/windows/CMakeLists.txt
similarity index 100%
rename from examples/api/windows/CMakeLists.txt
rename to packages/flutter/examples/api/windows/CMakeLists.txt
diff --git a/examples/api/windows/flutter/CMakeLists.txt b/packages/flutter/examples/api/windows/flutter/CMakeLists.txt
similarity index 100%
rename from examples/api/windows/flutter/CMakeLists.txt
rename to packages/flutter/examples/api/windows/flutter/CMakeLists.txt
diff --git a/examples/api/windows/runner/CMakeLists.txt b/packages/flutter/examples/api/windows/runner/CMakeLists.txt
similarity index 100%
rename from examples/api/windows/runner/CMakeLists.txt
rename to packages/flutter/examples/api/windows/runner/CMakeLists.txt
diff --git a/examples/api/windows/runner/Runner.rc b/packages/flutter/examples/api/windows/runner/Runner.rc
similarity index 100%
rename from examples/api/windows/runner/Runner.rc
rename to packages/flutter/examples/api/windows/runner/Runner.rc
diff --git a/examples/api/windows/runner/flutter_window.cpp b/packages/flutter/examples/api/windows/runner/flutter_window.cpp
similarity index 100%
rename from examples/api/windows/runner/flutter_window.cpp
rename to packages/flutter/examples/api/windows/runner/flutter_window.cpp
diff --git a/examples/api/windows/runner/flutter_window.h b/packages/flutter/examples/api/windows/runner/flutter_window.h
similarity index 100%
rename from examples/api/windows/runner/flutter_window.h
rename to packages/flutter/examples/api/windows/runner/flutter_window.h
diff --git a/examples/api/windows/runner/main.cpp b/packages/flutter/examples/api/windows/runner/main.cpp
similarity index 100%
rename from examples/api/windows/runner/main.cpp
rename to packages/flutter/examples/api/windows/runner/main.cpp
diff --git a/examples/api/windows/runner/resource.h b/packages/flutter/examples/api/windows/runner/resource.h
similarity index 100%
rename from examples/api/windows/runner/resource.h
rename to packages/flutter/examples/api/windows/runner/resource.h
diff --git a/examples/api/windows/runner/runner.exe.manifest b/packages/flutter/examples/api/windows/runner/runner.exe.manifest
similarity index 100%
rename from examples/api/windows/runner/runner.exe.manifest
rename to packages/flutter/examples/api/windows/runner/runner.exe.manifest
diff --git a/examples/api/windows/runner/utils.cpp b/packages/flutter/examples/api/windows/runner/utils.cpp
similarity index 100%
rename from examples/api/windows/runner/utils.cpp
rename to packages/flutter/examples/api/windows/runner/utils.cpp
diff --git a/examples/api/windows/runner/utils.h b/packages/flutter/examples/api/windows/runner/utils.h
similarity index 100%
rename from examples/api/windows/runner/utils.h
rename to packages/flutter/examples/api/windows/runner/utils.h
diff --git a/examples/api/windows/runner/win32_window.cpp b/packages/flutter/examples/api/windows/runner/win32_window.cpp
similarity index 100%
rename from examples/api/windows/runner/win32_window.cpp
rename to packages/flutter/examples/api/windows/runner/win32_window.cpp
diff --git a/examples/api/windows/runner/win32_window.h b/packages/flutter/examples/api/windows/runner/win32_window.h
similarity index 100%
rename from examples/api/windows/runner/win32_window.h
rename to packages/flutter/examples/api/windows/runner/win32_window.h
diff --git a/packages/flutter/lib/analysis_options.yaml b/packages/flutter/lib/analysis_options.yaml
index 60b5bafebd4da..bc5fae02e0bd5 100644
--- a/packages/flutter/lib/analysis_options.yaml
+++ b/packages/flutter/lib/analysis_options.yaml
@@ -1,5 +1,14 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../../dev/flutter_analyzer_plugin
+    diagnostics:
+      no_double_clamp: true
+      no_stopwatches: true
+      protect_public_state_subtypes: true
+      render_box_intrinsics: true
+
 linter:
   rules:
     # diagnostic_describe_all_properties: true # blocked on https://github.com/dart-lang/sdk/issues/47418
diff --git a/packages/flutter/lib/foundation.dart b/packages/flutter/lib/foundation.dart
index b366a781b81d3..f3821e00d81c8 100644
--- a/packages/flutter/lib/foundation.dart
+++ b/packages/flutter/lib/foundation.dart
@@ -11,11 +11,11 @@ library foundation;
 
 export 'package:meta/meta.dart'
     show
+        RecordUse,
         awaitNotRequired,
         factory,
         immutable,
         internal,
-        // ignore: experimental_member_use
         mustBeConst,
         mustCallSuper,
         nonVirtual,
diff --git a/packages/flutter/lib/src/animation/curves.dart b/packages/flutter/lib/src/animation/curves.dart
index 1b8dc5dcf3128..a2244e38e7631 100644
--- a/packages/flutter/lib/src/animation/curves.dart
+++ b/packages/flutter/lib/src/animation/curves.dart
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'package:flutter/cupertino.dart';
 /// @docImport 'package:flutter/material.dart';
 library;
 
 import 'dart:math' as math;
 import 'dart:ui';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 
 export 'dart:ui' show Offset;
diff --git a/packages/flutter/lib/src/foundation/licenses.dart b/packages/flutter/lib/src/foundation/licenses.dart
index f0f2c115d7935..d5431a64f3615 100644
--- a/packages/flutter/lib/src/foundation/licenses.dart
+++ b/packages/flutter/lib/src/foundation/licenses.dart
@@ -162,8 +162,13 @@ class LicenseEntryWithLineBreaks extends LicenseEntry {
     final result = <LicenseParagraph>[];
 
     void addLine() {
-      assert(lineStart < currentPosition);
-      lines.add(text.substring(lineStart, currentPosition));
+      var lineEnd = currentPosition;
+      // Drop a trailing CR so CRLF line endings are treated like LF line endings.
+      if (text[lineEnd - 1] == '\r') {
+        lineEnd -= 1;
+      }
+      assert(lineStart < lineEnd);
+      lines.add(text.substring(lineStart, lineEnd));
     }
 
     LicenseParagraph getParagraph() {
diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart
index 34f5d1b5cdce8..e06bb1f238e6d 100644
--- a/packages/flutter/lib/src/rendering/box.dart
+++ b/packages/flutter/lib/src/rendering/box.dart
@@ -478,16 +478,21 @@ class BoxConstraints extends Constraints {
   /// If either is null, this function interpolates from a [BoxConstraints]
   /// object whose fields are all set to 0.0.
   ///
+  /// The result is [normalize]d, so that a `t` value outside of the range 0.0
+  /// to 1.0 (for example from an overshooting [Curve] such as
+  /// [Curves.easeOutBack]) never produces constraints with negative or
+  /// contradictory values.
+  ///
   /// {@macro dart.ui.shadow.lerp}
   static BoxConstraints? lerp(BoxConstraints? a, BoxConstraints? b, double t) {
     if (identical(a, b)) {
       return a;
     }
     if (a == null) {
-      return b! * t;
+      return (b! * t).normalize();
     }
     if (b == null) {
-      return a * (1.0 - t);
+      return (a * (1.0 - t)).normalize();
     }
     assert(a.debugAssertIsValid());
     assert(b.debugAssertIsValid());
@@ -520,7 +525,7 @@ class BoxConstraints extends Constraints {
       maxHeight: a.maxHeight.isFinite
           ? ui.lerpDouble(a.maxHeight, b.maxHeight, t)!
           : double.infinity,
-    );
+    ).normalize();
   }
 
   /// Returns whether the object's constraints are normalized.
diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart
index e47a18c9a668f..a4336e881af27 100644
--- a/packages/flutter/lib/src/rendering/proxy_box.dart
+++ b/packages/flutter/lib/src/rendering/proxy_box.dart
@@ -95,17 +95,13 @@ mixin RenderProxyBoxMixin<T extends RenderBox> on RenderBox, RenderObjectWithChi
 
   @override
   double? computeDistanceToActualBaseline(TextBaseline baseline) {
-    return child?.getDistanceToActualBaseline(baseline) ??
-        super.computeDistanceToActualBaseline(baseline);
+    return child?.getDistanceToActualBaseline(baseline);
   }
 
   @override
   @protected
   double? computeDryBaseline(covariant BoxConstraints constraints, TextBaseline baseline) {
-    final RenderBox? child = this.child;
-    return child == null
-        ? super.computeDryBaseline(constraints, baseline)
-        : child.getDryBaseline(constraints, baseline);
+    return child?.getDryBaseline(constraints, baseline);
   }
 
   @override
@@ -159,6 +155,22 @@ enum HitTestBehavior {
 
   /// Translucent targets both receive events within their bounds and permit
   /// targets visually behind them to also receive events.
+  ///
+  /// When both a translucent target and its descendant are listening to the
+  /// same pointer event, both will receive it. Events are dispatched to the
+  /// most specific target first (the descendant), then to the translucent
+  /// target. In gesture arena competitions for the same gesture, the
+  /// descendant typically wins because it enters the arena first (first come,
+  /// first served). The translucent target's gesture is not invoked unless the
+  /// descendant's gesture is rejected or the descendant listens to a different
+  /// gesture.
+  ///
+  /// See also:
+  ///
+  ///  * [HitTestResult.path], which describes the order in which hit test
+  ///    entries receive events.
+  ///  * [GestureDetector.behavior], which configures the hit test behavior
+  ///    used for gesture detection.
   translucent,
 }
 
diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart
index 5cc2d64d6d0e1..13c34fb94e5fc 100644
--- a/packages/flutter/lib/src/semantics/semantics.dart
+++ b/packages/flutter/lib/src/semantics/semantics.dart
@@ -1377,6 +1377,38 @@ class SemanticsData with Diagnosticable {
   /// Whether [actions] contains the given action.
   bool hasAction(SemanticsAction action) => (actions & action.index) != 0;
 
+  /// Returns a JSON-compatible map representation of this object.
+  ///
+  /// Used by debugging tools and VM service extensions such as
+  /// `ext.flutter.accessibility.getSemanticsTree`.
+  Map<String, Object?> toJson() {
+    final flagsList = <String>[
+      for (final SemanticsFlag flag in SemanticsFlag.values)
+        if (hasFlag(flag)) flag.name,
+    ];
+    final actionsList = <String>[
+      for (final SemanticsAction action in SemanticsAction.values)
+        if (hasAction(action)) action.name,
+    ];
+    return <String, Object?>{
+      'label': label,
+      'value': value,
+      'hint': hint,
+      'tooltip': tooltip,
+      'increasedValue': increasedValue,
+      'decreasedValue': decreasedValue,
+      'flags': flagsList,
+      'actions': actionsList,
+      'rect': <String, double>{
+        'left': rect.left,
+        'top': rect.top,
+        'width': rect.width,
+        'height': rect.height,
+      },
+      'transform': ?transform?.storage.toList(),
+    };
+  }
+
   @override
   String toStringShort() => objectRuntimeType(this, 'SemanticsData');
 
@@ -4566,6 +4598,29 @@ class SemanticsNode with DiagnosticableTreeMixin {
       DebugSemanticsDumpOrder.traversalOrder => _childrenInTraversalOrder(),
     };
   }
+
+  /// Returns a JSON-compatible map representation of this node and its children
+  /// identifiers.
+  ///
+  /// Used by debugging tools and VM service extensions such as
+  /// `ext.flutter.accessibility.getSemanticsTree`.
+  Map<String, Object?> toJson() {
+    final SemanticsData data = getSemanticsData();
+    final List<SemanticsNode> traversalChildren = debugListChildrenInOrder(
+      DebugSemanticsDumpOrder.traversalOrder,
+    );
+    final List<SemanticsNode> hitTestChildren = debugListChildrenInOrder(
+      DebugSemanticsDumpOrder.inverseHitTest,
+    );
+    return <String, Object?>{
+      'id': id,
+      ...data.toJson(),
+      'childrenInTraversalOrder': <int>[
+        for (final SemanticsNode child in traversalChildren) child.id,
+      ],
+      'childrenInHitTestOrder': <int>[for (final SemanticsNode child in hitTestChildren) child.id],
+    };
+  }
 }
 
 /// An edge of a box, such as top, bottom, left or right, used to compute
diff --git a/packages/flutter/lib/src/widgets/_window_win32.dart b/packages/flutter/lib/src/widgets/_window_win32.dart
index 0e9d3db33c7a1..2fe25351303b4 100644
--- a/packages/flutter/lib/src/widgets/_window_win32.dart
+++ b/packages/flutter/lib/src/widgets/_window_win32.dart
@@ -917,6 +917,7 @@ class TooltipWindowControllerWin32 extends TooltipWindowController
 
   @override
   void updatePosition({Rect? anchorRect, WindowPositioner? positioner}) {
+    _ensureNotDestroyed();
     if (anchorRect != null) {
       _anchorRect = anchorRect;
     }
diff --git a/packages/flutter/lib/src/widgets/accessibility_inspector.dart b/packages/flutter/lib/src/widgets/accessibility_inspector.dart
new file mode 100644
index 0000000000000..6604a9c4bcc34
--- /dev/null
+++ b/packages/flutter/lib/src/widgets/accessibility_inspector.dart
@@ -0,0 +1,121 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/rendering.dart';
+
+import 'service_extensions.dart';
+
+/// Service that handles accessibility and semantics inspection.
+class AccessibilityInspector {
+  AccessibilityInspector._();
+
+  /// The active [AccessibilityInspector] instance.
+  static final AccessibilityInspector instance = AccessibilityInspector._();
+
+  SemanticsHandle? _semanticsHandle;
+
+  /// Registers accessibility-related VM service extensions.
+  void initServiceExtensions(
+    void Function({required String name, required ServiceExtensionCallback callback})
+    registerServiceExtension,
+  ) {
+    registerServiceExtension(
+      name: AccessibilityServiceExtensions.getSemanticsTree.extensionName,
+      callback: _getSemanticsTree,
+    );
+    registerServiceExtension(
+      name: AccessibilityServiceExtensions.enableSemantics.extensionName,
+      callback: _enableSemantics,
+    );
+    registerServiceExtension(
+      name: AccessibilityServiceExtensions.disposeSemantics.extensionName,
+      callback: _disposeSemantics,
+    );
+  }
+
+  /// Reset the helper state (primarily used in tests).
+  @visibleForTesting
+  void resetAllState() {
+    _semanticsHandle?.dispose();
+    _semanticsHandle = null;
+  }
+
+  /// Enables semantics inspection on the connected application.
+  ///
+  /// Returns a mutable map as required by [BindingBase.registerServiceExtension],
+  /// which mutates the returned map to append metadata.
+  Future<Map<String, Object?>> _enableSemantics(Map<String, String> parameters) async {
+    _semanticsHandle ??= SemanticsBinding.instance.ensureSemantics();
+    return <String, Object?>{};
+  }
+
+  /// Disposes accessibility semantics state.
+  ///
+  /// Returns a mutable map as required by [BindingBase.registerServiceExtension].
+  Future<Map<String, Object?>> _disposeSemantics(Map<String, String> parameters) async {
+    resetAllState();
+    return <String, Object?>{};
+  }
+
+  /// Evaluates and returns the semantics tree hierarchy of the application.
+  Future<Map<String, Object?>> _getSemanticsTree(Map<String, String> parameters) async {
+    if (!SemanticsBinding.instance.semanticsEnabled) {
+      return <String, Object?>{'error': 'Semantics not enabled.'};
+    }
+    final PipelineOwner? pipelineOwner = _findPipelineOwner();
+    final SemanticsOwner? semanticsOwner = pipelineOwner?.semanticsOwner;
+    if (semanticsOwner == null) {
+      return <String, Object?>{'error': 'No PipelineOwner with SemanticsOwner found'};
+    }
+    final SemanticsNode? root = semanticsOwner.rootSemanticsNode;
+    if (root == null) {
+      RendererBinding.instance.ensureVisualUpdate();
+      return <String, Object?>{'error': 'rootSemanticsNode is null', 'needsFrame': true};
+    }
+
+    final nodes = <String, Object?>{};
+    final visited = <int>{};
+    final queue = <SemanticsNode>[root];
+    while (queue.isNotEmpty) {
+      final SemanticsNode node = queue.removeLast();
+      if (!visited.add(node.id)) {
+        continue;
+      }
+      nodes[node.id.toString()] = node.toJson();
+      for (final SemanticsNode child in node.debugListChildrenInOrder(
+        DebugSemanticsDumpOrder.traversalOrder,
+      )) {
+        if (!visited.contains(child.id)) {
+          queue.add(child);
+        }
+      }
+      for (final SemanticsNode child in node.debugListChildrenInOrder(
+        DebugSemanticsDumpOrder.inverseHitTest,
+      )) {
+        if (!visited.contains(child.id)) {
+          queue.add(child);
+        }
+      }
+    }
+
+    return <String, Object?>{'data': nodes};
+  }
+
+  // TODO(hannahjin): This returns the first SemanticsOwner of any RenderView.
+  // This getSemanticsTree feature is used in DevTools, which currently only supports
+  // single-view inspection. Add multi-view support when DevTools needs it.
+  PipelineOwner? _findPipelineOwner() {
+    for (final RenderView renderView in RendererBinding.instance.renderViews) {
+      if (renderView.owner?.semanticsOwner != null) {
+        return renderView.owner;
+      }
+    }
+    final PipelineOwner deprecatedOwner = RendererBinding.instance.pipelineOwner;
+    if (deprecatedOwner.semanticsOwner != null) {
+      return deprecatedOwner;
+    }
+    return null;
+  }
+}
diff --git a/packages/flutter/lib/src/widgets/binding.dart b/packages/flutter/lib/src/widgets/binding.dart
index 4bf52688e0df7..0e49026ee0d16 100644
--- a/packages/flutter/lib/src/widgets/binding.dart
+++ b/packages/flutter/lib/src/widgets/binding.dart
@@ -38,6 +38,7 @@ import 'package:flutter/services.dart';
 import '../foundation/_features.dart';
 import '_accessibility_evaluations.dart';
 import '_window.dart';
+import 'accessibility_inspector.dart';
 import 'app.dart';
 import 'debug.dart';
 import 'focus_manager.dart';
@@ -807,7 +808,7 @@ mixin WidgetsBinding
           return _forceRebuild();
         },
       );
-
+      AccessibilityInspector.instance.initServiceExtensions(registerServiceExtension);
       WidgetInspectorService.instance.initServiceExtensions(registerServiceExtension);
 
       return true;
diff --git a/packages/flutter/lib/src/widgets/context_menu_controller.dart b/packages/flutter/lib/src/widgets/context_menu_controller.dart
index 2e1742f101143..ff697fe84968d 100644
--- a/packages/flutter/lib/src/widgets/context_menu_controller.dart
+++ b/packages/flutter/lib/src/widgets/context_menu_controller.dart
@@ -20,7 +20,7 @@ import 'overlay.dart';
 /// This example shows how to use a GestureDetector to show a context menu
 /// anywhere in a widget subtree that receives a right click or long press.
 ///
-/// ** See code in examples/api/lib/material/context_menu/context_menu_controller.0.dart **
+/// ** See code in examples/api/lib/widgets/context_menu/context_menu_controller.0.dart **
 /// {@end-tool}
 ///
 /// See also:
diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart
index d43f4c6465e20..ca6a88fbba1ab 100644
--- a/packages/flutter/lib/src/widgets/editable_text.dart
+++ b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -2023,14 +2023,14 @@ class EditableText extends StatefulWidget {
   /// This example shows how to customize the menu, in this case by keeping the
   /// default buttons for the platform but modifying their appearance.
   ///
-  /// ** See code in examples/api/lib/material/context_menu/editable_text_toolbar_builder.0.dart **
+  /// ** See code in examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.0.dart **
   /// {@end-tool}
   ///
   /// {@tool dartpad}
   /// This example shows how to show a custom button only when an email address
   /// is currently selected.
   ///
-  /// ** See code in examples/api/lib/material/context_menu/editable_text_toolbar_builder.1.dart **
+  /// ** See code in examples/api/lib/widgets/context_menu/editable_text_toolbar_builder.1.dart **
   /// {@end-tool}
   ///
   /// See also:
diff --git a/packages/flutter/lib/src/widgets/expansible.dart b/packages/flutter/lib/src/widgets/expansible.dart
index 41f7c7a07cea5..3698be3e97f26 100644
--- a/packages/flutter/lib/src/widgets/expansible.dart
+++ b/packages/flutter/lib/src/widgets/expansible.dart
@@ -230,7 +230,7 @@ class ExpansibleController extends ChangeNotifier {
 /// This example demonstrates how to use the [Expansible] widget and how an
 /// [ExpansibleController] can be used to programmatically expand or collapse it.
 ///
-/// ** See code in examples/api/lib/material/expansible/expansible.0.dart **
+/// ** See code in examples/api/lib/widgets/expansible/expansible.0.dart **
 /// {@end-tool}
 ///
 /// See also:
diff --git a/packages/flutter/lib/src/widgets/focus_traversal.dart b/packages/flutter/lib/src/widgets/focus_traversal.dart
index e54eb5fbcd3b8..5e4458f9124ee 100644
--- a/packages/flutter/lib/src/widgets/focus_traversal.dart
+++ b/packages/flutter/lib/src/widgets/focus_traversal.dart
@@ -1371,8 +1371,7 @@ mixin DirectionalFocusTraversalPolicyMixin on FocusTraversalPolicy {
     final FocusScopeNode nearestScope = currentNode.nearestScope!;
     final FocusNode? focusedChild = nearestScope.focusedChild;
     if (focusedChild == null) {
-      final FocusNode firstFocus =
-          findFirstFocusInDirection(currentNode, direction) ?? currentNode;
+      final FocusNode firstFocus = findFirstFocusInDirection(currentNode, direction) ?? currentNode;
       switch (direction) {
         case TraversalDirection.up:
         case TraversalDirection.left:
@@ -1795,6 +1794,12 @@ abstract class FocusOrder with Diagnosticable implements Comparable<FocusOrder>
   /// const constructors so that they can be used in const expressions.
   const FocusOrder();
 
+  /// Creates a [LexicalFocusOrder] that describes its order in lexical order.
+  const factory FocusOrder.lexical(String order) = LexicalFocusOrder;
+
+  /// Creates a [NumericFocusOrder] that describes its order numerically.
+  const factory FocusOrder.numeric(double order) = NumericFocusOrder;
+
   /// Compares this object to another [Comparable].
   ///
   /// When overriding [FocusOrder], implement [doCompare] instead of this
diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart
index 2bc2e3f3012b7..832653def72e3 100644
--- a/packages/flutter/lib/src/widgets/framework.dart
+++ b/packages/flutter/lib/src/widgets/framework.dart
@@ -1477,6 +1477,9 @@ abstract class State<T extends StatefulWidget> with Diagnosticable {
   /// this method because they need to do some expensive work (e.g., network
   /// fetches) when their dependencies change, and that work would be too
   /// expensive to do for every build.
+  ///
+  /// Implementations of this method should start with a call to the inherited
+  /// method, as in `super.didChangeDependencies`.
   @protected
   @mustCallSuper
   void didChangeDependencies() {}
@@ -1501,7 +1504,7 @@ abstract class State<T extends StatefulWidget> with Diagnosticable {
   }
 
   // If @protected State methods are added or removed, the analysis rule should be
-  // updated accordingly (dev/bots/custom_rules/protect_public_state_subtypes.dart)
+  // updated accordingly (dev/flutter_analyzer_plugin/lib/src/rules/protect_public_state_subtypes.dart)
 }
 
 /// A widget that has a child widget provided to it, instead of building a new
diff --git a/packages/flutter/lib/src/widgets/heroes.dart b/packages/flutter/lib/src/widgets/heroes.dart
index d4951873d7f8c..6c31edc4914e0 100644
--- a/packages/flutter/lib/src/widgets/heroes.dart
+++ b/packages/flutter/lib/src/widgets/heroes.dart
@@ -443,7 +443,6 @@ class _HeroFlightManifest {
   _HeroFlightManifest({
     required this.type,
     required this.overlay,
-    required this.navigatorSize,
     required this.fromRoute,
     required this.toRoute,
     required this.fromHero,
@@ -456,7 +455,6 @@ class _HeroFlightManifest {
 
   final HeroFlightDirection type;
   final OverlayState overlay;
-  final Size navigatorSize;
   final PageRoute<dynamic> fromRoute;
   final PageRoute<dynamic> toRoute;
   final _HeroState fromHero;
@@ -584,12 +582,8 @@ class _HeroFlight {
       child: shuttle,
       builder: (BuildContext context, Widget? child) {
         final Rect rect = heroRectTween.evaluate(_proxyAnimation)!;
-        final offsets = RelativeRect.fromSize(rect, manifest.navigatorSize);
-        return Positioned(
-          top: offsets.top,
-          right: offsets.right,
-          bottom: offsets.bottom,
-          left: offsets.left,
+        return Positioned.fromRect(
+          rect: rect,
           child: IgnorePointer(
             child: FadeTransition(opacity: _heroOpacity, child: child),
           ),
@@ -996,17 +990,6 @@ class HeroController extends NavigatorObserver {
       return;
     }
 
-    final RenderObject? navigatorRenderObject = navigator.context.findRenderObject();
-
-    if (navigatorRenderObject is! RenderBox) {
-      assert(
-        false,
-        'Navigator $navigator has an invalid RenderObject type ${navigatorRenderObject.runtimeType}.',
-      );
-      return;
-    }
-    assert(navigatorRenderObject.hasSize);
-
     // At this point, the toHeroes may have been built and laid out for the first time.
     //
     // If `fromSubtreeContext` is null, call endFlight on all toHeroes, for good measure.
@@ -1030,7 +1013,6 @@ class HeroController extends NavigatorObserver {
           : _HeroFlightManifest(
               type: flightType,
               overlay: overlay,
-              navigatorSize: navigatorRenderObject.size,
               fromRoute: from,
               toRoute: to,
               fromHero: fromHero,
diff --git a/packages/flutter/lib/src/widgets/icon_data.dart b/packages/flutter/lib/src/widgets/icon_data.dart
index a38934e7883f1..eaa4e96ecb41e 100644
--- a/packages/flutter/lib/src/widgets/icon_data.dart
+++ b/packages/flutter/lib/src/widgets/icon_data.dart
@@ -19,6 +19,7 @@ import 'package:flutter/foundation.dart';
 /// In release builds, the Flutter tool will tree shake out of bundled fonts
 /// the code points (or instances of [IconData]) which are not referenced from
 /// Dart app code. See the [staticIconProvider] annotation for more details.
+@RecordUse()
 @immutable
 final class IconData {
   /// Creates icon data.
diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart
index 680cc9e7835a5..5d5a54c9dc3fe 100644
--- a/packages/flutter/lib/src/widgets/navigator.dart
+++ b/packages/flutter/lib/src/widgets/navigator.dart
@@ -5716,7 +5716,7 @@ class NavigatorState extends State<Navigator> with TickerProviderStateMixin, Res
         (_RouteEntry e) => _RouteEntry.isPresentPredicate(e) && e != candidate,
       );
 
-      if (next != null && !next.route.willHandlePopInternally && predicate(next.route)) {
+      if (next != null && !candidate.route.willHandlePopInternally && predicate(next.route)) {
         pop<T>(result);
       } else {
         pop();
diff --git a/packages/flutter/lib/src/widgets/platform_menu_bar.dart b/packages/flutter/lib/src/widgets/platform_menu_bar.dart
index 8edda62b7018b..8370e56889661 100644
--- a/packages/flutter/lib/src/widgets/platform_menu_bar.dart
+++ b/packages/flutter/lib/src/widgets/platform_menu_bar.dart
@@ -438,7 +438,7 @@ class DefaultPlatformMenuDelegate extends PlatformMenuDelegate {
 ///
 /// **This example will only work on macOS.**
 ///
-/// ** See code in examples/api/lib/material/platform_menu_bar/platform_menu_bar.0.dart **
+/// ** See code in examples/api/lib/widgets/platform_menu_bar/platform_menu_bar.0.dart **
 /// {@end-tool}
 ///
 /// The menus could just as effectively be managed without using the widget tree
diff --git a/packages/flutter/lib/src/widgets/primary_scroll_controller.dart b/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
index dc8d211429d91..c017e9167ddde 100644
--- a/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
+++ b/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
@@ -147,7 +147,7 @@ class PrimaryScrollController extends InheritedWidget {
   ///
   /// See also:
   ///
-  /// * [PrimaryScrollController.maybeOf], which is similar to this method, but
+  /// * [PrimaryScrollController.of], which is similar to this method, but
   ///   asserts if no [PrimaryScrollController] ancestor is found.
   static ScrollController? maybeOf(BuildContext context) {
     final PrimaryScrollController? result = context
diff --git a/packages/flutter/lib/src/widgets/raw_tooltip.dart b/packages/flutter/lib/src/widgets/raw_tooltip.dart
index 7566dfd6bb07b..4a77433aa3a77 100644
--- a/packages/flutter/lib/src/widgets/raw_tooltip.dart
+++ b/packages/flutter/lib/src/widgets/raw_tooltip.dart
@@ -404,7 +404,11 @@ class RawTooltip extends StatefulWidget {
   ///
   /// If [AnimationStyle.reverseCurve] is provided, it will be used to override
   /// the hide tooltip animation curve. If it is null, the same curve will be
-  /// used as for the show tooltip animation.
+  /// used as for the show tooltip animation. The reverse curve only takes
+  /// effect when the tooltip starts hiding from the fully shown state; a
+  /// tooltip dismissed while it is still animating in continues to use the
+  /// show curve, to avoid a visual discontinuity. See
+  /// [CurvedAnimation.reverseCurve].
   ///
   /// To disable the tooltip show/hide animation, use
   /// [AnimationStyle.noAnimation].
@@ -528,6 +532,13 @@ class RawTooltip extends StatefulWidget {
         defaultValue: null,
       ),
     );
+    properties.add(
+      DiagnosticsProperty<AnimationStyle>(
+        'animationStyle',
+        animationStyle,
+        defaultValue: _kDefaultAnimationStyle,
+      ),
+    );
   }
 }
 
@@ -540,10 +551,16 @@ class RawTooltipState extends State<RawTooltip> with SingleTickerProviderStateMi
 
   Timer? _timer;
   AnimationController? _backingController;
+  Duration get _showDuration => widget.animationStyle.duration ?? _kDefaultAnimationStyle.duration!;
+  Duration get _hideDuration =>
+      widget.animationStyle.reverseDuration ?? _kDefaultAnimationStyle.reverseDuration!;
+  Curve get _showCurve => widget.animationStyle.curve ?? _kDefaultAnimationStyle.curve!;
+  Curve? get _hideCurve => widget.animationStyle.reverseCurve;
+
   AnimationController get _controller {
     return _backingController ??= AnimationController(
-      duration: widget.animationStyle.duration,
-      reverseDuration: widget.animationStyle.reverseDuration,
+      duration: _showDuration,
+      reverseDuration: _hideDuration,
       vsync: this,
     )..addStatusListener(_handleStatusChanged);
   }
@@ -552,7 +569,8 @@ class RawTooltipState extends State<RawTooltip> with SingleTickerProviderStateMi
   CurvedAnimation get _overlayAnimation {
     return _backingOverlayAnimation ??= CurvedAnimation(
       parent: _controller,
-      curve: widget.animationStyle.curve ?? _kDefaultAnimationStyle.curve!,
+      curve: _showCurve,
+      reverseCurve: _hideCurve,
     );
   }
 
@@ -798,6 +816,20 @@ class RawTooltipState extends State<RawTooltip> with SingleTickerProviderStateMi
     GestureBinding.instance.pointerRouter.addGlobalRoute(_handleGlobalPointerEvent);
   }
 
+  @protected
+  @override
+  void didUpdateWidget(RawTooltip oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.animationStyle != oldWidget.animationStyle) {
+      _backingController
+        ?..duration = _showDuration
+        ..reverseDuration = _hideDuration;
+      _backingOverlayAnimation
+        ?..curve = _showCurve
+        ..reverseCurve = _hideCurve;
+    }
+  }
+
   Widget _buildTooltipOverlay(BuildContext context, OverlayChildLayoutInfo layoutInfo) {
     if (layoutInfo.childPaintTransform.determinant() == 0.0) {
       // The child is not visible.
diff --git a/packages/flutter/lib/src/widgets/scroll_physics.dart b/packages/flutter/lib/src/widgets/scroll_physics.dart
index b00a5b5c1bca0..091e11d4e3d7d 100644
--- a/packages/flutter/lib/src/widgets/scroll_physics.dart
+++ b/packages/flutter/lib/src/widgets/scroll_physics.dart
@@ -780,7 +780,7 @@ class BouncingScrollPhysics extends ScrollPhysics {
   double get minFlingVelocity => kMinFlingVelocity * 2.0;
 
   // Methodology:
-  // 1- Use https://github.com/flutter/platform_tests/tree/master/scroll_overlay to test with
+  // 1- Use https://github.com/flutter/platform_tests/tree/main/scroll_overlay to test with
   //    Flutter and platform scroll views superimposed.
   // 3- If the scrollables stopped overlapping at any moment, adjust the desired
   //    output value of this function at that input speed.
diff --git a/packages/flutter/lib/src/widgets/selectable_region.dart b/packages/flutter/lib/src/widgets/selectable_region.dart
index bb34e8a722e30..fd52fc649416f 100644
--- a/packages/flutter/lib/src/widgets/selectable_region.dart
+++ b/packages/flutter/lib/src/widgets/selectable_region.dart
@@ -160,7 +160,7 @@ const double _kSelectableVerticalComparingThreshold = 3.0;
 /// This sample demonstrates how to create an adapter widget that makes any
 /// child widget selectable.
 ///
-/// ** See code in examples/api/lib/material/selectable_region/selectable_region.0.dart **
+/// ** See code in examples/api/lib/widgets/selectable_region/selectable_region.0.dart **
 /// {@end-tool}
 ///
 /// ## Complex layout
@@ -173,7 +173,7 @@ const double _kSelectableVerticalComparingThreshold = 3.0;
 /// This sample demonstrates how to create a [SelectionContainer] that only
 /// allows selecting everything or nothing with no partial selection.
 ///
-/// ** See code in examples/api/lib/material/selection_container/selection_container.0.dart **
+/// ** See code in examples/api/lib/widgets/selection_container/selection_container.0.dart **
 /// {@end-tool}
 ///
 /// In the case where a group of widgets should be excluded from selection under
@@ -183,7 +183,7 @@ const double _kSelectableVerticalComparingThreshold = 3.0;
 /// {@tool dartpad}
 /// This sample demonstrates how to disable selection for a Text in a Column.
 ///
-/// ** See code in examples/api/lib/material/selection_container/selection_container_disabled.0.dart **
+/// ** See code in examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart **
 /// {@end-tool}
 ///
 /// To create a separate selection system from its parent selection area,
@@ -448,6 +448,10 @@ class SelectableRegionState extends State<SelectableRegion>
   final _SelectableRegionSelectionStatusNotifier _selectionStatusNotifier =
       _SelectableRegionSelectionStatusNotifier._();
 
+  /// Preserves the selection status scope and root selection container when the
+  /// desktop web context menu wrapper is added or removed.
+  final GlobalKey _selectionStatusScopeKey = GlobalKey(debugLabel: 'selectionStatusScopeKey');
+
   @protected
   @override
   void initState() {
@@ -1959,6 +1963,7 @@ class SelectableRegionState extends State<SelectableRegion>
   Widget build(BuildContext context) {
     assert(debugCheckHasOverlay(context));
     Widget result = SelectableRegionSelectionStatusScope._(
+      key: _selectionStatusScopeKey,
       selectionStatusNotifier: _selectionStatusNotifier,
       child: SelectionContainer(registrar: this, delegate: _selectionDelegate, child: widget.child),
     );
@@ -3516,6 +3521,7 @@ final class _SelectableRegionSelectionStatusNotifier extends ChangeNotifier
 /// does not change.
 final class SelectableRegionSelectionStatusScope extends InheritedWidget {
   const SelectableRegionSelectionStatusScope._({
+    super.key,
     required this.selectionStatusNotifier,
     required super.child,
   });
diff --git a/packages/flutter/lib/src/widgets/selection_container.dart b/packages/flutter/lib/src/widgets/selection_container.dart
index 5d5a2386a7a21..eb6720ffa9f0d 100644
--- a/packages/flutter/lib/src/widgets/selection_container.dart
+++ b/packages/flutter/lib/src/widgets/selection_container.dart
@@ -34,7 +34,7 @@ import 'framework.dart';
 /// This sample demonstrates how to create a [SelectionContainer] that only
 /// allows selecting everything or nothing with no partial selection.
 ///
-/// ** See code in examples/api/lib/material/selection_container/selection_container.0.dart **
+/// ** See code in examples/api/lib/widgets/selection_container/selection_container.0.dart **
 /// {@end-tool}
 ///
 /// See also:
@@ -60,7 +60,7 @@ class SelectionContainer extends StatefulWidget {
   /// This sample demonstrates how to disable selection for a Text under a
   /// SelectionArea.
   ///
-  /// ** See code in examples/api/lib/material/selection_container/selection_container_disabled.0.dart **
+  /// ** See code in examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart **
   /// {@end-tool}
   const SelectionContainer.disabled({super.key, required this.child})
     : registrar = null,
diff --git a/packages/flutter/lib/src/widgets/service_extensions.dart b/packages/flutter/lib/src/widgets/service_extensions.dart
index ca0749ea8cf85..6474cd20f36fb 100644
--- a/packages/flutter/lib/src/widgets/service_extensions.dart
+++ b/packages/flutter/lib/src/widgets/service_extensions.dart
@@ -6,6 +6,7 @@
 /// @docImport 'package:flutter/foundation.dart';
 /// @docImport 'package:flutter/rendering.dart';
 ///
+/// @docImport 'accessibility_inspector.dart';
 /// @docImport 'app.dart';
 /// @docImport 'binding.dart';
 /// @docImport 'debug.dart';
@@ -537,3 +538,46 @@ enum WidgetInspectorServiceExtensions {
   ///   extension is registered.
   setFlexProperties,
 }
+
+/// Service extension constants for accessibility and semantics.
+///
+/// These constants will be used when registering service extensions in the
+/// framework, and they will also be used by tools and services that call these
+/// service extensions.
+///
+/// The String value for each of these extension names should be accessed by
+/// calling the [extensionName] property on the enum value.
+enum AccessibilityServiceExtensions {
+  /// Name of service extension that, when called, returns the JSON serialized
+  /// semantics tree.
+  ///
+  /// This extension should only be called after semantics has been enabled
+  /// (for example, by calling [enableSemantics]).
+  ///
+  /// See also:
+  ///
+  /// * [AccessibilityInspector.initServiceExtensions], where the service
+  ///   extension is registered.
+  getSemanticsTree,
+
+  /// Name of service extension that, when called, enables semantics in the app
+  /// by creating a [SemanticsHandle].
+  ///
+  /// See also:
+  ///
+  /// * [AccessibilityInspector.initServiceExtensions], where the service
+  ///   extension is registered.
+  enableSemantics,
+
+  /// Name of service extension that, when called, disposes the [SemanticsHandle]
+  /// created by [enableSemantics].
+  ///
+  /// See also:
+  ///
+  /// * [AccessibilityInspector.initServiceExtensions], where the service
+  ///   extension is registered.
+  disposeSemantics;
+
+  /// The full name of the service extension, including the `accessibility.` prefix.
+  String get extensionName => 'accessibility.$name';
+}
diff --git a/packages/flutter/lib/src/widgets/text.dart b/packages/flutter/lib/src/widgets/text.dart
index a44b97eeb0bb2..ba8e8d8ede929 100644
--- a/packages/flutter/lib/src/widgets/text.dart
+++ b/packages/flutter/lib/src/widgets/text.dart
@@ -486,7 +486,7 @@ class DefaultTextHeightBehavior extends InheritedTheme {
 /// This sample demonstrates how to disable selection for a Text under a
 /// SelectionArea.
 ///
-/// ** See code in examples/api/lib/material/selection_container/selection_container_disabled.0.dart **
+/// ** See code in examples/api/lib/widgets/selection_container/selection_container_disabled.0.dart **
 /// {@end-tool}
 ///
 /// See also:
diff --git a/packages/flutter/lib/src/widgets/toggleable.dart b/packages/flutter/lib/src/widgets/toggleable.dart
index 56a3e2e079973..8ad4c2557a885 100644
--- a/packages/flutter/lib/src/widgets/toggleable.dart
+++ b/packages/flutter/lib/src/widgets/toggleable.dart
@@ -23,6 +23,9 @@ const Duration _kToggleDuration = Duration(milliseconds: 200);
 // Duration of the fade animation for the reaction when focus and hover occur.
 const Duration _kReactionFadeDuration = Duration(milliseconds: 50);
 
+// Default duration of the radial reaction animation.
+const Duration _kReactionAnimationDuration = Duration(milliseconds: 100);
+
 /// A mixin for [StatefulWidget]s that implement toggleable
 /// controls with toggle animations (e.g. [Switch]es, [CupertinoSwitch]es,
 /// [Checkbox]es, [CupertinoCheckbox]es, [Radio]s, and [CupertinoRadio]s).
@@ -102,8 +105,7 @@ mixin ToggleableStateMixin<S extends StatefulWidget> on TickerProviderStateMixin
   /// The amount of time a circular ink response should take to expand to its
   /// full size if a radial reaction is drawn using
   /// [ToggleablePainter.paintRadialReaction].
-  Duration? get reactionAnimationDuration => _reactionAnimationDuration;
-  final Duration _reactionAnimationDuration = const Duration(milliseconds: 100);
+  Duration? get reactionAnimationDuration => _kReactionAnimationDuration;
 
   /// Whether [value] of this control can be changed by user interaction.
   ///
@@ -159,7 +161,10 @@ mixin ToggleableStateMixin<S extends StatefulWidget> on TickerProviderStateMixin
       curve: Curves.easeIn,
       reverseCurve: Curves.easeOut,
     );
-    _reactionController = AnimationController(duration: _reactionAnimationDuration, vsync: this);
+    _reactionController = AnimationController(
+      duration: reactionAnimationDuration ?? _kReactionAnimationDuration,
+      vsync: this,
+    );
     _reaction = CurvedAnimation(parent: _reactionController, curve: Curves.fastOutSlowIn);
     _reactionHoverFadeController = AnimationController(
       duration: _kReactionFadeDuration,
diff --git a/packages/flutter/test/analysis_options.yaml b/packages/flutter/test/analysis_options.yaml
index 594830c78b9be..ef5a00c20efd8 100644
--- a/packages/flutter/test/analysis_options.yaml
+++ b/packages/flutter/test/analysis_options.yaml
@@ -1,5 +1,11 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../../dev/flutter_analyzer_plugin
+    diagnostics:
+      no_stopwatches: true
+
 linter:
   rules:
     # Tests try to throw and catch things in exciting ways all the time, so
diff --git a/packages/flutter/test/foundation/licenses_test.dart b/packages/flutter/test/foundation/licenses_test.dart
index eeb24066194c3..51742c64b8579 100644
--- a/packages/flutter/test/foundation/licenses_test.dart
+++ b/packages/flutter/test/foundation/licenses_test.dart
@@ -179,6 +179,21 @@ S
     expect(paragraphs, hasLength(1));
   });
 
+  test('LicenseEntryWithLineBreaks - CRLF line endings inside paragraphs', () {
+    final List<LicenseParagraph> paragraphs = const LicenseEntryWithLineBreaks(
+      <String>[],
+      'A\r\nB\r\nC\r\n\r\nD\r\nE',
+    ).paragraphs.toList();
+
+    expect(paragraphs[0].text, 'A B C');
+    expect(paragraphs[0].text.contains('\r'), isFalse);
+    expect(paragraphs[0].indent, 0);
+    expect(paragraphs[1].text, 'D E');
+    expect(paragraphs[1].text.contains('\r'), isFalse);
+    expect(paragraphs[1].indent, 0);
+    expect(paragraphs, hasLength(2));
+  });
+
   test('LicenseRegistry', () async {
     expect(await LicenseRegistry.licenses.toList(), isEmpty);
     LicenseRegistry.addLicense(() async* {
diff --git a/packages/flutter/test/foundation/service_extensions_test.dart b/packages/flutter/test/foundation/service_extensions_test.dart
index e79a999612767..379fdf19fbd79 100644
--- a/packages/flutter/test/foundation/service_extensions_test.dart
+++ b/packages/flutter/test/foundation/service_extensions_test.dart
@@ -194,6 +194,14 @@ void main() {
       hasLength(widgetInspectorExtensionCount),
     );
 
+    // See accessibility_inspector_test.dart for tests of the ext.flutter.accessibility
+    // service extensions included in this count.
+    const accessibilityExtensionCount = 3;
+    expect(
+      binding.extensions.keys.where((String name) => name.startsWith('accessibility.')),
+      hasLength(accessibilityExtensionCount),
+    );
+
     // The following service extensions are disabled in web:
     // 1. exit
     // 2. showPerformanceOverlay
@@ -202,7 +210,8 @@ void main() {
     // The expected number of registered service extensions in the Flutter
     // framework, excluding any that are for the widget inspector (see
     // widget_inspector_test.dart for tests of the ext.flutter.inspector service
-    // extensions). Any test counted here must be tested in this file!
+    // extensions) or accessibility inspector (see accessibility_inspector_test.dart).
+    // Any test counted here must be tested in this file!
     const serviceExtensionCount = 31;
 
     // The tests are in the widgets/accessibility_evaluations_service_extension_test.dart
@@ -211,7 +220,10 @@ void main() {
 
     expect(
       binding.extensions.length,
-      serviceExtensionCount + widgetInspectorExtensionCount - disabledExtensions,
+      serviceExtensionCount +
+          widgetInspectorExtensionCount +
+          accessibilityExtensionCount -
+          disabledExtensions,
     );
     expect(testedExtensions, hasLength(serviceExtensionCount));
 
diff --git a/packages/flutter/test/painting/text_painter_rtl_test.dart b/packages/flutter/test/painting/text_painter_rtl_test.dart
index 07cd840e6e14d..85197cc61e1ff 100644
--- a/packages/flutter/test/painting/text_painter_rtl_test.dart
+++ b/packages/flutter/test/painting/text_painter_rtl_test.dart
@@ -548,78 +548,77 @@ void main() {
     );
     painter.layout();
 
-    // TODO(ianh): Remove the toString()s once https://github.com/flutter/engine/pull/4283 lands
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       // ^
-      painter.getPositionForOffset(const Offset(0.0, 5.0)).toString(),
-      const TextPosition(offset: 0).toString(),
+      painter.getPositionForOffset(const Offset(0.0, 5.0)),
+      const TextPosition(offset: 0),
     );
     expect(
       //                     Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       // ^
-      painter.getPositionForOffset(const Offset(-100.0, 5.0)).toString(),
-      const TextPosition(offset: 0).toString(),
+      painter.getPositionForOffset(const Offset(-100.0, 5.0)),
+      const TextPosition(offset: 0),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //  ^
-      painter.getPositionForOffset(const Offset(4.0, 5.0)).toString(),
-      const TextPosition(offset: 0).toString(),
+      painter.getPositionForOffset(const Offset(4.0, 5.0)),
+      const TextPosition(offset: 0),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //    ^
-      painter.getPositionForOffset(const Offset(8.0, 5.0)).toString(),
-      const TextPosition(offset: 1, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(8.0, 5.0)),
+      const TextPosition(offset: 1, affinity: TextAffinity.upstream),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //       ^
-      painter.getPositionForOffset(const Offset(12.0, 5.0)).toString(),
-      const TextPosition(offset: 1).toString(),
+      painter.getPositionForOffset(const Offset(12.0, 5.0)),
+      const TextPosition(offset: 1),
       // currently we say upstream instead of downstream
       skip: skipExpectsWithKnownBugs, // https://github.com/flutter/flutter/issues/87536
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //              ^
-      painter.getPositionForOffset(const Offset(28.0, 5.0)).toString(),
-      const TextPosition(offset: 3, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(28.0, 5.0)),
+      const TextPosition(offset: 3, affinity: TextAffinity.upstream),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //                 ^
-      painter.getPositionForOffset(const Offset(32.0, 5.0)).toString(),
-      const TextPosition(offset: 6, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(32.0, 5.0)),
+      const TextPosition(offset: 6, affinity: TextAffinity.upstream),
       // this is part of https://github.com/flutter/flutter/issues/11375
       skip: skipExpectsWithKnownBugs,
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //                                ^
-      painter.getPositionForOffset(const Offset(58.0, 5.0)).toString(),
-      const TextPosition(offset: 3).toString(),
+      painter.getPositionForOffset(const Offset(58.0, 5.0)),
+      const TextPosition(offset: 3),
       // this is part of https://github.com/flutter/flutter/issues/11375
       skip: skipExpectsWithKnownBugs,
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //                                   ^
-      painter.getPositionForOffset(const Offset(62.0, 5.0)).toString(),
-      const TextPosition(offset: 6).toString(),
+      painter.getPositionForOffset(const Offset(62.0, 5.0)),
+      const TextPosition(offset: 6),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //                                               ^
-      painter.getPositionForOffset(const Offset(88.0, 5.0)).toString(),
-      const TextPosition(offset: 9, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(88.0, 5.0)),
+      const TextPosition(offset: 9, affinity: TextAffinity.upstream),
     );
     expect(
       //  Aaa  Bbb  Ccc  Gimel  Bet  Alef  Ddd  Eee  Fff
       //                                                     ^
-      painter.getPositionForOffset(const Offset(100.0, 5.0)).toString(),
-      const TextPosition(offset: 9, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(100.0, 5.0)),
+      const TextPosition(offset: 9, affinity: TextAffinity.upstream),
     );
     painter.dispose();
   }, skip: skipTestsWithKnownBugs); // https://github.com/flutter/flutter/issues/87536
@@ -633,40 +632,39 @@ void main() {
     );
     painter.layout();
 
-    // TODO(ianh): Remove the toString()s once https://github.com/flutter/engine/pull/4283 lands
     expect(
       //   Vav He Dalet Aaa Bbb Ccc Gimel Bet Alef
       // ^
-      painter.getPositionForOffset(const Offset(-4.0, 5.0)).toString(),
-      const TextPosition(offset: 9, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(-4.0, 5.0)),
+      const TextPosition(offset: 9, affinity: TextAffinity.upstream),
     );
     expect(
       // Vav He Dalet Aaa Bbb Ccc Gimel Bet Alef
       //            ^
-      painter.getPositionForOffset(const Offset(28.0, 5.0)).toString(),
-      const TextPosition(offset: 6).toString(),
+      painter.getPositionForOffset(const Offset(28.0, 5.0)),
+      const TextPosition(offset: 6),
     );
     expect(
       // Vav He Dalet Aaa Bbb Ccc Gimel Bet Alef
       //              ^
-      painter.getPositionForOffset(const Offset(32.0, 5.0)).toString(),
-      const TextPosition(offset: 3).toString(),
+      painter.getPositionForOffset(const Offset(32.0, 5.0)),
+      const TextPosition(offset: 3),
       // this is part of https://github.com/flutter/flutter/issues/11375
       skip: skipExpectsWithKnownBugs,
     );
     expect(
       // Vav He Dalet Aaa Bbb Ccc Gimel Bet Alef
       //                        ^
-      painter.getPositionForOffset(const Offset(58.0, 5.0)).toString(),
-      const TextPosition(offset: 6, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(58.0, 5.0)),
+      const TextPosition(offset: 6, affinity: TextAffinity.upstream),
       // this is part of https://github.com/flutter/flutter/issues/11375
       skip: skipExpectsWithKnownBugs,
     );
     expect(
       // Vav He Dalet Aaa Bbb Ccc Gimel Bet Alef
       //                          ^
-      painter.getPositionForOffset(const Offset(62.0, 5.0)).toString(),
-      const TextPosition(offset: 3, affinity: TextAffinity.upstream).toString(),
+      painter.getPositionForOffset(const Offset(62.0, 5.0)),
+      const TextPosition(offset: 3, affinity: TextAffinity.upstream),
     );
     painter.dispose();
   }, skip: skipTestsWithKnownBugs); // https://github.com/flutter/flutter/issues/87536
diff --git a/packages/flutter/test/rendering/box_constraints_test.dart b/packages/flutter/test/rendering/box_constraints_test.dart
index 0544c2c133550..54eea60d4080d 100644
--- a/packages/flutter/test/rendering/box_constraints_test.dart
+++ b/packages/flutter/test/rendering/box_constraints_test.dart
@@ -131,6 +131,58 @@ void main() {
     expect(() => BoxConstraints.lerp(constraints2, constraints3, 0.5), throwsAssertionError);
   });
 
+  test('BoxConstraints lerp with overshooting t is normalized', () {
+    // Regression test for https://github.com/flutter/flutter/issues/37559.
+    expect(
+      BoxConstraints.lerp(
+        const BoxConstraints.tightFor(height: 25.0),
+        const BoxConstraints.tightFor(height: 0.0),
+        1.2,
+      ),
+      const BoxConstraints.tightFor(height: 0.0),
+    );
+    expect(
+      BoxConstraints.lerp(
+        BoxConstraints.tight(const Size(10.0, 10.0)),
+        const BoxConstraints(maxWidth: 100.0, maxHeight: 100.0),
+        -0.1,
+      )!.isNormalized,
+      isTrue,
+    );
+    expect(
+      BoxConstraints.lerp(
+        BoxConstraints.tight(const Size(10.0, 10.0)),
+        const BoxConstraints(maxWidth: 100.0, maxHeight: 100.0),
+        -0.1,
+      ),
+      BoxConstraints.tight(const Size(11.0, 11.0)),
+    );
+    expect(
+      BoxConstraints.lerp(
+        null,
+        const BoxConstraints.tightFor(width: 10.0, height: 10.0),
+        -0.5,
+      )!.isNormalized,
+      isTrue,
+    );
+    expect(
+      BoxConstraints.lerp(null, const BoxConstraints.tightFor(width: 10.0, height: 10.0), -0.5),
+      const BoxConstraints.tightFor(width: 0.0, height: 0.0),
+    );
+    expect(
+      BoxConstraints.lerp(
+        const BoxConstraints.tightFor(width: 10.0, height: 10.0),
+        null,
+        1.5,
+      )!.isNormalized,
+      isTrue,
+    );
+    expect(
+      BoxConstraints.lerp(const BoxConstraints.tightFor(width: 10.0, height: 10.0), null, 1.5),
+      const BoxConstraints.tightFor(width: 0.0, height: 0.0),
+    );
+  });
+
   test('BoxConstraints normalize', () {
     const constraints = BoxConstraints(
       minWidth: 3.0,
diff --git a/packages/flutter/test/rendering/proxy_box_test.dart b/packages/flutter/test/rendering/proxy_box_test.dart
index 86e7c888082e3..fe3dc0bb4ee4d 100644
--- a/packages/flutter/test/rendering/proxy_box_test.dart
+++ b/packages/flutter/test/rendering/proxy_box_test.dart
@@ -1093,10 +1093,7 @@ void main() {
   test('RenderProxyBoxMixin.computeDryBaseline returns null when the child has no baseline', () {
     // Regression test for https://github.com/flutter/flutter/issues/189711
     final child = _RenderNoBaseline();
-    final proxy = RenderSemanticsAnnotations(
-      child: child,
-      properties: const SemanticsProperties(),
-    );
+    final proxy = RenderSemanticsAnnotations(child: child, properties: const SemanticsProperties());
     layout(proxy);
     expect(
       proxy.getDryBaseline(
@@ -1106,6 +1103,46 @@ void main() {
       isNull,
     );
   });
+
+  test(
+    'RenderProxyBoxMixin.computeDistanceToActualBaseline returns null when child is null or child has no baseline',
+    () {
+      final proxyNoChild = RenderProxyBox();
+      final parentNoChild = _TestBaselineParent(proxyNoChild);
+      layout(parentNoChild, constraints: BoxConstraints.tight(const Size(40.0, 20.0)));
+      expect(parentNoChild.childBaseline, isNull);
+
+      final child = _RenderNoBaseline();
+      final proxyWithChild = RenderProxyBox(child);
+      final parentWithChild = _TestBaselineParent(proxyWithChild);
+      layout(parentWithChild, constraints: BoxConstraints.tight(const Size(40.0, 20.0)));
+      expect(parentWithChild.childBaseline, isNull);
+    },
+  );
+
+  test('RenderProxyBoxMixin.computeDryBaseline returns null when child is null', () {
+    final proxyNoChild = RenderProxyBox();
+    expect(
+      proxyNoChild.getDryBaseline(
+        const BoxConstraints.tightFor(width: 40.0, height: 20.0),
+        TextBaseline.alphabetic,
+      ),
+      isNull,
+    );
+  });
+}
+
+class _TestBaselineParent extends RenderProxyBox {
+  _TestBaselineParent(super.child);
+
+  double? childBaseline;
+
+  @override
+  void performLayout() {
+    child!.layout(constraints, parentUsesSize: true);
+    size = child!.size;
+    childBaseline = child!.getDistanceToBaseline(TextBaseline.alphabetic, onlyReal: true);
+  }
 }
 
 class _TestRectClipper extends CustomClipper<Rect> {
diff --git a/packages/flutter/test/semantics/semantics_test.dart b/packages/flutter/test/semantics/semantics_test.dart
index 743e6ab05f965..5225f629dce29 100644
--- a/packages/flutter/test/semantics/semantics_test.dart
+++ b/packages/flutter/test/semantics/semantics_test.dart
@@ -1342,6 +1342,47 @@ void main() {
       expect(label, 'Emoji: 😀🎉 Math: ∑∆π Currency: €£¥');
     });
   });
+
+  test('SemanticsData.toJson and SemanticsNode.toJson generate expected maps', () {
+    final node = SemanticsNode()
+      ..rect = const Rect.fromLTRB(0.0, 0.0, 100.0, 50.0)
+      ..updateWith(
+        config: SemanticsConfiguration()
+          ..label = 'Test Label'
+          ..textDirection = TextDirection.ltr
+          ..value = 'Test Value'
+          ..hint = 'Test Hint'
+          ..isButton = true,
+      );
+
+    final SemanticsData data = node.getSemanticsData();
+    final Map<String, Object?> dataJsonMap = data.toJson();
+    expect(dataJsonMap['label'], 'Test Label');
+    expect(dataJsonMap['value'], 'Test Value');
+    expect(dataJsonMap['hint'], 'Test Hint');
+    expect(dataJsonMap['flags'], contains('isButton'));
+    expect(dataJsonMap['rect'], <String, double>{
+      'left': 0.0,
+      'top': 0.0,
+      'width': 100.0,
+      'height': 50.0,
+    });
+
+    final Map<String, Object?> nodeJsonMap = node.toJson();
+    expect(nodeJsonMap['id'], node.id);
+    expect(nodeJsonMap['label'], 'Test Label');
+    expect(nodeJsonMap['value'], 'Test Value');
+    expect(nodeJsonMap['hint'], 'Test Hint');
+    expect(nodeJsonMap['flags'], contains('isButton'));
+    expect(nodeJsonMap['rect'], <String, double>{
+      'left': 0.0,
+      'top': 0.0,
+      'width': 100.0,
+      'height': 50.0,
+    });
+    expect(nodeJsonMap['childrenInTraversalOrder'], isEmpty);
+    expect(nodeJsonMap['childrenInHitTestOrder'], isEmpty);
+  });
 }
 
 class TestRender extends RenderProxyBox {
diff --git a/packages/flutter/test/widgets/accessibility_inspector_test.dart b/packages/flutter/test/widgets/accessibility_inspector_test.dart
new file mode 100644
index 0000000000000..81f98bd149489
--- /dev/null
+++ b/packages/flutter/test/widgets/accessibility_inspector_test.dart
@@ -0,0 +1,158 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@Tags(<String>['reduced-test-set'])
+@TestOn('!chrome')
+library;
+
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/src/widgets/accessibility_inspector.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('ext.flutter.accessibility.getSemanticsTree', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: Semantics(
+          label: 'Root Node',
+          container: true,
+          explicitChildNodes: true,
+          child: Column(
+            children: <Widget>[
+              Semantics(
+                label: 'Child Node 1',
+                button: true,
+                tooltip: 'This is a tooltip',
+                child: const Text('Button 1'),
+              ),
+              Semantics(
+                label: 'Child Node 2',
+                value: '42',
+                increasedValue: '43',
+                decreasedValue: '41',
+                onIncrease: () {},
+                onDecrease: () {},
+                child: const Text('Value 2'),
+              ),
+              Transform.scale(
+                scale: 2.0,
+                child: Semantics(label: 'Child Node 3', child: const Text('Scaled')),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    final accessibilityExtensions = <String, ServiceExtensionCallback>{};
+    AccessibilityInspector.instance.initServiceExtensions(({
+      required String name,
+      required ServiceExtensionCallback callback,
+    }) {
+      accessibilityExtensions[name] = callback;
+    });
+
+    Future<Map<String, Object?>> callExtension(String name) async {
+      return json.decode(
+            json.encode(await accessibilityExtensions[name]!(const <String, String>{})),
+          )
+          as Map<String, Object?>;
+    }
+
+    // Calling getSemanticsTree before semantics is enabled returns an error.
+    final Map<String, Object?> disabledResult = await callExtension(
+      AccessibilityServiceExtensions.getSemanticsTree.extensionName,
+    );
+    expect(disabledResult['error'], equals('Semantics not enabled.'));
+    expect(disabledResult['needsFrame'], isNull);
+
+    // Calling enableSemantics enables semantics without returning the tree.
+    // Ensure the returned map is mutable (required by BindingBase.registerServiceExtension).
+    final Map<String, Object?> enableResult =
+        await accessibilityExtensions[AccessibilityServiceExtensions
+            .enableSemantics
+            .extensionName]!(const <String, String>{});
+    expect(enableResult, isEmpty);
+    expect(() => enableResult['type'] = '_extensionType', returnsNormally);
+
+    // Calling getSemanticsTree schedules a frame and returns an error map indicating root is null.
+    final Map<String, Object?> result1 = await callExtension(
+      AccessibilityServiceExtensions.getSemanticsTree.extensionName,
+    );
+
+    expect(result1['error'], equals('rootSemanticsNode is null'));
+    expect(result1['needsFrame'], isTrue);
+
+    // Pump a frame to build/flush the semantics tree.
+    await tester.pump();
+
+    // The second call returns the populated semantics tree.
+    final Map<String, Object?> result2 = await callExtension(
+      AccessibilityServiceExtensions.getSemanticsTree.extensionName,
+    );
+
+    expect(result2['error'], isNull);
+    expect(result2['data'], isA<Map<String, Object?>>());
+    final nodes = result2['data']! as Map<String, Object?>;
+    expect(nodes, isNotEmpty);
+
+    Map<String, Object?> findNodeWithLabel(Map<String, Object?> nodes, String label) {
+      for (final Object? value in nodes.values) {
+        final node = value! as Map<String, Object?>;
+        if ((node['label']! as String).contains(label)) {
+          return node;
+        }
+      }
+      return const <String, Object?>{};
+    }
+
+    final Map<String, Object?> rootNode = findNodeWithLabel(nodes, 'Root Node');
+    expect(rootNode, isNotEmpty);
+    expect(rootNode['id'], isNotNull);
+
+    final Map<String, Object?> child1 = findNodeWithLabel(nodes, 'Child Node 1');
+    expect(child1, isNotEmpty);
+    expect(child1['flags']! as List<Object?>, contains('isButton'));
+    expect(child1['tooltip'], equals('This is a tooltip'));
+
+    final Map<String, Object?> child2 = findNodeWithLabel(nodes, 'Child Node 2');
+    expect(child2, isNotEmpty);
+    expect(child2['value'], equals('42'));
+    expect(child2['increasedValue'], equals('43'));
+    expect(child2['decreasedValue'], equals('41'));
+    expect(child2['actions']! as List<Object?>, contains('increase'));
+    expect(child2['actions']! as List<Object?>, contains('decrease'));
+
+    final Map<String, Object?> child3 = findNodeWithLabel(nodes, 'Child Node 3');
+    expect(child3, isNotEmpty);
+    expect(child3['transform'], isNotNull);
+    final transform = child3['transform']! as List<Object?>;
+    expect(transform, hasLength(16));
+    expect(transform[0], equals(2.0));
+
+    expect(
+      rootNode['childrenInTraversalOrder']! as List<Object?>,
+      containsAll(<Object?>[child1['id'], child2['id'], child3['id']]),
+    );
+    expect(
+      rootNode['childrenInHitTestOrder']! as List<Object?>,
+      containsAll(<Object?>[child1['id'], child2['id'], child3['id']]),
+    );
+
+    // Calling disposeSemantics succeeds and cleans up semantics handle.
+    // Ensure the returned map is mutable.
+    final Map<String, Object?> disposeResult =
+        await accessibilityExtensions[AccessibilityServiceExtensions
+            .disposeSemantics
+            .extensionName]!(const <String, String>{});
+    expect(disposeResult, isEmpty);
+    expect(() => disposeResult['type'] = '_extensionType', returnsNormally);
+
+    AccessibilityInspector.instance.resetAllState();
+  }, semanticsEnabled: false);
+}
diff --git a/packages/flutter/test/widgets/app_test.dart b/packages/flutter/test/widgets/app_test.dart
index bccf5051dc401..0a6c886dd5469 100644
--- a/packages/flutter/test/widgets/app_test.dart
+++ b/packages/flutter/test/widgets/app_test.dart
@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import 'test_page_tester.dart';
+
 class TestIntent extends Intent {
   const TestIntent();
 }
@@ -44,14 +46,12 @@ void main() {
       WidgetsApp(
         key: key,
         builder: (BuildContext context, Widget? child) {
-          return Material(
-            child: Checkbox(
-              value: checked,
-              autofocus: true,
-              onChanged: (bool? value) {
-                checked = value;
-              },
-            ),
+          return _BasicCheckbox(
+            value: checked,
+            autofocus: true,
+            onChanged: (bool? value) {
+              checked = value;
+            },
           );
         },
         color: const Color(0xFF123456),
@@ -76,14 +76,12 @@ void main() {
           SingleActivator(LogicalKeyboardKey.space): TestIntent(),
         },
         builder: (BuildContext context, Widget? child) {
-          return Material(
-            child: Checkbox(
-              value: checked,
-              autofocus: true,
-              onChanged: (bool? value) {
-                checked = value;
-              },
-            ),
+          return _BasicCheckbox(
+            value: checked,
+            autofocus: true,
+            onChanged: (bool? value) {
+              checked = value;
+            },
           );
         },
         color: const Color(0xFF123456),
@@ -105,14 +103,12 @@ void main() {
     await tester.pumpWidget(
       WidgetsApp(
         builder: (BuildContext context, Widget? child) {
-          return Material(
-            child: Checkbox(
-              value: checked,
-              autofocus: true,
-              onChanged: (bool? value) {
-                checked = value;
-              },
-            ),
+          return _BasicCheckbox(
+            value: checked,
+            autofocus: true,
+            onChanged: (bool? value) {
+              checked = value;
+            },
           );
         },
         color: const Color(0xFF123456),
@@ -189,7 +185,7 @@ void main() {
       await expectFlutterError(
         key: key,
         tester: tester,
-        widget: MaterialApp(navigatorKey: key, home: Container(), onGenerateRoute: (_) => null),
+        widget: TestWidgetsApp(navigatorKey: key, home: Container(), onGenerateRoute: (_) => null),
         errorMessage:
             'FlutterError\n'
             '   Could not find a generator for route RouteSettings("/path", null)\n'
@@ -213,7 +209,7 @@ void main() {
       await expectFlutterError(
         key: key,
         tester: tester,
-        widget: MaterialApp(
+        widget: TestWidgetsApp(
           navigatorKey: key,
           home: Container(),
           onGenerateRoute: (_) => null,
@@ -555,8 +551,8 @@ void main() {
     late final List<Locale>? localesArg;
     late final Iterable<Locale> supportedLocalesArg;
     await tester.pumpWidget(
-      MaterialApp(
-        // This uses a MaterialApp because it introduces some actual localizations.
+      TestWidgetsApp(
+        localizationsDelegates: const <LocalizationsDelegate<Object?>>[TestLocalizationsDelegate()],
         localeListResolutionCallback: (List<Locale>? locales, Iterable<Locale> supportedLocales) {
           localesArg = locales;
           supportedLocalesArg = supportedLocales;
@@ -869,8 +865,8 @@ class SimpleNavigatorRouterDelegate extends RouterDelegate<RouteInformation>
       pages: <Page<void>>[
         // We need at least two pages for the pop to propagate through.
         // Otherwise, the navigator will bubble the pop to the system navigator.
-        const MaterialPage<void>(child: Text('base')),
-        MaterialPage<void>(
+        const TestPage<void>(child: Text('base')),
+        TestPage<void>(
           key: ValueKey<String>(routeInformation.uri.toString()),
           child: builder(context, routeInformation),
         ),
@@ -878,3 +874,46 @@ class SimpleNavigatorRouterDelegate extends RouterDelegate<RouteInformation>
     );
   }
 }
+
+class TestLocalizationsDelegate extends LocalizationsDelegate<Object> {
+  const TestLocalizationsDelegate();
+
+  @override
+  bool isSupported(Locale locale) => locale.languageCode == 'en';
+
+  @override
+  Future<Object> load(Locale locale) {
+    return SynchronousFuture<Object>(const Object());
+  }
+
+  @override
+  bool shouldReload(TestLocalizationsDelegate old) => false;
+}
+
+class _BasicCheckbox extends StatefulWidget {
+  const _BasicCheckbox({required this.value, required this.onChanged, this.autofocus = false});
+
+  final bool? value;
+  final ValueChanged<bool?>? onChanged;
+  final bool autofocus;
+
+  @override
+  State<_BasicCheckbox> createState() => _BasicCheckboxState();
+}
+
+class _BasicCheckboxState extends State<_BasicCheckbox> {
+  @override
+  Widget build(BuildContext context) {
+    return Actions(
+      actions: <Type, Action<Intent>>{
+        ActivateIntent: CallbackAction<ActivateIntent>(
+          onInvoke: (_) {
+            widget.onChanged?.call(!(widget.value ?? false));
+            return null;
+          },
+        ),
+      },
+      child: Focus(autofocus: widget.autofocus, child: const SizedBox()),
+    );
+  }
+}
diff --git a/packages/flutter/test/widgets/focus_traversal_test.dart b/packages/flutter/test/widgets/focus_traversal_test.dart
index 0d5697b8e571c..dc84864a57dc3 100644
--- a/packages/flutter/test/widgets/focus_traversal_test.dart
+++ b/packages/flutter/test/widgets/focus_traversal_test.dart
@@ -1196,11 +1196,11 @@ void main() {
             child: Column(
               children: <Widget>[
                 FocusTraversalOrder(
-                  order: const NumericFocusOrder(2),
+                  order: const .numeric(2),
                   child: Focus(child: SizedBox(key: key1, width: 100, height: 100)),
                 ),
                 FocusTraversalOrder(
-                  order: const NumericFocusOrder(1),
+                  order: const .numeric(1),
                   child: Focus(child: SizedBox(key: key2, width: 100, height: 100)),
                 ),
               ],
@@ -1299,7 +1299,7 @@ void main() {
                 children: List<Widget>.generate(
                   nodeCount,
                   (int index) => FocusTraversalOrder(
-                    order: NumericFocusOrder(nodeCount - index.toDouble()),
+                    order: .numeric(nodeCount - index.toDouble()),
                     child: Focus(
                       focusNode: nodes[index],
                       child: const SizedBox(width: 10, height: 10),
@@ -1357,7 +1357,7 @@ void main() {
                 children: List<Widget>.generate(
                   nodeCount,
                   (int index) => FocusTraversalOrder(
-                    order: LexicalFocusOrder(keys[index]),
+                    order: .lexical(keys[index]),
                     child: Focus(
                       focusNode: nodes[index],
                       child: const SizedBox(width: 10, height: 10),
@@ -1413,27 +1413,27 @@ void main() {
                 child: Row(
                   children: <Widget>[
                     FocusTraversalOrder(
-                      order: const NumericFocusOrder(0),
+                      order: const .numeric(0),
                       child: FocusTraversalGroup(
                         policy: WidgetOrderTraversalPolicy(),
                         child: Row(
                           children: <Widget>[
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(9),
+                              order: const .numeric(9),
                               child: Focus(
                                 focusNode: nodes[9],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(8),
+                              order: const .numeric(8),
                               child: Focus(
                                 focusNode: nodes[8],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(7),
+                              order: const .numeric(7),
                               child: Focus(
                                 focusNode: nodes[7],
                                 child: const SizedBox(width: 10, height: 10),
@@ -1444,27 +1444,27 @@ void main() {
                       ),
                     ),
                     FocusTraversalOrder(
-                      order: const NumericFocusOrder(1),
+                      order: const .numeric(1),
                       child: FocusTraversalGroup(
                         policy: OrderedTraversalPolicy(secondary: WidgetOrderTraversalPolicy()),
                         child: Row(
                           children: <Widget>[
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(4),
+                              order: const .numeric(4),
                               child: Focus(
                                 focusNode: nodes[4],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(5),
+                              order: const .numeric(5),
                               child: Focus(
                                 focusNode: nodes[5],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const NumericFocusOrder(6),
+                              order: const .numeric(6),
                               child: Focus(
                                 focusNode: nodes[6],
                                 child: const SizedBox(width: 10, height: 10),
@@ -1475,34 +1475,34 @@ void main() {
                       ),
                     ),
                     FocusTraversalOrder(
-                      order: const NumericFocusOrder(2),
+                      order: const .numeric(2),
                       child: FocusTraversalGroup(
                         policy: OrderedTraversalPolicy(secondary: WidgetOrderTraversalPolicy()),
                         child: Row(
                           children: <Widget>[
                             FocusTraversalOrder(
-                              order: const LexicalFocusOrder('D'),
+                              order: const .lexical('D'),
                               child: Focus(
                                 focusNode: nodes[3],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const LexicalFocusOrder('C'),
+                              order: const .lexical('C'),
                               child: Focus(
                                 focusNode: nodes[2],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const LexicalFocusOrder('B'),
+                              order: const .lexical('B'),
                               child: Focus(
                                 focusNode: nodes[1],
                                 child: const SizedBox(width: 10, height: 10),
                               ),
                             ),
                             FocusTraversalOrder(
-                              order: const LexicalFocusOrder('A'),
+                              order: const .lexical('A'),
                               child: Focus(
                                 focusNode: nodes[0],
                                 child: const SizedBox(width: 10, height: 10),
@@ -1548,7 +1548,7 @@ void main() {
               child: Builder(
                 builder: (BuildContext context) {
                   return FocusTraversalOrder(
-                    order: const NumericFocusOrder(0),
+                    order: const .numeric(0),
                     child: TestButton(
                       key: key1,
                       focusNode: testNode1,
@@ -1564,7 +1564,7 @@ void main() {
                                 ) {
                                   return Center(
                                     child: FocusTraversalOrder(
-                                      order: const NumericFocusOrder(0),
+                                      order: const .numeric(0),
                                       child: TestButton(
                                         key: key2,
                                         focusNode: testNode2,
@@ -3108,169 +3108,165 @@ void main() {
       variant: KeySimulatorTransitModeVariant.all(),
     );
 
-    testWidgets(
-      'Arrow focus traversal actions can be re-enabled for text fields.',
-      (WidgetTester tester) async {
-        final GlobalKey upperLeftKey = GlobalKey(debugLabel: 'upperLeftKey');
-        final GlobalKey upperRightKey = GlobalKey(debugLabel: 'upperRightKey');
-        final GlobalKey lowerLeftKey = GlobalKey(debugLabel: 'lowerLeftKey');
-        final GlobalKey lowerRightKey = GlobalKey(debugLabel: 'lowerRightKey');
+    testWidgets('Arrow focus traversal actions can be re-enabled for text fields.', (
+      WidgetTester tester,
+    ) async {
+      final GlobalKey upperLeftKey = GlobalKey(debugLabel: 'upperLeftKey');
+      final GlobalKey upperRightKey = GlobalKey(debugLabel: 'upperRightKey');
+      final GlobalKey lowerLeftKey = GlobalKey(debugLabel: 'lowerLeftKey');
+      final GlobalKey lowerRightKey = GlobalKey(debugLabel: 'lowerRightKey');
 
-        final controller1 = TextEditingController();
-        addTearDown(controller1.dispose);
-        final controller2 = TextEditingController();
-        addTearDown(controller2.dispose);
-        final controller3 = TextEditingController();
-        addTearDown(controller3.dispose);
-        final controller4 = TextEditingController();
-        addTearDown(controller4.dispose);
-
-        final focusNodeUpperLeft = FocusNode(debugLabel: 'upperLeft');
-        addTearDown(focusNodeUpperLeft.dispose);
-        final focusNodeUpperRight = FocusNode(debugLabel: 'upperRight');
-        addTearDown(focusNodeUpperRight.dispose);
-        final focusNodeLowerLeft = FocusNode(debugLabel: 'lowerLeft');
-        addTearDown(focusNodeLowerLeft.dispose);
-        final focusNodeLowerRight = FocusNode(debugLabel: 'lowerRight');
-        addTearDown(focusNodeLowerRight.dispose);
-
-        Widget generateTestWidgets(bool ignoreTextFields) {
-          final shortcuts = <ShortcutActivator, Intent>{
-            const SingleActivator(LogicalKeyboardKey.arrowLeft): DirectionalFocusIntent(
-              TraversalDirection.left,
-              ignoreTextFields: ignoreTextFields,
-            ),
-            const SingleActivator(LogicalKeyboardKey.arrowRight): DirectionalFocusIntent(
-              TraversalDirection.right,
-              ignoreTextFields: ignoreTextFields,
-            ),
-            const SingleActivator(LogicalKeyboardKey.arrowDown): DirectionalFocusIntent(
-              TraversalDirection.down,
-              ignoreTextFields: ignoreTextFields,
-            ),
-            const SingleActivator(LogicalKeyboardKey.arrowUp): DirectionalFocusIntent(
-              TraversalDirection.up,
-              ignoreTextFields: ignoreTextFields,
-            ),
-          };
+      final controller1 = TextEditingController();
+      addTearDown(controller1.dispose);
+      final controller2 = TextEditingController();
+      addTearDown(controller2.dispose);
+      final controller3 = TextEditingController();
+      addTearDown(controller3.dispose);
+      final controller4 = TextEditingController();
+      addTearDown(controller4.dispose);
+
+      final focusNodeUpperLeft = FocusNode(debugLabel: 'upperLeft');
+      addTearDown(focusNodeUpperLeft.dispose);
+      final focusNodeUpperRight = FocusNode(debugLabel: 'upperRight');
+      addTearDown(focusNodeUpperRight.dispose);
+      final focusNodeLowerLeft = FocusNode(debugLabel: 'lowerLeft');
+      addTearDown(focusNodeLowerLeft.dispose);
+      final focusNodeLowerRight = FocusNode(debugLabel: 'lowerRight');
+      addTearDown(focusNodeLowerRight.dispose);
+
+      Widget generateTestWidgets(bool ignoreTextFields) {
+        final shortcuts = <ShortcutActivator, Intent>{
+          const SingleActivator(LogicalKeyboardKey.arrowLeft): DirectionalFocusIntent(
+            TraversalDirection.left,
+            ignoreTextFields: ignoreTextFields,
+          ),
+          const SingleActivator(LogicalKeyboardKey.arrowRight): DirectionalFocusIntent(
+            TraversalDirection.right,
+            ignoreTextFields: ignoreTextFields,
+          ),
+          const SingleActivator(LogicalKeyboardKey.arrowDown): DirectionalFocusIntent(
+            TraversalDirection.down,
+            ignoreTextFields: ignoreTextFields,
+          ),
+          const SingleActivator(LogicalKeyboardKey.arrowUp): DirectionalFocusIntent(
+            TraversalDirection.up,
+            ignoreTextFields: ignoreTextFields,
+          ),
+        };
 
-          return TestWidgetsApp(
-            home: Shortcuts(
-              shortcuts: shortcuts,
-              child: FocusScope(
-                debugLabel: 'scope',
-                child: Column(
-                  children: <Widget>[
-                    Row(
-                      children: <Widget>[
-                        SizedBox.square(
-                          dimension: 100.0,
-                          child: EditableText(
-                            autofocus: true,
-                            key: upperLeftKey,
-                            controller: controller1,
-                            focusNode: focusNodeUpperLeft,
-                            cursorColor: const Color(0xffffffff),
-                            backgroundCursorColor: const Color(0xff808080),
-                            style: const TextStyle(),
-                          ),
+        return TestWidgetsApp(
+          home: Shortcuts(
+            shortcuts: shortcuts,
+            child: FocusScope(
+              debugLabel: 'scope',
+              child: Column(
+                children: <Widget>[
+                  Row(
+                    children: <Widget>[
+                      SizedBox.square(
+                        dimension: 100.0,
+                        child: EditableText(
+                          autofocus: true,
+                          key: upperLeftKey,
+                          controller: controller1,
+                          focusNode: focusNodeUpperLeft,
+                          cursorColor: const Color(0xffffffff),
+                          backgroundCursorColor: const Color(0xff808080),
+                          style: const TextStyle(),
                         ),
-                        SizedBox.square(
-                          dimension: 100.0,
-                          child: EditableText(
-                            key: upperRightKey,
-                            controller: controller2,
-                            focusNode: focusNodeUpperRight,
-                            cursorColor: const Color(0xffffffff),
-                            backgroundCursorColor: const Color(0xff808080),
-                            style: const TextStyle(),
-                          ),
+                      ),
+                      SizedBox.square(
+                        dimension: 100.0,
+                        child: EditableText(
+                          key: upperRightKey,
+                          controller: controller2,
+                          focusNode: focusNodeUpperRight,
+                          cursorColor: const Color(0xffffffff),
+                          backgroundCursorColor: const Color(0xff808080),
+                          style: const TextStyle(),
                         ),
-                      ],
-                    ),
-                    Row(
-                      children: <Widget>[
-                        SizedBox.square(
-                          dimension: 100.0,
-                          child: EditableText(
-                            key: lowerLeftKey,
-                            controller: controller3,
-                            focusNode: focusNodeLowerLeft,
-                            cursorColor: const Color(0xffffffff),
-                            backgroundCursorColor: const Color(0xff808080),
-                            style: const TextStyle(),
-                          ),
+                      ),
+                    ],
+                  ),
+                  Row(
+                    children: <Widget>[
+                      SizedBox.square(
+                        dimension: 100.0,
+                        child: EditableText(
+                          key: lowerLeftKey,
+                          controller: controller3,
+                          focusNode: focusNodeLowerLeft,
+                          cursorColor: const Color(0xffffffff),
+                          backgroundCursorColor: const Color(0xff808080),
+                          style: const TextStyle(),
                         ),
-                        SizedBox.square(
-                          dimension: 100.0,
-                          child: EditableText(
-                            key: lowerRightKey,
-                            controller: controller4,
-                            focusNode: focusNodeLowerRight,
-                            cursorColor: const Color(0xffffffff),
-                            backgroundCursorColor: const Color(0xff808080),
-                            style: const TextStyle(),
-                          ),
+                      ),
+                      SizedBox.square(
+                        dimension: 100.0,
+                        child: EditableText(
+                          key: lowerRightKey,
+                          controller: controller4,
+                          focusNode: focusNodeLowerRight,
+                          cursorColor: const Color(0xffffffff),
+                          backgroundCursorColor: const Color(0xff808080),
+                          style: const TextStyle(),
                         ),
-                      ],
-                    ),
-                  ],
-                ),
+                      ),
+                    ],
+                  ),
+                ],
               ),
             ),
-          );
-        }
-
-        await tester.pumpWidget(generateTestWidgets(false));
-
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
-        expect(focusNodeUpperRight.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
-        expect(focusNodeLowerRight.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowLeft);
-        expect(focusNodeLowerLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowUp);
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-
-        await tester.pumpWidget(generateTestWidgets(true));
-
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
-        expect(focusNodeUpperRight.hasPrimaryFocus, isFalse);
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
-        expect(focusNodeLowerRight.hasPrimaryFocus, isFalse);
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowLeft);
-        expect(focusNodeLowerLeft.hasPrimaryFocus, isFalse);
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowUp);
-        expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
-      },
-      variant: KeySimulatorTransitModeVariant.all(),
-    );
+          ),
+        );
+      }
 
-    testWidgets(
-      'Focus traversal does not break when no focusable is available on a WidgetsApp',
-      (WidgetTester tester) async {
-        final events = <Object>[];
+      await tester.pumpWidget(generateTestWidgets(false));
+
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
+      expect(focusNodeUpperRight.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
+      expect(focusNodeLowerRight.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowLeft);
+      expect(focusNodeLowerLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowUp);
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+
+      await tester.pumpWidget(generateTestWidgets(true));
+
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
+      expect(focusNodeUpperRight.hasPrimaryFocus, isFalse);
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
+      expect(focusNodeLowerRight.hasPrimaryFocus, isFalse);
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowLeft);
+      expect(focusNodeLowerLeft.hasPrimaryFocus, isFalse);
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowUp);
+      expect(focusNodeUpperLeft.hasPrimaryFocus, isTrue);
+    }, variant: KeySimulatorTransitModeVariant.all());
+
+    testWidgets('Focus traversal does not break when no focusable is available on a WidgetsApp', (
+      WidgetTester tester,
+    ) async {
+      final events = <Object>[];
 
-        await tester.pumpWidget(TestWidgetsApp(home: Container()));
+      await tester.pumpWidget(TestWidgetsApp(home: Container()));
 
-        HardwareKeyboard.instance.addHandler((KeyEvent event) {
-          events.add(event);
-          return true;
-        });
+      HardwareKeyboard.instance.addHandler((KeyEvent event) {
+        events.add(event);
+        return true;
+      });
 
-        await tester.idle();
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
-        await tester.idle();
+      await tester.idle();
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
+      await tester.idle();
 
-        expect(events.length, 2);
-      },
-      variant: KeySimulatorTransitModeVariant.all(),
-    );
+      expect(events.length, 2);
+    }, variant: KeySimulatorTransitModeVariant.all());
 
     testWidgets('Focus traversal does not throw when no focusable is available in a group', (
       WidgetTester tester,
@@ -3286,26 +3282,24 @@ void main() {
       expect(primaryFocus, equals(initialFocus));
     });
 
-    testWidgets(
-      'Focus traversal does not break when no focusable is available on a WidgetsApp',
-      (WidgetTester tester) async {
-        final events = <KeyEvent>[];
+    testWidgets('Focus traversal does not break when no focusable is available on a WidgetsApp', (
+      WidgetTester tester,
+    ) async {
+      final events = <KeyEvent>[];
 
-        await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
+      await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
 
-        HardwareKeyboard.instance.addHandler((KeyEvent event) {
-          events.add(event);
-          return true;
-        });
+      HardwareKeyboard.instance.addHandler((KeyEvent event) {
+        events.add(event);
+        return true;
+      });
 
-        await tester.idle();
-        await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
-        await tester.idle();
+      await tester.idle();
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowRight);
+      await tester.idle();
 
-        expect(events.length, 2);
-      },
-      variant: KeySimulatorTransitModeVariant.all(),
-    );
+      expect(events.length, 2);
+    }, variant: KeySimulatorTransitModeVariant.all());
 
     testWidgets('Custom requestFocusCallback gets called on focusInDirection up/down/left/right.', (
       WidgetTester tester,
@@ -3490,7 +3484,10 @@ void main() {
               // FocusScope above. parentNode reparents it to the root scope.
               child: FocusTraversalGroup(
                 parentNode: FocusManager.instance.rootScope,
-                child: Focus(focusNode: childNode, child: SizedBox(key: key)),
+                child: Focus(
+                  focusNode: childNode,
+                  child: SizedBox(key: key),
+                ),
               ),
             ),
           ),
diff --git a/packages/flutter/test/widgets/framework_test.dart b/packages/flutter/test/widgets/framework_test.dart
index 000097ab1f519..7a2b17226a064 100644
--- a/packages/flutter/test/widgets/framework_test.dart
+++ b/packages/flutter/test/widgets/framework_test.dart
@@ -1714,7 +1714,7 @@ void main() {
     final element = TestRenderObjectElement();
 
     final focusTraversalOrder = _TestInheritedElement(
-      const FocusTraversalOrder(order: LexicalFocusOrder(''), child: Placeholder()),
+      const FocusTraversalOrder(order: .lexical(''), child: Placeholder()),
     );
     final directionality = _TestInheritedElement(
       const Directionality(textDirection: TextDirection.ltr, child: Placeholder()),
diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
index c714f4c159470..4b61883e7f6e4 100644
--- a/packages/flutter/test/widgets/heroes_test.dart
+++ b/packages/flutter/test/widgets/heroes_test.dart
@@ -3920,6 +3920,103 @@ Future<void> main() async {
     );
     expect(tester.getSize(find.byType(Hero)), Size.zero);
   });
+
+  testWidgets('Hero does not resize when its Navigator resizes during flight', (
+    WidgetTester tester,
+  ) async {
+    final heroController = HeroController(
+      createRectTween: (begin, end) => RectTween(begin: begin, end: end),
+    );
+
+    addTearDown(heroController.dispose);
+
+    final navigatorKey = GlobalKey<NavigatorState>();
+    const shuttleKey = ValueKey<String>('hero-shuttle');
+
+    late StateSetter updateHost;
+    var navigatorHeight = 600.0;
+
+    Widget buildHero(Alignment alignment) {
+      return Align(
+        alignment: alignment,
+        child: Hero(
+          tag: 'hero',
+          flightShuttleBuilder: (_, _, _, _, _) {
+            return const SizedBox(key: shuttleKey, width: 100.0, height: 100.0);
+          },
+          child: const SizedBox(width: 100.0, height: 100.0),
+        ),
+      );
+    }
+
+    Widget buildSourcePage() {
+      return buildHero(Alignment.topLeft);
+    }
+
+    Widget buildDestinationPage() {
+      return buildHero(Alignment.topRight);
+    }
+
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: StatefulBuilder(
+          builder: (BuildContext context, StateSetter setState) {
+            updateHost = setState;
+
+            return Align(
+              alignment: Alignment.topLeft,
+              child: SizedBox(
+                width: 400.0,
+                height: navigatorHeight,
+                child: HeroControllerScope(
+                  controller: heroController,
+                  child: Navigator(
+                    key: navigatorKey,
+                    onGenerateRoute: (RouteSettings settings) {
+                      return PageRouteBuilder<void>(
+                        transitionDuration: const Duration(seconds: 1),
+                        pageBuilder: (_, _, _) => buildSourcePage(),
+                      );
+                    },
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+
+    await tester.pumpAndSettle();
+
+    // Push the destination route to start the Hero transition.
+    navigatorKey.currentState!.push(
+      PageRouteBuilder<void>(
+        transitionDuration: const Duration(seconds: 1),
+        pageBuilder: (_, _, _) => buildDestinationPage(),
+      ),
+    );
+
+    // Build the destination route, then advance into the middle of the Hero flight.
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
+
+    final Finder shuttle = find.byKey(shuttleKey);
+
+    // Verify the shuttle starts with the expected size.
+    expect(shuttle, findsOneWidget);
+    expect(tester.getSize(shuttle), const Size(100.0, 100.0));
+
+    // Resize the Navigator while the Hero is still in flight.
+    updateHost(() => navigatorHeight -= 100.0);
+    await tester.pump();
+
+    // Verify that resizing the Navigator does not alter the shuttle's size.
+    expect(shuttle, findsOneWidget);
+    expect(tester.getSize(shuttle), const Size(100.0, 100.0));
+
+    await tester.pumpAndSettle();
+  });
 }
 
 class TestDependencies extends StatelessWidget {
diff --git a/packages/flutter/test/widgets/inherited_test.dart b/packages/flutter/test/widgets/inherited_test.dart
index 865cf202d71cc..e4f2e59d0226e 100644
--- a/packages/flutter/test/widgets/inherited_test.dart
+++ b/packages/flutter/test/widgets/inherited_test.dart
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'test_widgets.dart';
 
+const _kWhite = Color(0xFFFFFFFF);
+const _kBlack = Color(0xFF000000);
+
 class TestInherited extends InheritedWidget {
   const TestInherited({super.key, required super.child, this.shouldNotify = true});
 
@@ -55,32 +58,82 @@ class ChangeNotifierInherited extends InheritedNotifier<ChangeNotifier> {
   const ChangeNotifierInherited({super.key, required super.child, super.notifier});
 }
 
-class ThemedCard extends SingleChildRenderObjectWidget {
-  const ThemedCard({super.key}) : super(child: const SizedBox.expand());
+@immutable
+class TestWidgetData {
+  const TestWidgetData({
+    this.color,
+    this.elevation,
+    this.shadowColor,
+    this.shape,
+    this.clipBehavior,
+  });
+
+  final Color? color;
+  final double? elevation;
+  final Color? shadowColor;
+  final ShapeBorder? shape;
+  final Clip? clipBehavior;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is TestWidgetData &&
+        other.color == color &&
+        other.elevation == elevation &&
+        other.shadowColor == shadowColor &&
+        other.shape == shape &&
+        other.clipBehavior == clipBehavior;
+  }
+
+  @override
+  int get hashCode => Object.hash(color, elevation, shadowColor, shape, clipBehavior);
+}
+
+class TestDataWidget extends InheritedWidget {
+  const TestDataWidget({super.key, required super.child, required this.data});
+
+  final TestWidgetData data;
+
+  static TestWidgetData of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<TestDataWidget>()?.data ??
+        const TestWidgetData();
+  }
+
+  @override
+  bool updateShouldNotify(TestDataWidget oldWidget) => data != oldWidget.data;
+}
+
+class ThemedWidget extends SingleChildRenderObjectWidget {
+  const ThemedWidget({super.key}) : super(child: const SizedBox.expand());
 
   @override
   RenderPhysicalShape createRenderObject(BuildContext context) {
-    final CardThemeData cardTheme = CardTheme.of(context);
+    final TestWidgetData data = TestDataWidget.of(context);
 
     return RenderPhysicalShape(
-      clipper: ShapeBorderClipper(shape: cardTheme.shape ?? const RoundedRectangleBorder()),
-      clipBehavior: cardTheme.clipBehavior ?? Clip.antiAlias,
-      color: cardTheme.color ?? Colors.white,
-      elevation: cardTheme.elevation ?? 0.0,
-      shadowColor: cardTheme.shadowColor ?? Colors.black,
+      clipper: ShapeBorderClipper(shape: data.shape ?? const RoundedRectangleBorder()),
+      clipBehavior: data.clipBehavior ?? Clip.antiAlias,
+      color: data.color ?? _kWhite,
+      elevation: data.elevation ?? 0.0,
+      shadowColor: data.shadowColor ?? _kBlack,
     );
   }
 
   @override
   void updateRenderObject(BuildContext context, RenderPhysicalShape renderObject) {
-    final CardThemeData cardTheme = CardTheme.of(context);
+    final TestWidgetData data = TestDataWidget.of(context);
 
     renderObject
-      ..clipper = ShapeBorderClipper(shape: cardTheme.shape ?? const RoundedRectangleBorder())
-      ..clipBehavior = cardTheme.clipBehavior ?? Clip.antiAlias
-      ..color = cardTheme.color ?? Colors.white
-      ..elevation = cardTheme.elevation ?? 0.0
-      ..shadowColor = cardTheme.shadowColor ?? Colors.black;
+      ..clipper = ShapeBorderClipper(shape: data.shape ?? const RoundedRectangleBorder())
+      ..clipBehavior = data.clipBehavior ?? Clip.antiAlias
+      ..color = data.color ?? _kWhite
+      ..elevation = data.elevation ?? 0.0
+      ..shadowColor = data.shadowColor ?? _kBlack;
   }
 }
 
@@ -523,30 +576,30 @@ void main() {
   });
 
   testWidgets('InheritedWidgets can trigger RenderObject updates', (WidgetTester tester) async {
-    var cardThemeData = const CardThemeData(color: Colors.white);
+    var data = const TestWidgetData(color: _kWhite);
     late StateSetter setState;
 
-    // Verifies that the "themed card" is rendered
+    // Verifies that the "themed widget" is rendered
     // with the appropriate inherited theme data.
-    void expectCardToMatchTheme() {
-      final RenderPhysicalShape renderShape = tester.renderObject(find.byType(ThemedCard));
+    void expectWidgetToMatchTheme() {
+      final RenderPhysicalShape renderShape = tester.renderObject(find.byType(ThemedWidget));
 
-      if (cardThemeData.color != null) {
-        expect(renderShape.color, cardThemeData.color);
+      if (data.color != null) {
+        expect(renderShape.color, data.color);
       }
-      if (cardThemeData.elevation != null) {
-        expect(renderShape.elevation, cardThemeData.elevation);
+      if (data.elevation != null) {
+        expect(renderShape.elevation, data.elevation);
       }
-      if (cardThemeData.shadowColor != null) {
-        expect(renderShape.shadowColor, cardThemeData.shadowColor);
+      if (data.shadowColor != null) {
+        expect(renderShape.shadowColor, data.shadowColor);
       }
-      if (cardThemeData.shape != null) {
+      if (data.shape != null) {
         final CustomClipper<Path>? clipper = renderShape.clipper;
         expect(clipper, isA<ShapeBorderClipper>());
-        expect((clipper! as ShapeBorderClipper).shape, cardThemeData.shape);
+        expect((clipper! as ShapeBorderClipper).shape, data.shape);
       }
-      if (cardThemeData.clipBehavior != null) {
-        expect(renderShape.clipBehavior, cardThemeData.clipBehavior);
+      if (data.clipBehavior != null) {
+        expect(renderShape.clipBehavior, data.clipBehavior);
       }
     }
 
@@ -554,38 +607,35 @@ void main() {
       StatefulBuilder(
         builder: (BuildContext context, StateSetter stateSetter) {
           setState = stateSetter;
-          return Theme(
-            data: ThemeData(cardTheme: cardThemeData),
-            child: const ThemedCard(),
-          );
+          return TestDataWidget(data: data, child: const ThemedWidget());
         },
       ),
     );
-    expectCardToMatchTheme();
+    expectWidgetToMatchTheme();
 
     setState(() {
-      cardThemeData = const CardThemeData(
+      data = const TestWidgetData(
         shape: BeveledRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(20))),
       );
     });
     await tester.pump();
-    expectCardToMatchTheme();
+    expectWidgetToMatchTheme();
 
     setState(() {
-      cardThemeData = const CardThemeData(clipBehavior: Clip.hardEdge);
+      data = const TestWidgetData(clipBehavior: Clip.hardEdge);
     });
     await tester.pump();
-    expectCardToMatchTheme();
+    expectWidgetToMatchTheme();
 
     setState(() {
-      cardThemeData = const CardThemeData(
+      data = const TestWidgetData(
         elevation: 5.0,
-        shadowColor: Colors.blueGrey,
+        shadowColor: Color(0xFF0000FF),
         shape: ContinuousRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
         clipBehavior: Clip.antiAliasWithSaveLayer,
       );
     });
     await tester.pump();
-    expectCardToMatchTheme();
+    expectWidgetToMatchTheme();
   });
 }
diff --git a/packages/flutter/test/widgets/navigator_restoration_test.dart b/packages/flutter/test/widgets/navigator_restoration_test.dart
index 1fbc147c15527..efd7cf0979bd8 100644
--- a/packages/flutter/test/widgets/navigator_restoration_test.dart
+++ b/packages/flutter/test/widgets/navigator_restoration_test.dart
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
 
+import 'route_tester.dart';
+import 'test_page_tester.dart';
+
 void main() {
   testWidgets('Restoration Smoke Test', (WidgetTester tester) async {
     await tester.pumpWidget(const TestWidget());
@@ -1076,13 +1079,13 @@ void main() {
         .withIgnoredAll(), // leaking by design because of exception
     (WidgetTester tester) async {
       await tester.pumpWidget(
-        MaterialApp(
+        TestWidgetsApp(
           restorationScopeId: 'material_app',
           initialRoute: '/',
           routes: <String, WidgetBuilder>{'/': (BuildContext context) => Container()},
           onGenerateInitialRoutes: (String initialRoute) {
-            return <MaterialPageRoute<void>>[
-              MaterialPageRoute<void>(builder: (BuildContext context) => Container()),
+            return <TestRoute<void>>[
+              TestRoute<void>(maintainState: true, builder: (BuildContext context) => Container()),
             ];
           },
         ),
@@ -1100,7 +1103,8 @@ void main() {
 
 @pragma('vm:entry-point')
 Route<void> _routeBuilder(BuildContext context, Object? arguments) {
-  return MaterialPageRoute<void>(
+  return TestRoute<void>(
+    maintainState: true,
     builder: (BuildContext context) {
       return RouteWidget(name: arguments! as String);
     },
@@ -1109,7 +1113,8 @@ Route<void> _routeBuilder(BuildContext context, Object? arguments) {
 
 @pragma('vm:entry-point')
 Route<void> _routeFutureBuilder(BuildContext context, Object? arguments) {
-  return MaterialPageRoute<void>(
+  return TestRoute<void>(
+    maintainState: true,
     builder: (BuildContext context) {
       return const RouteFutureWidget();
     },
@@ -1188,12 +1193,22 @@ class PagedTestNavigatorState extends State<PagedTestNavigator> with Restoration
           : _routes.value.split(',').map((String name) {
               if (name.startsWith('r-')) {
                 name = name.substring(2);
-                return TestPage(name: name, restorationId: name, key: ValueKey<String>(name));
+                return TestPage<void>(
+                  name: name,
+                  restorationId: name,
+                  key: ValueKey<String>(name),
+                  child: RouteWidget(name: name),
+                );
               }
-              return TestPage(name: name, key: ValueKey<String>(name));
+              return TestPage<void>(
+                name: name,
+                key: ValueKey<String>(name),
+                child: RouteWidget(name: name),
+              );
             }).toList(),
       onGenerateRoute: (RouteSettings settings) {
-        return MaterialPageRoute<int>(
+        return TestRoute<int>(
+          maintainState: true,
           settings: settings,
           builder: (BuildContext context) {
             return RouteWidget(name: settings.name!, arguments: settings.arguments);
@@ -1218,20 +1233,6 @@ class PagedTestNavigatorState extends State<PagedTestNavigator> with Restoration
   }
 }
 
-class TestPage extends Page<void> {
-  const TestPage({super.key, required String super.name, super.restorationId});
-
-  @override
-  Route<void> createRoute(BuildContext context) {
-    return MaterialPageRoute<void>(
-      settings: this,
-      builder: (BuildContext context) {
-        return RouteWidget(name: name!);
-      },
-    );
-  }
-}
-
 class TestWidget extends StatelessWidget {
   const TestWidget({super.key, this.restorationId = 'app'});
 
@@ -1249,8 +1250,11 @@ class TestWidget extends StatelessWidget {
             initialRoute: 'home',
             restorationScopeId: 'app',
             onGenerateRoute: (RouteSettings settings) {
-              return MaterialPageRoute<int>(
+              return TestRoute<int>(
+                maintainState: true,
                 settings: settings,
+                transitionDuration: const Duration(milliseconds: 300),
+                reverseTransitionDuration: const Duration(milliseconds: 300),
                 builder: (BuildContext context) {
                   return RouteWidget(name: settings.name!, arguments: settings.arguments);
                 },
diff --git a/packages/flutter/test/widgets/navigator_test.dart b/packages/flutter/test/widgets/navigator_test.dart
index d1cd8f16cd291..c0f8280c2f6f9 100644
--- a/packages/flutter/test/widgets/navigator_test.dart
+++ b/packages/flutter/test/widgets/navigator_test.dart
@@ -1342,6 +1342,77 @@ void main() {
     expect(secondReturnValue, isNull);
   });
 
+  testWidgets(
+    'popUntilWithResult returns value to the last popped route when destination route has local history entries',
+    (WidgetTester tester) async {
+      bool? firstReturnValue;
+      bool? secondReturnValue;
+
+      Widget buildPage(String id, VoidCallback? onTap) {
+        return GestureDetector(
+          onTap: onTap,
+          behavior: HitTestBehavior.opaque,
+          child: Center(child: Text(id, textDirection: TextDirection.ltr)),
+        );
+      }
+
+      await tester.pumpWidget(
+        TestWidgetsApp(
+          initialRoute: '/',
+          onGenerateRoute: (RouteSettings settings) {
+            final String? routeName = settings.name;
+
+            switch (routeName) {
+              case '/':
+                return TestRoute<bool>(
+                  settings: settings,
+                  builder: (BuildContext context) => buildPage('/', () async {
+                    ModalRoute.of(context)!.addLocalHistoryEntry(LocalHistoryEntry());
+                    firstReturnValue = await Navigator.pushNamed(context, '/A');
+                  }),
+                );
+              case '/A':
+                return TestRoute<bool>(
+                  settings: settings,
+                  builder: (BuildContext context) => buildPage('A', () async {
+                    secondReturnValue = await Navigator.pushNamed(context, '/B');
+                  }),
+                );
+              case '/B':
+                return TestRoute<bool>(
+                  settings: settings,
+                  builder: (BuildContext context) => buildPage('B', () async {
+                    Navigator.popUntilWithResult<bool>(
+                      context,
+                      (Route<dynamic> route) => route.isFirst,
+                      true,
+                    );
+                  }),
+                );
+              default:
+                return null;
+            }
+          },
+        ),
+      );
+      expect(find.text('/'), findsOneWidget);
+
+      await tester.tap(find.text('/'));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('A'));
+      await tester.pumpAndSettle();
+      expect(find.text('B'), findsOneWidget);
+
+      await tester.tap(find.text('B'));
+      await tester.pumpAndSettle();
+      expect(find.text('/'), findsOneWidget);
+
+      expect(firstReturnValue, isTrue);
+      expect(secondReturnValue, isNull);
+    },
+  );
+
   testWidgets('pushAndRemoveUntil triggers secondaryAnimation', (WidgetTester tester) async {
     final routes = <String, WidgetBuilder>{
       '/': (BuildContext context) => OnTapPage(
@@ -6265,84 +6336,82 @@ void main() {
     clear();
   });
 
-  testWidgets(
-    'Navigator focus restoration reports error to FlutterError',
-    (WidgetTester tester) async {
-      final errorDetails = <FlutterErrorDetails>[];
-      final FlutterExceptionHandler? oldHandler = FlutterError.onError;
-      FlutterError.onError = (FlutterErrorDetails details) {
-        errorDetails.add(details);
-      };
+  testWidgets('Navigator focus restoration reports error to FlutterError', (
+    WidgetTester tester,
+  ) async {
+    final errorDetails = <FlutterErrorDetails>[];
+    final FlutterExceptionHandler? oldHandler = FlutterError.onError;
+    FlutterError.onError = (FlutterErrorDetails details) {
+      errorDetails.add(details);
+    };
 
-      try {
-        // Mock accessibility channel to throw error.
-        TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
-            .setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, (
-              dynamic message,
-            ) async {
-              final map = message as Map<dynamic, dynamic>;
-              if (map['type'] == 'focus') {
-                throw Exception('Focus restoration failed');
-              }
-              return null;
-            });
+    try {
+      // Mock accessibility channel to throw error.
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, (
+            dynamic message,
+          ) async {
+            final map = message as Map<dynamic, dynamic>;
+            if (map['type'] == 'focus') {
+              throw Exception('Focus restoration failed');
+            }
+            return null;
+          });
 
-        await tester.pumpWidget(
-          MaterialApp(
-            home: Scaffold(
-              body: Builder(
-                builder: (BuildContext context) {
-                  return ElevatedButton(
-                    onPressed: () {
-                      Navigator.push(
-                        context,
-                        NoAnimationPageRoute(
-                          pageBuilder: (BuildContext context) => Scaffold(
-                            appBar: AppBar(title: const Text('Second Route')),
-                            body: ElevatedButton(
-                              onPressed: () => Navigator.pop(context),
-                              child: const Text('Pop'),
-                            ),
+      await tester.pumpWidget(
+        MaterialApp(
+          home: Scaffold(
+            body: Builder(
+              builder: (BuildContext context) {
+                return ElevatedButton(
+                  onPressed: () {
+                    Navigator.push(
+                      context,
+                      NoAnimationPageRoute(
+                        pageBuilder: (BuildContext context) => Scaffold(
+                          appBar: AppBar(title: const Text('Second Route')),
+                          body: ElevatedButton(
+                            onPressed: () => Navigator.pop(context),
+                            child: const Text('Pop'),
                           ),
                         ),
-                      );
-                    },
-                    child: const Text('Push'),
-                  );
-                },
-              ),
+                      ),
+                    );
+                  },
+                  child: const Text('Push'),
+                );
+              },
             ),
           ),
-        );
+        ),
+      );
 
-        // Record the last focus in route entry.
-        ServicesBinding.instance.accessibilityFocus.value = 123;
-        await tester.pump();
+      // Record the last focus in route entry.
+      ServicesBinding.instance.accessibilityFocus.value = 123;
+      await tester.pump();
 
-        // Push second route.
-        await tester.tap(find.text('Push'));
-        await tester.pumpAndSettle();
+      // Push second route.
+      await tester.tap(find.text('Push'));
+      await tester.pumpAndSettle();
 
-        // Now we are on the second route.
-        // Pop it.
-        await tester.tap(find.text('Pop'));
-        await tester.pumpAndSettle();
+      // Now we are on the second route.
+      // Pop it.
+      await tester.tap(find.text('Pop'));
+      await tester.pumpAndSettle();
 
-        expect(errorDetails.length, 1);
-        expect(errorDetails[0].exception.toString(), contains('Focus restoration failed'));
-        expect(errorDetails[0].library, 'widgets library');
-        expect(
-          errorDetails[0].context.toString(),
-          contains('while restoring focus in the navigator'),
-        );
-      } finally {
-        FlutterError.onError = oldHandler;
-        TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
-            .setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, null);
-      }
-    },
-    variant: TargetPlatformVariant.only(TargetPlatform.iOS),
-  );
+      expect(errorDetails.length, 1);
+      expect(errorDetails[0].exception.toString(), contains('Focus restoration failed'));
+      expect(errorDetails[0].library, 'widgets library');
+      expect(
+        errorDetails[0].context.toString(),
+        contains('while restoring focus in the navigator'),
+      );
+    } finally {
+      FlutterError.onError = oldHandler;
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, null);
+    }
+  }, variant: TargetPlatformVariant.only(TargetPlatform.iOS));
 
   testWidgets('Navigator.pop throws FlutterError when popped with mismatched type', (
     WidgetTester tester,
diff --git a/packages/flutter/test/widgets/raw_tooltip_test.dart b/packages/flutter/test/widgets/raw_tooltip_test.dart
index 76fc3d86c6c5e..8ef464d61cecd 100644
--- a/packages/flutter/test/widgets/raw_tooltip_test.dart
+++ b/packages/flutter/test/widgets/raw_tooltip_test.dart
@@ -2794,6 +2794,467 @@ void main() {
     );
     expect(tester.getSize(find.byType(RawTooltip)), Size.zero);
   });
+
+  testWidgets('AnimationStyle.reverseCurve is used for the hide animation', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: const AnimationStyle(
+              curve: Curves.linear,
+              reverseCurve: Curves.easeInExpo,
+              duration: Duration(milliseconds: 100),
+              reverseDuration: Duration(milliseconds: 100),
+            ),
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 50));
+
+    // Halfway through the show animation, the forward curve applies.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    // CurvedAnimation only switches to the reverse curve when the direction
+    // changes from a completed state.
+    await tester.pumpAndSettle();
+    expect(tooltipAnimation.value, 1.0);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 50));
+
+    // Halfway through the hide animation, the reverse curve applies.
+    expect(tooltipAnimation.value, moreOrLessEquals(Curves.easeInExpo.transform(0.5)));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('Hide animation uses the forward curve when AnimationStyle.reverseCurve is null', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: const AnimationStyle(
+              curve: Curves.easeInExpo,
+              duration: Duration(milliseconds: 100),
+              reverseDuration: Duration(milliseconds: 100),
+            ),
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pumpAndSettle();
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 50));
+
+    // The hide animation follows the forward curve when no reverse curve is
+    // provided.
+    expect(tooltipAnimation.value, moreOrLessEquals(Curves.easeInExpo.transform(0.5)));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('AnimationStyle duration changes take effect after the first show', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+
+    Widget buildApp(AnimationStyle animationStyle) {
+      return TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: animationStyle,
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      );
+    }
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    // Show once to instantiate the lazily-created animation controller.
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pumpAndSettle();
+    RawTooltip.dismissAllToolTips();
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          duration: Duration(milliseconds: 300),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 150));
+
+    // Halfway through the updated 300ms show duration, not the original 100ms
+    // duration which would have already completed the animation.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    await tester.pump(const Duration(milliseconds: 150));
+    expect(tooltipAnimation.value, 1.0);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('Null AnimationStyle durations fall back to the documented defaults', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: const AnimationStyle(curve: Curves.linear),
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 75));
+
+    // Halfway through the default 150ms show duration.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    await tester.pump(const Duration(milliseconds: 75));
+    expect(tooltipAnimation.value, 1.0);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(microseconds: 37500));
+
+    // Halfway through the default 75ms hide duration.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('Hide animation defaults to 75ms even when AnimationStyle.duration is set', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: const AnimationStyle(
+              curve: Curves.linear,
+              duration: Duration(milliseconds: 400),
+            ),
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pumpAndSettle();
+    expect(tooltipAnimation.value, 1.0);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(microseconds: 37500));
+    // Halfway through the default 75ms hide duration, not the 400ms duration.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('AnimationStyle curve changes take effect after the first show', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+
+    Widget buildApp(AnimationStyle animationStyle) {
+      return TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: animationStyle,
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      );
+    }
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    // Show once to instantiate the lazily-created animation objects.
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pumpAndSettle();
+    RawTooltip.dismissAllToolTips();
+    await tester.pumpAndSettle();
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.easeInExpo,
+          reverseCurve: Curves.bounceOut,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 50));
+
+    // Halfway through the show animation, the updated forward curve applies.
+    expect(tooltipAnimation.value, moreOrLessEquals(Curves.easeInExpo.transform(0.5)));
+    await tester.pumpAndSettle();
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 50));
+
+    // Halfway through the hide animation, the updated reverse curve applies.
+    expect(tooltipAnimation.value, moreOrLessEquals(Curves.bounceOut.transform(0.5)));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('AnimationStyle changes while the tooltip is shown apply to the next animation', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+
+    Widget buildApp(AnimationStyle animationStyle) {
+      return TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: animationStyle,
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      );
+    }
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pumpAndSettle();
+    expect(tooltipAnimation.value, 1.0);
+
+    // Update the style while the tooltip is fully shown.
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          reverseCurve: Curves.easeInExpo,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 200),
+        ),
+      ),
+    );
+    expect(tester.takeException(), isNull);
+    expect(find.text(tooltipText), findsOneWidget);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 100));
+
+    // Halfway through the updated 200ms hide duration, following the updated
+    // reverse curve.
+    expect(tooltipAnimation.value, moreOrLessEquals(Curves.easeInExpo.transform(0.5)));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('Changing animationStyle while the tooltip is animating in does not crash', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+
+    Widget buildApp(AnimationStyle animationStyle) {
+      return TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: animationStyle,
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      );
+    }
+
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.linear,
+          duration: Duration(milliseconds: 100),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 25));
+
+    // Update the style while the show animation is running.
+    await tester.pumpWidget(
+      buildApp(
+        const AnimationStyle(
+          curve: Curves.easeInExpo,
+          duration: Duration(milliseconds: 300),
+          reverseDuration: Duration(milliseconds: 100),
+        ),
+      ),
+    );
+    expect(tester.takeException(), isNull);
+
+    // The running show animation completes on its original 100ms timeline, of
+    // which 25ms have already elapsed. Duration changes take effect the next
+    // time an animation starts.
+    await tester.pump(const Duration(milliseconds: 75));
+    expect(tooltipAnimation.value, 1.0);
+    expect(find.text(tooltipText), findsOneWidget);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
+
+  testWidgets('Zero show duration shows instantly and hides with the default 75ms', (
+    WidgetTester tester,
+  ) async {
+    final tooltipKey = GlobalKey<RawTooltipState>();
+    late Animation<double> tooltipAnimation;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: Center(
+          child: RawTooltip(
+            key: tooltipKey,
+            semanticsTooltip: tooltipText,
+            animationStyle: const AnimationStyle(curve: Curves.linear, duration: Duration.zero),
+            tooltipBuilder: (BuildContext context, Animation<double> animation) {
+              tooltipAnimation = animation;
+              return const Text(tooltipText);
+            },
+            child: const SizedBox(width: 100.0, height: 100.0),
+          ),
+        ),
+      ),
+    );
+
+    tooltipKey.currentState!.ensureTooltipVisible();
+    await tester.pump();
+    expect(tooltipAnimation.value, 1.0);
+    expect(find.text(tooltipText), findsOneWidget);
+
+    RawTooltip.dismissAllToolTips();
+    await tester.pump();
+    await tester.pump(const Duration(microseconds: 37500));
+
+    // The hide animation uses the default 75ms reverse duration.
+    expect(tooltipAnimation.value, moreOrLessEquals(0.5));
+    await tester.pumpAndSettle();
+    expect(find.text(tooltipText), findsNothing);
+  });
 }
 
 Future<void> setWidgetForTooltipMode(
diff --git a/packages/flutter/test/widgets/selectable_region_context_menu_test.dart b/packages/flutter/test/widgets/selectable_region_context_menu_test.dart
index bc4fccc21c1c9..5298257ec194a 100644
--- a/packages/flutter/test/widgets/selectable_region_context_menu_test.dart
+++ b/packages/flutter/test/widgets/selectable_region_context_menu_test.dart
@@ -14,6 +14,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:web/web.dart' as web;
 
+import 'editable_text_tester.dart';
 import 'web_platform_view_registry_utils.dart';
 
 extension on web.HTMLCollection {
@@ -43,11 +44,23 @@ void main() {
     fakePlatformViewRegistry = FakePlatformViewRegistry();
     PlatformSelectableRegionContextMenu.debugOverrideRegisterViewFactory =
         fakePlatformViewRegistry.registerViewFactory;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
+      SystemChannels.contextMenu,
+      (MethodCall call) {
+        // Just complete successfully, so that BrowserContextMenu thinks that
+        // the engine successfully received its call.
+        return Future<void>.value();
+      },
+    );
   });
 
   tearDown(() {
     PlatformSelectableRegionContextMenu.debugOverrideRegisterViewFactory = null;
     PlatformSelectableRegionContextMenu.debugResetRegistry();
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
+      SystemChannels.contextMenu,
+      null,
+    );
   });
 
   testWidgets('DOM element is set up correctly', (WidgetTester tester) async {
@@ -429,6 +442,44 @@ void main() {
       expect(event.defaultPrevented, isTrue);
     }
   }, variant: _browserContextMenuEnabledVariants);
+
+  // Regression test for https://github.com/flutter/flutter/issues/186459
+  testWidgets('can rebuild SelectableRegion as browser context menu toggles', (
+    WidgetTester tester,
+  ) async {
+    await BrowserContextMenu.enableContextMenu();
+    addTearDown(BrowserContextMenu.enableContextMenu);
+
+    late StateSetter rebuild;
+    await tester.pumpWidget(
+      TestWidgetsApp(
+        home: StatefulBuilder(
+          builder: (BuildContext context, StateSetter setState) {
+            rebuild = setState;
+            return SelectableRegion(
+              selectionControls: testTextSelectionHandleControls,
+              child: const Text('How are you?'),
+            );
+          },
+        ),
+      ),
+    );
+
+    await BrowserContextMenu.disableContextMenu();
+    rebuild(() {});
+    await tester.pump();
+    expect(tester.takeException(), isNull);
+
+    await BrowserContextMenu.enableContextMenu();
+    rebuild(() {});
+    await tester.pump();
+    expect(tester.takeException(), isNull);
+
+    await BrowserContextMenu.disableContextMenu();
+    rebuild(() {});
+    await tester.pumpAndSettle();
+    expect(tester.takeException(), isNull);
+  }, variant: _browserContextMenuEnabledVariants);
 }
 
 void removeAllStyleElements() {
diff --git a/packages/flutter/test/widgets/toggleable_test.dart b/packages/flutter/test/widgets/toggleable_test.dart
index 8bfffd520334c..a34cba12f4791 100644
--- a/packages/flutter/test/widgets/toggleable_test.dart
+++ b/packages/flutter/test/widgets/toggleable_test.dart
@@ -12,7 +12,7 @@ void main() {
     expect(testPainter, isNot(throwsException));
   });
 
-  testWidgets('Toggleable exists in widget layer', (WidgetTester tester) async {
+  testWidgets('Toggleable can be toggled by tap', (WidgetTester tester) async {
     await tester.pumpWidget(const TestWidgetsApp(home: TestToggleable()));
     final TestToggleableState state = tester.state<TestToggleableState>(
       find.byType(TestToggleable),
@@ -29,6 +29,63 @@ void main() {
     await tester.pumpAndSettle();
     expect(state.value, isFalse);
   });
+
+  testWidgets('reactionController defaults to a 100ms duration', (WidgetTester tester) async {
+    await tester.pumpWidget(const TestWidgetsApp(home: TestToggleable()));
+    final TestToggleableState state = tester.state<TestToggleableState>(
+      find.byType(TestToggleable),
+    );
+
+    expect(state.reactionController.duration, const Duration(milliseconds: 100));
+  });
+
+  testWidgets('reactionAnimationDuration override is used by the reactionController', (
+    WidgetTester tester,
+  ) async {
+    await tester.pumpWidget(
+      const TestWidgetsApp(
+        home: TestToggleable(reactionAnimationDuration: Duration(milliseconds: 250)),
+      ),
+    );
+    final TestToggleableState state = tester.state<TestToggleableState>(
+      find.byType(TestToggleable),
+    );
+
+    expect(state.reactionController.duration, const Duration(milliseconds: 250));
+  });
+
+  testWidgets('reactionAnimationDuration is only read when the state initializes', (
+    WidgetTester tester,
+  ) async {
+    const toggleableKey = Key('toggleable');
+    await tester.pumpWidget(
+      const TestWidgetsApp(
+        home: TestToggleable(
+          key: toggleableKey,
+          reactionAnimationDuration: Duration(milliseconds: 250),
+        ),
+      ),
+    );
+    final TestToggleableState state = tester.state<TestToggleableState>(
+      find.byType(TestToggleable),
+    );
+
+    // Pump again with a different reactionAnimationDuration but without
+    // re-initializing state.
+    await tester.pumpWidget(
+      const TestWidgetsApp(
+        home: TestToggleable(
+          key: toggleableKey,
+          reactionAnimationDuration: Duration(milliseconds: 400),
+        ),
+      ),
+    );
+
+    // State is conserved across rebuilds, and the reaction controller keeps the
+    // duration that was read at initialization.
+    expect(tester.state(find.byKey(toggleableKey)), same(state));
+    expect(state.reactionController.duration, const Duration(milliseconds: 250));
+  });
 }
 
 class TestPainter extends ToggleablePainter {
@@ -37,7 +94,9 @@ class TestPainter extends ToggleablePainter {
 }
 
 class TestToggleable extends StatefulWidget {
-  const TestToggleable({super.key});
+  const TestToggleable({super.key, this.reactionAnimationDuration});
+
+  final Duration? reactionAnimationDuration;
 
   @override
   State<StatefulWidget> createState() => TestToggleableState();
@@ -45,6 +104,9 @@ class TestToggleable extends StatefulWidget {
 
 class TestToggleableState extends State<TestToggleable>
     with TickerProviderStateMixin, ToggleableStateMixin {
+  @override
+  Duration? get reactionAnimationDuration => widget.reactionAnimationDuration;
+
   @override
   Widget build(BuildContext context) {
     return buildToggleableWithChild(child: const Text('child'));
diff --git a/packages/flutter_driver/analysis_options.yaml b/packages/flutter_driver/analysis_options.yaml
index e125c22faa575..2a26552df03c9 100644
--- a/packages/flutter_driver/analysis_options.yaml
+++ b/packages/flutter_driver/analysis_options.yaml
@@ -1,5 +1,9 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+
 analyzer:
   exclude:
   - "test_fixes/**"
diff --git a/packages/flutter_localizations/lib/src/l10n/generated_widgets_localizations.dart b/packages/flutter_localizations/lib/src/l10n/generated_widgets_localizations.dart
index 020fa71b928d9..a1c0fbdfca444 100644
--- a/packages/flutter_localizations/lib/src/l10n/generated_widgets_localizations.dart
+++ b/packages/flutter_localizations/lib/src/l10n/generated_widgets_localizations.dart
@@ -1354,6 +1354,29 @@ class WidgetsLocalizationEsEc extends WidgetsLocalizationEs {
   String get radioButtonUnselectedLabel => 'Sin seleccionar';
 }
 
+/// The translations for Spanish Castilian, as used in Spain (`es_ES`).
+class WidgetsLocalizationEsEs extends WidgetsLocalizationEs {
+  /// Create an instance of the translation bundle for Spanish Castilian, as used in Spain.
+  ///
+  /// For details on the meaning of the arguments, see [GlobalWidgetsLocalizations].
+  const WidgetsLocalizationEsEs();
+
+  @override
+  String get reorderItemToStart => 'Mover al inicio';
+
+  @override
+  String get searchResultsFound => 'Se encontraron resultados de la búsqueda';
+
+  @override
+  String get noResultsFound => 'No se encontraron resultados';
+
+  @override
+  String get lookUpButtonLabel => 'Consultar';
+
+  @override
+  String get radioButtonUnselectedLabel => 'Sin seleccionar';
+}
+
 /// The translations for Spanish Castilian, as used in Guatemala (`es_GT`).
 class WidgetsLocalizationEsGt extends WidgetsLocalizationEs {
   /// Create an instance of the translation bundle for Spanish Castilian, as used in Guatemala.
@@ -5539,7 +5562,7 @@ final Set<String> kWidgetsSupportedLanguages = HashSet<String>.from(const <Strin
 ///  * `de` - German (plus one country variation)
 ///  * `el` - Modern Greek
 ///  * `en` - English (plus 8 country variations)
-///  * `es` - Spanish Castilian (plus 20 country variations)
+///  * `es` - Spanish Castilian (plus 21 country variations)
 ///  * `et` - Estonian
 ///  * `eu` - Basque
 ///  * `fa` - Persian
@@ -5688,6 +5711,8 @@ GlobalWidgetsLocalizations? getWidgetsTranslation(
           return const WidgetsLocalizationEsDo();
         case 'EC':
           return const WidgetsLocalizationEsEc();
+        case 'ES':
+          return const WidgetsLocalizationEsEs();
         case 'GT':
           return const WidgetsLocalizationEsGt();
         case 'HN':
diff --git a/packages/flutter_localizations/lib/src/l10n/widgets_es_ES.arb b/packages/flutter_localizations/lib/src/l10n/widgets_es_ES.arb
new file mode 100644
index 0000000000000..e4ded549c0325
--- /dev/null
+++ b/packages/flutter_localizations/lib/src/l10n/widgets_es_ES.arb
@@ -0,0 +1,18 @@
+{
+  "reorderItemToStart": "Mover al inicio",
+  "reorderItemToEnd": "Mover al final",
+  "reorderItemUp": "Mover hacia arriba",
+  "reorderItemDown": "Mover hacia abajo",
+  "reorderItemLeft": "Mover hacia la izquierda",
+  "reorderItemRight": "Mover hacia la derecha",
+  "searchResultsFound": "Se encontraron resultados de la búsqueda",
+  "noResultsFound": "No se encontraron resultados",
+  "copyButtonLabel": "Copiar",
+  "cutButtonLabel": "Cortar",
+  "lookUpButtonLabel": "Consultar",
+  "searchWebButtonLabel": "Buscar en la Web",
+  "shareButtonLabel": "Compartir",
+  "pasteButtonLabel": "Pegar",
+  "selectAllButtonLabel": "Seleccionar todo",
+  "radioButtonUnselectedLabel": "Sin seleccionar"
+}
diff --git a/packages/flutter_test/analysis_options.yaml b/packages/flutter_test/analysis_options.yaml
index 2509a6ee60810..8461e419f4fa3 100644
--- a/packages/flutter_test/analysis_options.yaml
+++ b/packages/flutter_test/analysis_options.yaml
@@ -1,5 +1,9 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+
 analyzer:
   exclude:
     - "test_fixes/**"
diff --git a/packages/flutter_test/lib/src/test_widgets_app.dart b/packages/flutter_test/lib/src/test_widgets_app.dart
index d383b7a3f3f0b..140fbb6e6556c 100644
--- a/packages/flutter_test/lib/src/test_widgets_app.dart
+++ b/packages/flutter_test/lib/src/test_widgets_app.dart
@@ -68,6 +68,8 @@ class TestWidgetsApp extends StatelessWidget {
     this.home,
     this.initialRoute,
     this.onGenerateRoute,
+    this.onGenerateInitialRoutes,
+    this.onUnknownRoute,
     this.navigatorObservers = const <NavigatorObserver>[],
     this.routes = const <String, WidgetBuilder>{},
     this.color = const Color(0xFFFFFFFF),
@@ -77,6 +79,8 @@ class TestWidgetsApp extends StatelessWidget {
     this.shortcuts,
     this.actions,
     this.restorationScopeId,
+    this.localizationsDelegates,
+    this.localeListResolutionCallback,
   });
 
   /// A key to use when building the [Navigator].
@@ -140,6 +144,26 @@ class TestWidgetsApp extends StatelessWidget {
   ///  * [WidgetsApp.onGenerateRoute], the equivalent property in [WidgetsApp].
   final RouteFactory? onGenerateRoute;
 
+  /// The routes generator callback used for generating initial routes if
+  /// [initialRoute] is provided.
+  ///
+  /// If this property is not set, the underlying
+  /// [Navigator.onGenerateInitialRoutes] will default to
+  /// [Navigator.defaultGenerateInitialRoutes].
+  ///
+  /// See also:
+  ///
+  ///  * [WidgetsApp.onGenerateInitialRoutes], the equivalent property in [WidgetsApp].
+  final InitialRouteListFactory? onGenerateInitialRoutes;
+
+  /// Called when [onGenerateRoute] fails to generate a route, except for the
+  /// [initialRoute].
+  ///
+  /// See also:
+  ///
+  ///  * [WidgetsApp.onUnknownRoute], the equivalent property in [WidgetsApp].
+  final RouteFactory? onUnknownRoute;
+
   /// A list of [NavigatorObserver] for the app's [Navigator].
   ///
   /// Defaults to an empty list.
@@ -250,6 +274,23 @@ class TestWidgetsApp extends StatelessWidget {
   ///  * [WidgetsApp.restorationScopeId], the equivalent property in [WidgetsApp].
   final String? restorationScopeId;
 
+  /// The delegates for this app's [Localizations] widget.
+  ///
+  /// See also:
+  ///
+  ///  * [WidgetsApp.localizationsDelegates], the equivalent property in [WidgetsApp].
+  final Iterable<LocalizationsDelegate<Object?>>? localizationsDelegates;
+
+  /// The callback responsible for choosing the app's locale
+  /// when the app is started, and when the user changes the
+  /// device's locale.
+  ///
+  /// See also:
+  ///
+  ///  * [WidgetsApp.localeListResolutionCallback], the equivalent property in [WidgetsApp].
+  ///  * [basicLocaleListResolution], the default locale resolution algorithm.
+  final LocaleListResolutionCallback? localeListResolutionCallback;
+
   static PageRoute<T> _defaultPageRouteBuilder<T>(RouteSettings settings, WidgetBuilder builder) {
     return PageRouteBuilder<T>(
       settings: settings,
@@ -279,12 +320,16 @@ class TestWidgetsApp extends StatelessWidget {
       home: home,
       initialRoute: initialRoute,
       onGenerateRoute: onGenerateRoute,
+      onGenerateInitialRoutes: onGenerateInitialRoutes,
+      onUnknownRoute: onUnknownRoute,
       routes: routes,
       pageRouteBuilder: pageRouteBuilder,
       builder: builder,
       shortcuts: shortcuts,
       actions: actions,
       restorationScopeId: restorationScopeId,
+      localizationsDelegates: localizationsDelegates,
+      localeListResolutionCallback: localeListResolutionCallback,
     );
   }
 }
diff --git a/packages/flutter_test/test/accessibility_window_test.dart b/packages/flutter_test/test/accessibility_window_test.dart
index f9c20b9bcf947..bbd8e6df4eb0e 100644
--- a/packages/flutter_test/test/accessibility_window_test.dart
+++ b/packages/flutter_test/test/accessibility_window_test.dart
@@ -2,24 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
+  const kOrange = Color(0xFFFF9800);
+  const kOrangeAccent = Color(0xFFFFAB40);
+
   testWidgets('Fails correctly with configured screen size - small', (WidgetTester tester) async {
     tester.view.devicePixelRatio = 1.2;
     tester.view.physicalSize = const Size(250, 300);
     addTearDown(tester.view.reset);
 
-    final Widget invalidButton = ElevatedButton(
-      onPressed: () {},
-      style: ElevatedButton.styleFrom(
-        foregroundColor: Colors.orange,
-        backgroundColor: Colors.orangeAccent,
-      ),
-      child: const Text('Button'),
+    const Widget invalidButton = ColoredBox(
+      color: kOrangeAccent,
+      child: Text('Button', style: TextStyle(color: kOrange)),
     );
-    await tester.pumpWidget(MaterialApp(home: Scaffold(body: invalidButton)));
+    await tester.pumpWidget(const TestWidgetsApp(home: SizedBox.expand(child: invalidButton)));
 
     final Evaluation result = await textContrastGuideline.evaluate(tester);
     expect(result.passed, false);
@@ -30,15 +29,11 @@ void main() {
     tester.view.physicalSize = const Size(2500, 3000);
     addTearDown(tester.view.reset);
 
-    final Widget invalidButton = ElevatedButton(
-      onPressed: () {},
-      style: ElevatedButton.styleFrom(
-        foregroundColor: Colors.orange,
-        backgroundColor: Colors.orangeAccent,
-      ),
-      child: const Text('Button'),
+    const Widget invalidButton = ColoredBox(
+      color: kOrangeAccent,
+      child: Text('Button', style: TextStyle(color: kOrange)),
     );
-    await tester.pumpWidget(MaterialApp(home: Scaffold(body: invalidButton)));
+    await tester.pumpWidget(const TestWidgetsApp(home: SizedBox.expand(child: invalidButton)));
 
     final Evaluation result = await textContrastGuideline.evaluate(tester);
     expect(result.passed, false);
diff --git a/packages/flutter_test/test/bindings_test.dart b/packages/flutter_test/test/bindings_test.dart
index b217c69acc886..4eb66519153b7 100644
--- a/packages/flutter_test/test/bindings_test.dart
+++ b/packages/flutter_test/test/bindings_test.dart
@@ -2,15 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependencies have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=20210721"
-@Tags(<String>['no-shuffle'])
-library;
-
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -44,28 +36,22 @@ void main() {
     });
   });
 
-  // The next three tests must run in order -- first using `test`, then `testWidgets`, then `test` again.
-
-  var order = 0;
-
-  test('Initializes httpOverrides and testTextInput', () async {
-    assert(order == 0);
-    expect(binding.testTextInput, isNotNull);
-    expect(binding.testTextInput.isRegistered, isFalse);
-    expect(HttpOverrides.current, isNotNull);
-    order += 1;
-  });
+  group('testTextInput', () {
+    setUp(() {
+      expect(binding.testTextInput, isNotNull);
+      expect(binding.testTextInput.isRegistered, isFalse);
+    });
+    tearDown(() {
+      expect(binding.testTextInput.isRegistered, isFalse);
+    });
 
-  testWidgets('Registers testTextInput', (WidgetTester tester) async {
-    assert(order == 1);
-    expect(tester.testTextInput.isRegistered, isTrue);
-    order += 1;
-  });
+    testWidgets('testWidgets registers testTextInput', (WidgetTester tester) async {
+      expect(tester.testTextInput.isRegistered, isTrue);
+    });
 
-  test('Unregisters testTextInput', () async {
-    assert(order == 2);
-    expect(binding.testTextInput.isRegistered, isFalse);
-    order += 1;
+    test('test does not register testTextInput', () async {
+      expect(binding.testTextInput.isRegistered, isFalse);
+    });
   });
 
   testWidgets('timeStamp should be accurate to microsecond precision', (WidgetTester tester) async {
diff --git a/packages/flutter_test/test/http_overrides/test_test.dart b/packages/flutter_test/test/http_overrides/test_test.dart
new file mode 100644
index 0000000000000..958d00a0f4c8e
--- /dev/null
+++ b/packages/flutter_test/test/http_overrides/test_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  setUp(() {
+    expect(HttpOverrides.current, isNull);
+  });
+
+  test('test does not register HttpOverrides.current', () {
+    expect(HttpOverrides.current, isNull);
+  });
+}
diff --git a/packages/flutter_test/test/http_overrides/test_widgets_test.dart b/packages/flutter_test/test/http_overrides/test_widgets_test.dart
new file mode 100644
index 0000000000000..509ebeba45a3d
--- /dev/null
+++ b/packages/flutter_test/test/http_overrides/test_widgets_test.dart
@@ -0,0 +1,17 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  setUp(() {
+    expect(HttpOverrides.current, isNotNull);
+  });
+
+  testWidgets('testWidgets registers HttpOverrides.current', (WidgetTester tester) async {
+    expect(HttpOverrides.current, isNotNull);
+  });
+}
diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart
index 0fcb6873de4f2..28cde97f2c99d 100644
--- a/packages/flutter_test/test/matchers_test.dart
+++ b/packages/flutter_test/test/matchers_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// flutter_ignore_for_file: golden_tag (see analyze.dart)
+// ignore_for_file: golden_test_tags
 
 import 'dart:math' as math;
 import 'dart:typed_data';
diff --git a/packages/flutter_test/test/test_widgets_app_test.dart b/packages/flutter_test/test/test_widgets_app_test.dart
index b2b7afb6248a8..eb4dc0c2bd0cc 100644
--- a/packages/flutter_test/test/test_widgets_app_test.dart
+++ b/packages/flutter_test/test/test_widgets_app_test.dart
@@ -698,5 +698,97 @@ void main() {
       final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
       expect(widgetsApp.onGenerateRoute, isNull);
     });
+
+    testWidgets('onUnknownRoute defaults to null', (WidgetTester tester) async {
+      await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(widgetsApp.onUnknownRoute, isNull);
+    });
+
+    testWidgets('onUnknownRoute is passed to WidgetsApp', (WidgetTester tester) async {
+      await tester.pumpWidget(
+        TestWidgetsApp(home: const Placeholder(), onUnknownRoute: (settings) => null),
+      );
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(widgetsApp.onUnknownRoute, isNotNull);
+    });
+
+    testWidgets('localizationsDelegates defaults to null', (WidgetTester tester) async {
+      await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(widgetsApp.localizationsDelegates, isNull);
+    });
+
+    testWidgets('localizationsDelegates is passed to WidgetsApp', (WidgetTester tester) async {
+      final delegates = <LocalizationsDelegate<Object?>>[];
+
+      await tester.pumpWidget(
+        TestWidgetsApp(home: const Placeholder(), localizationsDelegates: delegates),
+      );
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(identical(widgetsApp.localizationsDelegates, delegates), isTrue);
+    });
+
+    testWidgets('localeListResolutionCallback defaults to null', (WidgetTester tester) async {
+      await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(widgetsApp.localeListResolutionCallback, isNull);
+    });
+
+    testWidgets('localeListResolutionCallback is passed to WidgetsApp', (
+      WidgetTester tester,
+    ) async {
+      await tester.pumpWidget(
+        const TestWidgetsApp(
+          home: Placeholder(),
+          localeListResolutionCallback: testLocalResolutionCallback,
+        ),
+      );
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(
+        identical(widgetsApp.localeListResolutionCallback, testLocalResolutionCallback),
+        isTrue,
+      );
+    });
+
+    testWidgets('onGenerateInitialRoutes defaults to null', (WidgetTester tester) async {
+      await tester.pumpWidget(const TestWidgetsApp(home: Placeholder()));
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(widgetsApp.onGenerateInitialRoutes, isNull);
+    });
+
+    testWidgets('onGenerateInitialRoutes is passed to WidgetsApp', (WidgetTester tester) async {
+      await tester.pumpWidget(
+        TestWidgetsApp(
+          onGenerateInitialRoutes: testOnGenerateInitialRoutes,
+          onGenerateRoute: (_) => null,
+        ),
+      );
+
+      final WidgetsApp widgetsApp = tester.widget(find.byType(WidgetsApp));
+      expect(identical(widgetsApp.onGenerateInitialRoutes, testOnGenerateInitialRoutes), isTrue);
+    });
   });
 }
+
+Locale? testLocalResolutionCallback(List<Locale>? locales, Iterable<Locale> supportedLocales) {
+  return null;
+}
+
+List<Route<Object?>> testOnGenerateInitialRoutes(String initialRouteName) {
+  return <Route<Object?>>[
+    PageRouteBuilder<int>(
+      settings: const RouteSettings(name: '/'),
+      pageBuilder: (_, _, _) {
+        return const Placeholder();
+      },
+    ),
+  ];
+}
diff --git a/packages/flutter_tools/analysis_options.yaml b/packages/flutter_tools/analysis_options.yaml
index 71e95192ecdd5..e8af77b87aae6 100644
--- a/packages/flutter_tools/analysis_options.yaml
+++ b/packages/flutter_tools/analysis_options.yaml
@@ -9,6 +9,12 @@ analyzer:
     - linux/**
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+    diagnostics:
+      avoid_future_catch_error: true
+
 linter:
   rules:
     avoid_catches_without_on_clauses: true
diff --git a/packages/flutter_tools/bin/podhelper.rb b/packages/flutter_tools/bin/podhelper.rb
index e09c48dfddf6a..f7308a6f86cbd 100644
--- a/packages/flutter_tools/bin/podhelper.rb
+++ b/packages/flutter_tools/bin/podhelper.rb
@@ -82,6 +82,13 @@ def flutter_additional_ios_build_settings(target)
     # ARC code targeting iOS 8 does not build on Xcode 14.3. Force to at least iOS 9.
     build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' if force_to_arc_supported_min
 
+    # Suppress warning/error when pod supports a version lower than the minimum supported by Xcode.
+    # Xcode 27+ produces an error while previous versions produced a warning.
+    # When it's just a warning, it's harmless but confusing--it's not a bad thing for dependencies to support a lower version.
+    # When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
+    # If the pod only supports a higher version, do not delete to correctly produce an error.
+    build_configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if inherit_deployment_target
+
     # Skip other updates if it does not depend on Flutter (including transitive dependency)
     next unless depends_on_flutter(target, 'Flutter')
 
@@ -103,11 +110,6 @@ def flutter_additional_ios_build_settings(target)
     build_configuration.build_settings['OTHER_LDFLAGS'] = '$(inherited) -framework Flutter'
 
     build_configuration.build_settings['CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER'] = 'NO'
-    # Suppress warning when pod supports a version lower than the minimum supported by Xcode (Xcode 12 - iOS 9).
-    # This warning is harmless but confusing--it's not a bad thing for dependencies to support a lower version.
-    # When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
-    # If the pod only supports a higher version, do not delete to correctly produce an error.
-    build_configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if inherit_deployment_target
 
     # Override legacy Xcode 11 style VALID_ARCHS[sdk=iphonesimulator*]=x86_64 and prefer Xcode 12 EXCLUDED_ARCHS.
     build_configuration.build_settings['VALID_ARCHS[sdk=iphonesimulator*]'] = '$(ARCHS_STANDARD)'
@@ -128,8 +130,9 @@ def flutter_additional_macos_build_settings(target)
                                   (deployment_target_major.to_i < 10) ||
                                   (deployment_target_major.to_i == 10 && deployment_target_minor.to_i < 11)
 
-  # Suppress warning when pod supports a version lower than the minimum supported by the latest stable version of Xcode (currently 12.0).
-  # This warning is harmless but confusing--it's not a bad thing for dependencies to support a lower version.
+  # Suppress warning/error when pod supports a version lower than the minimum supported by the latest stable version of Xcode (currently 12.0).
+  # Xcode 27+ produces an error while previous versions produced a warning.
+  # When it's just a warning, it's harmless but confusing--it's not a bad thing for dependencies to support a lower version.
   inherit_deployment_target = !target.deployment_target.blank? &&
     (deployment_target_major.to_i < 12)
 
@@ -152,6 +155,10 @@ def flutter_additional_macos_build_settings(target)
     # ARC code targeting macOS 10.10 does not build on Xcode 14.3. Force to at least macOS 10.11.
     build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.11' if force_to_arc_supported_min
 
+    # When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
+    # If the pod only supports a higher version, do not delete to correctly produce an error.
+    build_configuration.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET' if inherit_deployment_target
+
     # Skip other updates if it does not depend on Flutter (including transitive dependency)
     next unless depends_on_flutter(target, 'FlutterMacOS')
 
@@ -167,10 +174,6 @@ def flutter_additional_macos_build_settings(target)
       end
     end
 
-    # When deleted, the deployment version will inherit from the higher version derived from the 'Runner' target.
-    # If the pod only supports a higher version, do not delete to correctly produce an error.
-    build_configuration.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET' if inherit_deployment_target
-
     # Avoid error about Pods-Runner not supporting provisioning profiles.
     # Framework signing is handled at the app layer, not per framework, so disallow individual signing.
     build_configuration.build_settings.delete 'EXPANDED_CODE_SIGN_IDENTITY'
diff --git a/packages/flutter_tools/bin/tool_backend.dart b/packages/flutter_tools/bin/tool_backend.dart
index fb62e172c07a8..c2173d660bb4f 100644
--- a/packages/flutter_tools/bin/tool_backend.dart
+++ b/packages/flutter_tools/bin/tool_backend.dart
@@ -26,6 +26,8 @@ Future<void> main(List<String> arguments) async {
   final String? localEngineHost = Platform.environment['LOCAL_ENGINE_HOST'];
   final String? projectDirectory = Platform.environment['PROJECT_DIR'];
   final String? splitDebugInfo = Platform.environment['SPLIT_DEBUG_INFO'];
+  final String? buildName = Platform.environment['BUILD_NAME'];
+  final String? buildNumber = Platform.environment['BUILD_NUMBER'];
   final trackWidgetCreation = Platform.environment['TRACK_WIDGET_CREATION'] == 'true';
   final treeShakeIcons = Platform.environment['TREE_SHAKE_ICONS'] == 'true';
   final verbose = Platform.environment['VERBOSE_SCRIPT_LOGGING'] == 'true';
@@ -98,6 +100,8 @@ or
     if (codeSizeDirectory != null) '-dCodeSizeDirectory=$codeSizeDirectory',
     if (flavor != null && flavor.isNotEmpty) '-dFlavor=$flavor',
     if (splitDebugInfo != null) '-dSplitDebugInfo=$splitDebugInfo',
+    if (buildName != null) '-dBuildName=$buildName',
+    if (buildNumber != null) '-dBuildNumber=$buildNumber',
     if (dartDefines != null) '--DartDefines=$dartDefines',
     if (extraGenSnapshotOptions != null) '--ExtraGenSnapshotOptions=$extraGenSnapshotOptions',
     if (frontendServerStarterPath != null) '-dFrontendServerStarterPath=$frontendServerStarterPath',
diff --git a/packages/flutter_tools/gradle/build.gradle.kts b/packages/flutter_tools/gradle/build.gradle.kts
index dd7341f6c0ee5..0be679dd49897 100644
--- a/packages/flutter_tools/gradle/build.gradle.kts
+++ b/packages/flutter_tools/gradle/build.gradle.kts
@@ -49,6 +49,11 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     }
 }
 
+// The AGP version the Flutter Gradle Plugin compiles and tests against. CI additionally runs
+// this build with -PagpVersion=<AGP 9 line> to catch public-DSL binary incompatibilities
+// between the AGP major versions the plugin supports (see AgpCommonExtensionWrapper).
+val agpVersion: String = providers.gradleProperty("agpVersion").getOrElse("8.11.1")
+
 dependencies {
     // Versions available https://mvnrepository.com/artifact/androidx.annotation/annotation-jvm.
     // Version release notes https://developer.android.com/jetpack/androidx/releases/annotation
@@ -61,14 +66,58 @@ dependencies {
     // All kotlinx implementation dependencies must work with the oldest kotlin supported versions.
     // Defined in packages/flutter_tools/gradle/src/main/kotlin/DependencyVersionChecker.kt
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
-    // When bumping, also update:
+    // When bumping the default agpVersion above, also update:
     //  * AGP version constants in packages/flutter_tools/lib/src/android/gradle_utils.dart
     //  * ndkVersion constant in packages/flutter_tools/lib/src/android/gradle_utils.dart
     //  * ndkVersion in FlutterExtension in packages/flutter_tools/gradle/src/main/kotlin/FlutterExtension.kt
-    compileOnly("com.android.tools.build:gradle:8.11.1")
+    compileOnly("com.android.tools.build:gradle:$agpVersion")
 
     testImplementation(kotlin("test"))
-    testImplementation("com.android.tools.build:gradle:8.11.1")
-    testImplementation("org.mockito:mockito-core:5.8.0")
+    testImplementation("com.android.tools.build:gradle:$agpVersion")
     testImplementation("io.mockk:mockk:1.13.16")
 }
+
+// CommonExtension is binary-incompatible between AGP 8 and 9, which is why DSL access is
+// routed through AgpCommonExtensionWrapper. If the compiler emits a reference to
+// CommonExtension as the owner of a call, the plugin breaks on one of the two AGP lines at
+// runtime even though it compiles on both. Fail fast if such a reference appears in the
+// main bytecode (test bytecode intentionally references AGP types directly).
+val validateNoCommonExtensionInBytecode by tasks.registering {
+    description =
+        "Checks that no compiled main class references com.android.build.api.dsl.CommonExtension."
+    dependsOn(tasks.named("compileKotlin"))
+    val classesDir = layout.buildDirectory.dir("classes/kotlin/main")
+    doLast {
+        val needle = "com/android/build/api/dsl/CommonExtension".toByteArray(Charsets.ISO_8859_1)
+        val offenders =
+            classesDir
+                .get()
+                .asFile
+                .walkTopDown()
+                .filter { it.isFile && it.extension == "class" }
+                .filter { file ->
+                    val bytes = file.readBytes()
+                    (0..bytes.size - needle.size).any { start ->
+                        needle.indices.all { i -> bytes[start + i] == needle[i] }
+                    }
+                }.map { it.name }
+                .toList()
+        if (offenders.isNotEmpty()) {
+            throw GradleException(
+                "CommonExtension must not be referenced from Flutter Gradle Plugin bytecode " +
+                    "(it is binary-incompatible between AGP 8 and 9). Route DSL access through " +
+                    "AgpCommonExtensionWrapper instead. Offending classes: $offenders"
+            )
+        }
+    }
+}
+
+// Attached to `test` (not just `check`) because CI drives this build through `gradlew test`
+// (see packages/flutter_tools/test/integration.shard/android_run_flutter_gradle_plugin_tests_test.dart).
+tasks.test {
+    dependsOn(validateNoCommonExtensionInBytecode)
+}
+
+tasks.named("check") {
+    dependsOn(validateNoCommonExtensionInBytecode)
+}
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
index 806fc5097a022..c1b591537eb98 100644
--- a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
+++ b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt
@@ -246,12 +246,12 @@ class FlutterPlugin : Plugin<Project> {
             }
             localEngineHost = engineHostOut.name
         }
-        FlutterPluginUtils.getLegacyAndroidExtension(project).buildTypes.all {
+        FlutterPluginUtils.getAndroidExtension(project).buildTypes.all {
             addFlutterDependencies(this)
         }
     }
 
-    private fun addFlutterDependencies(buildType: com.android.builder.model.BuildType) {
+    private fun addFlutterDependencies(buildType: BuildType) {
         FlutterPluginUtils.addFlutterDependencies(
             project!!,
             buildType,
@@ -304,6 +304,10 @@ class FlutterPlugin : Plugin<Project> {
             FlutterPluginUtils.addTaskForPrintNdkVersion(projectToAddTasksTo)
             FlutterPluginUtils.addTasksForOutputsAppLinkSettings(projectToAddTasksTo)
         }
+        // Only applies to app projects. For module (aar) projects the host app's manifest is
+        // the source of truth for HCPP; see addTasksForEnableHcppManifest for why injecting
+        // into the library manifest would break host builds that explicitly opt out.
+        FlutterPluginUtils.addTasksForEnableHcppManifest(projectToAddTasksTo)
 
         val targetPlatforms: List<String> =
             FlutterPluginUtils.getTargetPlatforms(projectToAddTasksTo)
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt
index f9860dbd4f53a..a41eaba2b0baf 100644
--- a/packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt
+++ b/packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt
@@ -6,13 +6,16 @@ package com.flutter.gradle
 
 import com.android.build.api.AndroidPluginVersion
 import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.dsl.ApplicationBuildType
 import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.DynamicFeatureBuildType
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import com.android.builder.model.BuildType
 import com.flutter.gradle.plugins.PluginHandler
 import com.flutter.gradle.tasks.DeepLinkJsonFromManifestTask
+import com.flutter.gradle.tasks.EnableHcppManifestTask
 import com.flutter.gradle.tasks.PrintTask
 import com.flutter.gradle.tasks.ValidateCompileSdkVersionTask
 import groovy.lang.Closure
@@ -28,6 +31,7 @@ import java.io.File
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.util.Properties
+import com.android.build.api.dsl.BuildType as DslBuildType
 
 /**
  * A collection of static utility functions used by the Flutter Gradle Plugin.
@@ -38,6 +42,8 @@ object FlutterPluginUtils {
     // recommended to use these const values in tests.
     internal const val PROP_SHOULD_SHRINK_RESOURCES = "shrink"
     internal const val PROP_SPLIT_PER_ABI = "split-per-abi"
+    internal const val PROP_ENABLE_HCPP = "enable-hcpp"
+    internal const val PROP_EXPLICIT_ENABLE_HCPP = "explicit-enable-hcpp"
     internal const val PROP_LOCAL_ENGINE_REPO = "local-engine-repo"
     internal const val PROP_IS_VERBOSE = "verbose"
     internal const val PROP_TARGET = "target"
@@ -472,12 +478,55 @@ object FlutterPluginUtils {
     internal fun buildModeFor(buildType: BuildType): String {
         if (buildType.name == "profile") {
             return "profile"
-        } else if (buildType.isDebuggable) {
+        }
+        return buildModeFor(buildType.name, buildType.isDebuggable)
+    }
+
+    /**
+     * Returns a Flutter build mode for a build type identified by [buildTypeName] and its
+     * [isDebuggable] flag.
+     *
+     * Variant-scope callers must pass the public `Component.debuggable` flag so that custom
+     * debuggable build types (e.g. a host app's `staging`) map to the debug engine artifacts.
+     *
+     * @return "debug", "profile", or "release" (fall-back).
+     */
+    @JvmStatic
+    @JvmName("buildModeFor")
+    internal fun buildModeFor(
+        buildTypeName: String,
+        isDebuggable: Boolean
+    ): String {
+        if (buildTypeName == "profile") {
+            return "profile"
+        } else if (isDebuggable) {
             return "debug"
         }
         return "release"
     }
 
+    /**
+     * Returns a Flutter build mode for a new-DSL [buildType].
+     *
+     * Application and dynamic-feature build types expose a public `isDebuggable` flag.
+     * Library build types do not, so for them the conventional "debug" name is the only
+     * public signal available at DSL scope.
+     */
+    @JvmStatic
+    @JvmName("buildModeFor")
+    internal fun buildModeFor(buildType: DslBuildType): String {
+        if (buildType.name == "profile") {
+            return "profile"
+        }
+        val isDebuggable =
+            when (buildType) {
+                is ApplicationBuildType -> buildType.isDebuggable
+                is DynamicFeatureBuildType -> buildType.isDebuggable
+                else -> buildType.name == "debug"
+            }
+        return buildModeFor(buildType.name, isDebuggable)
+    }
+
     /**
      * Returns true if the build mode is supported by the current call to Gradle.
      * This only relevant when using a local engine. Because the engine
@@ -986,7 +1035,7 @@ object FlutterPluginUtils {
     @JvmName("addFlutterDependencies")
     internal fun addFlutterDependencies(
         project: Project,
-        buildType: BuildType,
+        buildType: DslBuildType,
         pluginHandler: PluginHandler,
         engineVersion: String
     ) {
@@ -1159,4 +1208,55 @@ object FlutterPluginUtils {
                 ).toTransform(SingleArtifact.MERGED_MANIFEST) // (3) Indicate the artifact and operation type.
         }
     }
+
+    /**
+     * Adds tasks that inject the `io.flutter.embedding.android.EnableHcpp` meta-data into the
+     * merged manifest of each variant, when the flutter tool passed `-Penable-hcpp=true` (i.e.
+     * when the `--enable-hcpp` flag was passed).
+     *
+     * The meta-data is only added when not already present in the merged manifest, so an
+     * explicit value in the developer's manifest always takes priority over the tool's default.
+     * An explicit `--enable-hcpp`/`--no-enable-hcpp` on `flutter run`/`flutter test` is passed
+     * to the engine at launch instead, which takes priority over the manifest at runtime.
+     *
+     * Only applies to application projects. Injecting into a module (aar) library manifest
+     * would propagate into the host app's merged manifest, and if the host app explicitly sets
+     * the meta-data to a different value the manifest merger fails the host build with an
+     * attribute conflict ("Attribute meta-data#...EnableHcpp@value value=(false) ... is also
+     * present at [library] ... value=(true)") instead of letting the host win. Add-to-app hosts
+     * therefore control HCPP exclusively through their own manifest.
+     */
+    @JvmStatic
+    @JvmName("addTasksForEnableHcppManifest")
+    internal fun addTasksForEnableHcppManifest(project: Project) {
+        if (!isFlutterAppProject(project)) {
+            return
+        }
+        val enableHcpp: Boolean =
+            project.findProperty(PROP_ENABLE_HCPP)?.toString()?.toBoolean() ?: false
+        val explicitEnableHcpp: Boolean? =
+            project.findProperty(PROP_EXPLICIT_ENABLE_HCPP)?.toString()?.toBoolean()
+        if (!enableHcpp && explicitEnableHcpp == null) {
+            return
+        }
+        val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
+        androidComponents.onVariants { variant ->
+            val hcppManifestUpdater =
+                project.tasks.register(
+                    "enableHcppInManifest${capitalize(variant.name)}",
+                    EnableHcppManifestTask::class.java
+                ) {
+                    this.requestedEnableHcpp.set(enableHcpp)
+                    if (explicitEnableHcpp != null) {
+                        this.explicitEnableHcpp.set(explicitEnableHcpp)
+                    }
+                }
+            variant.artifacts
+                .use(hcppManifestUpdater)
+                .wiredWithFiles(
+                    EnableHcppManifestTask::manifestFile,
+                    EnableHcppManifestTask::updatedManifest
+                ).toTransform(SingleArtifact.MERGED_MANIFEST)
+        }
+    }
 }
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/VersionFetcher.kt b/packages/flutter_tools/gradle/src/main/kotlin/VersionFetcher.kt
index 0632bef409c38..9c5f48f41201c 100644
--- a/packages/flutter_tools/gradle/src/main/kotlin/VersionFetcher.kt
+++ b/packages/flutter_tools/gradle/src/main/kotlin/VersionFetcher.kt
@@ -64,7 +64,7 @@ internal object VersionFetcher {
                 .findPlugin(KotlinAndroidPluginWrapper::class.java)
         // Partial implementation of getKotlinPluginVersion from the comment above.
         var versionString: String? = kotlinPlugin?.pluginVersion
-        if (!versionString.isNullOrEmpty()) {
+        if (!versionString.isNullOrEmpty() && versionString != "unknown") {
             return Version.fromString(versionString)
         }
         // Fall back to reflection.
@@ -73,7 +73,7 @@ internal object VersionFetcher {
                 it.name == firstKotlinVersionFieldName || it.name == secondKotlinVersionFieldName
             }
         versionString = versionField?.call(kotlinPlugin) as String?
-        return if (versionString == null) {
+        return if (versionString == null || versionString == "unknown") {
             null
         } else {
             Version.fromString(versionString)
@@ -144,13 +144,18 @@ internal data class CompileSdkVersion(
      *   returns false rather than guessing.
      * - if either side is unset, returns false.
      */
-    fun isHigherThan(other: CompileSdkVersion): Boolean =
-        when {
-            previewCodename != null && other.previewCodename != null -> false
-            previewCodename != null && other.apiLevel != null -> true
-            apiLevel != null && other.apiLevel != null -> apiLevel > other.apiLevel
-            else -> false
+    fun isHigherThan(other: CompileSdkVersion): Boolean {
+        if (other.previewCodename != null) {
+            return false
         }
+        if (previewCodename != null && other.apiLevel != null) {
+            return true
+        }
+        if (apiLevel != null && other.apiLevel != null) {
+            return apiLevel > other.apiLevel
+        }
+        return false
+    }
 
     /** The human-readable form used in log messages, e.g. "35" or "Baklava". */
     override fun toString(): String = previewCodename ?: apiLevel?.toString() ?: "unknown"
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/plugins/PluginHandler.kt b/packages/flutter_tools/gradle/src/main/kotlin/plugins/PluginHandler.kt
index 16a8e8d986a30..d5b1042a3f6a8 100644
--- a/packages/flutter_tools/gradle/src/main/kotlin/plugins/PluginHandler.kt
+++ b/packages/flutter_tools/gradle/src/main/kotlin/plugins/PluginHandler.kt
@@ -4,12 +4,13 @@
 
 package com.flutter.gradle.plugins
 
-import com.android.builder.model.BuildType
+import com.android.build.api.dsl.BuildType
 import com.flutter.gradle.CompileSdkVersion
 import com.flutter.gradle.FlutterExtension
 import com.flutter.gradle.FlutterPluginUtils
 import com.flutter.gradle.FlutterPluginUtils.addApiDependencies
 import com.flutter.gradle.FlutterPluginUtils.buildModeFor
+import com.flutter.gradle.FlutterPluginUtils.getAndroidExtension
 import com.flutter.gradle.FlutterPluginUtils.getCompileSdkFromProject
 import com.flutter.gradle.FlutterPluginUtils.getLegacyAndroidExtension
 import com.flutter.gradle.FlutterPluginUtils.isBuiltAsApp
@@ -112,7 +113,7 @@ class PluginHandler(
             // Add plugin dependency to the app project. We only want to add dependency
             // for dev dependencies in non-release builds.
             project.afterEvaluate {
-                getLegacyAndroidExtension(project).buildTypes.forEach { buildType ->
+                getAndroidExtension(project).buildTypes.forEach { buildType ->
                     if (!(pluginObject["dev_dependency"] as Boolean) || buildType.name != "release") {
                         project.dependencies.add("${buildType.name}Api", pluginProject)
                     }
@@ -133,7 +134,7 @@ class PluginHandler(
                     )
                 }
 
-                getLegacyAndroidExtension(project).buildTypes.forEach { buildType ->
+                getAndroidExtension(project).buildTypes.forEach { buildType ->
                     addEmbeddingDependencyToPlugin(project, pluginProject, buildType, engineVersion)
                 }
             }
@@ -213,7 +214,7 @@ class PluginHandler(
                 }
             val pluginProject: Project = project.rootProject.findProject(":$pluginName") ?: return
 
-            getLegacyAndroidExtension(project).buildTypes.forEach { buildType ->
+            getAndroidExtension(project).buildTypes.forEach { buildType ->
                 val flutterBuildMode: String = buildModeFor(buildType)
                 if (flutterBuildMode == "release" && (pluginObject["dev_dependency"] as? Boolean == true)) {
                     // This plugin is a dev dependency will not be included in the
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTask.kt b/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTask.kt
new file mode 100644
index 0000000000000..6eeb66b73db98
--- /dev/null
+++ b/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTask.kt
@@ -0,0 +1,58 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package com.flutter.gradle.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Manages the `io.flutter.embedding.android.EnableHcpp` meta-data in the merged
+ * AndroidManifest.
+ *
+ * If [explicitEnableHcpp] is provided it is written to the manifest, replacing any value already
+ * there. Otherwise [requestedEnableHcpp] is injected only when the manifest does not set the
+ * metadata at all. See [EnableHcppManifestTaskHelper.processHcppManifest] for the precedence.
+ *
+ * The message reporting that the flag overrode the manifest is emitted from the task action, so it
+ * is only printed when the task actually runs. A subsequent up-to-date or cached build produces the
+ * same (correct) manifest without repeating the message.
+ */
+@CacheableTask
+abstract class EnableHcppManifestTask : DefaultTask() {
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val manifestFile: RegularFileProperty
+
+    @get:OutputFile
+    abstract val updatedManifest: RegularFileProperty
+
+    @get:Input
+    @get:Optional
+    abstract val requestedEnableHcpp: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val explicitEnableHcpp: Property<Boolean>
+
+    @TaskAction
+    fun processManifest() {
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile.get().asFile,
+            updatedManifest = updatedManifest.get().asFile,
+            requestedEnableHcpp = requestedEnableHcpp.getOrElse(false),
+            explicitEnableHcpp = explicitEnableHcpp.orNull,
+            logger = logger
+        )
+    }
+}
diff --git a/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTaskHelper.kt b/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTaskHelper.kt
new file mode 100644
index 0000000000000..a701cbd269b4d
--- /dev/null
+++ b/packages/flutter_tools/gradle/src/main/kotlin/tasks/EnableHcppManifestTaskHelper.kt
@@ -0,0 +1,101 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package com.flutter.gradle.tasks
+
+import groovy.util.Node
+import groovy.xml.XmlNodePrinter
+import groovy.xml.XmlParser
+import org.gradle.api.logging.Logger
+import java.io.File
+import java.io.PrintWriter
+
+/**
+ * Stateless object to contain the logic used in [EnableHcppManifestTask].
+ */
+object EnableHcppManifestTaskHelper {
+    private const val MANIFEST_NAME_KEY = "android:name"
+    private const val MANIFEST_VALUE_KEY = "android:value"
+    internal const val HCPP_METADATA_NAME = "io.flutter.embedding.android.EnableHcpp"
+
+    // The flutter tool flags that set the properties this task consumes. Only used to name the
+    // flag the developer passed when reporting that it overrode the manifest.
+    internal const val ENABLE_HCPP_FLAG = "--enable-hcpp"
+    internal const val NO_ENABLE_HCPP_FLAG = "--no-enable-hcpp"
+
+    /**
+     * Processes [manifestFile] and writes to [updatedManifest].
+     *
+     * [explicitEnableHcpp] is the value of an explicit `--[no-]enable-hcpp`, or null when the
+     * developer did not pass the flag. When it is non-null it is written to the merged manifest,
+     * replacing any value already there: a flag passed at invocation time takes priority over
+     * checked in configuration, matching how the same flag behaves at launch for
+     * `flutter run`/`test`/`drive`, and how Gradle orders `-P` properties ahead of
+     * `gradle.properties`.
+     *
+     * With no explicit flag, [requestedEnableHcpp] is only a default: it is injected when the
+     * merged manifest does not set `EnableHcpp` at all, so an entry in the manifest wins.
+     *
+     * The resulting precedence is `--[no-]enable-hcpp` > AndroidManifest.xml > the tool's default.
+     *
+     * Note that the manifest is re-serialized from the parsed tree whenever it is modified,
+     * which drops XML comments (including the provenance comments the manifest merger emits).
+     * This is invisible to aapt2, but does affect the merged manifest as read by a human.
+     */
+    fun processHcppManifest(
+        manifestFile: File,
+        updatedManifest: File,
+        requestedEnableHcpp: Boolean,
+        explicitEnableHcpp: Boolean? = null,
+        logger: Logger? = null
+    ) {
+        val manifest: Node =
+            XmlParser(false, false)
+                .parse(manifestFile)
+        val applicationNode: Node =
+            manifest.children().filterIsInstance<Node>().find { node ->
+                node.name() == "application"
+            } ?: Node(manifest, "application")
+        val metaDataNode: Node? =
+            applicationNode.children().filterIsInstance<Node>().find { node ->
+                node.name() == "meta-data" && node.attribute(MANIFEST_NAME_KEY) == HCPP_METADATA_NAME
+            }
+
+        val valueToWrite: String? =
+            when {
+                // An explicit flag always wins, whether or not the manifest already says something.
+                explicitEnableHcpp != null -> explicitEnableHcpp.toString()
+                // Otherwise only supply a default, and only when the manifest is silent.
+                metaDataNode == null && requestedEnableHcpp -> true.toString()
+                else -> null
+            }
+        if (valueToWrite == null) {
+            manifestFile.copyTo(updatedManifest, overwrite = true)
+            return
+        }
+
+        if (metaDataNode != null) {
+            val existingValue = metaDataNode.attribute(MANIFEST_VALUE_KEY)?.toString()
+            if (existingValue == valueToWrite) {
+                manifestFile.copyTo(updatedManifest, overwrite = true)
+                return
+            }
+            val flagName = if (explicitEnableHcpp == true) ENABLE_HCPP_FLAG else NO_ENABLE_HCPP_FLAG
+            logger?.lifecycle(
+                "$flagName overrides the merged Android manifest, which sets $HCPP_METADATA_NAME " +
+                    "to \"$existingValue\". This artifact is built with $HCPP_METADATA_NAME=$valueToWrite."
+            )
+            metaDataNode.attributes()[MANIFEST_VALUE_KEY] = valueToWrite
+        } else {
+            applicationNode.appendNode(
+                "meta-data",
+                mapOf(MANIFEST_NAME_KEY to HCPP_METADATA_NAME, MANIFEST_VALUE_KEY to valueToWrite)
+            )
+        }
+        updatedManifest.printWriter().use { writer: PrintWriter ->
+            writer.println("""<?xml version="1.0" encoding="utf-8"?>""")
+            XmlNodePrinter(writer).print(manifest)
+        }
+    }
+}
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/BaseApplicationNameHandlerTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/BaseApplicationNameHandlerTest.kt
index e0d6b0ef18db0..907c9d14bae3b 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/BaseApplicationNameHandlerTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/BaseApplicationNameHandlerTest.kt
@@ -7,10 +7,11 @@ package com.flutter.gradle
 import com.android.build.api.dsl.ApplicationDefaultConfig
 import com.android.build.api.dsl.ApplicationExtension
 import com.flutter.gradle.BaseApplicationNameHandler.GRADLE_BASE_APPLICATION_NAME_PROPERTY
+import io.mockk.every
+import io.mockk.mockk
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionContainer
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.mockito.Mockito
 import kotlin.test.Test
 
 class BaseApplicationNameHandlerTest {
@@ -19,19 +20,19 @@ class BaseApplicationNameHandlerTest {
         val baseApplicationNamePassedByFlutterTool = "toolSetBaseApplicationName"
 
         // Set up mocks.
-        val mockProject: Project = Mockito.mock(Project::class.java)
-        val mockAndroidComponentsExtension: ApplicationExtension = Mockito.mock(ApplicationExtension::class.java)
-        val mockExtensionContainer: ExtensionContainer = Mockito.mock(ExtensionContainer::class.java)
-        val mockDefaultConfig = Mockito.mock(ApplicationDefaultConfig::class.java)
+        val mockProject = mockk<Project>()
+        val mockAndroidComponentsExtension = mockk<ApplicationExtension>()
+        val mockExtensionContainer = mockk<ExtensionContainer>()
+        val mockDefaultConfig = mockk<ApplicationDefaultConfig>()
         val mockManifestPlaceholders = HashMap<String, Any>()
 
-        Mockito.`when`(mockProject.hasProperty(GRADLE_BASE_APPLICATION_NAME_PROPERTY)).thenReturn(true)
-        Mockito.`when`(mockProject.property(GRADLE_BASE_APPLICATION_NAME_PROPERTY)).thenReturn(baseApplicationNamePassedByFlutterTool)
+        every { mockProject.hasProperty(GRADLE_BASE_APPLICATION_NAME_PROPERTY) } returns true
+        every { mockProject.property(GRADLE_BASE_APPLICATION_NAME_PROPERTY) } returns baseApplicationNamePassedByFlutterTool
 
-        Mockito.`when`(mockProject.extensions).thenReturn(mockExtensionContainer)
-        Mockito.`when`(mockExtensionContainer.findByType(ApplicationExtension::class.java)).thenReturn(mockAndroidComponentsExtension)
-        Mockito.`when`(mockAndroidComponentsExtension.defaultConfig).thenReturn(mockDefaultConfig)
-        Mockito.`when`(mockDefaultConfig.manifestPlaceholders).thenReturn(mockManifestPlaceholders)
+        every { mockProject.extensions } returns mockExtensionContainer
+        every { mockExtensionContainer.findByType(ApplicationExtension::class.java) } returns mockAndroidComponentsExtension
+        every { mockAndroidComponentsExtension.defaultConfig } returns mockDefaultConfig
+        every { mockDefaultConfig.manifestPlaceholders } returns mockManifestPlaceholders
 
         // Call the base name handler.
         BaseApplicationNameHandler.setBaseName(mockProject)
@@ -43,18 +44,18 @@ class BaseApplicationNameHandlerTest {
     @Test
     fun `setBaseName defaults to correct value`() {
         // Set up mocks.
-        val mockProject: Project = Mockito.mock(Project::class.java)
-        val mockAndroidComponentsExtension: ApplicationExtension = Mockito.mock(ApplicationExtension::class.java)
-        val mockExtensionContainer: ExtensionContainer = Mockito.mock(ExtensionContainer::class.java)
-        val mockDefaultConfig = Mockito.mock(ApplicationDefaultConfig::class.java)
+        val mockProject = mockk<Project>()
+        val mockAndroidComponentsExtension = mockk<ApplicationExtension>()
+        val mockExtensionContainer = mockk<ExtensionContainer>()
+        val mockDefaultConfig = mockk<ApplicationDefaultConfig>()
         val mockManifestPlaceholders = HashMap<String, Any>()
 
-        Mockito.`when`(mockProject.hasProperty(GRADLE_BASE_APPLICATION_NAME_PROPERTY)).thenReturn(false)
+        every { mockProject.hasProperty(GRADLE_BASE_APPLICATION_NAME_PROPERTY) } returns false
 
-        Mockito.`when`(mockProject.extensions).thenReturn(mockExtensionContainer)
-        Mockito.`when`(mockExtensionContainer.findByType(ApplicationExtension::class.java)).thenReturn(mockAndroidComponentsExtension)
-        Mockito.`when`(mockAndroidComponentsExtension.defaultConfig).thenReturn(mockDefaultConfig)
-        Mockito.`when`(mockDefaultConfig.manifestPlaceholders).thenReturn(mockManifestPlaceholders)
+        every { mockProject.extensions } returns mockExtensionContainer
+        every { mockExtensionContainer.findByType(ApplicationExtension::class.java) } returns mockAndroidComponentsExtension
+        every { mockAndroidComponentsExtension.defaultConfig } returns mockDefaultConfig
+        every { mockDefaultConfig.manifestPlaceholders } returns mockManifestPlaceholders
 
         // Call the base name handler.
         BaseApplicationNameHandler.setBaseName(mockProject)
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt
index 1b779b21fae50..19151c051d26d 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt
@@ -4,9 +4,9 @@
 
 package com.flutter.gradle
 
-import org.gradle.internal.impldep.org.junit.Assert.assertThrows
 import kotlin.test.Test
 import kotlin.test.assertContains
+import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -41,7 +41,7 @@ class DeeplinkTest {
         val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck())
         val deeplink2 = null
 
-        assertThrows(NullPointerException::class.java) { deeplink1.equals(deeplink2) }
+        assertFailsWith<NullPointerException> { deeplink1.equals(deeplink2) }
     }
 
     @Test
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginTest.kt
index cad147bd862e8..840e48dd40500 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginTest.kt
@@ -3,7 +3,6 @@ package com.flutter.gradle
 import com.android.build.api.dsl.ApplicationBuildType
 import com.android.build.api.dsl.ApplicationDefaultConfig
 import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.gradle.AbstractAppExtension
@@ -76,9 +75,8 @@ class FlutterPluginTest {
         every { project.extensions.create("flutter", any<Class<*>>()) } returns flutterExtension
         every { project.extensions.findByType(FlutterExtension::class.java) } returns flutterExtension
         val mockBaseExtension = mockk<BaseExtension>(relaxed = true)
-        val mockCommonExtension = mockk<CommonExtension<*, *, *, *, *, *>>(relaxed = true)
-        val mockDebugBuildType = mockk<com.android.build.api.dsl.ApplicationBuildType>(relaxed = true)
-        val mockReleaseBuildType = mockk<com.android.build.api.dsl.ApplicationBuildType>(relaxed = true)
+        val mockDebugBuildType = mockk<ApplicationBuildType>(relaxed = true)
+        val mockReleaseBuildType = mockk<ApplicationBuildType>(relaxed = true)
 
         // Cast our multi-interface mock instead of creating a brand new one
         val mockApplicationExtension = mockAbstractAppExtension as ApplicationExtension
@@ -87,12 +85,7 @@ class FlutterPluginTest {
         every { mockApplicationExtension.buildTypes.getByName("debug") } returns mockDebugBuildType
         every { mockApplicationExtension.buildTypes.getByName("release") } returns mockReleaseBuildType
 
-        // Keep the CommonExtension mocks just in case other parts of the plugin look for it
-        every { mockCommonExtension.buildTypes.getByName("debug") } returns mockDebugBuildType
-        every { mockCommonExtension.buildTypes.getByName("release") } returns mockReleaseBuildType
-
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
-        every { project.extensions.findByType(CommonExtension::class.java) } returns mockCommonExtension
 
         // Pass the dual-purpose mock for any ApplicationExtension lookups
         every { project.extensions.findByType(ApplicationExtension::class.java) } returns mockApplicationExtension
@@ -173,9 +166,8 @@ class FlutterPluginTest {
         every { project.extensions.create("flutter", any<Class<*>>()) } returns flutterExtension
         every { project.extensions.findByType(FlutterExtension::class.java) } returns flutterExtension
         val mockBaseExtension = mockk<BaseExtension>(relaxed = true)
-        val mockCommonExtension = mockk<CommonExtension<*, *, *, *, *, *>>(relaxed = true)
-        val mockDebugBuildType = mockk<com.android.build.api.dsl.ApplicationBuildType>(relaxed = true)
-        val mockReleaseBuildType = mockk<com.android.build.api.dsl.ApplicationBuildType>(relaxed = true)
+        val mockDebugBuildType = mockk<ApplicationBuildType>(relaxed = true)
+        val mockReleaseBuildType = mockk<ApplicationBuildType>(relaxed = true)
 
         // Cast our multi-interface mock instead of creating a brand new one
         val mockApplicationExtension = mockAbstractAppExtension as ApplicationExtension
@@ -184,12 +176,7 @@ class FlutterPluginTest {
         every { mockApplicationExtension.buildTypes.getByName("debug") } returns mockDebugBuildType
         every { mockApplicationExtension.buildTypes.getByName("release") } returns mockReleaseBuildType
 
-        // Keep the CommonExtension mocks just in case other parts of the plugin look for it
-        every { mockCommonExtension.buildTypes.getByName("debug") } returns mockDebugBuildType
-        every { mockCommonExtension.buildTypes.getByName("release") } returns mockReleaseBuildType
-
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
-        every { project.extensions.findByType(CommonExtension::class.java) } returns mockCommonExtension
 
         // Pass the dual-purpose mock for any ApplicationExtension lookups
         every { project.extensions.findByType(ApplicationExtension::class.java) } returns mockApplicationExtension
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginUtilsTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginUtilsTest.kt
index d4f25869100cd..a22539c43d9d5 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginUtilsTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/FlutterPluginUtilsTest.kt
@@ -5,7 +5,9 @@
 package com.flutter.gradle
 
 import com.android.build.api.AndroidPluginVersion
+import com.android.build.api.dsl.ApplicationBuildType
 import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryBuildType
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Variant
 import com.android.build.api.variant.VariantBuilder
@@ -19,6 +21,7 @@ import com.flutter.gradle.FlutterPluginUtils.BUILT_IN_KOTLIN_DOCS_FOR_PLUGINS
 import com.flutter.gradle.FlutterPluginUtils.BUILT_IN_KOTLIN_DOCS_TO_REPORT_UNMIGRATED_PLUGINS
 import com.flutter.gradle.FlutterPluginUtils.detectApplyingKotlinGradlePlugin
 import com.flutter.gradle.plugins.PluginHandler
+import com.flutter.gradle.tasks.EnableHcppManifestTask
 import com.flutter.gradle.tasks.PrintTask
 import io.mockk.called
 import io.mockk.every
@@ -50,6 +53,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.io.TempDir
+import testing.setUpMockAndroidExtension
 import java.io.File
 import java.io.IOException
 import java.nio.file.Path
@@ -528,6 +532,34 @@ class FlutterPluginUtilsTest {
         assertEquals("release", result)
     }
 
+    @Test
+    fun `buildModeFor with a name and debuggable flag prefers the profile name over debuggability`() {
+        assertEquals("profile", FlutterPluginUtils.buildModeFor("profile", isDebuggable = true))
+        assertEquals("debug", FlutterPluginUtils.buildModeFor("staging", isDebuggable = true))
+        assertEquals("release", FlutterPluginUtils.buildModeFor("staging", isDebuggable = false))
+    }
+
+    @Test
+    fun `buildModeFor reads isDebuggable from new-DSL application build types`() {
+        val buildType = mockk<ApplicationBuildType>()
+        every { buildType.name } returns "staging"
+        every { buildType.isDebuggable } returns true
+
+        assertEquals("debug", FlutterPluginUtils.buildModeFor(buildType))
+    }
+
+    @Test
+    fun `buildModeFor falls back to the conventional debug name for new-DSL library build types`() {
+        // LibraryBuildType has no public isDebuggable flag, so the name is the only signal.
+        val debugBuildType = mockk<LibraryBuildType>()
+        every { debugBuildType.name } returns "debug"
+        assertEquals("debug", FlutterPluginUtils.buildModeFor(debugBuildType))
+
+        val customBuildType = mockk<LibraryBuildType>()
+        every { customBuildType.name } returns "staging"
+        assertEquals("release", FlutterPluginUtils.buildModeFor(customBuildType))
+    }
+
     // supportsBuildMode
     @Test
     fun `supportsBuildMode returns true if project should not use local engine`() {
@@ -616,7 +648,7 @@ class FlutterPluginUtilsTest {
     @Test
     fun `getCompileSdkFromProject returns the compileSdk from the project`() {
         val project = mockk<Project>()
-        val androidExtension = mockk<com.android.build.api.dsl.ApplicationExtension>()
+        val androidExtension = mockk<ApplicationExtension>()
         every { project.extensions.findByName("android") } returns androidExtension
         every { androidExtension.compileSdk } returns 35
         every { androidExtension.compileSdkPreview } returns null
@@ -628,7 +660,7 @@ class FlutterPluginUtilsTest {
     @Test
     fun `getCompileSdkFromProject returns the preview codename from the project`() {
         val project = mockk<Project>()
-        val androidExtension = mockk<com.android.build.api.dsl.ApplicationExtension>()
+        val androidExtension = mockk<ApplicationExtension>()
         every { project.extensions.findByName("android") } returns androidExtension
         every { androidExtension.compileSdk } returns null
         every { androidExtension.compileSdkPreview } returns "Baklava"
@@ -1893,7 +1925,6 @@ class FlutterPluginUtilsTest {
         val mockCmakeOptions = mockk<CmakeOptions>()
         val mockNdkBuildOptions = mockk<com.android.build.gradle.internal.dsl.NdkBuildOptions>()
         val mockDefaultConfig = mockk<DefaultConfig>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every {
             project.extensions
                 .findByType(BaseExtension::class.java)!!
@@ -1909,6 +1940,7 @@ class FlutterPluginUtilsTest {
         every { mockCmakeOptions.path } returns fakeCmakeFile
         every { mockNdkBuildOptions.path } returns null
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "ignored")
 
         verify(exactly = 1) {
@@ -1928,7 +1960,6 @@ class FlutterPluginUtilsTest {
         val mockCmakeOptions = mockk<CmakeOptions>()
         val mockNdkBuildOptions = mockk<com.android.build.gradle.internal.dsl.NdkBuildOptions>()
         val mockDefaultConfig = mockk<DefaultConfig>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every {
             project.extensions
                 .findByType(BaseExtension::class.java)!!
@@ -1944,6 +1975,7 @@ class FlutterPluginUtilsTest {
         every { mockCmakeOptions.path } returns null
         every { mockNdkBuildOptions.path } returns fakeAndroidMkFile
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "ignored")
 
         verify(exactly = 1) {
@@ -1982,9 +2014,6 @@ class FlutterPluginUtilsTest {
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns ""
         every { project.gradle.startParameter.taskNames } returns emptyList()
         every { project.gradle.startParameter.isOffline } returns false
-        val mockAndroidExtension = mockk<ApplicationExtension>()
-        every { project.extensions.findByName("android") } returns mockAndroidExtension
-        every { mockAndroidExtension.ndkVersion } returns "29.0.13846066"
         every { project.serviceOf<ExecOperations>() } returns mockExecOperations
         every { mockExecOperations.exec(capture(execActionSlot)) } answers {
             File(tempDir.toFile(), "ndk/29.0.13846066/source.properties").apply {
@@ -1996,6 +2025,7 @@ class FlutterPluginUtilsTest {
         every { mockExecResult.assertNormalExitValue() } returns mockExecResult
         every { mockExecSpec.commandLine(any<List<String>>()) } returns mockExecSpec
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         finalizeDslSlot.captured.invoke(Any())
         execActionSlot.captured.execute(mockExecSpec)
@@ -2034,10 +2064,8 @@ class FlutterPluginUtilsTest {
         every { project.findProperty(FlutterPluginUtils.PROP_ANDROID_SDK_ROOT) } returns "/sdk/root"
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns "29.0.13846066"
         every { project.gradle.startParameter.taskNames } returns emptyList()
-        val mockAndroidExtension = mockk<ApplicationExtension>()
-        every { project.extensions.findByName("android") } returns mockAndroidExtension
-        every { mockAndroidExtension.ndkVersion } returns "29.0.13846066"
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         finalizeDslSlot.captured.invoke(Any())
 
@@ -2058,7 +2086,6 @@ class FlutterPluginUtilsTest {
         val mockDirectory = mockk<Directory>()
         val mockBaseExtension = mockk<BaseExtension>()
         var cmakePath: File? = null
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
         every { mockBaseExtension.externalNativeBuild.cmake } returns mockCmakeOptions
         every { mockBaseExtension.externalNativeBuild.ndkBuild } returns mockNdkBuildOptions
@@ -2082,6 +2109,7 @@ class FlutterPluginUtilsTest {
         every { mockBuildType.name } returns "Debug"
         every { mockBuildType.externalNativeBuild.cmake.arguments(any(), any(), any()) } returns Unit
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         cmakePath = tempDir.resolve("CMakeLists.txt").toFile()
         finalizeDslSlot.captured.invoke(Any())
@@ -2124,9 +2152,6 @@ class FlutterPluginUtilsTest {
         } returns "26.3.11579264"
         every { project.gradle.startParameter.taskNames } returns emptyList()
         every { project.gradle.startParameter.isOffline } returns false
-        val mockAndroidExtension = mockk<ApplicationExtension>()
-        every { project.extensions.findByName("android") } returns mockAndroidExtension
-        every { mockAndroidExtension.ndkVersion } answers { configuredNdkVersion }
         every { project.serviceOf<ExecOperations>() } returns mockExecOperations
         every { mockExecOperations.exec(capture(execActionSlot)) } answers {
             File(tempDir.toFile(), "ndk/27.3.13750724/source.properties").apply {
@@ -2138,6 +2163,8 @@ class FlutterPluginUtilsTest {
         every { mockExecResult.assertNormalExitValue() } returns mockExecResult
         every { mockExecSpec.commandLine(any<List<String>>()) } returns mockExecSpec
 
+        val mockAndroidExtension = setUpMockAndroidExtension(project)
+        every { mockAndroidExtension.ndkVersion } answers { configuredNdkVersion }
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         configuredNdkVersion = "27.3.13750724"
         finalizeDslSlot.captured.invoke(Any())
@@ -2208,6 +2235,8 @@ class FlutterPluginUtilsTest {
         every { mockExecResult.assertNormalExitValue() } returns mockExecResult
         every { mockExecSpec.commandLine(any<List<String>>()) } returns mockExecSpec
 
+        val mockAndroidExtension = setUpMockAndroidExtension(project)
+        every { mockAndroidExtension.ndkVersion } answers { configuredNdkVersion }
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         configuredNdkVersion = "27.3.13750724"
         finalizeDslSlot.captured.invoke(Any())
@@ -2236,7 +2265,6 @@ class FlutterPluginUtilsTest {
         val mockNdkBuildOptions = mockk<com.android.build.gradle.internal.dsl.NdkBuildOptions>()
         val mockDefaultConfig = mockk<DefaultConfig>()
         val mockBaseExtension = mockk<BaseExtension>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
         every { mockBaseExtension.externalNativeBuild.cmake } returns mockCmakeOptions
         every { mockBaseExtension.externalNativeBuild.ndkBuild } returns mockNdkBuildOptions
@@ -2248,10 +2276,8 @@ class FlutterPluginUtilsTest {
         every { project.findProperty(FlutterPluginUtils.PROP_ANDROID_SDK_ROOT) } returns "/sdk/root"
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns "29.0.13846066"
         every { project.gradle.startParameter.taskNames } returns emptyList()
-        val mockAndroidExtension = mockk<ApplicationExtension>()
-        every { project.extensions.findByName("android") } returns mockAndroidExtension
-        every { mockAndroidExtension.ndkVersion } returns "29.0.13846066"
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         finalizeDslSlot.captured.invoke(Any())
 
@@ -2285,6 +2311,7 @@ class FlutterPluginUtilsTest {
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns "29.0.13846066"
         every { project.gradle.startParameter.taskNames } returns emptyList()
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
         finalizeDslSlot.captured.invoke(Any())
 
@@ -2316,13 +2343,11 @@ class FlutterPluginUtilsTest {
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns ""
         every { project.gradle.startParameter.taskNames } returns emptyList()
         every { project.gradle.startParameter.isOffline } returns false
-        val mockAndroidExtension = mockk<ApplicationExtension>()
-        every { project.extensions.findByName("android") } returns mockAndroidExtension
-        every { mockAndroidExtension.ndkVersion } returns "29.0.13846066"
         every { project.serviceOf<ExecOperations>() } returns mockExecOperations
         every { mockExecOperations.exec(any<Action<ExecSpec>>()) } returns mockExecResult
         every { mockExecResult.assertNormalExitValue() } returns mockExecResult
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, "/base/path")
 
         assertThrows<GradleException> {
@@ -2365,7 +2390,6 @@ class FlutterPluginUtilsTest {
         val mockDirectoryProperty = mockk<DirectoryProperty>()
         val mockDirectory = mockk<Directory>()
         val mockBaseExtension = mockk<BaseExtension>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
         every { mockBaseExtension.externalNativeBuild.cmake } returns mockCmakeOptions
         every { mockBaseExtension.externalNativeBuild.ndkBuild } returns mockNdkBuildOptions
@@ -2390,6 +2414,7 @@ class FlutterPluginUtilsTest {
         every { mockBuildType.name } returns "Debug"
         every { mockBuildType.externalNativeBuild.cmake.arguments(any(), any(), any()) } returns Unit
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, basePath)
         finalizeDslSlot.captured.invoke(Any())
 
@@ -2416,7 +2441,6 @@ class FlutterPluginUtilsTest {
         val mockDirectoryProperty = mockk<DirectoryProperty>()
         val mockDirectory = mockk<Directory>()
         val mockBaseExtension = mockk<BaseExtension>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every { project.extensions.findByType(BaseExtension::class.java) } returns mockBaseExtension
         every { mockBaseExtension.externalNativeBuild.cmake } returns mockCmakeOptions
         every { mockBaseExtension.externalNativeBuild.ndkBuild } returns mockNdkBuildOptions
@@ -2442,6 +2466,8 @@ class FlutterPluginUtilsTest {
         every { mockBuildType.name } returns "Debug"
         every { mockBuildType.externalNativeBuild.cmake.arguments(any(), any(), any()) } returns Unit
 
+        setUpMockAndroidExtension(project)
+        every { project.gradle.startParameter.isOffline } returns true
         FlutterPluginUtils.forceNdkDownload(project, basePath)
         finalizeDslSlot.captured.invoke(Any())
 
@@ -2466,7 +2492,6 @@ class FlutterPluginUtilsTest {
         val mockDefaultConfig = mockk<DefaultConfig>()
         val mockDirectoryProperty = mockk<DirectoryProperty>()
         val mockDirectory = mockk<Directory>()
-        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
         every { project.findProperty(FlutterPluginUtils.PROP_SDK_MANAGER_PATH) } returns null
         every { project.findProperty(FlutterPluginUtils.PROP_ANDROID_SDK_ROOT) } returns null
         every { project.findProperty(FlutterPluginUtils.PROP_INSTALLED_NDK_VERSIONS) } returns null
@@ -2504,6 +2529,7 @@ class FlutterPluginUtilsTest {
         every { mockBuildType.name } returns "Debug"
         every { mockBuildType.externalNativeBuild.cmake.arguments(any(), any(), any()) } returns Unit
 
+        setUpMockAndroidExtension(project)
         FlutterPluginUtils.forceNdkDownload(project, basePath)
 
         verify(exactly = 1) {
@@ -2552,7 +2578,7 @@ class FlutterPluginUtilsTest {
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
         every { NativePluginLoaderReflectionBridge.getPlugins(any(), any()) } returns pluginListWithoutDevDependency
-        val buildType: BuildType = mockk<BuildType>()
+        val buildType = mockk<ApplicationBuildType>()
         every { buildType.name } returns "debug"
         every { buildType.isDebuggable } returns true
         every { project.hasProperty("local-engine-repo") } returns true
@@ -2584,7 +2610,7 @@ class FlutterPluginUtilsTest {
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
         every { NativePluginLoaderReflectionBridge.getPlugins(any(), any()) } returns pluginListWithoutDevDependency
-        val buildType: BuildType = mockk<BuildType>()
+        val buildType = mockk<ApplicationBuildType>()
         val engineVersion = EXAMPLE_ENGINE_VERSION
         every { buildType.name } returns "debug"
         every { buildType.isDebuggable } returns true
@@ -2622,7 +2648,7 @@ class FlutterPluginUtilsTest {
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
         every { NativePluginLoaderReflectionBridge.getPlugins(any(), any()) } returns pluginListWithSingleDevDependency
-        val buildType: BuildType = mockk<BuildType>()
+        val buildType = mockk<ApplicationBuildType>()
         val engineVersion = EXAMPLE_ENGINE_VERSION
         every { buildType.name } returns "release"
         every { buildType.isDebuggable } returns false
@@ -2676,7 +2702,7 @@ class FlutterPluginUtilsTest {
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
         every { NativePluginLoaderReflectionBridge.getPlugins(any(), any()) } returns pluginListWithSingleDevDependency
-        val buildType: BuildType = mockk<BuildType>()
+        val buildType = mockk<ApplicationBuildType>()
         val engineVersion = EXAMPLE_ENGINE_VERSION
         every { buildType.name } returns "debug"
         every { buildType.isDebuggable } returns true
@@ -2781,4 +2807,96 @@ class FlutterPluginUtilsTest {
             mockPrintTask.description = "Prints out all build variants for this Android project"
         }
     }
+
+    // addTasksForEnableHcppManifest
+    @Test
+    fun `addTasksForEnableHcppManifest skips module (library) projects`() {
+        // Injecting into a library manifest would propagate into the host app's merged
+        // manifest, where a conflicting explicit host value fails the build in the manifest
+        // merger instead of taking priority. See addTasksForEnableHcppManifest.
+        val project = mockk<Project>()
+        every { project.extensions.findByType(ApplicationExtension::class.java) } returns null
+
+        FlutterPluginUtils.addTasksForEnableHcppManifest(project)
+
+        // The function must return before reading properties or registering any tasks.
+        verify(exactly = 0) { project.findProperty(any()) }
+        verify(exactly = 0) { project.tasks }
+    }
+
+    @Test
+    fun `addTasksForEnableHcppManifest skips app projects when enable-hcpp is not true and no explicit flag passed`() {
+        val project = mockk<Project>()
+        every { project.extensions.findByType(ApplicationExtension::class.java) } returns mockk<ApplicationExtension>()
+        every { project.findProperty(FlutterPluginUtils.PROP_ENABLE_HCPP) } returns "false"
+        every { project.findProperty(FlutterPluginUtils.PROP_EXPLICIT_ENABLE_HCPP) } returns null
+
+        FlutterPluginUtils.addTasksForEnableHcppManifest(project)
+
+        verify(exactly = 0) { project.tasks }
+    }
+
+    /**
+     * Sets up [project] as an application project with the given hcpp properties, and drives
+     * [FlutterPluginUtils.addTasksForEnableHcppManifest] through a single "debug" variant.
+     *
+     * Returns the [EnableHcppManifestTask] the registration action was applied to, so callers can
+     * verify how it was configured.
+     */
+    private fun registerHcppTaskForDebugVariant(
+        enableHcppProperty: String,
+        explicitEnableHcppProperty: String?
+    ): EnableHcppManifestTask {
+        val project = mockk<Project>(relaxed = true)
+        val androidComponents = mockk<AndroidComponentsExtension<*, *, *>>()
+        every { project.extensions.findByType(ApplicationExtension::class.java) } returns mockk<ApplicationExtension>()
+        every { project.extensions.getByType(AndroidComponentsExtension::class.java) } returns androidComponents
+        every { project.findProperty(FlutterPluginUtils.PROP_ENABLE_HCPP) } returns enableHcppProperty
+        every {
+            project.findProperty(FlutterPluginUtils.PROP_EXPLICIT_ENABLE_HCPP)
+        } returns explicitEnableHcppProperty
+        every { project.tasks.register(any(), eq(EnableHcppManifestTask::class.java), any()) } returns mockk(relaxed = true)
+
+        // AGP's onVariants takes a defaulted selector, so selector().all() has to be stubbed for
+        // the call to get through to the captured callback.
+        every { androidComponents.selector() } returns mockk { every { all() } returns mockk() }
+        val onVariantsSlot = slot<(Variant) -> Unit>()
+        every { androidComponents.onVariants(any(), capture(onVariantsSlot)) } answers {
+            onVariantsSlot.captured.invoke(mockk<Variant>(relaxed = true) { every { name } returns "debug" })
+        }
+
+        FlutterPluginUtils.addTasksForEnableHcppManifest(project)
+
+        val configureSlot = slot<Action<EnableHcppManifestTask>>()
+        verify(exactly = 1) {
+            project.tasks.register(
+                "enableHcppInManifestDebug",
+                eq(EnableHcppManifestTask::class.java),
+                capture(configureSlot)
+            )
+        }
+        val task = mockk<EnableHcppManifestTask>(relaxed = true)
+        configureSlot.captured.execute(task)
+        return task
+    }
+
+    @Test
+    fun `addTasksForEnableHcppManifest registers manifest transform on app projects when enable-hcpp is true`() {
+        val task = registerHcppTaskForDebugVariant(enableHcppProperty = "true", explicitEnableHcppProperty = null)
+
+        verify(exactly = 1) { task.requestedEnableHcpp.set(true) }
+        // Without an explicit flag there is nothing to warn about, so the task must not be told
+        // to compare against one.
+        verify(exactly = 0) { task.explicitEnableHcpp.set(any<Boolean>()) }
+    }
+
+    @Test
+    fun `addTasksForEnableHcppManifest registers manifest transform when explicit-enable-hcpp is present even if enable-hcpp is false`() {
+        val task = registerHcppTaskForDebugVariant(enableHcppProperty = "false", explicitEnableHcppProperty = "false")
+
+        // Nothing is injected, but the task still runs so that it can warn when the manifest
+        // explicitly disagrees with --no-enable-hcpp.
+        verify(exactly = 1) { task.requestedEnableHcpp.set(false) }
+        verify(exactly = 1) { task.explicitEnableHcpp.set(false) }
+    }
 }
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/VersionFetcherTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/VersionFetcherTest.kt
index 257ed7c42f47d..6735c72e0db2b 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/VersionFetcherTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/VersionFetcherTest.kt
@@ -75,7 +75,6 @@ class VersionFetcherTest {
         assertEquals(null, result)
     }
 
-    // CompileSdkVersion.isHigherThan
     @Test
     fun `isHigherThan compares numeric api levels numerically`() {
         val sdk35 = CompileSdkVersion(apiLevel = 35, previewCodename = null)
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/plugins/PluginHandlerTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/plugins/PluginHandlerTest.kt
index accd03bc3d4b3..a5687d581f869 100644
--- a/packages/flutter_tools/gradle/src/test/kotlin/plugins/PluginHandlerTest.kt
+++ b/packages/flutter_tools/gradle/src/test/kotlin/plugins/PluginHandlerTest.kt
@@ -4,6 +4,7 @@
 
 package com.flutter.gradle.plugins
 
+import com.android.build.api.dsl.ApplicationBuildType
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.gradle.BaseExtension
 import com.flutter.gradle.FlutterExtension
@@ -35,15 +36,24 @@ import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class PluginHandlerTest {
-    /** Mocks the new-DSL android extension read by [FlutterPluginUtils.getCompileSdkFromProject]. */
-    private fun mockCompileSdk(
+    /**
+     * Mocks the new-DSL android extension read through [FlutterPluginUtils.getAndroidExtension]
+     * (compileSdk for the mismatch warning, buildTypes for the dependency-wiring loops).
+     */
+    private fun mockAndroidExtension(
         project: Project,
-        compileSdk: Int
-    ) {
+        compileSdk: Int = 35,
+        buildTypes: List<ApplicationBuildType> = emptyList()
+    ): ApplicationExtension {
         val androidExtension = mockk<ApplicationExtension>()
         every { project.extensions.findByName("android") } returns androidExtension
         every { androidExtension.compileSdk } returns compileSdk
         every { androidExtension.compileSdkPreview } returns null
+        val container = mockk<NamedDomainObjectContainer<ApplicationBuildType>>()
+        // A fresh iterator per call: the container is iterated by multiple loops.
+        every { container.iterator() } answers { buildTypes.toMutableList().iterator() }
+        every { androidExtension.buildTypes } returns container
+        return androidExtension
     }
 
     // getPluginListWithoutDevDependencies
@@ -210,24 +220,14 @@ class PluginHandlerTest {
         every { pluginProject.configurations.named(any<String>()) } returns mockk()
         every { pluginProject.dependencies.add(any(), any()) } returns mockk()
 
-        every {
-            project.extensions
-                .findByType(BaseExtension::class.java)!!
-                .buildTypes
-                .iterator()
-        } returns
-            mutableListOf(
-                mockBuildType
-            ).iterator() andThen
-            mutableListOf( // can't return the same iterator as it is stateful
-                mockBuildType
-            ).iterator() andThen
-            mutableListOf( // and again
-                mockBuildType
-            ).iterator()
+        // The new-DSL dependency-wiring loops iterate the wrapper container; the legacy
+        // container is only read by the build-type copy block, which this test leaves empty.
+        every { mockProjectBuildTypes.iterator() } answers {
+            mutableListOf<com.android.build.gradle.internal.dsl.BuildType>().iterator()
+        }
         every { project.dependencies.add(any(), any()) } returns mockk()
-        mockCompileSdk(project, compileSdk = 35)
-        mockCompileSdk(pluginProject, compileSdk = 35)
+        mockAndroidExtension(project, buildTypes = listOf(mockBuildType))
+        mockAndroidExtension(pluginProject)
 
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
@@ -306,24 +306,9 @@ class PluginHandlerTest {
         every { pluginProject.configurations.named(any<String>()) } returns mockk()
         every { pluginProject.dependencies.add(any(), any()) } returns mockk()
 
-        every {
-            project.extensions
-                .findByType(BaseExtension::class.java)!!
-                .buildTypes
-                .iterator()
-        } returns
-            mutableListOf(
-                mockBuildType
-            ).iterator() andThen
-            mutableListOf( // can't return the same iterator as it is stateful
-                mockBuildType
-            ).iterator() andThen
-            mutableListOf( // and again
-                mockBuildType
-            ).iterator()
         every { project.dependencies.add(any(), any()) } returns mockk()
-        mockCompileSdk(project, compileSdk = 35)
-        mockCompileSdk(pluginProject, compileSdk = 35)
+        mockAndroidExtension(project, buildTypes = listOf(mockBuildType))
+        mockAndroidExtension(pluginProject)
 
         val pluginHandler = PluginHandler(project)
         mockkObject(NativePluginLoaderReflectionBridge)
@@ -464,8 +449,8 @@ class PluginHandlerTest {
         every { pluginProject.configurations.named(any<String>()) } returns mockk()
         every { pluginProject.dependencies.add(any(), any()) } returns mockk()
         every { project.dependencies.add(any(), any()) } returns mockk()
-        mockCompileSdk(project, compileSdk = 35)
-        mockCompileSdk(pluginProject, compileSdk = 35)
+        mockAndroidExtension(project, buildTypes = listOf(mockBuildType))
+        mockAndroidExtension(pluginProject)
     }
 
     private fun setupPluginMocks(project: Project) {
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/tasks/EnableHcppManifestTaskTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/tasks/EnableHcppManifestTaskTest.kt
new file mode 100644
index 0000000000000..c08a2fe0f96d4
--- /dev/null
+++ b/packages/flutter_tools/gradle/src/test/kotlin/tasks/EnableHcppManifestTaskTest.kt
@@ -0,0 +1,573 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package com.flutter.gradle.tasks
+
+import groovy.util.Node
+import io.mockk.mockk
+import io.mockk.verify
+import org.gradle.api.logging.Logger
+import java.io.File
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+/**
+ * Tests for [EnableHcppManifestTaskHelper].
+ */
+class EnableHcppManifestTaskTest {
+    private val defaultNamespace = "dev.flutter.example"
+
+    private fun createTempManifestFile(content: String): File {
+        val manifestFile = File.createTempFile("AndroidManifestTest", ".xml")
+        manifestFile.deleteOnExit()
+        manifestFile.writeText(content.trimIndent())
+        return manifestFile
+    }
+
+    private fun createTempOutputFile(): File {
+        val outputFile = File.createTempFile("AndroidManifestUpdated", ".xml")
+        outputFile.deleteOnExit()
+        return outputFile
+    }
+
+    private fun findHcppMetadataValue(manifestFile: File): String? {
+        val manifest: Node =
+            groovy.xml
+                .XmlParser(false, false)
+                .parse(manifestFile)
+        val applicationNode: Node =
+            manifest.children().filterIsInstance<Node>().find { node ->
+                node.name() == "application"
+            } ?: return null
+        val metadataNode: Node? =
+            applicationNode.children().filterIsInstance<Node>().find { node ->
+                node.name() == "meta-data" &&
+                    node.attribute("android:name") == EnableHcppManifestTaskHelper.HCPP_METADATA_NAME
+            }
+        return metadataNode?.attribute("android:value")?.toString()
+    }
+
+    @Test
+    fun addsMetadataWhenAbsent() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <activity android:name=".MainActivity" android:exported="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+    }
+
+    @Test
+    fun manifestFalseWinsOverDefaultWhenNoExplicitFlag() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="false" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("false", findHcppMetadataValue(updatedManifest))
+        assertEquals(
+            manifestFile.readText(),
+            updatedManifest.readText(),
+            "A manifest that sets the value should be copied unmodified when no flag was passed"
+        )
+    }
+
+    @Test
+    fun manifestTrueWinsOverDefaultWhenNoExplicitFlag() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        assertEquals(
+            manifestFile.readText(),
+            updatedManifest.readText(),
+            "A manifest that sets the value should be copied unmodified when no flag was passed"
+        )
+    }
+
+    @Test
+    fun explicitEnableHcppOverridesManifestFalse() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="false" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+        val logger = mockk<Logger>(relaxed = true)
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true,
+            explicitEnableHcpp = true,
+            logger = logger
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        verify(exactly = 1) {
+            logger.lifecycle(
+                match { message ->
+                    message.contains("${EnableHcppManifestTaskHelper.ENABLE_HCPP_FLAG} overrides") &&
+                        message.contains("to \"false\"")
+                }
+            )
+        }
+    }
+
+    @Test
+    fun explicitNoEnableHcppOverridesManifestTrue() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+        val logger = mockk<Logger>(relaxed = true)
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = false,
+            explicitEnableHcpp = false,
+            logger = logger
+        )
+
+        assertEquals("false", findHcppMetadataValue(updatedManifest))
+        verify(exactly = 1) {
+            logger.lifecycle(
+                match { message ->
+                    message.contains("${EnableHcppManifestTaskHelper.NO_ENABLE_HCPP_FLAG} overrides") &&
+                        message.contains("to \"true\"")
+                }
+            )
+        }
+    }
+
+    @Test
+    fun saysNothingWhenExplicitFlagMatchesManifest() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+        val logger = mockk<Logger>(relaxed = true)
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true,
+            explicitEnableHcpp = true,
+            logger = logger
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        assertEquals(
+            manifestFile.readText(),
+            updatedManifest.readText(),
+            "A manifest that already agrees with the flag should be copied unmodified"
+        )
+        verify(exactly = 0) { logger.lifecycle(any()) }
+        verify(exactly = 0) { logger.warn(any()) }
+    }
+
+    @Test
+    fun explicitFlagOverridesResourceRef() {
+        // A resource reference cannot be resolved here, so the flag replaces it outright rather
+        // than trying to guess what it evaluates to.
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="${EnableHcppManifestTaskHelper.HCPP_METADATA_NAME}" android:value="@bool/enable_hcpp" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+        val logger = mockk<Logger>(relaxed = true)
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true,
+            explicitEnableHcpp = true,
+            logger = logger
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        verify(exactly = 1) {
+            logger.lifecycle(
+                match { message ->
+                    message.contains("${EnableHcppManifestTaskHelper.ENABLE_HCPP_FLAG} overrides") &&
+                        message.contains("to \"@bool/enable_hcpp\"")
+                }
+            )
+        }
+    }
+
+    @Test
+    fun addsApplicationElementWhenAbsent() {
+        // A library (add-to-app module) manifest may not contain an application element.
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+    }
+
+    @Test
+    fun keepsOtherMetadataIntact() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        val manifest: Node =
+            groovy.xml
+                .XmlParser(false, false)
+                .parse(updatedManifest)
+        val applicationNode: Node? =
+            manifest.children().filterIsInstance<Node>().find { node ->
+                node.name() == "application"
+            }
+        assertNotNull(applicationNode)
+        val impellerNode: Node? =
+            applicationNode.children().filterIsInstance<Node>().find { node ->
+                node.name() == "meta-data" &&
+                    node.attribute("android:name") == "io.flutter.embedding.android.EnableImpeller"
+            }
+        assertNotNull(impellerNode, "Existing meta-data should be preserved")
+        assertEquals("Test App", applicationNode.attribute("android:label"))
+    }
+
+    @Test
+    fun preservesRealMergedManifestContent() {
+        // Fixture captured from an actual AGP 8.11.1 processDebugMainManifest output
+        // (MERGED_MANIFEST artifact), which is what this task transforms in practice.
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="com.example.host" >
+
+                    <uses-sdk
+                        android:minSdkVersion="24"
+                        android:targetSdkVersion="36" />
+                    <!-- A comment that mimics real app manifests. -->
+                    <uses-permission android:name="android.permission.INTERNET" />
+
+                    <queries>
+                        <intent>
+                            <action android:name="android.intent.action.PROCESS_TEXT" />
+
+                            <data android:mimeType="text/plain" />
+                        </intent>
+                    </queries>
+
+                    <application
+                        android:debuggable="true"
+                        android:extractNativeLibs="false"
+                        android:hardwareAccelerated="true"
+                        android:label="Host"
+                        android:supportsRtl="true" >
+                        <activity
+                            android:name="com.example.host.MainActivity"
+                            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+                            android:exported="true"
+                            android:launchMode="singleTop"
+                            android:windowSoftInputMode="adjustResize" >
+                            <intent-filter>
+                                <action android:name="android.intent.action.MAIN" />
+
+                                <category android:name="android.intent.category.LAUNCHER" />
+                            </intent-filter>
+                        </activity>
+
+                        <meta-data
+                            android:name="flutterEmbedding"
+                            android:value="2" />
+                        <meta-data
+                            android:name="io.flutter.embedding.android.EnableImpeller"
+                            android:value="true" />
+                        <meta-data
+                            android:name="io.flutter.embedding.android.OldGenHeapSize"
+                            android:value="519" />
+                    </application>
+
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+
+        // The rewritten manifest must preserve all elements and attributes.
+        val manifest: Node =
+            groovy.xml
+                .XmlParser(false, false)
+                .parse(updatedManifest)
+        assertEquals("com.example.host", manifest.attribute("package"))
+        assertEquals(
+            "http://schemas.android.com/apk/res/android",
+            manifest.attribute("xmlns:android"),
+            "The android namespace declaration must be preserved"
+        )
+        val topLevel: List<Node> = manifest.children().filterIsInstance<Node>()
+        assertEquals(
+            "24",
+            topLevel
+                .first { it.name() == "uses-sdk" }
+                .attribute("android:minSdkVersion")
+        )
+        assertEquals(
+            "android.permission.INTERNET",
+            topLevel
+                .first { it.name() == "uses-permission" }
+                .attribute("android:name")
+        )
+        val queriesIntent: Node =
+            topLevel
+                .first { it.name() == "queries" }
+                .children()
+                .filterIsInstance<Node>()
+                .first { it.name() == "intent" }
+        assertEquals(
+            "text/plain",
+            queriesIntent
+                .children()
+                .filterIsInstance<Node>()
+                .first { it.name() == "data" }
+                .attribute("android:mimeType")
+        )
+        val applicationNode: Node = topLevel.first { it.name() == "application" }
+        assertEquals("Host", applicationNode.attribute("android:label"))
+        assertEquals("true", applicationNode.attribute("android:debuggable"))
+        val activityNode: Node =
+            applicationNode
+                .children()
+                .filterIsInstance<Node>()
+                .first { it.name() == "activity" }
+        assertEquals("com.example.host.MainActivity", activityNode.attribute("android:name"))
+        assertEquals("singleTop", activityNode.attribute("android:launchMode"))
+        val intentFilter: Node =
+            activityNode
+                .children()
+                .filterIsInstance<Node>()
+                .first { it.name() == "intent-filter" }
+        assertEquals(
+            "android.intent.action.MAIN",
+            intentFilter
+                .children()
+                .filterIsInstance<Node>()
+                .first { it.name() == "action" }
+                .attribute("android:name")
+        )
+        val metadataValuesByName: Map<Any?, Any?> =
+            applicationNode
+                .children()
+                .filterIsInstance<Node>()
+                .filter { it.name() == "meta-data" }
+                .associate { it.attribute("android:name") to it.attribute("android:value") }
+        assertEquals("2", metadataValuesByName["flutterEmbedding"])
+        assertEquals("true", metadataValuesByName["io.flutter.embedding.android.EnableImpeller"])
+        assertEquals("519", metadataValuesByName["io.flutter.embedding.android.OldGenHeapSize"])
+        assertEquals("true", metadataValuesByName[EnableHcppManifestTaskHelper.HCPP_METADATA_NAME])
+    }
+
+    @Test
+    fun copiesManifestUnmodifiedWhenNotRequestedAndMetadataAbsent() {
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <activity android:name=".MainActivity" android:exported="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+        val logger = mockk<Logger>(relaxed = true)
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = false,
+            logger = logger
+        )
+
+        assertNull(
+            findHcppMetadataValue(updatedManifest),
+            "No metadata should be injected when it was not requested"
+        )
+        assertEquals(
+            manifestFile.readText(),
+            updatedManifest.readText(),
+            "The manifest should be copied byte for byte when nothing is injected"
+        )
+        verify(exactly = 0) { logger.warn(any()) }
+    }
+
+    @Test
+    fun dropsXmlCommentsWhenInjecting() {
+        // Documents a known side effect of re-serializing the parsed manifest: groovy's XmlParser
+        // discards comments, so the provenance comments the manifest merger emits do not survive
+        // injection. aapt2 does not care, but the merged manifest is less readable.
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App">
+                        <!-- Added by com.example.somelibrary -->
+                        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="true" />
+                    </application>
+                </manifest>
+                """
+            )
+        val updatedManifest = createTempOutputFile()
+
+        EnableHcppManifestTaskHelper.processHcppManifest(
+            manifestFile = manifestFile,
+            updatedManifest = updatedManifest,
+            requestedEnableHcpp = true
+        )
+
+        assertEquals("true", findHcppMetadataValue(updatedManifest))
+        assertFalse(
+            updatedManifest.readText().contains("Added by com.example.somelibrary"),
+            "Comments are expected to be dropped; update this test if that changes"
+        )
+    }
+
+    @Test
+    fun noMetadataInManifestWithoutInjection() {
+        // Sanity check that the test helper does not find metadata that is not there.
+        val manifestFile =
+            createTempManifestFile(
+                """
+                <?xml version="1.0" encoding="utf-8"?>
+                <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+                    package="$defaultNamespace">
+                    <application android:label="Test App" />
+                </manifest>
+                """
+            )
+        assertNull(findHcppMetadataValue(manifestFile))
+    }
+}
diff --git a/packages/flutter_tools/gradle/src/test/kotlin/testing/AndroidExtensionMocks.kt b/packages/flutter_tools/gradle/src/test/kotlin/testing/AndroidExtensionMocks.kt
new file mode 100644
index 0000000000000..3663666ac764c
--- /dev/null
+++ b/packages/flutter_tools/gradle/src/test/kotlin/testing/AndroidExtensionMocks.kt
@@ -0,0 +1,31 @@
+package testing
+
+import com.android.build.api.dsl.ApplicationExtension
+import io.mockk.every
+import io.mockk.mockk
+import org.gradle.api.Project
+
+/** Mocks the Android extension for tests reading compileSdk or ndkVersion via the public DSL. */
+fun setUpMockAndroidExtension(
+    project: Project,
+    compileSdk: Int? = null,
+    ndkVersion: String? = "29.0.13846066"
+): ApplicationExtension {
+    val mockAndroidExtension = mockk<ApplicationExtension>()
+
+    if (compileSdk != null) {
+        every { mockAndroidExtension.compileSdk } returns compileSdk
+        every { mockAndroidExtension.compileSdkPreview } returns null
+    }
+    if (ndkVersion != null) {
+        every { mockAndroidExtension.ndkVersion } returns ndkVersion
+    }
+
+    every { project.extensions.findByType(ApplicationExtension::class.java) } returns mockAndroidExtension
+    every { project.extensions.findByName("android") } returns mockAndroidExtension
+
+    every { project.gradle.startParameter.taskNames } returns emptyList()
+    every { project.gradle.startParameter.isOffline } returns false
+
+    return mockAndroidExtension
+}
diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
index 2c4d4b731b535..41ca8f2d8548b 100644
--- a/packages/flutter_tools/lib/src/artifacts.dart
+++ b/packages/flutter_tools/lib/src/artifacts.dart
@@ -82,6 +82,8 @@ enum Artifact {
 
   /// Tools related to subsetting or icon font files.
   fontSubset('font-subset', isExecutable: true),
+
+  /// Still used in g3 so cannot be deleted yet.
   constFinder('const_finder.dart.snapshot'),
 
   /// The location of file generators.
@@ -161,9 +163,10 @@ enum HostArtifact {
 
   iosDeploy('ios-deploy'),
   idevicesyslog('idevicesyslog'),
-  idevicescreenshot('idevicescreenshot'),
   iproxy('iproxy'),
 
+  idevicescreenshot('idevicescreenshot'),
+
   /// The root of the sky_engine package.
   skyEnginePath('sky_engine'),
 
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
index 70af6b2afc9f1..e50eba9840611 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -458,12 +458,39 @@ class ManifestAssetBundle implements AssetBundle {
           continue;
         }
         // Collect any additional licenses from each package.
+        final isAppItself = packageFlutterManifest.appName == flutterManifest.appName;
         final licenseFiles = <File>[];
-        for (final String relativeLicensePath in packageFlutterManifest.additionalLicenses) {
-          final String absoluteLicensePath = _fileSystem.path.fromUri(
-            package.root.resolve(relativeLicensePath),
-          );
-          licenseFiles.add(_fileSystem.file(absoluteLicensePath).absolute);
+        // Most packages declare no additional licenses, so skip all of the work
+        // below (including canonicalization) when there is nothing to collect.
+        if (packageFlutterManifest.additionalLicenses.isNotEmpty) {
+          // The package root is constant for this package, so canonicalize it
+          // once instead of per license path. The app itself is exempt from the
+          // containment check, in which case this stays null.
+          final String? packageRoot = isAppItself
+              ? null
+              : _fileSystem.path.canonicalize(_fileSystem.path.fromUri(package.root));
+          for (final String relativeLicensePath in packageFlutterManifest.additionalLicenses) {
+            final String absoluteLicensePath = _fileSystem.path.fromUri(
+              package.root.resolve(relativeLicensePath),
+            );
+            // A dependency must not declare a license path that escapes its own
+            // package directory (e.g. '../secret'). Otherwise the build would read
+            // an arbitrary file outside the package and bundle its contents into
+            // the app's NOTICES. This mirrors the containment check applied to
+            // dependency-declared asset paths in `_ensureAssetPathIsValid`.
+            if (packageRoot != null) {
+              final String resolvedLicense = _fileSystem.path.canonicalize(absoluteLicensePath);
+              if (packageRoot != resolvedLicense &&
+                  !_fileSystem.path.isWithin(packageRoot, resolvedLicense)) {
+                throwToolExit(
+                  'Package "${packageFlutterManifest.appName}" specified a license path '
+                  '"$relativeLicensePath" that escapes its package directory. License paths '
+                  'declared by a package must stay within that package.',
+                );
+              }
+            }
+            licenseFiles.add(_fileSystem.file(absoluteLicensePath).absolute);
+          }
         }
         additionalLicenseFiles[packageFlutterManifest.appName] = licenseFiles;
 
diff --git a/packages/flutter_tools/lib/src/base/bot_detector.dart b/packages/flutter_tools/lib/src/base/bot_detector.dart
index 648b6e0ee7a37..afa208833a709 100644
--- a/packages/flutter_tools/lib/src/base/bot_detector.dart
+++ b/packages/flutter_tools/lib/src/base/bot_detector.dart
@@ -33,16 +33,10 @@ class BotDetector {
         // When set, GA logs to a local file (normally for tests) so we don't need to filter.
         ||
         _platform.environment.containsKey('FLUTTER_ANALYTICS_LOG_FILE')) {
-      _persistentToolState.setIsRunningOnBot(false);
       return false;
     }
 
-    if (_persistentToolState.isRunningOnBot != null) {
-      return _persistentToolState.isRunningOnBot!;
-    }
-
-    final bool result =
-        _platform.environment['BOT'] == 'true'
+    if (_platform.environment['BOT'] == 'true'
         // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
         ||
         _platform.environment['TRAVIS'] == 'true' ||
@@ -72,10 +66,17 @@ class BotDetector {
         // Property when running on borg.
         ||
         _platform.environment.containsKey('BORG_ALLOC_DIR')
-        // Property when running on Azure.
+        // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables
         ||
-        await _azureDetector.isRunningOnAzure;
+        _platform.environment.containsKey('TF_BUILD')) {
+      return true;
+    }
+
+    if (_persistentToolState.isRunningOnBot != null) {
+      return _persistentToolState.isRunningOnBot!;
+    }
 
+    final bool result = await _azureDetector.isRunningOnAzure;
     _persistentToolState.setIsRunningOnBot(result);
     return result;
   }
@@ -107,22 +108,17 @@ class AzureDetector {
           .timeout(requestTimeout);
       request.headers.add('Metadata', true);
       await request.close();
-    } on SocketException {
-      // If there is an error on the socket, it probably means that we are not
-      // running on Azure.
-      return _isRunningOnAzure = false;
     } on HttpException {
-      // If the connection gets set up, but encounters an error condition, it
-      // still means we're on Azure.
+      // The connection was established but an HTTP error occurred.
+      // This still indicates we're running on Azure.
       return _isRunningOnAzure = true;
-    } on TimeoutException {
-      // The HttpClient connected to a host, but it did not respond in a timely
-      // fashion. Assume we are not on a bot.
-      return _isRunningOnAzure = false;
-    } on OSError {
-      // The HttpClient might be running in a WSL1 environment.
+    } on Object {
+      // Metadata detection is best-effort. Any other failure (socket errors,
+      // timeouts, malformed redirect URIs, WSL1 networking issues, etc.)
+      // should not prevent Flutter from starting.
       return _isRunningOnAzure = false;
     }
+
     // We got a response. We're running on Azure.
     return _isRunningOnAzure = true;
   }
diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart
index d836785258489..0ec08b673912f 100644
--- a/packages/flutter_tools/lib/src/base/build.dart
+++ b/packages/flutter_tools/lib/src/base/build.dart
@@ -219,10 +219,6 @@ class AOTSnapshotter {
     }
 
     if (platform == TargetPlatform.android_arm) {
-      // Use softfp for Android armv7 devices.
-      // TODO(cbracken): eliminate this when we fix https://github.com/flutter/flutter/issues/17489
-      genSnapshotArgs.add('--no-sim-use-hardfp');
-
       // Not supported by the Pixel in 32-bit mode.
       genSnapshotArgs.add('--no-use-integer-division');
     }
diff --git a/packages/flutter_tools/lib/src/base/error_handling_io.dart b/packages/flutter_tools/lib/src/base/error_handling_io.dart
index 64a1ab547823e..e1a96d2f58e0b 100644
--- a/packages/flutter_tools/lib/src/base/error_handling_io.dart
+++ b/packages/flutter_tools/lib/src/base/error_handling_io.dart
@@ -96,13 +96,21 @@ class ErrorHandlingFileSystem extends ForwardingFileSystem {
   /// This can be used to bypass the [ErrorHandlingFileSystem] permission exit
   /// checks for situations where failure is acceptable, such as the flutter
   /// persistent settings cache.
-  static void noExitOnFailure(void Function() operation) {
+  static T noExitOnFailure<T>(T Function() operation) {
     final bool previousValue = ErrorHandlingFileSystem._noExitOnFailure;
+    ErrorHandlingFileSystem._noExitOnFailure = true;
     try {
-      ErrorHandlingFileSystem._noExitOnFailure = true;
-      operation();
-    } finally {
+      final T result = operation();
+      if (result is Future) {
+        return (result.whenComplete(() {
+          ErrorHandlingFileSystem._noExitOnFailure = previousValue;
+        })) as T;
+      }
+      ErrorHandlingFileSystem._noExitOnFailure = previousValue;
+      return result;
+    } catch (_) {
       ErrorHandlingFileSystem._noExitOnFailure = previousValue;
+      rethrow;
     }
   }
 
diff --git a/packages/flutter_tools/lib/src/base/file_system.dart b/packages/flutter_tools/lib/src/base/file_system.dart
index 6e1a75fea7101..53724f70a7a72 100644
--- a/packages/flutter_tools/lib/src/base/file_system.dart
+++ b/packages/flutter_tools/lib/src/base/file_system.dart
@@ -2,15 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:file/file.dart';
 import 'package:file/local.dart' as local_fs;
 import 'package:meta/meta.dart';
 
 import 'common.dart';
 import 'io.dart';
+import 'logger.dart';
 import 'platform.dart';
 import 'process.dart';
 import 'signals.dart';
+import 'terminal.dart';
 
 // package:file/local.dart must not be exported. This exposes LocalFileSystem,
 // which we override to ensure that temporary directories are cleaned up when
@@ -273,3 +277,67 @@ class LocalFileSystem extends local_fs.LocalFileSystem {
   @visibleForTesting
   Directory get superSystemTempDirectory => super.systemTempDirectory;
 }
+
+extension FileSystemLocking on FileSystem {
+  /// Runs [scope] while holding an exclusive file lock on the file at [lockPath].
+  ///
+  /// The lock is released after [scope] completes, even if it throws.
+  ///
+  /// If the lock cannot be acquired immediately, it will retry every 50ms.
+  Future<T> runLocked<T>({
+    required String lockPath,
+    required FutureOr<T> Function() scope,
+    Logger? logger,
+    String? traceMessage,
+    String? warningMessage,
+  }) async {
+    final File lockFile = file(lockPath);
+    var printed = false;
+    RandomAccessFile? openedFile;
+    while (true) {
+      try {
+        lockFile.parent.createSync(recursive: true);
+        openedFile = lockFile.openSync(mode: FileMode.write);
+        openedFile.lockSync();
+        break;
+      } on UnimplementedError {
+        logger?.printTrace(traceMessage ?? 'Locking not supported (UnimplementedError).');
+        break;
+      } on UnsupportedError {
+        logger?.printTrace(traceMessage ?? 'Locking not supported (UnsupportedError).');
+        break;
+      } on FileSystemException catch (e) {
+        final lockFailed = openedFile != null;
+        if (openedFile != null) {
+          try {
+            openedFile.closeSync();
+          } on FileSystemException catch (_) {}
+          openedFile = null;
+        }
+        if (!printed) {
+          final details = lockFailed ? '' : ' (Error: $e)';
+          logger?.printTrace(
+            traceMessage ?? 'Waiting to obtain lock of directory: ${lockFile.path}$details',
+          );
+          logger?.printWarning(
+            warningMessage ?? 'Waiting for another flutter command to release the lock...',
+            color: TerminalColor.grey,
+            fatal: false,
+          );
+          printed = true;
+        }
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+      }
+    }
+
+    try {
+      return await scope();
+    } finally {
+      if (openedFile != null) {
+        try {
+          openedFile.closeSync();
+        } on FileSystemException {} // ignore: empty_catches
+      }
+    }
+  }
+}
diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart
index 15bb4cda19027..190fae8883999 100644
--- a/packages/flutter_tools/lib/src/base/os.dart
+++ b/packages/flutter_tools/lib/src/base/os.dart
@@ -143,8 +143,40 @@ abstract class OperatingSystemUtils {
     return osNames[osName] ?? osName;
   }
 
+  /// Optional override for the host platform architecture.
+  HostPlatform? hostPlatformOverride;
+
   /// Represents the platform of the host machine running the Flutter tool.
+  ///
+  /// The architecture may be overridden, in precedence order, by the
+  /// [hostPlatformOverride] property or the `FLUTTER_HOST_ARCH` environment
+  /// variable. When neither is set, or the environment variable does not match
+  /// an architecture supported on the current OS, the host platform is
+  /// determined by [defaultHostPlatform], which subclasses may override to
+  /// probe the hardware directly.
   HostPlatform get hostPlatform {
+    if (hostPlatformOverride case final HostPlatform override) {
+      return override;
+    }
+    if (_platform.environment['FLUTTER_HOST_ARCH'] case final String overrideArch) {
+      final HostPlatform? overridePlatform = HostPlatform.fromOsAndArch(
+        _platform.operatingSystem,
+        overrideArch,
+      );
+      if (overridePlatform != null) {
+        return overridePlatform;
+      }
+    }
+    return defaultHostPlatform;
+  }
+
+  /// The host platform detected when no architecture override is in effect.
+  ///
+  /// Defaults to the architecture the tool was compiled for. Subclasses may
+  /// override this to probe the underlying hardware (for example, to see
+  /// through Rosetta translation on macOS).
+  @protected
+  HostPlatform get defaultHostPlatform {
     return switch (_currentAbi) {
       Abi.macosX64 => HostPlatform.darwin_x64,
       Abi.macosArm64 => HostPlatform.darwin_arm64,
@@ -365,7 +397,7 @@ class _MacOSUtils extends _PosixUtils {
   HostPlatform? _hostPlatform;
 
   @override
-  HostPlatform get hostPlatform {
+  HostPlatform get defaultHostPlatform {
     if (_hostPlatform == null) {
       String? sysctlPath;
       if (which('sysctl') == null) {
@@ -612,6 +644,25 @@ enum HostPlatform {
 
   final String cliName;
   final String platformName;
+
+  /// Returns the host platform for the specified OS and architecture.
+  ///
+  /// [os] is an operating system name as returned by
+  /// [Platform.operatingSystem]. [arch] is an architecture name matching the
+  /// [platformName] of one of the values of this enum. Returns null if no match
+  /// is found.
+  static HostPlatform? fromOsAndArch(String os, String arch) {
+    return switch ((os, arch.toLowerCase())) {
+      ('macos', 'x64') => darwin_x64,
+      ('macos', 'arm64') => darwin_arm64,
+      ('linux', 'x64') => linux_x64,
+      ('linux', 'arm64') => linux_arm64,
+      ('linux', 'riscv64') => linux_riscv64,
+      ('windows', 'x64') => windows_x64,
+      ('windows', 'arm64') => windows_arm64,
+      _ => null,
+    };
+  }
 }
 
 // flutter_ignore: deprecation_syntax (see analyze.dart)
diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart
index 1fb4184195e5c..9cb792f61bf18 100644
--- a/packages/flutter_tools/lib/src/base/utils.dart
+++ b/packages/flutter_tools/lib/src/base/utils.dart
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/// @docImport 'common.dart';
 /// @docImport 'terminal.dart';
 library;
 
 import 'dart:async';
 import 'dart:math' as math;
+import 'dart:typed_data';
 
 import 'package:file/file.dart';
 import 'package:intl/intl.dart' as intl;
@@ -647,3 +649,57 @@ List<String> formatTable(List<List<String>> table, {String separator = ' • ',
     return '$indentString$formatted';
   }).toList();
 }
+
+/// Decodes a list of bytes into a string, supporting UTF-8 (with or without
+/// BOM) and UTF-16 LE/BE (with BOM).
+///
+/// Inspects leading Byte Order Mark (BOM) signatures in [bytes] to determine
+/// the encoding:
+///
+/// * **UTF-16 LE** (`0xFF, 0xFE`): Strips the 2-byte BOM and decodes the
+///   remaining payload as 16-bit little-endian code units.
+/// * **UTF-16 BE** (`0xFE, 0xFF`): Strips the 2-byte BOM and decodes the
+///   remaining payload as 16-bit big-endian code units.
+/// * **UTF-8 with BOM** (`0xEF, 0xBB, 0xBF`): Strips the 3-byte BOM and decodes
+///   the remaining payload as strict UTF-8.
+/// * **Default UTF-8** (no BOM): Decodes the entire byte list as strict UTF-8.
+///
+/// Throws a [FormatException] if a UTF-16 byte payload has an odd length after
+/// stripping the BOM, or a [ToolExit] if strict UTF-8 decoding fails.
+String decodeUtf8OrUtf16(List<int> bytes) {
+  // Avoid using list pattern matching here (e.g., `[0xFF, 0xFE, ...final payload]`)
+  // as the rest pattern allocates a copied sublist for the payload.
+  if (bytes.length >= 2 && bytes[0] == 0xFF && bytes[1] == 0xFE) {
+    return _decodeUtf16(bytes, 2, Endian.little);
+  }
+  if (bytes.length >= 2 && bytes[0] == 0xFE && bytes[1] == 0xFF) {
+    return _decodeUtf16(bytes, 2, Endian.big);
+  }
+  if (bytes.length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF) {
+    return utf8.decode(bytes.sublist(3));
+  }
+  return utf8.decode(bytes);
+}
+
+/// Decodes a UTF-16 byte list [bytes] starting from [offset] after its BOM has
+/// been stripped.
+///
+/// Reads 16-bit integers according to the specified byte [endian] (either
+/// [Endian.little] or [Endian.big]).
+///
+/// Throws a [FormatException] if the payload length has an odd number of bytes,
+/// as each UTF-16 code unit requires exactly 2 bytes.
+String _decodeUtf16(List<int> bytes, int offset, Endian endian) {
+  final int length = bytes.length - offset;
+  if (length.isOdd) {
+    throw const FormatException('UTF-16 data length must be even after BOM');
+  }
+  final Uint8List uint8List = bytes is Uint8List ? bytes : Uint8List.fromList(bytes);
+  final byteData = ByteData.sublistView(uint8List, offset);
+  final int count = length ~/ 2;
+  final codeUnits = Uint16List(count);
+  for (var i = 0; i < count; i++) {
+    codeUnits[i] = byteData.getUint16(i * 2, endian);
+  }
+  return String.fromCharCodes(codeUnits);
+}
diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart
index 551da4d7bc108..4645f89be70f2 100644
--- a/packages/flutter_tools/lib/src/build_info.dart
+++ b/packages/flutter_tools/lib/src/build_info.dart
@@ -48,6 +48,8 @@ class BuildInfo {
     this.codeSizeDirectory,
     this.androidGradleDaemon = true,
     this.androidSkipBuildDependencyValidation = false,
+    this.androidEnableHcpp,
+    this.explicitAndroidEnableHcpp,
     this.packageConfig = PackageConfig.empty,
     this.initializeFromDill,
     this.assumeInitializeFromDillUpToDate = false,
@@ -93,6 +95,8 @@ class BuildInfo {
       codeSizeDirectory: codeSizeDirectory,
       androidGradleDaemon: androidGradleDaemon,
       androidSkipBuildDependencyValidation: androidSkipBuildDependencyValidation,
+      androidEnableHcpp: androidEnableHcpp,
+      explicitAndroidEnableHcpp: explicitAndroidEnableHcpp,
       packageConfig: packageConfig ?? this.packageConfig,
       initializeFromDill: initializeFromDill ?? this.initializeFromDill,
       assumeInitializeFromDillUpToDate: assumeInitializeFromDillUpToDate,
@@ -201,6 +205,26 @@ class BuildInfo {
   /// dependencies.
   final bool androidSkipBuildDependencyValidation;
 
+  /// The default `enable-hcpp` value (currently false unless the CLI flag was
+  /// passed), given to Gradle so the Flutter Gradle Plugin can inject the
+  /// corresponding manifest metadata if absent.
+  ///
+  /// The injection only happens for application projects, and only when the
+  /// merged manifest does not already contain the
+  /// `io.flutter.embedding.android.EnableHcpp` metadata, so a value in the
+  /// app's manifest takes priority over this one. Module (aar) manifests are
+  /// never injected; the add-to-app host's manifest is the source of truth.
+  /// When null, no property is passed and no injection happens.
+  final bool? androidEnableHcpp;
+
+  /// The explicit `--[no-]enable-hcpp` value passed by the user on the CLI, or
+  /// null if the user did not pass the flag explicitly.
+  ///
+  /// Passed to Gradle, which writes it into the merged manifest over any value
+  /// already there, so it takes priority over both [androidEnableHcpp] and the
+  /// app's manifest. When null, the manifest decides.
+  final bool? explicitAndroidEnableHcpp;
+
   /// Additional key value pairs that are passed directly to the gradle project via the `-P`
   /// flag.
   final List<String> androidProjectArgs;
@@ -393,6 +417,8 @@ class BuildInfo {
         'EXTRA_FRONT_END_OPTIONS': extraFrontEndOptions.join(','),
       if (extraGenSnapshotOptions.isNotEmpty)
         'EXTRA_GEN_SNAPSHOT_OPTIONS': extraGenSnapshotOptions.join(','),
+      'BUILD_NAME': ?buildName,
+      'BUILD_NUMBER': ?buildNumber,
       'SPLIT_DEBUG_INFO': ?splitDebugInfoPath,
       'TRACK_WIDGET_CREATION': trackWidgetCreation.toString(),
       'TREE_SHAKE_ICONS': treeShakeIcons.toString(),
@@ -423,6 +449,8 @@ class BuildInfo {
       if (performanceMeasurementFile != null)
         '-Pperformance-measurement-file=$performanceMeasurementFile',
       if (codeSizeDirectory != null) '-Pcode-size-directory=$codeSizeDirectory',
+      if (androidEnableHcpp != null) '-Penable-hcpp=$androidEnableHcpp',
+      if (explicitAndroidEnableHcpp != null) '-Pexplicit-enable-hcpp=$explicitAndroidEnableHcpp',
       for (final String projectArg in androidProjectArgs) '-P$projectArg',
       if (androidGradleProjectCacheDir != null) '--project-cache-dir=$androidGradleProjectCacheDir',
     ];
diff --git a/packages/flutter_tools/lib/src/build_system/targets/common.dart b/packages/flutter_tools/lib/src/build_system/targets/common.dart
index b66db673bcc2e..6356a52b58c43 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/common.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/common.dart
@@ -13,7 +13,6 @@ import '../../compile.dart';
 import '../../dart/package_map.dart';
 import '../../darwin/darwin.dart';
 import '../../devfs.dart';
-import '../../features.dart';
 import '../../globals.dart' as globals show xcode;
 import '../../isolated/native_assets/dart_hook_result.dart';
 import '../../project.dart';
@@ -155,10 +154,9 @@ class KernelSnapshot extends Target {
   ];
 
   @override
-  List<Source> get outputs => <Source>[
-    const Source.pattern('{BUILD_DIR}/${KernelSnapshot.dillName}'),
-    if (featureFlags.isRecordUseEnabled)
-      const Source.pattern('{BUILD_DIR}/${KernelSnapshot.recordedUsesFileName}'),
+  List<Source> get outputs => const <Source>[
+    Source.pattern('{BUILD_DIR}/${KernelSnapshot.dillName}'),
+    Source.pattern('{BUILD_DIR}/${KernelSnapshot.recordedUsesFileName}'),
   ];
 
   static const depfile = 'kernel_snapshot_program.d';
@@ -216,14 +214,14 @@ class KernelSnapshot extends Target {
     final File recordedUsesFile = environment.buildDir.childFile(
       KernelSnapshot.recordedUsesFileName,
     );
-    if (featureFlags.isRecordUseEnabled) {
-      if (buildMode.isPrecompiled) {
-        extraFrontEndOptions.add('--recorded-uses=${recordedUsesFile.path}');
-      } else {
-        // Produce an empty file to satisfy the build system in JIT mode.
-        // Always overwrite to avoid stale data.
-        recordedUsesFile.writeAsStringSync(KernelSnapshot.recordedUsesEmptyContent);
-      }
+    if (buildMode.isPrecompiled) {
+      // Always pass --recorded-uses in AOT mode because both recorded uses for
+      // link hooks and icon tree shaking depend on this file.
+      extraFrontEndOptions.add('--recorded-uses=${recordedUsesFile.path}');
+    } else {
+      // Produce an empty file to satisfy the build system in JIT mode.
+      // Always overwrite to avoid stale data.
+      recordedUsesFile.writeAsStringSync(KernelSnapshot.recordedUsesEmptyContent);
     }
     final List<String>? fileSystemRoots = environment.defines[kFileSystemRoots]?.split(',');
     final String? fileSystemScheme = environment.defines[kFileSystemScheme];
@@ -314,6 +312,9 @@ class KernelSnapshot extends Target {
     if (output == null || output.errorCount != 0) {
       throw Exception();
     }
+    if (buildMode.isPrecompiled && !recordedUsesFile.existsSync()) {
+      throw Exception('${KernelSnapshot.recordedUsesFileName} was not generated by the compiler.');
+    }
   }
 
   Future<void> _addFlavorToDartDefines(
diff --git a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
index aeefa12a0c54e..4e66092ef39fb 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
@@ -5,6 +5,7 @@
 import 'package:meta/meta.dart';
 import 'package:mime/mime.dart' as mime;
 import 'package:process/process.dart';
+import 'package:record_use/record_use.dart';
 
 import '../../artifacts.dart';
 import '../../base/common.dart';
@@ -67,14 +68,18 @@ class IconTreeShaker {
     'application/x-font-ttf', // based on running locally.
   };
 
-  /// The [Source] inputs that targets using this should depend on.
+  /// The [Source] inputs that native targets using this should depend on.
+  ///
+  /// Web targets (such as `WebReleaseBundle`) do not use this field because
+  /// their recorded uses inputs are dynamically provided via
+  /// `Dart2WebTarget.buildPatternStems`.
   ///
   /// See [Target.inputs].
   static const inputs = <Source>[
     Source.pattern(
       '{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart',
     ),
-    Source.artifact(Artifact.constFinder),
+    Source.pattern('{BUILD_DIR}/recorded_uses.json'),
     Source.artifact(Artifact.fontSubset),
   ];
 
@@ -101,16 +106,34 @@ class IconTreeShaker {
       return;
     }
 
-    final File appDill = environment.buildDir.childFile('app.dill');
-    if (!appDill.existsSync()) {
+    final candidates = <String>[
+      'recorded_uses.json',
+      'recorded_uses_js.json',
+      'recorded_uses_wasm.json',
+    ];
+    final recordedUsesFiles = <File>[];
+    for (final candidate in candidates) {
+      final File file = environment.buildDir.childFile(candidate);
+      if (file.existsSync() && file.lengthSync() > 0) {
+        recordedUsesFiles.add(file);
+      }
+    }
+    if (recordedUsesFiles.isEmpty) {
+      final File defaultFile = environment.buildDir.childFile('recorded_uses.json');
       throw IconTreeShakerException._(
-        'Expected to find kernel file at ${appDill.path}, but no file found.',
+        'Expected to find recorded uses file at ${defaultFile.path}, but no file found.',
       );
     }
-    final File constFinder = _fs.file(_artifacts.getArtifactPath(Artifact.constFinder));
-    final File dart = _fs.file(_artifacts.getArtifactPath(Artifact.engineDartBinary));
 
-    final Map<String, List<int>> iconData = await _findConstants(dart, constFinder, appDill);
+    Recordings? combinedRecordings;
+    for (final file in recordedUsesFiles) {
+      final Recordings recordings = await _readRecordings(file);
+      combinedRecordings = combinedRecordings == null
+          ? recordings
+          : combinedRecordings.merge(recordings);
+    }
+
+    final Map<String, List<int>> iconData = _parseRecordings(combinedRecordings!);
     final Set<String> familyKeys = iconData.keys.toSet();
 
     final Map<String, String> fonts = await _parseFontJson(
@@ -118,9 +141,12 @@ class IconTreeShaker {
       familyKeys,
     );
 
-    if (fonts.length != iconData.length) {
+    final Set<String> missingFonts = iconData.keys
+        .where((String key) => !fonts.containsKey(key))
+        .toSet();
+    if (missingFonts.isNotEmpty) {
       environment.logger.printStatus(
-        'Expected to find fonts for ${iconData.keys}, but found '
+        'Expected to find fonts for $missingFonts, but found '
         '${fonts.keys}. This usually means you are referring to '
         'font families in an IconData class but not including them '
         'in the assets section of your pubspec.yaml, are missing '
@@ -131,11 +157,13 @@ class IconTreeShaker {
 
     final result = <String, _IconTreeShakerData>{};
     const kSpacePoint = 32;
-    for (final MapEntry<String, String> entry in fonts.entries) {
-      final List<int>? codePoints = iconData[entry.key];
+    for (final MapEntry(:key, :value) in fonts.entries) {
+      final int? fallbackCodePoint = _kKnownIconFontFallbackCodePoints[key];
+      final List<int>? codePoints =
+          iconData[key] ?? (fallbackCodePoint != null ? <int>[fallbackCodePoint] : null);
       if (codePoints == null) {
         throw IconTreeShakerException._(
-          'Expected to font code points for ${entry.key}, but none were found.',
+          'Expected to font code points for $key, but none were found.',
         );
       }
 
@@ -143,9 +171,9 @@ class IconTreeShaker {
       final optionalCodePoints = _targetPlatform == TargetPlatform.web_javascript
           ? <int>[kSpacePoint]
           : <int>[];
-      result[entry.value] = _IconTreeShakerData(
-        family: entry.key,
-        relativePath: entry.value,
+      result[value] = _IconTreeShakerData(
+        family: key,
+        relativePath: value,
         codePoints: codePoints,
         optionalCodePoints: optionalCodePoints,
       );
@@ -169,7 +197,7 @@ class IconTreeShaker {
     if (!enabled) {
       return false;
     }
-    if (input.lengthSync() < 12) {
+    if (!input.existsSync() || input.lengthSync() < 12) {
       return false;
     }
     final String? mimeType = mime.lookupMimeType(
@@ -246,6 +274,14 @@ class IconTreeShaker {
         'by providing the --no-tree-shake-icons flag when building your app.';
   }
 
+  /// Known icon font families that should be subsetted even if 0 icons are recorded.
+  /// Subsetting unused icon fonts to a single dummy icon ensures that unused fonts
+  /// are not bundled in their entirety.
+  static const Map<String, int> _kKnownIconFontFallbackCodePoints = <String, int>{
+    'MaterialIcons': 57415, // 0xe047, Icons.add
+    'packages/cupertino_icons/CupertinoIcons': 62418, // 0xf3d2, CupertinoIcons.chevron_left
+  };
+
   /// Returns a map of { fontFamily: relativePath } pairs.
   Future<Map<String, String>> _parseFontJson(String fontManifestData, Set<String> families) async {
     final result = <String, String>{};
@@ -262,7 +298,8 @@ class IconTreeShaker {
           'got: ${map['family']}.',
         );
       }
-      if (!families.contains(familyKey)) {
+      if (!families.contains(familyKey) &&
+          !_kKnownIconFontFallbackCodePoints.containsKey(familyKey)) {
         continue;
       }
       final List<Map<String, Object?>> fonts = _getList(
@@ -287,106 +324,121 @@ class IconTreeShaker {
     return result;
   }
 
-  Future<Map<String, List<int>>> _findConstants(File dart, File constFinder, File appDill) async {
-    final cmd = <String>[
-      dart.path,
-      constFinder.path,
-      '--kernel-file',
-      appDill.path,
-      '--class-library-uri',
-      'package:flutter/src/widgets/icon_data.dart',
-      '--class-name',
-      'IconData',
-      '--annotation-class-name',
-      '_StaticIconProvider',
-      '--annotation-class-library-uri',
-      'package:flutter/src/widgets/icon_data.dart',
-    ];
-    _logger.printTrace('Running command: ${cmd.join(' ')}');
-    final ProcessResult constFinderProcessResult = await _processManager.run(cmd);
-
-    if (constFinderProcessResult.exitCode != 0) {
-      throw IconTreeShakerException._('ConstFinder failure: ${constFinderProcessResult.stderr}');
+  Future<Recordings> _readRecordings(File recordedUsesFile) async {
+    final String content = await recordedUsesFile.readAsString();
+    final Object? data;
+    try {
+      data = json.decode(content);
+    } on FormatException catch (e) {
+      throw IconTreeShakerException._('Failed to parse recorded uses file: $e');
     }
-    final Object? constFinderMap = json.decode(constFinderProcessResult.stdout as String);
-    if (constFinderMap is! Map<String, Object?>) {
+    if (data is! Map<String, Object?>) {
       throw IconTreeShakerException._(
-        'Invalid ConstFinder output: expected a top level JSON object, '
-        'got $constFinderMap.',
+        'Invalid recorded uses file: expected a top level JSON object.',
       );
     }
-    final constFinderResult = _ConstFinderResult(constFinderMap);
-    if (constFinderResult.hasNonConstantLocations) {
+
+    try {
+      return Recordings.fromJson(data);
+    } on Exception catch (e) {
+      throw IconTreeShakerException._('Failed to parse recorded uses file: $e');
+    }
+  }
+
+  Map<String, List<int>> _parseRecordings(Recordings recordings) {
+    final result = <String, List<int>>{};
+    var hasNonConstant = false;
+
+    for (final MapEntry(:key, :value) in recordings.instances.entries) {
+      if (_isIconDataDefinition(key)) {
+        for (final reference in value) {
+          final _IconDataConstants? constants = _extractIconDataConstants(reference);
+          if (constants == null) {
+            hasNonConstant = true;
+            continue;
+          }
+
+          if (constants.codePoint is IntConstant) {
+            final int codePoint = (constants.codePoint! as IntConstant).value;
+            if (constants.fontFamily is! StringConstant) {
+              _logger.printTrace(
+                'Expected to find fontFamily for constant IconData with codepoint: '
+                '$codePoint, but found fontFamily: null. This usually means '
+                'you are relying on the system font. Alternatively, font families in '
+                'an IconData class can be provided in the assets section of your '
+                'pubspec.yaml, or you are missing "uses-material-design: true".',
+              );
+              continue;
+            }
+            final String fontFamily = (constants.fontFamily! as StringConstant).value;
+            final String? fontPackage = constants.fontPackage is StringConstant
+                ? (constants.fontPackage! as StringConstant).value
+                : null;
+            final family = fontPackage == null ? fontFamily : 'packages/$fontPackage/$fontFamily';
+            result[family] ??= <int>[];
+            result[family]!.add(codePoint);
+          }
+        }
+      }
+    }
+    if (hasNonConstant) {
       _logger.printError(
         'This application cannot tree shake icons fonts. '
-        'It has non-constant instances of IconData at the '
-        'following locations:',
+        'It has non-constant instances of IconData.',
         emphasis: true,
       );
-      for (final Map<String, Object?> location in constFinderResult.nonConstantLocations) {
-        _logger.printError(
-          '- ${location['file']}:${location['line']}:${location['column']}',
-          indent: 2,
-          hangingIndent: 4,
-        );
-      }
       throwToolExit(
         'Avoid non-constant invocations of IconData or try to '
         'build again with --no-tree-shake-icons.',
       );
     }
-    return _parseConstFinderResult(constFinderResult);
+    return result;
   }
 
-  Map<String, List<int>> _parseConstFinderResult(_ConstFinderResult constants) {
-    final result = <String, List<int>>{};
-    for (final Map<String, Object?> iconDataMap in constants.constantInstances) {
-      final Object? package = iconDataMap['fontPackage'];
-      final Object? fontFamily = iconDataMap['fontFamily'];
-      final Object? codePoint = iconDataMap['codePoint'];
-      if ((package ?? '') is! String || (fontFamily ?? '') is! String || codePoint is! num) {
-        throw IconTreeShakerException._(
-          'Invalid ConstFinder result. Expected "fontPackage" to be a String, '
-          '"fontFamily" to be a String, and "codePoint" to be an int, '
-          'got: $iconDataMap.',
-        );
-      }
-      if (fontFamily == null) {
-        _logger.printTrace(
-          'Expected to find fontFamily for constant IconData with codepoint: '
-          '$codePoint, but found fontFamily: $fontFamily. This usually means '
-          'you are relying on the system font. Alternatively, font families in '
-          'an IconData class can be provided in the assets section of your '
-          'pubspec.yaml, or you are missing "uses-material-design: true".',
+  static const String _iconDataClassName = 'IconData';
+  static const String _codePointFieldName = 'codePoint';
+  static const String _fontFamilyFieldName = 'fontFamily';
+  static const String _fontPackageFieldName = 'fontPackage';
+
+  bool _isIconDataDefinition(DefinitionWithInstances definition) {
+    if (definition is Class) {
+      return definition.name == _iconDataClassName &&
+          definition.library.uri == 'package:flutter/src/widgets/icon_data.dart';
+    }
+    final str = definition.toString();
+    return str == 'package:flutter/src/widgets/icon_data.dart::IconData' ||
+        str.startsWith('package:flutter/src/widgets/icon_data.dart::IconData.');
+  }
+
+  _IconDataConstants? _extractIconDataConstants(InstanceReference reference) {
+    if (reference case InstanceConstantReference(
+      instanceConstant: InstanceConstant(:final fields),
+    )) {
+      return (
+        codePoint: fields[_codePointFieldName],
+        fontFamily: fields[_fontFamilyFieldName],
+        fontPackage: fields[_fontPackageFieldName],
+      );
+    } else if (reference case InstanceCreationReference(
+      positionalArguments: final positional,
+      namedArguments: final named,
+    )) {
+      final bool hasNonConstantArg =
+          positional.any((MaybeConstant arg) => arg is! Constant) ||
+          named.values.any((MaybeConstant arg) => arg is! Constant);
+      if (!hasNonConstantArg) {
+        return (
+          codePoint: positional.isNotEmpty ? positional[0] as Constant : null,
+          fontFamily: named[_fontFamilyFieldName] as Constant?,
+          fontPackage: named[_fontPackageFieldName] as Constant?,
         );
-        continue;
       }
-      final family = fontFamily as String;
-      final key = package == null ? family : 'packages/$package/$family';
-      result[key] ??= <int>[];
-      result[key]!.add(codePoint.round());
     }
-    return result;
+    return null;
   }
 }
 
-class _ConstFinderResult {
-  _ConstFinderResult(this.result);
-
-  final Map<String, Object?> result;
-
-  late final List<Map<String, Object?>> constantInstances = _getList(
-    result['constantInstances'],
-    'Invalid ConstFinder output: Expected "constInstances" to be a list of objects.',
-  );
-
-  late final List<Map<String, Object?>> nonConstantLocations = _getList(
-    result['nonConstantLocations'],
-    'Invalid ConstFinder output: Expected "nonConstLocations" to be a list of objects',
-  );
-
-  bool get hasNonConstantLocations => nonConstantLocations.isNotEmpty;
-}
+typedef _IconDataConstants = ({Constant? codePoint, Constant? fontFamily, Constant? fontPackage});
 
 /// The font family name, relative path to font file, and list of code points
 /// the application is using.
@@ -427,3 +479,30 @@ class IconTreeShakerException implements Exception {
       'To disable icon tree shaking, pass --no-tree-shake-icons to the requested '
       'flutter build command';
 }
+
+extension on Recordings {
+  /// Returns a new [Recordings] containing all usages from both `this` and
+  /// [other].
+  ///
+  /// If a definition is present in both recordings, its usages from both
+  /// are combined in the returned [Recordings].
+  Recordings merge(Recordings other) {
+    final newCalls = <DefinitionWithStaticCalls, List<CallReference>>{};
+    for (final MapEntry(:key, :value) in calls.entries) {
+      newCalls[key] = <CallReference>[...value];
+    }
+    for (final MapEntry(:key, :value) in other.calls.entries) {
+      newCalls.putIfAbsent(key, () => <CallReference>[]).addAll(value);
+    }
+
+    final newInstances = <DefinitionWithInstances, List<InstanceReference>>{};
+    for (final MapEntry(:key, :value) in instances.entries) {
+      newInstances[key] = <InstanceReference>[...value];
+    }
+    for (final MapEntry(:key, :value) in other.instances.entries) {
+      newInstances.putIfAbsent(key, () => <InstanceReference>[]).addAll(value);
+    }
+
+    return Recordings(calls: newCalls, instances: newInstances);
+  }
+}
diff --git a/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart b/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart
index f729baee6c4ae..4c7b189e0b7da 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/native_assets.dart
@@ -419,6 +419,7 @@ Future<FlutterNativeAssetsBuildRunner> createFlutterNativeAssetsBuildRunner(
     packageConfig,
     fileSystem,
     environment.logger,
+    environment.platform,
     runPackageName,
     includeDevDependencies: includeDevDependencies,
     pubspecPath,
diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart
index 57775b9065d9d..bf0a326a9eebf 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/web.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart
@@ -12,6 +12,7 @@ import 'package:unified_analytics/unified_analytics.dart';
 import '../../artifacts.dart';
 import '../../base/common.dart';
 import '../../base/file_system.dart';
+import '../../base/logger.dart';
 import '../../base/process.dart';
 import '../../build_info.dart';
 import '../../cache.dart';
@@ -27,6 +28,7 @@ import '../../web/bootstrap.dart';
 import '../../web/compile.dart';
 import '../../web/file_generators/flutter_service_worker_js.dart';
 import '../../web/file_generators/main_dart.dart' as main_dart;
+import '../../web/web_constants.dart';
 import '../../web_template.dart';
 import '../build_system.dart';
 import '../depfile.dart';
@@ -93,7 +95,7 @@ class WebEntrypointTarget extends Target {
     // does not have an entry for the user's application or if the main file is
     // outside of the lib/ directory.
     final String importedEntrypoint =
-        packageConfig.toPackageUri(importUri)?.toString() ?? importUri.toString();
+        packageConfig.toPackageUriForWorkspace(importUri)?.toString() ?? importUri.toString();
 
     await injectBuildTimePluginFilesForWebPlatform(
       flutterProject,
@@ -198,10 +200,7 @@ class Dart2JSTarget extends Dart2WebTarget {
       else if (buildMode == BuildMode.release)
         '-Ddart.vm.product=true',
       for (final String dartDefine in computeDartDefines(environment)) '-D$dartDefine',
-      if (featureFlags.isRecordUseEnabled) ...<String>[
-        '--write-resources',
-        '--enable-experiment=record-use',
-      ],
+      if (featureFlags.isRecordUseEnabled) '--write-resources',
     ];
 
     // NOTE: most args should be populated in [toSharedCommandOptions].
@@ -302,6 +301,35 @@ class Dart2JSTarget extends Dart2WebTarget {
   ];
 }
 
+/// The classification of a wasm dry-run compile, derived from the compiler's
+/// exit code and output in [Dart2WasmTarget._logAndClassifyDryRunResult].
+///
+/// dart2wasm exits with code 254 when dry-run analysis completes with issues;
+/// any other non-zero exit code is unexpected.
+enum _DryRunOutcome {
+  /// The compiler exited with an unexpected exit code (anything other than 0
+  /// or 254), e.g. an internal compiler error.
+  crash,
+
+  /// The compiler exited with code 0: the app is wasm-compatible.
+  success,
+
+  /// The compiler exited with code 254 and wrote to stderr: compilation
+  /// failed for reasons other than dry-run findings (e.g. invalid Dart code
+  /// that does not compile for any web target).
+  failure,
+
+  /// The compiler exited with code 254 and wrote only to stdout: the
+  /// expected dry-run report of wasm-incompatible API usages, one finding
+  /// per line, e.g.:
+  ///
+  ///     package:bar/some/path.dart 120:5 - dart:js unsupported (1)
+  findings,
+
+  /// The compiler exited with code 254 but produced no output at all.
+  unknown,
+}
+
 /// Compiles a web entry point with dart2wasm.
 class Dart2WasmTarget extends Dart2WebTarget {
   Dart2WasmTarget(this.compilerConfig, this._analytics);
@@ -373,10 +401,8 @@ class Dart2WasmTarget extends Dart2WebTarget {
       ...decodeCommaSeparated(environment.defines, kExtraFrontEndOptions),
       for (final String dartDefine in dartDefines) '-D$dartDefine',
       '--extra-compiler-option=--depfile=${depFile.path}',
-      if (featureFlags.isRecordUseEnabled) ...<String>[
+      if (featureFlags.isRecordUseEnabled)
         '--recorded-uses=${environment.buildDir.childFile(LinkHooks.recordedUsesWasmFileName).path}',
-        '--enable-experiment=record-use',
-      ],
       ...compilerConfig.toCommandOptions(buildMode),
       '-o',
       outputWasmFile.path,
@@ -388,12 +414,14 @@ class Dart2WasmTarget extends Dart2WebTarget {
       processManager: environment.processManager,
     );
 
-    final RunResult runResult = await processUtils.run(
-      throwOnError: !compilerConfig.dryRun,
-      compilationArgs,
-    );
+    final RunResult runResult = await processUtils.run(compilationArgs);
     if (compilerConfig.dryRun) {
       await _handleDryRunResult(environment, runResult);
+    } else if (runResult.exitCode != 0) {
+      environment.logger.printStatus(runResult.stdout);
+      environment.logger.printError(runResult.stderr);
+      _checkForLegacyWebImports(environment, runResult.stdout, runResult.stderr);
+      throwToolExit('Failed to compile application for the Web.');
     }
     final File recordedUsesFile = environment.buildDir.childFile(
       LinkHooks.recordedUsesWasmFileName,
@@ -458,133 +486,300 @@ class Dart2WasmTarget extends Dart2WebTarget {
   @visibleForTesting
   Random? dryRunRandom;
 
+  /// Logs the outcome of a dry-run compile to the user and reports it to
+  /// analytics, including per-error-code package findings when the dry run
+  /// produced them.
   Future<void> _handleDryRunResult(Environment environment, RunResult runResult) async {
     final int exitCode = runResult.exitCode;
     final String stdout = runResult.stdout;
     final String stderr = runResult.stderr;
-    String? result;
-    final Map<String, String> findingsInfo = {};
 
+    final _DryRunOutcome outcome = _logAndClassifyDryRunResult(
+      logger: environment.logger,
+      exitCode: exitCode,
+      stdout: stdout,
+      stderr: stderr,
+    );
+
+    final Map<String, String> findingsInfo;
+    if (outcome == _DryRunOutcome.findings) {
+      final Map<String, String>? findings = await _collectFindingsInfo(
+        environment: environment,
+        stdout: stdout,
+        exitCode: exitCode,
+        result: outcome.name,
+      );
+      if (findings == null) {
+        return;
+      }
+      findingsInfo = findings;
+    } else {
+      findingsInfo = const <String, String>{};
+    }
+
+    _checkForLegacyWebImports(environment, stdout, stderr);
+
+    environment.logger.printWarning('Use --no-wasm-dry-run to disable these warnings.');
+
+    _analytics.send(
+      Event.flutterWasmDryRunPackage(
+        result: outcome.name,
+        exitCode: exitCode,
+        findingsInfo: findingsInfo,
+      ),
+    );
+  }
+
+  /// Classifies the dry-run compile result into a [_DryRunOutcome] (see the
+  /// enum values for the classification rules) and logs the corresponding
+  /// warning output to [logger].
+  static _DryRunOutcome _logAndClassifyDryRunResult({
+    required Logger logger,
+    required int exitCode,
+    required String stdout,
+    required String stderr,
+  }) {
     if (exitCode != 0 && exitCode != 254) {
-      environment.logger.printWarning('Unexpected wasm dry run failure ($exitCode):');
+      logger.printWarning('Unexpected wasm dry run failure ($exitCode):');
+      if (stdout.isNotEmpty) {
+        logger.printWarning('stdout:');
+        logger.printWarning(stdout);
+      }
       if (stderr.isNotEmpty) {
-        environment.logger.printWarning(stdout);
-        environment.logger.printWarning(stderr);
+        logger.printWarning('stderr:');
+        logger.printWarning(stderr);
       }
-      result = 'crash';
-    } else if (exitCode == 0) {
-      environment.logger.printWarning(
+      return _DryRunOutcome.crash;
+    }
+    if (exitCode == 0) {
+      logger.printWarning(
         'Wasm dry run succeeded. Consider building and testing your application with the '
         '`--wasm` flag. See docs for more info: '
         'https://docs.flutter.dev/platform-integration/web/wasm',
       );
-      result = 'success';
-    } else if (stderr.isNotEmpty) {
-      environment.logger.printWarning('Wasm dry run failed:');
-      environment.logger.printWarning(stdout);
-      environment.logger.printWarning(stderr);
-      result = 'failure';
-    } else if (stdout.isNotEmpty) {
-      environment.logger.printWarning('Wasm dry run findings:');
-      environment.logger.printWarning(stdout);
-      environment.logger.printWarning(
+      return _DryRunOutcome.success;
+    }
+    if (stderr.isNotEmpty) {
+      logger.printWarning('Wasm dry run failed:');
+      if (stdout.isNotEmpty) {
+        logger.printWarning('stdout:');
+        logger.printWarning(stdout);
+      }
+      logger.printWarning('stderr:');
+      logger.printWarning(stderr);
+      return _DryRunOutcome.failure;
+    }
+    if (stdout.isNotEmpty) {
+      logger.printWarning('Wasm dry run findings:');
+      logger.printWarning(stdout);
+      logger.printWarning(
         'Consider addressing these issues to enable wasm builds. See docs for more info: '
         'https://docs.flutter.dev/platform-integration/web/wasm\n',
       );
-      result = 'findings';
-      final Map<String, Set<Uri>> errorCodeToImportUris = {};
-      for (final String line in stdout.split('\n')) {
+      return _DryRunOutcome.findings;
+    }
+    return _DryRunOutcome.unknown;
+  }
+
+  /// Builds the per-error-code analytics payload for a dry run that produced
+  /// findings, mapping each error code (keyed as `E<code>`) to a formatted,
+  /// truncated summary of the pub-hosted packages it was found in.
+  ///
+  /// Returns null if the project's package config could not be loaded; in
+  /// that case an error event is sent to analytics instead.
+  Future<Map<String, String>?> _collectFindingsInfo({
+    required Environment environment,
+    required String stdout,
+    required int exitCode,
+    required String result,
+  }) async {
+    final Map<String, Set<Uri>> errorCodeToImportUris = _parseWasmFindings(stdout);
+
+    final PackageConfig packageConfigPackages;
+    try {
+      packageConfigPackages = await loadPackageConfigWithLogging(
+        findPackageConfigFileOrDefault(environment.projectDir),
+        logger: environment.logger,
+      );
+    } on ToolExit {
+      _analytics.send(
+        Event.flutterWasmDryRunPackage(
+          result: result,
+          exitCode: exitCode,
+          findingsInfo: {
+            'error': 'packageConfigNotLoaded',
+            'findings': errorCodeToImportUris.keys.join(','),
+          },
+        ),
+      );
+      return null;
+    }
+
+    final (:Map<String, String> hosted, :Set<String> private) = _categorizePackages(
+      packageConfigPackages,
+    );
+    final findingsInfo = <String, String>{};
+    for (final MapEntry(key: errorCode, value: uris) in errorCodeToImportUris.entries) {
+      findingsInfo['E$errorCode'] = _formatFindingsBuffer(
+        uris: uris,
+        hostedPackages: hosted,
+        privatePackages: private,
+        random: dryRunRandom,
+      );
+    }
+    return findingsInfo;
+  }
+
+  /// Matches the trailing error code of a dry-run finding line, e.g. the
+  /// `(1)` in:
+  ///
+  ///     package:bar/some/path.dart 120:5 - dart:js unsupported (1)
+  static final RegExp _wasmErrorCodePattern = RegExp(r'\(([0-9]+)\)\s*$');
+
+  /// Parses the dry-run findings printed to [stdout], one finding per line
+  /// in the form `<uri> <location> - <message> (<errorCode>)`, e.g.:
+  ///
+  ///     package:bar/some/path.dart 120:5 - dart:js unsupported (1)
+  ///
+  /// Returns a map from error code (`'1'` above) to the set of URIs that
+  /// triggered it (`package:bar/some/path.dart` above). Lines without a
+  /// trailing error code are ignored.
+  static Map<String, Set<Uri>> _parseWasmFindings(String stdout) {
+    final errorCodeToImportUris = <String, Set<Uri>>{};
+    for (final String line in stdout.split('\n')) {
+      final String? errorCode = _wasmErrorCodePattern.firstMatch(line)?.group(1);
+      if (errorCode != null) {
         final Uri uri = Uri.parse(line.split(' ')[0]);
-        final String? errorCode = RegExp(r'\(([0-9]+)\)\s*$').firstMatch(line)?.group(1);
-        if (errorCode != null) {
-          (errorCodeToImportUris[errorCode] ??= {}).add(uri);
-        }
+        (errorCodeToImportUris[errorCode] ??= {}).add(uri);
       }
+    }
+    return errorCodeToImportUris;
+  }
 
-      final PackageConfig packageConfigPackages;
-      try {
-        packageConfigPackages = await loadPackageConfigWithLogging(
-          findPackageConfigFileOrDefault(environment.projectDir),
-          logger: environment.logger,
-        );
-      } on ToolExit {
-        _analytics.send(
-          Event.flutterWasmDryRunPackage(
-            result: result,
-            exitCode: exitCode,
-            findingsInfo: {
-              'error': 'packageConfigNotLoaded',
-              'findings': errorCodeToImportUris.keys.join(','),
-            },
-          ),
-        );
-        return;
+  /// Splits the packages in the project's package config into pub-hosted
+  /// packages (mapped to their resolved version, which is safe to report to
+  /// analytics) and private packages (path/git dependencies and the like,
+  /// whose names must not be reported).
+  static ({Map<String, String> hosted, Set<String> private}) _categorizePackages(
+    PackageConfig packageConfigPackages,
+  ) {
+    final hostedPackages = <String, String>{};
+    final privatePackages = <String>{};
+    for (final Package package in packageConfigPackages.packages) {
+      final String packageName = package.name;
+      if (package.root.pathSegments.where((String s) => s.isNotEmpty).toList() case [
+        ...,
+        'hosted',
+        _,
+        final packageFolder,
+      ] when packageFolder.startsWith('$packageName-')) {
+        // Hosted package directories in .pub-cache follow '<packageName>-<version>'.
+        // Substring past the package name and hyphen to extract the version.
+        hostedPackages[packageName] = packageFolder.substring(packageName.length + 1);
+      } else {
+        privatePackages.add(packageName);
       }
+    }
+    return (hosted: hostedPackages, private: privatePackages);
+  }
 
-      final Map<String, String> hostedPackages = {};
-      final Set<String> privatePackages = {};
-      for (final Package package in packageConfigPackages.packages) {
-        final String packageName = package.name;
-        if (package.root.toString().contains('hosted/pub.dev')) {
-          final String? packageVersion = RegExp(
-            r'([0-9]+\.[0-9]+\.[0-9]+(?:-[\w\.-]+)?)',
-          ).firstMatch(package.root.toString())?.group(1);
-          hostedPackages[packageName] = packageVersion ?? '?';
-        } else {
-          privatePackages.add(packageName);
-        }
-      }
+  /// Formats the [uris] associated with a single error code into the
+  /// analytics value string: an optional leading hint (`-h` if the host app
+  /// itself had findings, `-p` if a private package did, `-hp` for both)
+  /// followed by a truncated, comma-separated list of `name:version` entries
+  /// for the affected pub-hosted packages.
+  static String _formatFindingsBuffer({
+    required Set<Uri> uris,
+    required Map<String, String> hostedPackages,
+    required Set<String> privatePackages,
+    Random? random,
+  }) {
+    // Shuffle the URIs so that, when the analytics buffer is truncated to
+    // [_truncateAnalyticsBuffer]'s character limit below, the reported
+    // packages are a random sample rather than always the first few in
+    // iteration order.
+    final urisList = <Uri>[...uris]..shuffle(random);
+    final (:Set<String> hostedFindings, :bool hostApp, :bool privatePackage) = _classifyUris(
+      urisList,
+      hostedPackages,
+      privatePackages,
+    );
+    final String hpHint = switch ((hostApp, privatePackage)) {
+      (true, true) => '-hp',
+      (true, false) => '-h',
+      (false, true) => '-p',
+      (false, false) => '',
+    };
+    return _truncateAnalyticsBuffer(hpHint, hostedFindings);
+  }
 
-      errorCodeToImportUris.forEach((String errorCode, Set<Uri> uris) {
-        final Set<String> hostedPackageFindings = {};
-        // Randomize the URI order so that we
-        final urisList = <Uri>[...uris]..shuffle(dryRunRandom);
-        var hostApp = false;
-        var privatePackage = false;
-        for (final uri in urisList) {
-          final String packageName = uri.pathSegments.first;
-          final String? hostedPackageVersion = hostedPackages[packageName];
-          if (uri.scheme == 'package') {
-            if (hostedPackageVersion != null) {
-              hostedPackageFindings.add('$packageName:$hostedPackageVersion');
-              continue;
-            } else if (privatePackages.contains(packageName)) {
-              privatePackage = true;
-              continue;
-            }
-          }
-          hostApp = true;
+  /// Buckets the [uris] from a set of findings by where they came from:
+  /// `name:version` strings for each affected pub-hosted package
+  /// (`hostedFindings`), whether any URI belonged to a private package
+  /// (`privatePackage`), and whether any URI came from outside a package
+  /// entirely, i.e. from the host app itself (`hostApp`).
+  ///
+  /// Only pub-hosted package names are collected; private package names and
+  /// host app paths are reduced to booleans so nothing identifying is
+  /// reported to analytics.
+  static ({Set<String> hostedFindings, bool hostApp, bool privatePackage}) _classifyUris(
+    Iterable<Uri> uris,
+    Map<String, String> hostedPackages,
+    Set<String> privatePackages,
+  ) {
+    final hostedFindings = <String>{};
+    var hostApp = false;
+    var privatePackage = false;
+    for (final uri in uris) {
+      if (uri.scheme == 'package' && uri.pathSegments.isNotEmpty) {
+        final String packageName = uri.pathSegments.first;
+        if (hostedPackages.containsKey(packageName)) {
+          hostedFindings.add('$packageName:${hostedPackages[packageName]}');
+          continue;
         }
-        final String? hpHint = switch ((hostApp, privatePackage)) {
-          (true, true) => '-hp',
-          (true, false) => '-h',
-          (false, true) => '-p',
-          _ => null,
-        };
-
-        final findingsBuffer = StringBuffer(hpHint ?? '');
-        for (final hostedPackageFinding in hostedPackageFindings) {
-          // Try to fit as many findings as we can into the 100 character limit imposed
-          // by google analytics.
-          final pendingString = '${findingsBuffer.isNotEmpty ? ',' : ''}$hostedPackageFinding';
-          if (findingsBuffer.length + pendingString.length <= 100) {
-            findingsBuffer.write(pendingString);
-          }
+        if (privatePackages.contains(packageName)) {
+          privatePackage = true;
+          continue;
         }
-        findingsInfo['E$errorCode'] = findingsBuffer.toString();
-      });
+      }
+      hostApp = true;
     }
-    result ??= 'unknown';
+    return (hostedFindings: hostedFindings, hostApp: hostApp, privatePackage: privatePackage);
+  }
 
-    environment.logger.printWarning('Use --no-wasm-dry-run to disable these warnings.');
+  /// Joins [prefix] and as many comma-separated [findings] as fit within
+  /// [maxLength] characters, silently dropping the rest.
+  static String _truncateAnalyticsBuffer(
+    String prefix,
+    Iterable<String> findings, {
+    int maxLength = 100,
+  }) {
+    final findingsBuffer = StringBuffer(prefix);
+    for (final finding in findings) {
+      // Try to fit as many findings as we can into the character limit imposed
+      // by google analytics.
+      final pendingString = '${findingsBuffer.isNotEmpty ? ',' : ''}$finding';
+      if (findingsBuffer.length + pendingString.length <= maxLength) {
+        findingsBuffer.write(pendingString);
+      }
+    }
+    return findingsBuffer.toString();
+  }
 
-    _analytics.send(
-      Event.flutterWasmDryRunPackage(
-        result: result,
-        exitCode: exitCode,
-        findingsInfo: findingsInfo,
-      ),
-    );
+  static final RegExp _kLegacyImportErrorPattern = RegExp(
+    "(?:Dart library|The unavailable library) '(${kLegacyWebLibraries.join('|')})'|"
+    '(${kLegacyWebLibraries.join('|')}) unsupported',
+  );
+
+  void _checkForLegacyWebImports(Environment environment, String stdout, String stderr) {
+    if (_kLegacyImportErrorPattern.hasMatch(stdout) ||
+        _kLegacyImportErrorPattern.hasMatch(stderr)) {
+      environment.logger.printStatus(
+        'Note: WebAssembly compilation failed due to legacy web imports.\n'
+        'Migrate your project from dart:html and package:js to package:web and dart:js_interop.\n'
+        '$kWasmErrorsMoreInfo',
+      );
+    }
   }
 }
 
diff --git a/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
index a87a36960bc76..1fa5cc91fa776 100644
--- a/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
+++ b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
@@ -265,7 +265,7 @@ class ShaderCompiler {
       final List<String> shaderTargets = _shaderTargetsFromTargetPlatform(targetPlatform);
       final List<String> cmd = makeImpellercCommand(shaderTargets);
       _logger.printTrace('impellerc command: $cmd');
-      final ProcessResult result = await _runCommand(cmd);
+      ProcessResult result = await _runCommand(cmd);
       if (result.exitCode != 0) {
         // Maybe retry impellerc command without --sksl.
         if (!(shaderTargets.length > 1 && shaderTargets.contains('--sksl'))) {
@@ -286,6 +286,7 @@ class ShaderCompiler {
         if (retryResult.exitCode != 0) {
           // Retry failed.
           _logger.printError('impellerc failure: ${retryResult.stderr}');
+          result = retryResult;
           failure = true;
         } else {
           // Retry succeeded. Don't fail, but log a warning message and the sksl
@@ -302,9 +303,15 @@ class ShaderCompiler {
 
       if (failure) {
         if (fatal) {
+          final String? hint = _getHelpfulHint(result, input, outputPath, impellerc.path);
+          final message =
+              'Shader compilation of "${input.path}" to "$outputPath" '
+              'failed with exit code ${result.exitCode}.'
+              '${hint != null ? '\n$hint' : ''}';
           throw ShaderCompilerException._(
-            'Shader compilation of "${input.path}" to "$outputPath" '
-            'failed with exit code ${result.exitCode}.',
+            message,
+            stdout: result.stdout as String?,
+            stderr: result.stderr as String?,
           );
         }
         return false;
@@ -320,9 +327,46 @@ class ShaderCompiler {
     return true;
   }
 
+  String? _getHelpfulHint(
+    ProcessResult result,
+    File input,
+    String outputPath,
+    String impellercPath,
+  ) {
+    final int exitCode = result.exitCode;
+    if (_platform.isMacOS && exitCode == -9) {
+      return 'The shader compiler (impellerc) may have been blocked by macOS Gatekeeper or run out of memory (OOM).\n'
+          'To resolve Gatekeeper issues, try running:\n'
+          '  xattr -d com.apple.quarantine "$impellercPath"';
+    }
+
+    final bool isWindowsAbort = _platform.isWindows && exitCode == 3;
+    final bool isPosixAbort = (_platform.isMacOS || _platform.isLinux) && exitCode == -6;
+
+    if (isWindowsAbort || isPosixAbort) {
+      var hint = 'The shader compiler (impellerc) aborted during compilation.';
+      if (_platform.isWindows) {
+        final bool hasNonAscii =
+            RegExp(r'[^\x00-\x7F]').hasMatch(input.path) ||
+            RegExp(r'[^\x00-\x7F]').hasMatch(outputPath);
+        if (hasNonAscii) {
+          hint +=
+              '\nWarning: The path contains non-ASCII characters, which is known to cause crashes on Windows.\n'
+              'Try moving your project to a path containing only ASCII characters.';
+        }
+      }
+      return hint;
+    }
+    return null;
+  }
+
   Future<ProcessResult> _runCommand(List<String> command) async {
     try {
-      return await _processManager.run(command, stderrEncoding: utf8);
+      return await _processManager.run(
+        command,
+        stdoutEncoding: utf8AllowMalformed,
+        stderrEncoding: utf8AllowMalformed,
+      );
     } on ProcessException catch (e) {
       if (_isBlockedBySecurityPolicy(e)) {
         throw _SecurityPolicyBlockException(e);
@@ -336,7 +380,9 @@ class ShaderCompiler {
       return false;
     }
     const winErrorAccessDisabledByPolicy = 1260;
-    return exception.errorCode == winErrorAccessDisabledByPolicy;
+    const winErrorSystemIntegrityPolicyViolation = 4551;
+    return exception.errorCode == winErrorAccessDisabledByPolicy ||
+        exception.errorCode == winErrorSystemIntegrityPolicyViolation;
   }
 
   void _logSecurityBlockError(String impellercPath) {
@@ -363,10 +409,26 @@ class _SecurityPolicyBlockException implements Exception {
 }
 
 class ShaderCompilerException implements Exception {
-  ShaderCompilerException._(this.message);
+  ShaderCompilerException._(this.message, {this.stdout, this.stderr});
 
   final String message;
+  final String? stdout;
+  final String? stderr;
 
   @override
-  String toString() => 'ShaderCompilerException: $message\n\n';
+  String toString() {
+    final buffer = StringBuffer();
+    buffer.write('ShaderCompilerException: $message\n');
+    final String? stdout = this.stdout;
+    if (stdout != null && stdout.trim().isNotEmpty) {
+      buffer.writeln('Stdout:');
+      buffer.writeln(stdout.trim());
+    }
+    final String? stderr = this.stderr;
+    if (stderr != null && stderr.trim().isNotEmpty) {
+      buffer.writeln('Stderr:');
+      buffer.writeln(stderr.trim());
+    }
+    return buffer.toString();
+  }
 }
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index ec17a559048ae..5b5cbc44a5df6 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -217,6 +217,7 @@ class Cache {
   final Platform _platform;
   final FileSystem _fileSystem;
   final OperatingSystemUtils _osUtils;
+  OperatingSystemUtils get osUtils => _osUtils;
   final Directory? _rootOverride;
   final List<ArtifactSet> _artifacts;
   final Stdio? _stdio;
diff --git a/packages/flutter_tools/lib/src/commands/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart
index 940804d64ce15..92b1aaaf14127 100644
--- a/packages/flutter_tools/lib/src/commands/analyze_once.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart
@@ -50,7 +50,6 @@ class AnalyzeOnce extends AnalyzeBase {
       throwToolExit('Nothing to analyze.', exitCode: 0);
     }
 
-    final analysisCompleter = Completer<void>();
     final errors = <AnalysisError>[];
 
     final server = AnalysisServer(
@@ -68,20 +67,6 @@ class AnalyzeOnce extends AnalyzeBase {
     Stopwatch? timer;
     Status? progress;
     try {
-      StreamSubscription<bool>? subscription;
-
-      void handleAnalysisStatus(bool isAnalyzing) {
-        if (!isAnalyzing) {
-          analysisCompleter.complete();
-          subscription?.cancel();
-          subscription = null;
-        }
-      }
-
-      subscription = server.onAnalyzing.listen(
-        (bool isAnalyzing) => handleAnalysisStatus(isAnalyzing),
-      );
-
       void handleAnalysisErrors(FileAnalysisErrors fileErrors) {
         errors.addAll(fileErrors.errors);
       }
@@ -89,18 +74,18 @@ class AnalyzeOnce extends AnalyzeBase {
       server.onErrors.listen(handleAnalysisErrors);
 
       await server.start();
-      // Completing the future in the callback can't fail.
+
+      // Capture if the server exits unexpectedly.
+      final exitErrorCompleter = Completer<void>();
       unawaited(
         server.onExit.then<void>((int? exitCode) {
-          if (!analysisCompleter.isCompleted) {
-            analysisCompleter.completeError(
-              // Include the last 20 lines of server output in exception message
-              _AnalysisServerExitException(
-                'analysis server exited with code $exitCode and output:\n${server.getLogs(20)}',
-                exitCode,
-              ),
-            );
-          }
+          exitErrorCompleter.completeError(
+            // Include the last 20 lines of server output in exception message
+            _AnalysisServerExitException(
+              'analysis server exited with code $exitCode and output:\n${server.getLogs(20)}',
+              exitCode,
+            ),
+          );
         }),
       );
 
@@ -113,8 +98,10 @@ class AnalyzeOnce extends AnalyzeBase {
           ? logger.startProgress('Analyzing $message...')
           : null;
 
+      // Wait for analysis to complete, or the server to exit and produce
+      // an error.
       try {
-        await analysisCompleter.future;
+        await Future.any([server.waitForAnalysis(), exitErrorCompleter.future]);
       } on _AnalysisServerExitException catch (error) {
         throwToolExit(error.message, exitCode: error.exitCode);
       }
diff --git a/packages/flutter_tools/lib/src/commands/build_aar.dart b/packages/flutter_tools/lib/src/commands/build_aar.dart
index ef719e6e7271b..f90f6252adc7f 100644
--- a/packages/flutter_tools/lib/src/commands/build_aar.dart
+++ b/packages/flutter_tools/lib/src/commands/build_aar.dart
@@ -50,6 +50,11 @@ class BuildAarCommand extends BuildSubCommand {
     usesTrackWidgetCreation(verboseHelp: false);
     addEnableExperimentation(hide: !verboseHelp);
     addAndroidSpecificBuildOptions(hide: !verboseHelp);
+    // No --[no-]enable-hcpp flag here: the Flutter Gradle Plugin intentionally
+    // does not inject the EnableHcpp metadata into module (aar) manifests,
+    // because a library-provided value that conflicts with an explicit value in
+    // the host app's manifest fails the host build in the manifest merger. The
+    // host app's manifest is the source of truth for HCPP in add-to-app.
     argParser.addMultiOption(
       'target-platform',
       defaultsTo: <String>['android-arm', 'android-arm64', 'android-x64'],
diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart
index 824a1008a01a6..7da02d519bb46 100644
--- a/packages/flutter_tools/lib/src/commands/build_apk.dart
+++ b/packages/flutter_tools/lib/src/commands/build_apk.dart
@@ -34,6 +34,7 @@ class BuildApkCommand extends BuildSubCommand {
     usesAnalyzeSizeFlag();
     addAndroidSpecificBuildOptions(hide: !verboseHelp);
     addIgnoreDeprecationOption();
+    addEnableHcppFlag(verboseHelp: verboseHelp);
     argParser
       ..addFlag(
         'split-per-abi',
@@ -110,7 +111,9 @@ class BuildApkCommand extends BuildSubCommand {
       buildApkTargetPlatform: _targetArchs.join(','),
       buildApkBuildMode: _buildMode.cliName,
       buildApkSplitPerAbi: boolArg('split-per-abi'),
-      buildApkEnableHcpp: FlutterProject.current().android.computeHcppEnabled(),
+      buildApkEnableHcpp:
+          explicitEnableHcpp ??
+          FlutterProject.current().android.computeHcppEnabled(ifAbsent: enableHcpp),
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/commands/build_appbundle.dart b/packages/flutter_tools/lib/src/commands/build_appbundle.dart
index f96180990545f..9a8c320fba9b0 100644
--- a/packages/flutter_tools/lib/src/commands/build_appbundle.dart
+++ b/packages/flutter_tools/lib/src/commands/build_appbundle.dart
@@ -38,6 +38,7 @@ class BuildAppBundleCommand extends BuildSubCommand {
     usesAnalyzeSizeFlag();
     addAndroidSpecificBuildOptions(hide: !verboseHelp);
     addIgnoreDeprecationOption();
+    addEnableHcppFlag(verboseHelp: verboseHelp);
     argParser.addMultiOption(
       'target-platform',
       defaultsTo: <String>['android-arm', 'android-arm64', 'android-x64'],
@@ -109,7 +110,9 @@ class BuildAppBundleCommand extends BuildSubCommand {
       commandHasTerminal: hasTerminal,
       buildAppBundleTargetPlatform: stringsArg('target-platform').join(','),
       buildAppBundleBuildMode: buildMode,
-      buildBundleEnableHcpp: FlutterProject.current().android.computeHcppEnabled(),
+      buildBundleEnableHcpp:
+          explicitEnableHcpp ??
+          FlutterProject.current().android.computeHcppEnabled(ifAbsent: enableHcpp),
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/commands/build_swift_package.dart b/packages/flutter_tools/lib/src/commands/build_swift_package.dart
index ba41167f26291..3bdc73de895f9 100644
--- a/packages/flutter_tools/lib/src/commands/build_swift_package.dart
+++ b/packages/flutter_tools/lib/src/commands/build_swift_package.dart
@@ -185,7 +185,13 @@ class BuildSwiftPackage extends BuildSubCommand {
     await super.validateCommand();
     _validateTargetPlatform();
     _validateFeatureFlags();
-    _validateXcodeVersion();
+    final Xcode? xcode = _xcode;
+    if (xcode == null || !xcode.isInstalled) {
+      throwToolExit(
+        'Flutter requires Xcode when using Swift Package Manager. Please ensure '
+        'Xcode is installed.',
+      );
+    }
   }
 
   /// Validates the Flutter project supports the [_targetPlatform].
@@ -223,19 +229,6 @@ class BuildSwiftPackage extends BuildSubCommand {
     }
   }
 
-  /// Validates the Xcode version is equal to or greater than 15.
-  ///
-  /// Throws a [ToolExit] if the Xcoder version is less than 15.
-  void _validateXcodeVersion() {
-    final Version? xcodeVersion = _xcode?.currentVersion;
-    if (xcodeVersion == null || xcodeVersion.major < 15) {
-      throwToolExit(
-        'Flutter requires Xcode 15 or greater when using Swift Package Manager. Please ensure '
-        'Xcode is installed and meets the version requirements.',
-      );
-    }
-  }
-
   late BuildSwiftPackageUtils utils = BuildSwiftPackageUtils(
     analytics: _analytics,
     artifacts: _artifacts,
diff --git a/packages/flutter_tools/lib/src/commands/clean.dart b/packages/flutter_tools/lib/src/commands/clean.dart
index e382891db70ee..8e5ce36d8f25c 100644
--- a/packages/flutter_tools/lib/src/commands/clean.dart
+++ b/packages/flutter_tools/lib/src/commands/clean.dart
@@ -29,6 +29,20 @@ class CleanCommand extends FlutterCommand {
           'Also clean the example directory, if one exists. '
           'Useful when developing in a package project.',
     );
+    argParser.addFlag(
+      'include-xcode-workspace',
+      negatable: false,
+      help:
+          'Whether to run "xcodebuild clean" on the Xcode workspace for iOS and macOS projects. '
+          "This removes build products and intermediate files from Xcode's build cache and can be slow to complete.",
+    );
+    argParser.addFlag(
+      'stop-gradle',
+      negatable: false,
+      help:
+          'Force stop active Gradle daemons before or during clean. '
+          'Useful on Windows when files in build/ are locked by background processes.',
+    );
   }
 
   final bool _verbose;
@@ -49,7 +63,10 @@ class CleanCommand extends FlutterCommand {
   Future<FlutterCommandResult> runCommand() async {
     final FlutterProject flutterProject = FlutterProject.current();
     final Xcode? xcode = globals.xcode;
-    final bool cleanXcode = xcode != null && xcode.isInstalledAndMeetsVersionCheck;
+    final bool userWantsXcodeClean =
+        boolArg('include-xcode-workspace') || (argResults?.wasParsed('scheme') ?? false);
+    final bool cleanXcode =
+        xcode != null && xcode.isInstalledAndMeetsVersionCheck && userWantsXcodeClean;
 
     await _cleanProject(flutterProject, cleanXcode: cleanXcode);
     if (boolArg('include-example')) {
@@ -75,24 +92,24 @@ class CleanCommand extends FlutterCommand {
     }
 
     final Directory buildDir = flutterProject.directory.childDirectory(getBuildDirectory());
-    deleteFile(buildDir);
+    await deleteFile(buildDir, flutterProject);
 
-    deleteFile(flutterProject.dartTool);
+    await deleteFile(flutterProject.dartTool, flutterProject);
 
-    deleteFile(flutterProject.android.ephemeralDirectory);
+    await deleteFile(flutterProject.android.ephemeralDirectory, flutterProject);
 
-    deleteFile(flutterProject.ios.ephemeralDirectory);
-    deleteFile(flutterProject.ios.ephemeralModuleDirectory);
-    deleteFile(flutterProject.ios.generatedXcodePropertiesFile);
-    deleteFile(flutterProject.ios.generatedEnvironmentVariableExportScript);
-    deleteFile(flutterProject.ios.deprecatedCompiledDartFramework);
-    deleteFile(flutterProject.ios.deprecatedProjectFlutterFramework);
-    deleteFile(flutterProject.ios.flutterPodspec);
+    await deleteFile(flutterProject.ios.ephemeralDirectory, flutterProject);
+    await deleteFile(flutterProject.ios.ephemeralModuleDirectory, flutterProject);
+    await deleteFile(flutterProject.ios.generatedXcodePropertiesFile, flutterProject);
+    await deleteFile(flutterProject.ios.generatedEnvironmentVariableExportScript, flutterProject);
+    await deleteFile(flutterProject.ios.deprecatedCompiledDartFramework, flutterProject);
+    await deleteFile(flutterProject.ios.deprecatedProjectFlutterFramework, flutterProject);
+    await deleteFile(flutterProject.ios.flutterPodspec, flutterProject);
 
-    deleteFile(flutterProject.linux.ephemeralDirectory);
-    deleteFile(flutterProject.macos.ephemeralDirectory);
-    deleteFile(flutterProject.windows.ephemeralDirectory);
-    deleteFile(flutterProject.flutterPluginsDependenciesFile);
+    await deleteFile(flutterProject.linux.ephemeralDirectory, flutterProject);
+    await deleteFile(flutterProject.macos.ephemeralDirectory, flutterProject);
+    await deleteFile(flutterProject.windows.ephemeralDirectory, flutterProject);
+    await deleteFile(flutterProject.flutterPluginsDependenciesFile, flutterProject);
   }
 
   Future<void> _cleanXcode(XcodeBasedProject xcodeProject) async {
@@ -146,17 +163,15 @@ class CleanCommand extends FlutterCommand {
   }
 
   @visibleForTesting
-  void deleteFile(FileSystemEntity file) {
+  Future<void> deleteFile(FileSystemEntity file, [FlutterProject? project]) async {
     try {
-      ErrorHandlingFileSystem.noExitOnFailure(() {
-        _deleteFile(file);
-      });
+      await ErrorHandlingFileSystem.noExitOnFailure(() => _deleteFile(file, project));
     } on Exception catch (e) {
       globals.printError('Failed to remove ${file.path}: $e');
     }
   }
 
-  void _deleteFile(FileSystemEntity file) {
+  Future<void> _deleteFile(FileSystemEntity file, FlutterProject? project) async {
     // This will throw a FileSystemException if the directory is missing permissions.
     try {
       if (!file.existsSync()) {
@@ -170,19 +185,80 @@ class CleanCommand extends FlutterCommand {
     try {
       file.deleteSync(recursive: true);
     } on FileSystemException catch (error) {
+      deletionStatus.stop();
       final String path = file.path;
       if (globals.platform.isWindows) {
+        if (await _tryStopGradleAndRetryDelete(file, project)) {
+          return;
+        }
+
         globals.printError(
           'Failed to remove $path. '
-          'A program may still be using a file in the directory or the directory itself. '
-          'To find and stop such a program, see: '
-          'https://superuser.com/questions/1333118/cant-delete-empty-folder-because-it-is-used',
+          'A background process (e.g. Gradle daemon or Java) is locking files in the directory.\n'
+          'To automatically stop Gradle daemons during clean, run:\n'
+          '  flutter clean --stop-gradle\n'
+          'Or manually stop daemons:\n'
+          '  cd android && ./gradlew --stop',
         );
       } else {
         globals.printError('Failed to remove $path: $error');
       }
+    }
+  }
+
+  /// Attempts to stop active Gradle daemons via `gradlew --stop` when Windows file locks
+  /// prevent deletion of build files, either via the `--stop-gradle` flag or an interactive prompt.
+  ///
+  /// Retries file deletion after stopping Gradle daemons and returns `true` if deletion succeeds.
+  Future<bool> _tryStopGradleAndRetryDelete(FileSystemEntity file, FlutterProject? project) async {
+    final bool stopGradleFlag =
+        (argResults?.wasParsed('stop-gradle') ?? false) && boolArg('stop-gradle');
+    final bool isInteractive = globals.terminal.stdinHasTerminal && globals.terminal.usesTerminalUi;
+    var shouldStopGradle = stopGradleFlag;
+
+    if (!stopGradleFlag && isInteractive) {
+      try {
+        final String choice = await globals.terminal.promptForCharInput(
+          <String>['y', 'n'],
+          logger: globals.logger,
+          prompt:
+              'Files in build/ are locked by background processes (likely Gradle).\n'
+              'Stop active Gradle daemons ("gradlew --stop") and retry clean? [y/N]',
+          defaultChoiceIndex: 1,
+        );
+        shouldStopGradle = choice.toLowerCase() == 'y';
+      } on StateError {
+        shouldStopGradle = false;
+      }
+    }
+
+    if (!shouldStopGradle) {
+      return false;
+    }
+
+    final FlutterProject flutterProject = project ?? FlutterProject.current();
+    final File gradlewFile = flutterProject.android.hostAppGradleRoot.childFile('gradlew.bat');
+    if (!gradlewFile.existsSync()) {
+      return false;
+    }
+
+    final Status stopStatus = globals.logger.startProgress('Stopping Gradle daemons...');
+    try {
+      await globals.processUtils.run(<String>[
+        gradlewFile.path,
+        '--stop',
+      ], workingDirectory: gradlewFile.parent.path);
+    } on Exception catch (e) {
+      globals.printTrace('Failed to stop Gradle daemons: $e');
     } finally {
-      deletionStatus.stop();
+      stopStatus.stop();
+    }
+
+    try {
+      file.deleteSync(recursive: true);
+      return true;
+    } on FileSystemException {
+      return false;
     }
   }
 }
diff --git a/packages/flutter_tools/lib/src/commands/create_base.dart b/packages/flutter_tools/lib/src/commands/create_base.dart
index 6f9caf3080c5d..7d78f7e055389 100644
--- a/packages/flutter_tools/lib/src/commands/create_base.dart
+++ b/packages/flutter_tools/lib/src/commands/create_base.dart
@@ -209,6 +209,12 @@ mixin CreateBase on FlutterCommand {
     if (globals.fs.path.isWithin(flutterRoot, projectDirPath)) {
       // Make exception for dev and examples to facilitate example project development.
       final String examplesDirectory = globals.fs.path.join(flutterRoot, 'examples');
+      final String packageExamplesDirectory = globals.fs.path.join(
+        flutterRoot,
+        'packages',
+        'flutter',
+        'examples',
+      );
       final String devDirectory = globals.fs.path.join(flutterRoot, 'dev');
       final String engineExamplesDirectory = globals.fs.path.join(
         flutterRoot,
@@ -218,6 +224,7 @@ mixin CreateBase on FlutterCommand {
         'examples',
       );
       if (!globals.fs.path.isWithin(examplesDirectory, projectDirPath) &&
+          !globals.fs.path.isWithin(packageExamplesDirectory, projectDirPath) &&
           !globals.fs.path.isWithin(devDirectory, projectDirPath) &&
           !globals.fs.path.isWithin(engineExamplesDirectory, projectDirPath)) {
         throwToolExit(
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart
index fb29bc4b12102..a05187c83d9f1 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -599,11 +599,7 @@ class DaemonDomain extends Domain {
 
       PlatformType.values.forEach(handlePlatformType);
 
-      return <String, Object>{
-        // TODO(fujino): delete this key https://github.com/flutter/flutter/issues/140473
-        'platforms': platformTypes,
-        'platformTypes': platformTypesMap,
-      };
+      return <String, Object>{'platformTypes': platformTypesMap};
     } on Exception catch (err, stackTrace) {
       sendEvent('log', <String, Object?>{
         'log': 'Failed to parse project metadata',
@@ -613,7 +609,6 @@ class DaemonDomain extends Domain {
       // On any sort of failure, fall back to Android and iOS for backwards
       // compatibility.
       return const <String, Object>{
-        'platforms': <String>['android', 'ios'],
         'platformTypes': <String, Object>{
           'android': <String, Object>{'isSupported': true},
           'ios': <String, Object>{'isSupported': true},
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index 8d45046b703f4..87f47ba68c367 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -354,6 +354,7 @@ class DriveCommand extends RunCommandBase {
             if (traceStartup) 'trace-startup': traceStartup,
             if (web) 'no-launch-chrome': true,
           },
+          webDefines: extractWebDefines(),
         );
       } else {
         final Uri? uri = Uri.tryParse(stringArg(_kUseExistingApp)!);
diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart
index d901aa96c67bb..a34d124f19a33 100644
--- a/packages/flutter_tools/lib/src/commands/packages.dart
+++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:collection';
+
 import 'package:args/args.dart';
 import 'package:package_config/package_config.dart';
 import 'package:pool/pool.dart';
@@ -397,12 +399,20 @@ class PackagesGetCommand extends FlutterCommand {
         const ignoreReleaseModeSinceItsNotABuildAndHopeItWorks = false;
         // We need to regenerate the platform specific tooling for both the
         // project itself and example (if present).
-        await project.regeneratePlatformSpecificTooling(
-          releaseMode: ignoreReleaseModeSinceItsNotABuildAndHopeItWorks,
-          pubspecCache: pubspecCache,
-          packageGraph: graph,
-          packageConfig: packageConfig,
-        );
+        //
+        // Workspace packages that do not depend on Flutter (such as a pub
+        // workspace root that is a plain Dart package) are skipped, so that a
+        // stray ios/ or android/ directory in one of them is not populated
+        // with Flutter project files.
+        // See https://github.com/flutter/flutter/issues/189550.
+        if (_dependsOnFlutter(graph, workspaceRootName)) {
+          await project.regeneratePlatformSpecificTooling(
+            releaseMode: ignoreReleaseModeSinceItsNotABuildAndHopeItWorks,
+            pubspecCache: pubspecCache,
+            packageGraph: graph,
+            packageConfig: packageConfig,
+          );
+        }
         if (example && project.hasExampleApp && project.example.pubspecFile.existsSync()) {
           final FlutterProject exampleProject = project.example;
           // Skip if the example is already a workspace root — it will be
@@ -423,6 +433,27 @@ class PackagesGetCommand extends FlutterCommand {
     return FlutterCommandResult.success();
   }
 
+  /// Whether [packageName] depends on the `flutter` package, directly or
+  /// transitively, according to the resolved package [graph].
+  static bool _dependsOnFlutter(PackageGraph graph, String packageName) {
+    final visited = <String>{};
+    final toVisit = Queue<String>.of(<String>[packageName]);
+    while (toVisit.isNotEmpty) {
+      final String current = toVisit.removeFirst();
+      if (!visited.add(current)) {
+        continue;
+      }
+      if (current == 'flutter') {
+        return true;
+      }
+      final List<String>? dependencies = graph.dependencies[current];
+      if (dependencies != null) {
+        toVisit.addAll(dependencies);
+      }
+    }
+    return false;
+  }
+
   late final Future<List<Plugin>> _pluginsFound = (() async {
     final FlutterProject? rootProject = _rootProject;
     if (rootProject == null) {
diff --git a/packages/flutter_tools/lib/src/commands/precache.dart b/packages/flutter_tools/lib/src/commands/precache.dart
index 438836e8051ca..5f0c727b2de8d 100644
--- a/packages/flutter_tools/lib/src/commands/precache.dart
+++ b/packages/flutter_tools/lib/src/commands/precache.dart
@@ -4,6 +4,7 @@
 
 import '../base/common.dart';
 import '../base/logger.dart';
+import '../base/os.dart';
 import '../base/platform.dart';
 import '../cache.dart';
 import '../features.dart';
@@ -83,6 +84,12 @@ class PrecacheCommand extends FlutterCommand {
       help: 'Precache the unsigned macOS binaries when available.',
       hide: !verboseHelp,
     );
+    argParser.addOption(
+      'host-arch',
+      allowed: const <String>['x64', 'arm64'],
+      help: 'Override the architecture of host artifacts to precache.',
+      hide: !verboseHelp,
+    );
   }
 
   final Cache _cache;
@@ -171,6 +178,19 @@ class PrecacheCommand extends FlutterCommand {
     if (boolArg('use-unsigned-mac-binaries')) {
       _cache.useUnsignedMacBinaries = true;
     }
+    final String? hostArch = stringArg('host-arch');
+    if (hostArch != null) {
+      final HostPlatform? overridePlatform = HostPlatform.fromOsAndArch(
+        _platform.operatingSystem,
+        hostArch,
+      );
+      if (overridePlatform == null) {
+        throwToolExit(
+          'Unsupported host architecture "$hostArch" for OS "${_platform.operatingSystem}"',
+        );
+      }
+      _cache.osUtils.hostPlatformOverride = overridePlatform;
+    }
     final Set<String> explicitlyEnabled = _explicitArtifactSelections();
     _cache.platformOverrideArtifacts = explicitlyEnabled;
 
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index ff276124bbcf6..2063b544440cb 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -276,7 +276,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment
   bool get enableVulkanValidation => boolArg('enable-vulkan-validation');
   bool get uninstallFirst => boolArg('uninstall-first');
   bool get enableEmbedderApi => boolArg('enable-embedder-api');
-  bool get enableHcpp => boolArg('enable-hcpp');
   bool get testFlag => boolArg('test-flag');
 
   @override
diff --git a/packages/flutter_tools/lib/src/commands/screenshot.dart b/packages/flutter_tools/lib/src/commands/screenshot.dart
index 7141adbd67999..44c20038a8379 100644
--- a/packages/flutter_tools/lib/src/commands/screenshot.dart
+++ b/packages/flutter_tools/lib/src/commands/screenshot.dart
@@ -125,6 +125,8 @@ class ScreenshotCommand extends FlutterCommand {
 
     try {
       await device!.takeScreenshot(outputFile);
+    } on ToolExit {
+      rethrow;
     } on Exception catch (error) {
       throwToolExit('Error taking screenshot: $error');
     }
diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart
index 78f4cd5a4c3c2..a70e1415f8de4 100644
--- a/packages/flutter_tools/lib/src/commands/test.dart
+++ b/packages/flutter_tools/lib/src/commands/test.dart
@@ -101,17 +101,25 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
         valueHelp: 'substring',
         splitCommas: false,
       )
-      ..addOption(
+      ..addMultiOption(
         'tags',
         abbr: 't',
         help:
             'Run only tests associated with the specified tags. See: https://pub.dev/packages/test#tagging-tests',
+        splitCommas: false,
       )
-      ..addOption(
+      ..addMultiOption(
         'exclude-tags',
         abbr: 'x',
         help:
             'Run only tests that do not have the specified tags. See: https://pub.dev/packages/test#tagging-tests',
+        splitCommas: false,
+      )
+      ..addMultiOption(
+        'preset',
+        abbr: 'P',
+        help: 'The configuration preset(s) to use. Presets are defined in "dart_test.yaml".',
+        splitCommas: false,
       )
       ..addFlag(
         'start-paused',
@@ -179,7 +187,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
         'update-goldens',
         negatable: false,
         help:
-            'Whether "matchesGoldenFile()" calls within your test methods should ' // flutter_ignore: golden_tag (see analyze.dart)
+            'Whether "matchesGoldenFile()" calls within your test methods should ' // ignore: golden_test_tags
             'update the golden files rather than test for an existing match.',
       )
       ..addOption(
@@ -428,8 +436,9 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
     final bool buildTestAssets = boolArg('test-assets');
     final List<String> names = stringsArg('name');
     final List<String> plainNames = stringsArg('plain-name');
-    final String? tags = stringArg('tags');
-    final String? excludeTags = stringArg('exclude-tags');
+    final List<String> tags = stringsArg('tags');
+    final List<String> excludeTags = stringsArg('exclude-tags');
+    final List<String> presets = stringsArg('preset');
     final BuildInfo buildInfo = await getBuildInfo(
       forcedBuildMode: BuildMode.debug,
       forcedUseLocalCanvasKit: true,
@@ -674,6 +683,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
         plainNames: plainNames,
         tags: tags,
         excludeTags: excludeTags,
+        presets: presets,
         machine: outputMachineFormat,
         updateGoldens: boolArg('update-goldens'),
         concurrency: jobs,
@@ -700,6 +710,7 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
         plainNames: plainNames,
         tags: tags,
         excludeTags: excludeTags,
+        presets: presets,
         watcher: watcher,
         enableVmService: collector != null || startPaused || enableVmService,
         machine: outputMachineFormat,
diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart
index b56b4f80869b8..63a1a966b04ee 100644
--- a/packages/flutter_tools/lib/src/commands/update_packages.dart
+++ b/packages/flutter_tools/lib/src/commands/update_packages.dart
@@ -214,6 +214,17 @@ class UpdatePackagesCommand extends FlutterCommand {
         );
         for (final (:project, :deps) in toolDeps) {
           _updatePubspec(project.directory, deps);
+          // When flutter_tools contains sub-packages in its workspace (under packages/),
+          // also update their pubspecs with the resolved dependencies so that shared
+          // package constraints (e.g. meta) remain in sync across the workspace.
+          final Directory subpackagesDir = project.directory.childDirectory('packages');
+          if (subpackagesDir.existsSync()) {
+            for (final FileSystemEntity entity in subpackagesDir.listSync()) {
+              if (entity is Directory && entity.childFile(_pubspecName).existsSync()) {
+                _updatePubspec(entity, deps);
+              }
+            }
+          }
         }
       }
     }
@@ -280,7 +291,28 @@ class UpdatePackagesCommand extends FlutterCommand {
       final yamlEditor = YamlEditor(pubspecContents);
       final ResolvedDependencies oldDeps = _fetchDeps(yamlEditor);
       final workspacePath = <String>['workspace'];
-      if (yamlEditor.parseAt(workspacePath, orElse: () => wrapAsYamlNode(null)).value != null) {
+      final YamlNode workspaceNode = yamlEditor.parseAt(
+        workspacePath,
+        orElse: () => wrapAsYamlNode(null),
+      );
+      final workspaceMembers = <String>{};
+      if (workspaceNode is YamlList) {
+        for (final Object? member in workspaceNode) {
+          if (member is String) {
+            String memberName = globals.fs.path.basename(member);
+            final File memberPubspec = globals.fs.file(
+              globals.fs.path.join(project.directory.path, member, _pubspecName),
+            );
+            if (memberPubspec.existsSync()) {
+              try {
+                memberName = Pubspec.parse(memberPubspec.readAsStringSync()).name;
+              } on Exception {
+                // Fall back to basename if parsing fails.
+              }
+            }
+            workspaceMembers.add(memberName);
+          }
+        }
         yamlEditor.remove(workspacePath);
       }
       final RelaxMode relaxMode = switch (cherryPicks.isNotEmpty) {
@@ -288,6 +320,7 @@ class UpdatePackagesCommand extends FlutterCommand {
         false => relaxToAny ? RelaxMode.any : RelaxMode.caret,
       };
       _relaxDeps(yamlEditor, relaxMode, pinnedDeps);
+      _removePathAndWorkspaceDependencies(yamlEditor, project.directory, workspaceMembers);
       tempPubspec.writeAsStringSync(yamlEditor.toString());
       globals.printStatus('Upgrade in $projectTempDir (for project: ${project.manifest.appName})');
       await pub.interactively(
@@ -309,6 +342,53 @@ class UpdatePackagesCommand extends FlutterCommand {
     return deps;
   }
 
+  /// Removes local path dependencies and workspace member dependencies from the
+  /// temporary pubspec before running `pub upgrade --tighten`.
+  ///
+  /// `_upgrade` runs `dart pub upgrade` inside an isolated temporary directory
+  /// where only the project's root `pubspec.yaml` is written. Workspace members
+  /// and local subpackages (e.g. `flutter_tools_core`) do not exist in the
+  /// temporary directory. Removing them from the temporary pubspec prevents
+  /// version solving failures caused by missing local paths or attempting to
+  /// resolve unreleased workspace subpackages from pub.dev. The actual path
+  /// dependencies and workspace definitions in the repository are preserved and
+  /// not affected by this removal.
+  void _removePathAndWorkspaceDependencies(
+    YamlEditor yamlEditor,
+    Directory projectDirectory,
+    Set<String> workspaceMembers,
+  ) {
+    final Directory subpackagesDir = projectDirectory.childDirectory('packages');
+    for (final dependencyType in <String>[
+      'dependencies',
+      'dev_dependencies',
+      'dependency_overrides',
+    ]) {
+      final YamlNode node = yamlEditor.parseAt(<String>[
+        dependencyType,
+      ], orElse: () => wrapAsYamlNode(null));
+      if (node is! YamlMap) {
+        continue;
+      }
+      final toRemove = <String>[];
+      for (final MapEntry<Object?, Object?> dep in node.entries) {
+        final Object? value = dep.value;
+        final packageName = dep.key! as String;
+        final bool isPathDependency = value is Map && value.containsKey('path');
+        final bool isWorkspaceMember =
+            workspaceMembers.contains(packageName) ||
+            (subpackagesDir.existsSync() &&
+                subpackagesDir.childDirectory(packageName).childFile(_pubspecName).existsSync());
+        if (isPathDependency || (value == null && isWorkspaceMember)) {
+          toRemove.add(packageName);
+        }
+      }
+      for (final packageName in toRemove) {
+        yamlEditor.remove(<String>[dependencyType, packageName]);
+      }
+    }
+  }
+
   void _relaxDeps(YamlEditor yamlEditor, RelaxMode relaxMode, Map<String, String> fixedDeps) {
     ResolvedDependencies().forEach(
       yamlEditor: yamlEditor,
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index 51d2c2797c7d4..d91ab00e0eed2 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -23,6 +23,7 @@ import 'base/utils.dart';
 import 'build_info.dart';
 import 'bundle.dart';
 import 'convert.dart';
+import 'dart/package_map.dart';
 
 /// Opt-in changes to the dart compilers.
 const kDartCompilerExperiments = <String>[];
@@ -291,7 +292,7 @@ class KernelCompiler {
       final File mainFile = _fileSystem.file(mainPath);
       final Uri mainFileUri = mainFile.uri;
       if (packagesPath != null) {
-        mainUri = packageConfig.toPackageUri(mainFileUri)?.toString();
+        mainUri = packageConfig.toPackageUriForWorkspace(mainFileUri)?.toString();
       }
       mainUri ??= toMultiRootPath(
         mainFileUri,
@@ -314,7 +315,7 @@ class KernelCompiler {
     if (dartPluginRegistrant != null && dartPluginRegistrant.existsSync()) {
       final Uri dartPluginRegistrantFileUri = dartPluginRegistrant.uri;
       dartPluginRegistrantUri =
-          packageConfig.toPackageUri(dartPluginRegistrantFileUri)?.toString() ??
+          packageConfig.toPackageUriForWorkspace(dartPluginRegistrantFileUri)?.toString() ??
           toMultiRootPath(
             dartPluginRegistrantFileUri,
             _fileSystemScheme,
@@ -853,13 +854,15 @@ class DefaultResidentCompiler implements ResidentCompiler {
     _stdoutHandler._suppressCompilerMessages = request.suppressErrors;
 
     final String mainUri =
-        request.packageConfig.toPackageUri(request.mainUri)?.toString() ??
+        request.packageConfig.toPackageUriForWorkspace(request.mainUri)?.toString() ??
         toMultiRootPath(request.mainUri, fileSystemScheme, fileSystemRoots, _platform.isWindows);
 
     String? additionalSourceUri;
     if (request.additionalSourceUri != null) {
       additionalSourceUri =
-          request.packageConfig.toPackageUri(request.additionalSourceUri!)?.toString() ??
+          request.packageConfig
+              .toPackageUriForWorkspace(request.additionalSourceUri!)
+              ?.toString() ??
           toMultiRootPath(
             request.additionalSourceUri!,
             fileSystemScheme,
@@ -898,7 +901,7 @@ class DefaultResidentCompiler implements ResidentCompiler {
           message = fileUri.toString();
         } else {
           message =
-              request.packageConfig.toPackageUri(fileUri)?.toString() ??
+              request.packageConfig.toPackageUriForWorkspace(fileUri)?.toString() ??
               toMultiRootPath(fileUri, fileSystemScheme, fileSystemRoots, _platform.isWindows);
         }
         server.stdin.writeln(message);
@@ -1079,25 +1082,25 @@ class DefaultResidentCompiler implements ResidentCompiler {
       return null;
     }
 
-    final String inputKey = const Uuid().v4();
-    server.stdin
-      ..writeln('compile-expression $inputKey')
-      ..writeln(request.expression);
-    request.definitions?.forEach(server.stdin.writeln);
-    server.stdin.writeln(inputKey);
-    request.definitionTypes?.forEach(server.stdin.writeln);
-    server.stdin.writeln(inputKey);
-    request.typeDefinitions?.forEach(server.stdin.writeln);
-    server.stdin.writeln(inputKey);
-    request.typeBounds?.forEach(server.stdin.writeln);
-    server.stdin.writeln(inputKey);
-    request.typeDefaults?.forEach(server.stdin.writeln);
     server.stdin
-      ..writeln(inputKey)
-      ..writeln(request.libraryUri ?? '')
-      ..writeln(request.klass ?? '')
-      ..writeln(request.method ?? '')
-      ..writeln(request.isStatic);
+      ..writeln('JSON_INPUT')
+      ..writeln(
+        json.encode(<String, Object?>{
+          'type': 'COMPILE_EXPRESSION',
+          'data': <String, Object?>{
+            'expression': request.expression,
+            'definitions': request.definitions ?? <String>[],
+            'definitionTypes': request.definitionTypes ?? <String>[],
+            'typeDefinitions': request.typeDefinitions ?? <String>[],
+            'typeBounds': request.typeBounds ?? <String>[],
+            'typeDefaults': request.typeDefaults ?? <String>[],
+            'libraryUri': request.libraryUri ?? '',
+            'class': request.klass,
+            'method': request.method,
+            'static': request.isStatic,
+          },
+        }),
+      );
 
     return _stdoutHandler.compilerOutput?.future;
   }
diff --git a/packages/flutter_tools/lib/src/context/android_context.dart b/packages/flutter_tools/lib/src/context/android_context.dart
new file mode 100644
index 0000000000000..6687d0940211a
--- /dev/null
+++ b/packages/flutter_tools/lib/src/context/android_context.dart
@@ -0,0 +1,30 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../android/android_sdk.dart';
+import '../android/android_studio.dart';
+import '../android/gradle_utils.dart';
+import '../android/java.dart';
+
+/// Holds Android-specific dependencies.
+class AndroidContext {
+  AndroidContext({
+    required this.androidSdk,
+    required this.androidStudio,
+    required this.gradleUtils,
+    required this.java,
+  });
+
+  /// Discovers, validates, and manages the local Android SDK and platform tools.
+  final AndroidSdk? androidSdk;
+
+  /// Discovers and inspects local Android Studio installations and embedded JDK paths.
+  final AndroidStudio? androidStudio;
+
+  /// Utility helpers for interacting with Gradle builds and resolving project configs.
+  final GradleUtils gradleUtils;
+
+  /// Discovers and validates the active Java Development Kit (JDK) binary.
+  final Java? java;
+}
diff --git a/packages/flutter_tools/lib/src/context/apple_context.dart b/packages/flutter_tools/lib/src/context/apple_context.dart
new file mode 100644
index 0000000000000..319a472583125
--- /dev/null
+++ b/packages/flutter_tools/lib/src/context/apple_context.dart
@@ -0,0 +1,50 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../ios/ios_workflow.dart';
+import '../ios/plist_parser.dart';
+import '../ios/simulators.dart';
+import '../ios/xcodeproj.dart';
+import '../macos/cocoapods.dart';
+import '../macos/cocoapods_validator.dart';
+import '../macos/xcdevice.dart';
+import '../macos/xcode.dart';
+
+/// Holds Apple-specific dependencies.
+class AppleContext {
+  AppleContext({
+    required this.cocoaPods,
+    required this.cocoapodsValidator,
+    required this.iosSimulatorUtils,
+    required this.iosWorkflow,
+    required this.plistParser,
+    required this.xcdevice,
+    required this.xcode,
+    required this.xcodeProjectInterpreter,
+  });
+
+  /// Interacts with and executes CocoaPods dependency management commands.
+  final CocoaPods cocoaPods;
+
+  /// Validates the host CocoaPods installation health and doctor status.
+  final CocoaPodsValidator cocoapodsValidator;
+
+  /// Manages discovery, booting, and queries for iOS simulator devices.
+  final IOSSimulatorUtils iosSimulatorUtils;
+
+  /// Evaluates host readiness and toolchain requirements for iOS workflows.
+  final IOSWorkflow iosWorkflow;
+
+  /// Parses Apple Property List (`.plist`) XML and binary format files.
+  final PlistParser plistParser;
+
+  /// Discovers and interacts with physical iOS devices attached to the host.
+  final XCDevice xcdevice;
+
+  /// Inspects and validates the host Xcode installation and SDK version compliance.
+  final Xcode xcode;
+
+  /// Evaluates Xcode project settings, schemes, and target configurations.
+  final XcodeProjectInterpreter xcodeProjectInterpreter;
+}
diff --git a/packages/flutter_tools/lib/src/context/tool_context.dart b/packages/flutter_tools/lib/src/context/tool_context.dart
new file mode 100644
index 0000000000000..db1e8960c5ebd
--- /dev/null
+++ b/packages/flutter_tools/lib/src/context/tool_context.dart
@@ -0,0 +1,132 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:process/process.dart';
+
+import '../artifacts.dart';
+import '../base/bot_detector.dart';
+import '../base/config.dart';
+import '../base/file_system.dart';
+import '../base/io.dart';
+import '../base/logger.dart';
+import '../base/os.dart';
+import '../base/platform.dart';
+import '../base/process.dart';
+import '../base/signals.dart';
+import '../base/terminal.dart';
+import '../base/time.dart';
+import '../base/user_messages.dart';
+import '../cache.dart';
+import '../custom_devices/custom_devices_config.dart';
+import '../git.dart';
+import '../native_assets.dart';
+import '../pre_run_validator.dart';
+import '../project.dart';
+import '../runner/local_engine.dart';
+import '../version.dart';
+
+/// Holds core, platform-independent dependencies.
+class ToolContext {
+  ToolContext({
+    required this.artifacts,
+    required this.botDetector,
+    required this.cache,
+    required this.config,
+    required this.customDevicesConfig,
+    required this.flutterVersion,
+    required this.fs,
+    required this.git,
+    required this.localEngineLocator,
+    required this.logger,
+    this.nativeAssetsBuilder,
+    required this.os,
+    required this.outputPreferences,
+    required this.platform,
+    required this.preRunValidator,
+    required this.processManager,
+    required this.processUtils,
+    required this.projectFactory,
+    required this.shutdownHooks,
+    required this.signals,
+    required this.stdio,
+    required this.systemClock,
+    required this.terminal,
+    required this.userMessages,
+  });
+
+  /// Cached and host-specific binary artifacts.
+  final Artifacts artifacts;
+
+  /// Detects whether the tool is running in a CI or automated bot environment.
+  final BotDetector botDetector;
+
+  /// Manages cached SDK artifacts, binary downloads, and directory structures.
+  final Cache cache;
+
+  /// Reads and writes user and persistent global configuration settings.
+  final Config config;
+
+  /// Manages user-configured custom device definitions stored on disk.
+  final CustomDevicesConfig customDevicesConfig;
+
+  /// Provides version and git channel info for the current Flutter SDK.
+  final FlutterVersion flutterVersion;
+
+  /// Provides mockable file system operations across host and virtual environments.
+  final FileSystem fs;
+
+  /// Wraps host `git` operations, tracking repository state and branch revisions.
+  final Git git;
+
+  /// Locates local engine builds specified via command-line flags.
+  final LocalEngineLocator localEngineLocator;
+
+  /// Formats and emits console status, trace, warning, and error logs.
+  final Logger logger;
+
+  /// Builds and packages native C/C++ or Rust assets for compilation and tests.
+  final TestCompilerNativeAssetsBuilder? nativeAssetsBuilder;
+
+  /// Operating system utilities and environment queries.
+  final OperatingSystemUtils os;
+
+  /// Manages formatting preferences for console output, such as line wrapping width.
+  final OutputPreferences outputPreferences;
+
+  /// Provides host operating system details and environment variables.
+  final Platform platform;
+
+  /// Validates environment prerequisites and file permissions before command execution.
+  final PreRunValidator preRunValidator;
+
+  /// Spawns and manages external host processes.
+  final ProcessManager processManager;
+
+  /// Utility helpers for executing processes, error handling, and stream capturing.
+  final ProcessUtils processUtils;
+
+  /// Instantiates and caches [FlutterProject] instances for project directories.
+  final FlutterProjectFactory projectFactory;
+
+  /// Manages lifecycle callbacks executed upon tool termination or interrupt signals.
+  final ShutdownHooks shutdownHooks;
+
+  /// Intercepts and dispatches process signals.
+  final Signals signals;
+
+  /// Provides standard I/O streams (`stdin`, `stdout`, `stderr`).
+  final Stdio stdio;
+
+  /// Provides mockable system time interfaces for timed operations.
+  final SystemClock systemClock;
+
+  /// Formats terminal text output, colorization, and ANSI terminal capabilities.
+  final AnsiTerminal terminal;
+
+  /// Centralized templates for user-facing status strings and error messages.
+  final UserMessages userMessages;
+
+  /// Common file system utilities.
+  FileSystemUtils get fileSystemUtils => FileSystemUtils(fileSystem: fs, platform: platform);
+}
diff --git a/packages/flutter_tools/lib/src/context/tool_dependencies.dart b/packages/flutter_tools/lib/src/context/tool_dependencies.dart
new file mode 100644
index 0000000000000..0c19ec2fc3ab7
--- /dev/null
+++ b/packages/flutter_tools/lib/src/context/tool_dependencies.dart
@@ -0,0 +1,477 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:process/process.dart';
+import 'package:unified_analytics/unified_analytics.dart';
+
+import '../android/android_sdk.dart';
+import '../android/android_studio.dart';
+import '../android/gradle_utils.dart';
+import '../android/java.dart';
+import '../artifacts.dart';
+import '../base/bot_detector.dart';
+import '../base/config.dart';
+import '../base/error_handling_io.dart';
+import '../base/file_system.dart';
+import '../base/io.dart';
+import '../base/logger.dart';
+import '../base/os.dart';
+import '../base/platform.dart';
+import '../base/process.dart';
+import '../base/signals.dart';
+import '../base/terminal.dart';
+import '../base/time.dart';
+import '../base/user_messages.dart';
+import '../build_system/build_system.dart';
+import '../build_system/build_targets.dart';
+import '../cache.dart';
+import '../custom_devices/custom_devices_config.dart';
+import '../flutter_cache.dart';
+import '../flutter_features.dart';
+import '../flutter_features_config.dart';
+import '../flutter_manifest.dart';
+import '../git.dart';
+import '../ios/ios_workflow.dart';
+import '../ios/iproxy.dart';
+import '../ios/plist_parser.dart';
+import '../ios/simulators.dart';
+import '../ios/xcodeproj.dart';
+import '../macos/cocoapods.dart';
+import '../macos/cocoapods_validator.dart';
+import '../macos/xcdevice.dart';
+import '../macos/xcode.dart';
+import '../native_assets.dart';
+import '../persistent_tool_state.dart';
+import '../pre_run_validator.dart';
+import '../project.dart';
+import '../reporting/crash_reporting.dart';
+import '../reporting/unified_analytics.dart';
+import '../runner/local_engine.dart';
+import '../version.dart';
+import 'android_context.dart';
+import 'apple_context.dart';
+import 'tool_context.dart';
+
+/// Bootstraps and manages tool dependencies.
+class ToolDependencies {
+  ToolDependencies({
+    required this.analytics,
+    required this.androidContext,
+    required this.appleContext,
+    required this.buildSystem,
+    this.buildTargets,
+    required this.crashReporter,
+    required this.toolContext,
+  });
+
+  /// Telemetry and analytics reporter for command and feature usage.
+  final Analytics analytics;
+
+  /// Sub-context containing Android-specific platform services.
+  final AndroidContext androidContext;
+
+  /// Sub-context containing Apple platform services.
+  final AppleContext appleContext;
+
+  /// High-performance compilation and build pipeline orchestrator.
+  final BuildSystem buildSystem;
+
+  /// Factory interface for constructing compile and bundle build targets.
+  final BuildTargets? buildTargets;
+
+  /// Captures and submits unhandled tool crash reports and stack traces.
+  final CrashReporter crashReporter;
+
+  /// Core container holding host environment and SDK configuration dependencies.
+  final ToolContext toolContext;
+
+  /// Bootstraps the dependency graph and constructs all three contexts.
+  static Future<ToolDependencies> bootstrap({
+    Analytics? analytics,
+    AndroidSdk? androidSdk,
+    AndroidStudio? androidStudio,
+    BotDetector? botDetector,
+    BuildSystem? buildSystem,
+    BuildTargets? buildTargets,
+    Cache? cache,
+    CocoaPods? cocoaPods,
+    CocoaPodsValidator? cocoapodsValidator,
+    Config? config,
+    CrashReporter? crashReporter,
+    CustomDevicesConfig? customDevicesConfig,
+    FileSystem? fs,
+    Git? git,
+    GradleUtils? gradleUtils,
+    IOSSimulatorUtils? iosSimulatorUtils,
+    IOSWorkflow? iosWorkflow,
+    Java? java,
+    LocalEngineLocator? localEngineLocator,
+    Logger? logger,
+    TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
+    OutputPreferences? outputPreferences,
+    PersistentToolState? persistentToolState,
+    Platform? platform,
+    PlistParser? plistParser,
+    PreRunValidator? preRunValidator,
+    ProcessManager? processManager,
+    FlutterVersion? flutterVersion,
+    FlutterProjectFactory? projectFactory,
+    ShutdownHooks? shutdownHooks,
+    Stdio? stdio,
+    SystemClock? systemClock,
+    AnsiTerminal? terminal,
+    UserMessages? userMessages,
+    XCDevice? xcdevice,
+    Xcode? xcode,
+    XcodeProjectInterpreter? xcodeProjectInterpreter,
+  }) async {
+    // 1. Core Platform Inputs
+    final Platform finalPlatform = platform ?? const LocalPlatform();
+    final SystemClock finalSystemClock = systemClock ?? const SystemClock();
+    final UserMessages finalUserMessages = userMessages ?? UserMessages();
+    final ShutdownHooks finalShutdownHooks = shutdownHooks ?? ShutdownHooks();
+    final Stdio finalStdio = stdio ?? Stdio();
+
+    // 2. Terminal and Preferences
+    final AnsiTerminal finalTerminal =
+        terminal ??
+        AnsiTerminal(
+          stdio: finalStdio,
+          platform: finalPlatform,
+          now: finalSystemClock.now(),
+          shutdownHooks: finalShutdownHooks,
+        );
+
+    final OutputPreferences finalOutputPreferences =
+        outputPreferences ??
+        OutputPreferences(
+          wrapText: finalStdio.hasTerminal,
+          showColor: finalPlatform.stdoutSupportsAnsi,
+          stdio: finalStdio,
+        );
+
+    // 3. Logger
+    final Logger finalLogger =
+        logger ??
+        (finalPlatform.isWindows
+            ? WindowsStdoutLogger(
+                terminal: finalTerminal,
+                stdio: finalStdio,
+                outputPreferences: finalOutputPreferences,
+              )
+            : StdoutLogger(
+                terminal: finalTerminal,
+                stdio: finalStdio,
+                outputPreferences: finalOutputPreferences,
+              ));
+
+    // 4. File System
+    final finalFS = fs == null
+        ? ErrorHandlingFileSystem(
+            delegate: LocalFileSystem(
+              LocalSignals.instance,
+              Signals.defaultExitSignals,
+              finalShutdownHooks,
+            ),
+            platform: finalPlatform,
+          )
+        : ErrorHandlingFileSystem(delegate: fs, platform: finalPlatform);
+
+    // 5. Bot Detector and Config
+    final PersistentToolState finalPersistentToolState =
+        persistentToolState ??
+        PersistentToolState(fileSystem: finalFS, logger: finalLogger, platform: finalPlatform);
+
+    final BotDetector finalBotDetector =
+        botDetector ??
+        BotDetector(
+          httpClientFactory: () => HttpClient(),
+          platform: finalPlatform,
+          persistentToolState: finalPersistentToolState,
+        );
+
+    final bool isBot = await finalBotDetector.isRunningOnBot;
+
+    final Config finalConfig =
+        config ??
+        Config(
+          Config.kFlutterSettings,
+          fileSystem: finalFS,
+          logger: finalLogger,
+          platform: finalPlatform,
+        );
+
+    // 6. Process Management & Git (resolving cycle via lazy analytics closure)
+    var finalAnalyticsInitialized = false;
+    late final Analytics finalAnalytics;
+
+    final finalProcessManager = ErrorHandlingProcessManager(
+      delegate: processManager ?? const LocalProcessManager(),
+      platform: finalPlatform,
+      analytics: () => finalAnalyticsInitialized ? finalAnalytics : const NoOpAnalytics(),
+    );
+
+    final finalProcessUtils = ProcessUtils(
+      processManager: finalProcessManager,
+      logger: finalLogger,
+    );
+
+    final Git finalGit =
+        git ?? Git(currentPlatform: finalPlatform, runProcessWith: finalProcessUtils);
+
+    // 7. Flutter Version and Cache
+    final String flutterRoot =
+        Cache.flutterRoot ??
+        Cache.defaultFlutterRoot(
+          platform: finalPlatform,
+          fileSystem: finalFS,
+          userMessages: finalUserMessages,
+        );
+    Cache.flutterRoot ??= flutterRoot;
+
+    final FlutterVersion finalFlutterVersion =
+        flutterVersion ?? FlutterVersion(fs: finalFS, flutterRoot: flutterRoot, git: finalGit);
+
+    // 8. Analytics
+    finalAnalytics =
+        analytics ??
+        getAnalytics(
+          runningOnBot: isBot,
+          flutterVersion: finalFlutterVersion,
+          environment: finalPlatform.environment,
+          clientIde: finalPlatform.environment['FLUTTER_HOST'],
+          config: finalConfig,
+        );
+    finalAnalyticsInitialized = true;
+
+    // 9. Project Factory and Operating System Utilities
+    final FlutterProjectFactory finalProjectFactory =
+        projectFactory ?? FlutterProjectFactory(logger: finalLogger, fileSystem: finalFS);
+
+    final finalOS = OperatingSystemUtils(
+      fileSystem: finalFS,
+      logger: finalLogger,
+      platform: finalPlatform,
+      processManager: finalProcessManager,
+    );
+
+    final Cache finalCache =
+        cache ??
+        FlutterCache(
+          fileSystem: finalFS,
+          logger: finalLogger,
+          platform: finalPlatform,
+          osUtils: finalOS,
+          projectFactory: finalProjectFactory,
+          stdio: finalStdio,
+        );
+
+    // 10. Remaining ToolContext Dependencies
+    final BuildSystem finalBuildSystem =
+        buildSystem ??
+        FlutterBuildSystem(fileSystem: finalFS, logger: finalLogger, platform: finalPlatform);
+
+    final finalBuildTargets = buildTargets;
+
+    final CrashReporter finalCrashReporter =
+        crashReporter ??
+        CrashReporter(
+          fileSystem: finalFS,
+          logger: finalLogger,
+          flutterProjectFactory: finalProjectFactory,
+        );
+
+    final CustomDevicesConfig finalCustomDevicesConfig =
+        customDevicesConfig ??
+        CustomDevicesConfig(fileSystem: finalFS, logger: finalLogger, platform: finalPlatform);
+
+    final PreRunValidator finalPreRunValidator =
+        preRunValidator ?? PreRunValidator(fileSystem: finalFS);
+
+    final LocalEngineLocator finalLocalEngineLocator =
+        localEngineLocator ??
+        LocalEngineLocator(
+          userMessages: finalUserMessages,
+          logger: finalLogger,
+          platform: finalPlatform,
+          fileSystem: finalFS,
+          flutterRoot: flutterRoot,
+        );
+
+    final finalNativeAssetsBuilder = nativeAssetsBuilder;
+
+    // 11. AppleContext Dependencies
+    final XcodeProjectInterpreter finalXcodeProjectInterpreter =
+        xcodeProjectInterpreter ??
+        XcodeProjectInterpreter(
+          platform: finalPlatform,
+          processManager: finalProcessManager,
+          logger: finalLogger,
+          fileSystem: finalFS,
+          analytics: finalAnalytics,
+        );
+
+    final Xcode finalXcode =
+        xcode ??
+        Xcode(
+          platform: finalPlatform,
+          processManager: finalProcessManager,
+          logger: finalLogger,
+          fileSystem: finalFS,
+          xcodeProjectInterpreter: finalXcodeProjectInterpreter,
+          userMessages: finalUserMessages,
+        );
+
+    final CocoaPods finalCocoaPods =
+        cocoaPods ??
+        CocoaPods(
+          fileSystem: finalFS,
+          processManager: finalProcessManager,
+          logger: finalLogger,
+          platform: finalPlatform,
+          xcodeProjectInterpreter: finalXcodeProjectInterpreter,
+          analytics: finalAnalytics,
+        );
+
+    final CocoaPodsValidator finalCocoapodsValidator =
+        cocoapodsValidator ?? CocoaPodsValidator(finalCocoaPods, finalUserMessages);
+
+    final finalArtifacts = CachedArtifacts(
+      fileSystem: finalFS,
+      cache: finalCache,
+      platform: finalPlatform,
+      operatingSystemUtils: finalOS,
+    );
+
+    final XCDevice finalXCDevice =
+        xcdevice ??
+        XCDevice(
+          processManager: finalProcessManager,
+          logger: finalLogger,
+          artifacts: finalArtifacts,
+          cache: finalCache,
+          platform: finalPlatform,
+          xcode: finalXcode,
+          iproxy: IProxy(
+            iproxyPath: finalArtifacts.getHostArtifact(HostArtifact.iproxy).path,
+            logger: finalLogger,
+            processManager: finalProcessManager,
+            dyLdLibEntry: finalCache.dyLdLibEntry,
+          ),
+          fileSystem: finalFS,
+          analytics: finalAnalytics,
+          shutdownHooks: finalShutdownHooks,
+        );
+
+    final String projectRoot = findProjectRoot(finalFS) ?? finalFS.currentDirectory.path;
+    final FlutterManifest? projectManifest = FlutterManifest.createFromPath(
+      finalFS.path.join(projectRoot, 'pubspec.yaml'),
+      fileSystem: finalFS,
+      logger: finalLogger,
+    );
+
+    final featureFlags = FlutterFeatureFlags(
+      flutterVersion: finalFlutterVersion,
+      featuresConfig: FlutterFeaturesConfig(
+        globalConfig: finalConfig,
+        platform: finalPlatform,
+        projectManifest: projectManifest,
+      ),
+      platform: finalPlatform,
+    );
+
+    final IOSWorkflow finalIOSWorkflow =
+        iosWorkflow ??
+        IOSWorkflow(featureFlags: featureFlags, xcode: finalXcode, platform: finalPlatform);
+
+    final IOSSimulatorUtils finalIOSSimulatorUtils =
+        iosSimulatorUtils ??
+        IOSSimulatorUtils(
+          logger: finalLogger,
+          operatingSystemUtils: finalOS,
+          processManager: finalProcessManager,
+          xcode: finalXcode,
+        );
+
+    final PlistParser finalPlistParser =
+        plistParser ??
+        PlistParser(fileSystem: finalFS, processManager: finalProcessManager, logger: finalLogger);
+
+    // 12. AndroidContext Dependencies
+    final AndroidStudio? finalAndroidStudio = androidStudio ?? AndroidStudio.latestValid();
+
+    final AndroidSdk? finalAndroidSdk = androidSdk ?? AndroidSdk.locateAndroidSdk();
+
+    final Java? finalJava =
+        java ??
+        Java.find(
+          config: finalConfig,
+          androidStudio: finalAndroidStudio,
+          logger: finalLogger,
+          fileSystem: finalFS,
+          platform: finalPlatform,
+          processManager: finalProcessManager,
+        );
+
+    final GradleUtils finalGradleUtils =
+        gradleUtils ??
+        GradleUtils(
+          platform: finalPlatform,
+          logger: finalLogger,
+          cache: finalCache,
+          operatingSystemUtils: finalOS,
+        );
+
+    return ToolDependencies(
+      analytics: finalAnalytics,
+      androidContext: AndroidContext(
+        androidSdk: finalAndroidSdk,
+        androidStudio: finalAndroidStudio,
+        gradleUtils: finalGradleUtils,
+        java: finalJava,
+      ),
+      appleContext: AppleContext(
+        cocoaPods: finalCocoaPods,
+        cocoapodsValidator: finalCocoapodsValidator,
+        iosSimulatorUtils: finalIOSSimulatorUtils,
+        iosWorkflow: finalIOSWorkflow,
+        plistParser: finalPlistParser,
+        xcdevice: finalXCDevice,
+        xcode: finalXcode,
+        xcodeProjectInterpreter: finalXcodeProjectInterpreter,
+      ),
+      buildSystem: finalBuildSystem,
+      buildTargets: finalBuildTargets,
+      crashReporter: finalCrashReporter,
+      toolContext: ToolContext(
+        artifacts: finalArtifacts,
+        botDetector: finalBotDetector,
+        cache: finalCache,
+        config: finalConfig,
+        customDevicesConfig: finalCustomDevicesConfig,
+        flutterVersion: finalFlutterVersion,
+        fs: finalFS,
+        git: finalGit,
+        localEngineLocator: finalLocalEngineLocator,
+        logger: finalLogger,
+        nativeAssetsBuilder: finalNativeAssetsBuilder,
+        os: finalOS,
+        outputPreferences: finalOutputPreferences,
+        platform: finalPlatform,
+        preRunValidator: finalPreRunValidator,
+        processManager: finalProcessManager,
+        processUtils: finalProcessUtils,
+        projectFactory: finalProjectFactory,
+        shutdownHooks: finalShutdownHooks,
+        signals: LocalSignals.instance,
+        stdio: finalStdio,
+        systemClock: finalSystemClock,
+        terminal: finalTerminal,
+        userMessages: finalUserMessages,
+      ),
+    );
+  }
+}
diff --git a/packages/flutter_tools/lib/src/convert.dart b/packages/flutter_tools/lib/src/convert.dart
index 5e8f24a6c5b78..6383d02d37ee1 100644
--- a/packages/flutter_tools/lib/src/convert.dart
+++ b/packages/flutter_tools/lib/src/convert.dart
@@ -67,16 +67,20 @@ const Encoding utf8 = Utf8Codec();
 class Utf8Decoder extends Converter<List<int>, String> {
   const Utf8Decoder({this.reportErrors = true});
 
-  static const _systemDecoder = cnv.Utf8Decoder(allowMalformed: true);
+  static const _allowMalformedDecoder = cnv.Utf8Decoder(allowMalformed: true);
+  static const _strictDecoder = cnv.Utf8Decoder();
 
   final bool reportErrors;
 
   @override
   String convert(List<int> input, [int start = 0, int? end]) {
-    final String result = _systemDecoder.convert(input, start, end);
-    // Finding a Unicode replacement character indicates that the input
-    // was malformed.
-    if (reportErrors && result.contains('\u{FFFD}')) {
+    if (!reportErrors) {
+      return _allowMalformedDecoder.convert(input, start, end);
+    }
+    try {
+      return _strictDecoder.convert(input, start, end);
+    } on FormatException {
+      final String result = _allowMalformedDecoder.convert(input, start, end);
       throwToolExit(
         'Bad UTF-8 encoding (U+FFFD; REPLACEMENT CHARACTER) found while decoding string: $result. '
         'The Flutter team would greatly appreciate if you could file a bug explaining '
@@ -85,16 +89,16 @@ class Utf8Decoder extends Converter<List<int>, String> {
         'The source bytes were:\n$input\n\n',
       );
     }
-    return result;
   }
 
   @override
   ByteConversionSink startChunkedConversion(Sink<String> sink) =>
-      _systemDecoder.startChunkedConversion(sink);
+      _allowMalformedDecoder.startChunkedConversion(sink);
 
   @override
-  Stream<String> bind(Stream<List<int>> stream) => _systemDecoder.bind(stream);
+  Stream<String> bind(Stream<List<int>> stream) => _allowMalformedDecoder.bind(stream);
 
   @override
-  Converter<List<int>, T> fuse<T>(Converter<String, T> other) => _systemDecoder.fuse(other);
+  Converter<List<int>, T> fuse<T>(Converter<String, T> other) =>
+      _allowMalformedDecoder.fuse(other);
 }
diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart
index 316c9f1003f70..c137e23261397 100644
--- a/packages/flutter_tools/lib/src/dart/analysis.dart
+++ b/packages/flutter_tools/lib/src/dart/analysis.dart
@@ -50,34 +50,18 @@ class AnalysisServer {
   final _errorsController = StreamController<FileAnalysisErrors>.broadcast();
   var _didServerErrorOccur = false;
 
-  /// Whether the server is currently analyzing.
-  bool get isAnalyzing => _isAnalyzing;
-  bool _isAnalyzing = false;
-
-  /// Returns a [Future] that completes when the server is no longer analyzing.
+  /// Returns a [Future] that completes when the server has completed any
+  /// in-progress initialization or analysis.
   ///
-  /// If [delay] is provided, this method will wait for that duration before
-  /// checking if the server is analyzing. if the server starts analyzing during
-  /// that duration, it will wait for analysis to complete.
+  /// This method will wait for [delay] before calling the server. If not
+  /// provided, defaults to 100ms.
   ///
   /// This is useful to avoid the race condition where analysis hasn't started
   /// yet after a file change.
   Future<void> waitForAnalysis({Duration delay = const Duration(milliseconds: 100)}) async {
-    if (_isAnalyzing) {
-      await onAnalyzing.firstWhere((bool analyzing) => !analyzing);
-    }
-    if (delay != Duration.zero) {
-      // Wait for analysis to potentially start.
-      try {
-        await onAnalyzing.firstWhere((bool analyzing) => analyzing).timeout(delay);
-        // If analysis started, wait for it to finish.
-        if (_isAnalyzing) {
-          await onAnalyzing.firstWhere((bool analyzing) => !analyzing);
-        }
-      } on TimeoutException {
-        // Analysis didn't start within the delay, so we assume it's not going to.
-      }
-    }
+    await Future<void>.delayed(delay);
+
+    await sendRequest('dart/workspace/analysis/complete', {});
   }
 
   var _id = 0;
@@ -146,6 +130,12 @@ class AnalysisServer {
 
   bool get didServerErrorOccur => _didServerErrorOccur;
 
+  /// A stream of booleans indicating that the server is starting or stopping
+  /// analysis.
+  ///
+  /// These statuses are intended to show progress to a user and not intended
+  /// as a reliable indicator that all analysis has completed. To know when
+  /// analysis has definitely completed, use [waitForAnalysis].
   Stream<bool> get onAnalyzing => _analyzingController.stream;
 
   Stream<FileAnalysisErrors> get onErrors => _errorsController.stream;
@@ -307,10 +297,8 @@ class AnalysisServer {
     if (value is Map<String, Object?>) {
       final kind = value['kind'] as String?;
       if (kind == 'begin') {
-        _isAnalyzing = true;
         _analyzingController.add(true);
       } else if (kind == 'end') {
-        _isAnalyzing = false;
         _analyzingController.add(false);
       }
     }
diff --git a/packages/flutter_tools/lib/src/dart/package_map.dart b/packages/flutter_tools/lib/src/dart/package_map.dart
index b7ac029532197..78417c24c26cb 100644
--- a/packages/flutter_tools/lib/src/dart/package_map.dart
+++ b/packages/flutter_tools/lib/src/dart/package_map.dart
@@ -131,3 +131,38 @@ Future<PackageConfig> loadPackageConfigWithLogging(
   }
   return result;
 }
+
+extension PackageConfigWorkspaceExtension on PackageConfig {
+  /// Converts a [fileUri] to a `package:` URI, finding the most specific
+  /// package whose [Package.packageUriRoot] is a prefix of [fileUri].
+  ///
+  /// The default [PackageConfig.toPackageUri] may match an outer package first
+  /// when pub workspace member packages are located under the workspace root
+  /// package's `lib/` directory.
+  Uri? toPackageUriForWorkspace(Uri fileUri) {
+    if (fileUri.isScheme('package')) {
+      return fileUri;
+    }
+    final path = fileUri.toString();
+    Package? bestMatch;
+    String? bestMatchRoot;
+
+    for (final Package package in packages) {
+      final rootPath = package.packageUriRoot.toString();
+      final rootPathWithSlash = rootPath.endsWith('/') ? rootPath : '$rootPath/';
+      if (path.startsWith(rootPathWithSlash)) {
+        if (bestMatchRoot == null || rootPathWithSlash.length > bestMatchRoot.length) {
+          bestMatch = package;
+          bestMatchRoot = rootPathWithSlash;
+        }
+      }
+    }
+
+    if (bestMatch == null || bestMatchRoot == null) {
+      return null;
+    }
+
+    final String rest = path.substring(bestMatchRoot.length);
+    return Uri(scheme: 'package', path: '${bestMatch.name}/$rest');
+  }
+}
diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
index 2fea38ff61fc8..65ef2800ab100 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -253,53 +253,9 @@ class _DefaultPub implements Pub {
     PubOutputMode outputMode = PubOutputMode.all,
   }) async {
     final String directory = project.directory.path;
-
-    // Here we use pub's private helper file to locate the package_config.
-    // In pub workspaces pub will generate a `.dart_tool/pub/workspace_ref.json`
-    // inside each workspace-package that refers to the workspace root where
-    // .dart_tool/package_config.json is located.
-    //
-    // By checking for this file instead of iterating parent directories until
-    // finding .dart_tool/package_config.json we will not mistakenly find a
-    // package_config.json from outside the workspace.
-    //
-    // TODO(sigurdm): avoid relying on pubs implementation details somehow?
-    final File workspaceRefFile = project.dartTool
-        .childDirectory('pub')
-        .childFile('workspace_ref.json');
-    final File packageConfigFile;
-    if (workspaceRefFile.existsSync()) {
-      switch (jsonDecode(workspaceRefFile.readAsStringSync())) {
-        case {'workspaceRoot': final String workspaceRoot}:
-          packageConfigFile = _fileSystem.file(
-            _fileSystem.path.join(workspaceRefFile.parent.path, workspaceRoot),
-          );
-        default:
-          // The workspace_ref.json file was malformed. Attempt to load the
-          // regular .dart_tool/package_config.json
-          //
-          // Most likely this doesn't exist, and we will get a new pub
-          // resolution.
-          //
-          // Alternatively this is a stray file somehow, and it can be ignored.
-          packageConfigFile = project.dartTool.childFile('package_config.json');
-      }
-    } else {
-      packageConfigFile = project.dartTool.childFile('package_config.json');
-    }
-
-    if (packageConfigFile.existsSync()) {
-      final Directory workspaceRoot = packageConfigFile.parent.parent;
-      final File lastVersion = workspaceRoot.childDirectory('.dart_tool').childFile('version');
-      final versionFromFile = FlutterVersion(
-        flutterRoot: Cache.flutterRoot!,
-        fs: _fileSystem,
-        git: _git,
-      );
-      final File pubspecYaml = project.pubspecFile;
-      final File pubLockFile = workspaceRoot.childFile('pubspec.lock');
-
-      if (shouldSkipThirdPartyGenerator) {
+    if (shouldSkipThirdPartyGenerator) {
+      final File? packageConfigFile = findPackageConfigFile(project.directory);
+      if (packageConfigFile != null && packageConfigFile.existsSync()) {
         Map<String, Object?> packageConfigMap;
         try {
           packageConfigMap =
@@ -316,23 +272,32 @@ class _DefaultPub implements Pub {
           return;
         }
       }
+    }
 
-      // If the pubspec.yaml is older than the package config file and the last
-      // flutter version used is the same as the current version skip pub get.
-      // This will incorrectly skip pub on the master branch if dependencies
-      // are being added/removed from the flutter framework packages, but this
-      // can be worked around by manually running pub.
-      if (checkUpToDate &&
-          pubLockFile.existsSync() &&
-          pubspecYaml.lastModifiedSync().isBefore(pubLockFile.lastModifiedSync()) &&
-          pubspecYaml.lastModifiedSync().isBefore(packageConfigFile.lastModifiedSync()) &&
-          lastVersion.existsSync() &&
-          lastVersion.readAsStringSync() == versionFromFile.frameworkVersion) {
-        _logger.printTrace('Skipping pub get: version match.');
-        return;
+    var versionMatch = false;
+    if (checkUpToDate) {
+      final File? packageConfigFile = findPackageConfigFile(project.directory);
+      if (packageConfigFile != null && packageConfigFile.existsSync()) {
+        final Directory workspaceRoot = packageConfigFile.parent.parent;
+        final File lastVersion = workspaceRoot.childDirectory('.dart_tool').childFile('version');
+        final versionFromFile = FlutterVersion(
+          flutterRoot: Cache.flutterRoot!,
+          fs: _fileSystem,
+          git: _git,
+        );
+        versionMatch =
+            lastVersion.existsSync() &&
+            lastVersion.readAsStringSync() == versionFromFile.frameworkVersion;
       }
     }
 
+    if (checkUpToDate &&
+        versionMatch &&
+        await _checkResolutionUpToDate(directory, context, flutterRootOverride)) {
+      _logger.printTrace('Skipping pub get: resolution up-to-date.');
+      return;
+    }
+
     final command = upgrade ? 'upgrade' : 'get';
     final args = <String>[
       if (_logger.supportsColor) '--color',
@@ -355,6 +320,33 @@ class _DefaultPub implements Pub {
     await _updateVersionAndPackageConfig(project);
   }
 
+  Future<bool> _checkResolutionUpToDate(
+    String directory,
+    PubContext context,
+    String? flutterRootOverride,
+  ) async {
+    final pubCommand = <String>[
+      ..._pubCommand,
+      '--directory',
+      _fileSystem.path.relative(directory),
+      'check-resolution-up-to-date',
+    ];
+    final Map<String, String> pubEnvironment = await _createPubEnvironment(
+      context: context,
+      flutterRootOverride: flutterRootOverride,
+    );
+    try {
+      final RunResult result = await _processUtils.run(
+        pubCommand,
+        workingDirectory: _fileSystem.path.current,
+        environment: pubEnvironment,
+      );
+      return result.exitCode == 0;
+    } on io.ProcessException {
+      return false;
+    }
+  }
+
   /// Runs pub with [arguments] and [ProcessStartMode.inheritStdio] mode.
   ///
   /// Uses [ProcessStartMode.normal] and [_stdio] if [Pub.test] constructor
diff --git a/packages/flutter_tools/lib/src/debug_adapters/error_formatter.dart b/packages/flutter_tools/lib/src/debug_adapters/error_formatter.dart
index 4141b9efcee60..af9ed21ffb2d2 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/error_formatter.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/error_formatter.dart
@@ -12,19 +12,27 @@ typedef _OutputSender =
       int? variablesReference,
     });
 
-/// A formatter for improving the display of Flutter structured errors over DAP.
+/// Deserializes and formats a Flutter structured error.
 ///
-/// The formatter deserializes a `Flutter.Error` event and produces output
-/// similar to the `renderedErrorText` field, but may include ansi color codes
-/// to provide improved formatting (such as making stack frames from non-user
-/// code faint) if the client indicated support.
+/// Produces output similar to the `renderedErrorText` field, but may include
+/// ansi color codes to provide improved formatting (such as making stack frames
+/// from non-user code faint) if the client indicated support.
 ///
 /// Lines that look like stack frames will be marked so they can be parsed by
 /// the base adapter and attached as `Source`s to allow them to be clickable
 /// in the client.
+///
+/// If the error contains a `DevToolsDeepLinkProperty` node, its URL will be
+/// extracted into [devToolsDeepLinkUrl].
 class FlutterErrorFormatter {
   final batchedOutput = <_BatchedOutput>[];
 
+  /// The text of the ErrorSummary node, if exists.
+  String? errorSummary;
+
+  /// The url of any DevTools deep link node.
+  String? devToolsDeepLinkUrl;
+
   /// Formats a Flutter error.
   ///
   /// If this is not the first error since the reload, only a summary will be
@@ -89,6 +97,14 @@ class FlutterErrorFormatter {
   /// Writes [node] to the output using [indent], recursing unless [recursive]
   /// is `false`.
   void _writeNode(_ErrorNode node, {int indent = 0, bool recursive = true}) {
+    if (node.type == _DiagnosticsNodeType.ErrorSummary) {
+      // Probably there is only one error summary, but keep the first
+      // (outer-most) if not.
+      errorSummary ??= node.description;
+    } else if (node.type == _DiagnosticsNodeType.DevToolsDeepLinkProperty) {
+      _parseDevToolsDeepLink(node);
+    }
+
     // Errors, summaries and lines starting "Exception:" are marked as errors so
     // they go to stderr instead of stdout (this may cause the client to colour
     // them like errors).
@@ -138,6 +154,17 @@ class FlutterErrorFormatter {
       );
     }
   }
+
+  /// Parse the DevTools deep link URL out of a
+  /// [_DiagnosticsNodeType.DevToolsDeepLinkProperty] node.
+  void _parseDevToolsDeepLink(_ErrorNode node) {
+    assert(node.type == _DiagnosticsNodeType.DevToolsDeepLinkProperty);
+    if (node.value case final url?) {
+      // Probably there is only one deep link, but keep the first
+      // (outer-most) if not.
+      devToolsDeepLinkUrl ??= url;
+    }
+  }
 }
 
 /// A container for output to be sent to the client.
@@ -160,7 +187,7 @@ enum _DiagnosticsNodeLevel { error, summary }
 
 enum _DiagnosticsNodeStyle { flat }
 
-enum _DiagnosticsNodeType { DiagnosticsBlock }
+enum _DiagnosticsNodeType { ErrorSummary, DevToolsDeepLinkProperty, DiagnosticsBlock }
 
 class _ErrorData extends _ErrorNode {
   _ErrorData(super.data);
@@ -182,6 +209,7 @@ class _ErrorNode {
   bool get showName => data['showName'] != false;
   _DiagnosticsNodeStyle? get style => asEnum('style', _DiagnosticsNodeStyle.values);
   _DiagnosticsNodeType? get type => asEnum('type', _DiagnosticsNodeType.values);
+  String? get value => asString('value');
 
   String? asString(String field) {
     final Object? value = data[field];
diff --git a/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter.dart b/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter.dart
index a6b434a0edf05..034977c81dd9d 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:dds/dap.dart' hide PidTracker;
+import 'package:dap_adapters/dap_adapters.dart' hide PidTracker;
 import 'package:vm_service/vm_service.dart' as vm;
 
 import '../base/io.dart';
@@ -228,9 +228,20 @@ class FlutterDebugAdapter extends FlutterBaseDebugAdapter with VmServiceInfoFile
       return;
     }
 
-    FlutterErrorFormatter()
+    final formatter = FlutterErrorFormatter()
       ..formatError(errorData)
       ..sendOutput(sendOutput);
+
+    // Forward any DevTools deep-links in a 'dart.flutter.devToolsDeepLink'
+    // event.
+    if (formatter case FlutterErrorFormatter(:final errorSummary?, :final devToolsDeepLinkUrl?)) {
+      // This event is interpreted by IDEs extensions like like Dart-Code and
+      // should not be changed in breaking ways without coordination.
+      sendEvent(
+        RawEventBody({'summary': errorSummary, 'deepLinkUrl': devToolsDeepLinkUrl}),
+        eventType: 'dart.flutter.devToolsDeepLink',
+      );
+    }
   }
 
   /// Called by [launchRequest] to request that we actually start the app to be run/debugged.
@@ -452,7 +463,17 @@ class FlutterDebugAdapter extends FlutterBaseDebugAdapter with VmServiceInfoFile
     // This may be useful when there's no VM Service (for example Profile mode)
     // but the editor still wants to know that startup has finished.
     if (enableDebugger) {
-      await debuggerInitialized; // Ensure we're fully initialized before sending.
+      waitingForDebugger = true;
+      try {
+        await Future.any<void>([debuggerInitialized, debuggerInitializationFailedCompleter.future]);
+      } catch (e) {
+        if (!isTerminating) {
+          rethrow;
+        }
+        return;
+      } finally {
+        waitingForDebugger = false;
+      }
     }
     sendEvent(RawEventBody(<String, Object?>{}), eventType: 'flutter.appStarted');
   }
diff --git a/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter_args.dart b/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter_args.dart
index 3be9e9371295e..b01d649648dc6 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter_args.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/flutter_adapter_args.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 
 /// An implementation of [AttachRequestArguments] that includes all fields used by the Flutter debug adapter.
 ///
diff --git a/packages/flutter_tools/lib/src/debug_adapters/flutter_base_adapter.dart b/packages/flutter_tools/lib/src/debug_adapters/flutter_base_adapter.dart
index 3b483f105dcbf..b32e294458333 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/flutter_base_adapter.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/flutter_base_adapter.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:dds/dap.dart' hide PidTracker;
+import 'package:dap_adapters/dap_adapters.dart' hide PidTracker;
 import 'package:vm_service/vm_service.dart' as vm;
 
 import '../base/file_system.dart';
@@ -45,6 +45,27 @@ abstract class FlutterBaseDebugAdapter
   /// the same as what is passed to the base class, which is always provided 'false'.
   final bool enableFlutterDds;
 
+  /// Whether the adapter is currently waiting for the debugger to initialize.
+  bool waitingForDebugger = false;
+
+  /// A completer that completes with an error if debugger initialization fails
+  /// (for example, if the session terminates early).
+  ///
+  /// A dummy error handler is attached to the future to prevent unhandled
+  /// asynchronous exceptions if it completes before any listeners are active.
+  final Completer<void> debuggerInitializationFailedCompleter = Completer<void>()
+    ..future.then<void>((_) {}, onError: (Object _) {});
+
+  @override
+  void handleSessionTerminate([String exitSuffix = '']) {
+    if (waitingForDebugger && !debuggerInitializationFailedCompleter.isCompleted) {
+      debuggerInitializationFailedCompleter.completeError(
+        DebugAdapterException('Session terminated before debugger initialized: $exitSuffix'),
+      );
+    }
+    super.handleSessionTerminate(exitSuffix);
+  }
+
   @override
   final FlutterLaunchRequestArguments Function(Map<String, Object?> obj) parseLaunchArgs =
       FlutterLaunchRequestArguments.fromJson;
diff --git a/packages/flutter_tools/lib/src/debug_adapters/flutter_test_adapter.dart b/packages/flutter_tools/lib/src/debug_adapters/flutter_test_adapter.dart
index cb0b36dd526d1..87e628891dc90 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/flutter_test_adapter.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/flutter_test_adapter.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:dds/dap.dart' hide PidTracker;
+import 'package:dap_adapters/dap_adapters.dart' hide PidTracker;
 
 import '../base/io.dart';
 import '../cache.dart';
@@ -66,11 +66,26 @@ class FlutterTestDebugAdapter extends FlutterBaseDebugAdapter with TestAdapter {
 
     final processArgs = <String>[...toolArgs, ...?args.toolArgs, ?program, ...?args.args];
 
-    await launchAsProcess(executable: executable, processArgs: processArgs, env: args.env);
+    if (debug) {
+      waitingForDebugger = true;
+    }
+
+    try {
+      await launchAsProcess(executable: executable, processArgs: processArgs, env: args.env);
+    } catch (e) {
+      if (debug) {
+        waitingForDebugger = false;
+      }
+      rethrow;
+    }
 
     // Delay responding until the debugger is connected.
     if (debug) {
-      await debuggerInitialized;
+      try {
+        await Future.any<void>([debuggerInitialized, debuggerInitializationFailedCompleter.future]);
+      } finally {
+        waitingForDebugger = false;
+      }
     }
   }
 
diff --git a/packages/flutter_tools/lib/src/debug_adapters/server.dart b/packages/flutter_tools/lib/src/debug_adapters/server.dart
index 93f55142e85c2..c678bf6bb31a9 100644
--- a/packages/flutter_tools/lib/src/debug_adapters/server.dart
+++ b/packages/flutter_tools/lib/src/debug_adapters/server.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:dds/dap.dart' hide DapServer;
+import 'package:dap_adapters/dap_adapters.dart' hide DapServer;
 
 import '../base/file_system.dart';
 import '../base/platform.dart';
diff --git a/packages/flutter_tools/lib/src/desktop_device.dart b/packages/flutter_tools/lib/src/desktop_device.dart
index b622e3b34df79..d2ce93dc36c69 100644
--- a/packages/flutter_tools/lib/src/desktop_device.dart
+++ b/packages/flutter_tools/lib/src/desktop_device.dart
@@ -135,12 +135,12 @@ abstract class DesktopDevice extends Device {
     _runningProcesses.add(process);
     unawaited(process.exitCode.then((_) => _runningProcesses.remove(process)));
 
-    _deviceLogReader.initializeProcess(process);
+    _deviceLogReader.listenToProcessOutput(process);
     if (debuggingOptions.buildInfo.isRelease) {
       return LaunchResult.succeeded();
     }
     final vmServiceDiscovery = ProtocolDiscovery.vmService(
-      _deviceLogReader,
+      SingleLaunchLogReader(_deviceLogReader.logLines, process.exitCode),
       devicePort: debuggingOptions.deviceVmServicePort,
       hostPort: debuggingOptions.hostVmServicePort,
       ipv6: debuggingOptions.ipv6,
@@ -342,26 +342,29 @@ abstract class DesktopDevice extends Device {
 
 /// A log reader for desktop applications that delegates to a [Process] stdout
 /// and stderr streams.
+///
+/// A single instance of this reader is kept for the lifetime of a
+/// [DesktopDevice], returned by [DesktopDevice.getLogReader], so that
+/// external callers (e.g. `flutter drive`, `flutter logs`) can subscribe to
+/// [logLines] once and keep receiving output across multiple `startApp`
+/// launches on the same device. Because of that, [logLines] is never closed
+/// when a given `process` exits: `Device.dispose()` (and therefore
+/// [dispose]) is called far more often than "the device is really done" —
+/// e.g. once per test file for desktop integration tests — so this reader
+/// deliberately has nothing for [dispose] to do, exactly like the upstream
+/// implementation this is based on. (Mirrors
+/// `CustomDeviceLogReader.listenToProcessOutput`, though that reader's
+/// [dispose] closes it — its callers dispose it at true end-of-life only.)
+///
+/// This reader is intentionally *not* used for a single launch's VM Service
+/// discovery — see [SingleLaunchLogReader] for that.
 class DesktopLogReader extends DeviceLogReader {
   final _inputController = StreamController<List<int>>.broadcast();
 
-  /// Begin listening to the stdout and stderr streams of the provided [process].
-  void initializeProcess(Process process) {
-    final StreamSubscription<List<int>> stdoutSub = process.stdout.listen(_inputController.add);
-    final StreamSubscription<List<int>> stderrSub = process.stderr.listen(_inputController.add);
-    final Future<void> stdioFuture = Future.wait<void>(<Future<void>>[
-      stdoutSub.asFuture<void>(),
-      stderrSub.asFuture<void>(),
-    ]);
-    process.exitCode.whenComplete(() async {
-      // Wait for output to be fully processed.
-      await stdioFuture;
-      // The streams have already completed, so waiting for the stream
-      // cancellation to complete is not needed.
-      unawaited(stdoutSub.cancel());
-      unawaited(stderrSub.cancel());
-      await _inputController.close();
-    });
+  /// Adds the stdout and stderr streams of the provided [process] to [logLines].
+  void listenToProcessOutput(Process process) {
+    process.stdout.listen(_inputController.add, onError: _inputController.addError);
+    process.stderr.listen(_inputController.add, onError: _inputController.addError);
   }
 
   @override
@@ -380,3 +383,47 @@ class DesktopLogReader extends DeviceLogReader {
   @override
   Future<void> provideVmService(FlutterVmService connectedVmService) async {}
 }
+
+/// A [DeviceLogReader] that mirrors `source` but closes [logLines] as soon
+/// as `scope` completes.
+///
+/// [ProtocolDiscovery] relies on [logLines] reaching "done" to detect that a
+/// launched process exited without ever exposing a VM Service, so it can
+/// give up instead of waiting forever. The device-scoped [DesktopLogReader]
+/// returned by `getLogReader()` can't provide that signal — it must survive
+/// across relaunches — so a fresh, throwaway [SingleLaunchLogReader] is
+/// created for each [DesktopDevice.startApp] call instead, scoped to that
+/// single process via `scope` (typically `process.exitCode`). This mirrors
+/// how `AndroidDevice.startApp` avoids reusing its cached `getLogReader()`
+/// singleton for the same reason, constructing a fresh `AdbLogReader` for VM
+/// Service discovery on each launch.
+class SingleLaunchLogReader extends DeviceLogReader {
+  SingleLaunchLogReader(Stream<String> source, Future<void> scope) {
+    _subscription = source.listen(_controller.add, onError: _controller.addError);
+    // Ignore how `scope` completed — only that it did — so an error from it
+    // (e.g. an unexpected failure reading `process.exitCode`) can't escape
+    // as an unhandled Future error.
+    scope.catchError((Object _, StackTrace _) {}).whenComplete(() {
+      unawaited(_subscription.cancel());
+      unawaited(_controller.close());
+    });
+  }
+
+  final _controller = StreamController<String>.broadcast();
+  late final StreamSubscription<String> _subscription;
+
+  @override
+  Stream<String> get logLines => _controller.stream;
+
+  @override
+  String get name => 'desktop (single launch)';
+
+  @override
+  void dispose() {
+    unawaited(_subscription.cancel());
+    unawaited(_controller.close());
+  }
+
+  @override
+  Future<void> provideVmService(FlutterVmService connectedVmService) async {}
+}
diff --git a/packages/flutter_tools/lib/src/drive/drive_service.dart b/packages/flutter_tools/lib/src/drive/drive_service.dart
index 8f519d549d74f..c9937bd68ed53 100644
--- a/packages/flutter_tools/lib/src/drive/drive_service.dart
+++ b/packages/flutter_tools/lib/src/drive/drive_service.dart
@@ -85,6 +85,7 @@ abstract class DriverService {
     String? userIdentifier,
     String? mainPath,
     Map<String, Object> platformArgs = const <String, Object>{},
+    Map<String, String> webDefines = const <String, String>{},
   });
 
   /// If --use-existing-app is provided, configured the correct VM Service URI.
@@ -160,6 +161,7 @@ class FlutterDriverService extends DriverService {
     String? userIdentifier,
     Map<String, Object> platformArgs = const <String, Object>{},
     String? mainPath,
+    Map<String, String> webDefines = const <String, String>{},
   }) async {
     if (buildInfo.isRelease) {
       throwToolExit(
diff --git a/packages/flutter_tools/lib/src/drive/web_driver_service.dart b/packages/flutter_tools/lib/src/drive/web_driver_service.dart
index d7aff791c05cf..e238d3364a3e9 100644
--- a/packages/flutter_tools/lib/src/drive/web_driver_service.dart
+++ b/packages/flutter_tools/lib/src/drive/web_driver_service.dart
@@ -23,6 +23,7 @@ import '../device.dart';
 import '../globals.dart' as globals;
 import '../project.dart';
 import '../resident_runner.dart';
+import '../web/chrome_constants.dart';
 import '../web/web_runner.dart';
 import 'drive_service.dart';
 
@@ -72,6 +73,7 @@ class WebDriverService extends DriverService {
     String? userIdentifier,
     String? mainPath,
     Map<String, Object> platformArgs = const <String, Object>{},
+    Map<String, String> webDefines = const <String, String>{},
   }) async {
     final FlutterDevice flutterDevice = await FlutterDevice.create(
       device,
@@ -98,6 +100,7 @@ class WebDriverService extends DriverService {
             ),
       platformArgs: platformArgs,
       stayResident: true,
+      webDefines: webDefines,
       flutterProject: FlutterProject.current(),
       fileSystem: globals.fs,
       analytics: globals.analytics,
@@ -340,6 +343,11 @@ Map<String, dynamic> getDesiredCapabilities(
         '--bwsi',
         '--disable-background-timer-throttling',
         '--disable-renderer-backgrounding',
+        '--disable-background-networking',
+        '--disable-sync',
+        '--disable-client-side-phishing-detection',
+        '--disable-notifications',
+        ...kGcmDisabledFlags,
         '--disable-default-apps',
         '--disable-extensions',
         '--disable-popup-blocking',
diff --git a/packages/flutter_tools/lib/src/experimental/extension_discovery.dart b/packages/flutter_tools/lib/src/experimental/extension_discovery.dart
new file mode 100644
index 0000000000000..5b209d89a2cad
--- /dev/null
+++ b/packages/flutter_tools/lib/src/experimental/extension_discovery.dart
@@ -0,0 +1,188 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:isolate';
+
+import 'package:flutter_tools_extension/flutter_tools_extension.dart';
+import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
+import 'package:stream_channel/isolate_channel.dart';
+
+import '../base/logger.dart';
+
+/// Typedef for an extension isolate entrypoint function.
+typedef ExtensionEntryPoint = void Function(SendPort sendPort);
+
+/// Represents an active host-side connection to a running tool extension isolate.
+class ExtensionConnection {
+  ExtensionConnection._({
+    required Isolate isolate,
+    required json_rpc.Peer peer,
+    required this.capabilities,
+    required Logger logger,
+  }) : _isolate = isolate,
+       _peer = peer,
+       _logger = logger;
+
+  Isolate? _isolate;
+  final json_rpc.Peer _peer;
+  final Logger _logger;
+
+  /// The capabilities and supported service namespaces of the extension.
+  final ToolExtensionCapabilities capabilities;
+
+  bool _isDisposed = false;
+
+  /// Sends an RPC request to the extension isolate.
+  Future<Object?> sendRequest(
+    String method, [
+    Object? params,
+    Duration timeout = const Duration(seconds: 5),
+  ]) async {
+    if (_isDisposed) {
+      throw StateError('ExtensionConnection has been disposed.');
+    }
+    _logger.printTrace('ExtensionConnection sending RPC request "$method"...');
+    try {
+      final Object? result = await _peer.sendRequest(method, params).timeout(timeout);
+      _logger.printTrace('ExtensionConnection received response for RPC request "$method".');
+      return result;
+    } catch (error) {
+      _logger.printTrace('ExtensionConnection RPC request "$method" failed with error: $error');
+      rethrow;
+    }
+  }
+
+  /// Spawns an extension isolate from [entryPoint] and completes handshake.
+  static Future<ExtensionConnection> spawn(
+    ExtensionEntryPoint entryPoint, {
+    required Logger logger,
+    Duration timeout = const Duration(seconds: 5),
+  }) async {
+    logger.printTrace('ExtensionConnection spawning extension isolate...');
+    final receivePort = ReceivePort();
+    final errorPort = RawReceivePort();
+    final exitPort = RawReceivePort();
+    final errorCompleter = Completer<Never>();
+
+    errorPort.handler = (Object? error) {
+      if (!errorCompleter.isCompleted) {
+        if (error is List && error.isNotEmpty) {
+          errorCompleter.completeError(StateError('Extension isolate error: ${error[0]}'));
+        } else {
+          errorCompleter.completeError(StateError('Extension isolate error: $error'));
+        }
+      }
+    };
+
+    exitPort.handler = (Object? _) {
+      if (!errorCompleter.isCompleted) {
+        errorCompleter.completeError(
+          StateError('Extension isolate exited unexpectedly before handshake completed.'),
+        );
+      }
+    };
+
+    Isolate? isolate;
+
+    try {
+      isolate = await Isolate.spawn(
+        entryPoint,
+        receivePort.sendPort,
+        onError: errorPort.sendPort,
+        onExit: exitPort.sendPort,
+      );
+      logger.printTrace('ExtensionConnection isolate spawned; connecting IsolateChannel...');
+      final channel = IsolateChannel<Object?>.connectReceive(receivePort);
+      final peer = json_rpc.Peer.withoutJson(channel);
+
+      unawaited(peer.listen());
+
+      logger.printTrace('ExtensionConnection querying extension.getCapabilities...');
+      final Object? responseObj = await Future.any<Object?>([
+        peer.sendRequest('extension.getCapabilities'),
+        errorCompleter.future,
+      ]).timeout(timeout);
+      if (responseObj is! Map<String, Object?>) {
+        throw StateError(
+          'Extension handshake failed: extension.getCapabilities did not return a Map.',
+        );
+      }
+      final capabilities = ToolExtensionCapabilities.fromJson(responseObj);
+      logger.printTrace(
+        'ExtensionConnection handshake complete. Capabilities: ${capabilities.services}',
+      );
+
+      return ExtensionConnection._(
+        isolate: isolate,
+        peer: peer,
+        capabilities: capabilities,
+        logger: logger,
+      );
+    } on TimeoutException {
+      logger.printTrace('ExtensionConnection handshake timed out.');
+      receivePort.close();
+      isolate?.kill(priority: Isolate.immediate);
+      throw TimeoutException('Handshake with tool extension isolate timed out.');
+    } on Object catch (error) {
+      logger.printTrace('ExtensionConnection spawn failed with error: $error');
+      receivePort.close();
+      isolate?.kill(priority: Isolate.immediate);
+      rethrow;
+    } finally {
+      errorPort.close();
+      exitPort.close();
+    }
+  }
+
+  /// Disposes the extension isolate connection.
+  Future<void> dispose() async {
+    if (_isDisposed) {
+      return;
+    }
+    _isDisposed = true;
+    _logger.printTrace('ExtensionConnection disposing isolate connection.');
+    try {
+      await _peer.close();
+    } on Object catch (error) {
+      _logger.printTrace('Error closing extension connection peer: $error');
+    } finally {
+      _isolate?.kill(priority: Isolate.immediate);
+      _isolate = null;
+    }
+  }
+}
+
+/// Discovers and manages active tool extension isolate connections.
+class ExtensionDiscovery {
+  /// Creates an [ExtensionDiscovery] instance with required [logger].
+  ExtensionDiscovery({required Logger logger}) : _logger = logger;
+
+  final List<ExtensionConnection> _connections = <ExtensionConnection>[];
+  final Logger _logger;
+
+  /// Active extension connections.
+  List<ExtensionConnection> get connections => List<ExtensionConnection>.unmodifiable(_connections);
+
+  /// Registers an active [connection].
+  void registerConnection(ExtensionConnection connection) {
+    _logger.printTrace('ExtensionDiscovery registering active connection.');
+    _connections.add(connection);
+  }
+
+  /// Registers multiple active [connections].
+  void registerConnections(Iterable<ExtensionConnection> connections) {
+    _logger.printTrace('ExtensionDiscovery registering ${connections.length} connection(s).');
+    _connections.addAll(connections);
+  }
+
+  /// Disposes all registered extension isolate connections.
+  Future<void> dispose() async {
+    _logger.printTrace('ExtensionDiscovery disposing all registered connections.');
+    for (final ExtensionConnection connection in _connections) {
+      await connection.dispose();
+    }
+    _connections.clear();
+  }
+}
diff --git a/packages/flutter_tools/lib/src/experimental/extension_manager.dart b/packages/flutter_tools/lib/src/experimental/extension_manager.dart
new file mode 100644
index 0000000000000..5e638e8e915d6
--- /dev/null
+++ b/packages/flutter_tools/lib/src/experimental/extension_manager.dart
@@ -0,0 +1,78 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import '../base/context.dart';
+import '../base/logger.dart';
+import '../base/os.dart';
+import '../features.dart';
+import 'extension_discovery.dart';
+
+/// Manages active tool extension isolate connections and exposes capability proxies.
+class ExtensionManager {
+  /// Creates an [ExtensionManager] targeting the active [hostPlatform].
+  ExtensionManager({
+    required this.hostPlatform,
+    required Logger logger,
+    ExtensionDiscovery? discovery,
+    FeatureFlags? featureFlags,
+  }) : _logger = logger,
+       _discovery = discovery ?? ExtensionDiscovery(logger: logger),
+       _featureFlags = featureFlags ?? context.get<FeatureFlags>()!;
+
+  /// The active [HostPlatform].
+  final HostPlatform hostPlatform;
+  final Logger _logger;
+  final ExtensionDiscovery _discovery;
+  final FeatureFlags _featureFlags;
+
+  /// Active extension connections compatible with [hostPlatform].
+  List<ExtensionConnection> get connections => _discovery.connections;
+
+  /// The operating system name of the host platform (e.g. `'linux'`, `'macos'`, `'windows'`).
+  String get hostPlatformName => switch (hostPlatform) {
+    HostPlatform.darwin_x64 || HostPlatform.darwin_arm64 => 'macos',
+    HostPlatform.linux_x64 || HostPlatform.linux_arm64 || HostPlatform.linux_riscv64 => 'linux',
+    HostPlatform.windows_x64 || HostPlatform.windows_arm64 => 'windows',
+  };
+
+  /// Spawns entrypoints without host OS checks; disposes any extension that reports
+  /// it does not support [hostPlatform].
+  Future<void> initialize({
+    List<ExtensionEntryPoint> entryPoints = const <ExtensionEntryPoint>[],
+  }) async {
+    if (!_featureFlags.isToolExtensionsEnabled) {
+      return;
+    }
+    _logger.printTrace(
+      'ExtensionManager initializing for platform "$hostPlatformName" with ${entryPoints.length} entrypoint(s).',
+    );
+    for (final entryPoint in entryPoints) {
+      final ExtensionConnection connection = await ExtensionConnection.spawn(
+        entryPoint,
+        logger: _logger,
+      );
+      if (connection.capabilities.supportsHostPlatform(hostPlatformName) ||
+          connection.capabilities.supportsHostPlatform(hostPlatform.cliName)) {
+        _logger.printTrace(
+          'Extension connection supported on host platform "$hostPlatformName"; registering.',
+        );
+        _discovery.registerConnection(connection);
+      } else {
+        _logger.printTrace(
+          'Extension connection does not support host platform "$hostPlatformName" '
+          '(supported platforms: ${connection.capabilities.supportedPlatforms}); disposing connection.',
+        );
+        await connection.dispose();
+      }
+    }
+  }
+
+  /// Disposes all active extension isolate connections.
+  Future<void> dispose() async {
+    _logger.printTrace('ExtensionManager disposing all active connections.');
+    await _discovery.dispose();
+  }
+}
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index c32c961972d6a..95d6ee004256b 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -88,6 +88,9 @@ abstract class FeatureFlags {
   /// Whether to only build for arm64 when targeting macOS.
   bool get isMacOSArm64OnlyEnabled;
 
+  /// Whether support for tool extensions is enabled.
+  bool get isToolExtensionsEnabled;
+
   /// Whether a particular feature is enabled for the current channel.
   ///
   /// Prefer using one of the specific getters above instead of this API.
@@ -115,6 +118,7 @@ abstract class FeatureFlags {
     uiSceneMigration,
     riscv64,
     macOSArm64Only,
+    toolExtensionsFeature,
   ];
 
   /// All current Flutter feature flags that can be configured.
@@ -327,6 +331,14 @@ const macOSArm64Only = Feature(
   stable: FeatureChannelSetting(available: true),
 );
 
+/// Enable tool extensions feature.
+const toolExtensionsFeature = Feature(
+  name: 'support for tool extensions',
+  configSetting: 'enable-tool-extensions',
+  environmentOverride: 'FLUTTER_TOOL_EXTENSIONS',
+  master: FeatureChannelSetting(available: true),
+);
+
 /// A [Feature] is a process for conditionally enabling tool features.
 ///
 /// All settings are optional, and if not provided will generally default to
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
index bf144dbc2a5e5..c85714f362cbb 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -823,7 +823,7 @@ class IosUsbArtifacts extends CachedArtifact {
   // used for additional download checks below, so we can re-download if they are
   // missing.
   static const _kExecutables = <String, List<String>>{
-    'libimobiledevice': <String>['idevicescreenshot', 'idevicesyslog'],
+    'libimobiledevice': <String>['idevicesyslog'],
     'libusbmuxd': <String>['iproxy'],
   };
 
@@ -927,7 +927,6 @@ const _iosBinaryDirs = <List<String>>[
 ];
 
 const _androidBinaryDirs = <List<String>>[
-  <String>['android-x86', 'android-x86/artifacts.zip'],
   <String>['android-x64', 'android-x64/artifacts.zip'],
   <String>['android-arm', 'android-arm/artifacts.zip'],
   <String>['android-arm-profile', 'android-arm-profile/artifacts.zip'],
diff --git a/packages/flutter_tools/lib/src/flutter_features.dart b/packages/flutter_tools/lib/src/flutter_features.dart
index 315e648de6a9c..b3fdc58dc8266 100644
--- a/packages/flutter_tools/lib/src/flutter_features.dart
+++ b/packages/flutter_tools/lib/src/flutter_features.dart
@@ -78,6 +78,9 @@ mixin FlutterFeatureFlagsIsEnabled implements FeatureFlags {
 
   @override
   bool get isMacOSArm64OnlyEnabled => isEnabled(macOSArm64Only);
+
+  @override
+  bool get isToolExtensionsEnabled => isEnabled(toolExtensionsFeature);
 }
 
 interface class FlutterFeatureFlags extends FeatureFlags with FlutterFeatureFlagsIsEnabled {
diff --git a/packages/flutter_tools/lib/src/flutter_plugins.dart b/packages/flutter_tools/lib/src/flutter_plugins.dart
index 1d52046878f6e..3af0fb0848407 100644
--- a/packages/flutter_tools/lib/src/flutter_plugins.dart
+++ b/packages/flutter_tools/lib/src/flutter_plugins.dart
@@ -1457,6 +1457,7 @@ Future<void> injectPlugins(
             templateRenderer: globals.templateRenderer,
             processUtils: globals.processUtils,
             config: globals.config,
+            logger: globals.logger,
           ),
           fileSystem: globals.fs,
           featureFlags: featureFlags,
diff --git a/packages/flutter_tools/lib/src/ios/core_devices.dart b/packages/flutter_tools/lib/src/ios/core_devices.dart
index f0c96f0a3c5fa..abbe083013267 100644
--- a/packages/flutter_tools/lib/src/ios/core_devices.dart
+++ b/packages/flutter_tools/lib/src/ios/core_devices.dart
@@ -20,6 +20,7 @@ import '../device.dart';
 import '../macos/xcode.dart';
 import '../project.dart';
 import 'application_package.dart';
+import 'device_support.dart';
 import 'lldb.dart';
 import 'xcode_debug.dart';
 import 'xcodeproj.dart';
@@ -101,6 +102,7 @@ class IOSCoreDeviceLauncher {
   /// Requires Xcode 16+.
   Future<bool> launchAppWithLLDBDebugger({
     required String deviceId,
+    required IOSDeviceSupport deviceSupport,
     required String bundlePath,
     required String bundleId,
     required List<String> launchArguments,
@@ -150,12 +152,22 @@ class IOSCoreDeviceLauncher {
       return false;
     }
 
+    // Kill LLDB and devicectl if the CLI shuts down so they do not hang in the background.
+    shutdownHooks.addShutdownHook(() async {
+      try {
+        await stopApp(deviceId: deviceId, processId: processId);
+      } on Exception {
+        // ignore any failures
+      }
+    });
+
     // Start LLDB and attach to the device process.
     final bool attachStatus = await _lldb.attachAndStart(
       deviceId: deviceId,
       appProcessId: processId,
       lldbLogForwarder: lldbLogForwarder,
       mode: mode,
+      deviceSupport: deviceSupport,
     );
 
     // If it fails to attach with lldb, kill the launched process so it doesn't stay hanging.
@@ -991,6 +1003,60 @@ class IOSCoreDeviceControl {
           IOSCoreDeviceRunningProcess.fromJson(processObject),
     ];
   }
+
+  /// Captures a screenshot from the device and saves it to the destination.
+  ///
+  /// Returns true if successfully able to take screenshot.
+  Future<bool> takeScreenshot({required String deviceId, required String destination}) async {
+    if (!_xcode.isDevicectlInstalled) {
+      _logger.printError('devicectl is not installed.');
+      return false;
+    }
+
+    final Directory tempDirectory = _fileSystem.systemTempDirectory.createTempSync('core_devices.');
+    final File output = tempDirectory.childFile('screenshot_results.json');
+    output.createSync();
+
+    final command = <String>[
+      ..._xcode.xcrunCommand(),
+      'devicectl',
+      'device',
+      'capture',
+      'screenshot',
+      '--device',
+      deviceId,
+      '--destination',
+      destination,
+      '--json-output',
+      output.path,
+    ];
+
+    try {
+      await _processUtils.run(command, throwOnError: true);
+      final String stringOutput = output.readAsStringSync();
+
+      try {
+        final Object? decoded = json.decode(stringOutput);
+        if (decoded is Map<String, Object?>) {
+          final Object? decodeResult = decoded['info'];
+          if (decodeResult is Map<String, Object?> && decodeResult['outcome'] == 'success') {
+            return true;
+          }
+        }
+        _logger.printError('devicectl returned unexpected JSON response: $stringOutput');
+        return false;
+      } on FormatException {
+        _logger.printError('devicectl returned non-JSON response: $stringOutput');
+        return false;
+      }
+    } finally {
+      try {
+        tempDirectory.deleteSync(recursive: true);
+      } on FileSystemException {
+        // Ignore.
+      }
+    }
+  }
 }
 
 class IOSCoreDevice {
diff --git a/packages/flutter_tools/lib/src/ios/device_support.dart b/packages/flutter_tools/lib/src/ios/device_support.dart
new file mode 100644
index 0000000000000..4a114f2fd9eb0
--- /dev/null
+++ b/packages/flutter_tools/lib/src/ios/device_support.dart
@@ -0,0 +1,250 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import '../base/file_system.dart';
+import '../base/io.dart';
+import '../base/logger.dart';
+import '../base/process.dart';
+import '../base/version.dart';
+import '../convert.dart';
+import '../macos/xcode.dart';
+
+/// A class to handle preparing the device support for an iOS/iPad device.
+class IOSDeviceSupport {
+  IOSDeviceSupport({
+    required Logger logger,
+    required ProcessUtils processUtils,
+    required Xcode? xcode,
+    required String deviceId,
+    required Directory? homeDirectory,
+    required String? modelCode,
+    required String? operatingSystemVersion,
+    required String? cpuArchitectureString,
+  }) : _xcode = xcode,
+       _logger = logger,
+       _processUtils = processUtils,
+       _deviceId = deviceId,
+       _homeDirectory = homeDirectory,
+       _modelCode = modelCode,
+       _operatingSystemVersion = operatingSystemVersion,
+       _cpuArchitectureString = cpuArchitectureString;
+
+  final Logger _logger;
+  final ProcessUtils _processUtils;
+  final Xcode? _xcode;
+
+  final String _deviceId;
+  final Directory? _homeDirectory;
+  final String? _modelCode;
+  final String? _operatingSystemVersion;
+  final String? _cpuArchitectureString;
+
+  /// The directory that contains iOS Device Support symbols for all devices.
+  ///
+  /// Return null if the $HOME directory cannot be found.
+  late final Directory? _deviceSupportDirectory = _homeDirectory
+      ?.childDirectory('Library')
+      .childDirectory('Developer')
+      .childDirectory('Xcode')
+      .childDirectory('iOS DeviceSupport');
+
+  /// Command to copy device support symbols from device to host machine.
+  List<String> get _prepareDeviceSupportCommand => [
+    'xcrun',
+    'xcodebuild',
+    '-prepareDeviceSupport',
+    '-destination',
+    'id=$_deviceId',
+  ];
+
+  /// Whether the prepareDeviceSupport command is available. Available on Xcode 16.3+.
+  late final bool _prepareDeviceSupportCommandAvailable = () {
+    final Version? xcodeVersion = _xcode?.currentVersion;
+    if (xcodeVersion == null || xcodeVersion < Version(16, 3, 0)) {
+      return false;
+    }
+    return true;
+  }();
+
+  /// Returns the directory for existing Device Support symbols. If there is not an existing
+  /// directory, returns null.
+  Directory? get existingDeviceSupportSymbols {
+    final (Directory? symbolDirectory, Directory? archSymbolDirectory) = _findSymbolDirectories();
+    if (archSymbolDirectory != null && archSymbolDirectory.existsSync()) {
+      return archSymbolDirectory;
+    }
+    if (symbolDirectory != null && symbolDirectory.existsSync()) {
+      return symbolDirectory;
+    }
+    return null;
+  }
+
+  /// Calls `xcodebuild -prepareDeviceSupport` and streams the logs when copying is in progress.
+  ///
+  /// The command copies symbols from the iOS device to the host machine and stores them in
+  /// $HOME/Library/Developer/Xcode/iOS DeviceSupport. Without these symbols, debugging is
+  /// extremely slow.
+  Future<void> prepareDeviceSupport() async {
+    if (!_prepareDeviceSupportCommandAvailable || existingDeviceSupportSymbols != null) {
+      return;
+    }
+
+    try {
+      final Process process = await _processUtils.start(_prepareDeviceSupportCommand);
+
+      final timer = Timer(const Duration(seconds: 10), () {
+        _logger.printError(
+          'Xcode is taking longer than expected to start preparing Device Support symbols...\n'
+          'Try closing Xcode, connecting your device via USB, and running the following command:\n'
+          '  "${_prepareDeviceSupportCommand.join(' ')}"',
+        );
+      });
+
+      var printToTrace = true;
+      final StreamSubscription<String> stdoutSubscription = process.stdout
+          .transform(utf8.decoder)
+          .listen((String text) {
+            if (text.contains('Copying')) {
+              printToTrace = false;
+              _logger.printStatus(
+                'Copying Device Support symbols. This may take several minutes to complete...\n'
+                'Please do not connect or disconnect your device or open Xcode until finished.',
+              );
+              timer.cancel();
+            }
+            if (printToTrace) {
+              _logger.printTrace(text);
+            } else {
+              _logger.printStatus(text, newline: false);
+            }
+          });
+
+      final StreamSubscription<String> stderrSubscription = process.stderr
+          .transform(utf8.decoder)
+          .transform(const LineSplitter())
+          .listen((String line) {
+            _logger.printError(line);
+          });
+
+      try {
+        // Wait for stdout and stderr to be fully processed
+        // because process.exitCode may complete first.
+        await Future.wait<void>(<Future<void>>[
+          stdoutSubscription.asFuture<void>(),
+          stderrSubscription.asFuture<void>(),
+        ]);
+
+        unawaited(stdoutSubscription.cancel());
+        unawaited(stderrSubscription.cancel());
+
+        final int exitCode = await process.exitCode;
+        if (exitCode != 0) {
+          _logger.printError('xcodebuild -prepareDeviceSupport exited with code $exitCode');
+        }
+      } finally {
+        timer.cancel();
+      }
+
+      // Print an empty line so that next prints aren't inline with logs from here.
+      if (!printToTrace) {
+        _logger.printStatus('');
+      }
+    } on ProcessException catch (exception, stackTrace) {
+      _logger.printError(
+        'Process exception running "xcodebuild -prepareDeviceSupport": $exception',
+      );
+      _logger.printTrace('$stackTrace');
+    }
+  }
+
+  /// Returns a warning describing the status of Device Support symbols and guided actions to
+  /// resolve issues.
+  String? missingSymbolsWarning({bool warnWhenSymbolsExist = false}) {
+    const reducePerformance =
+        'This will likely reduce debugging performance and may cause the app to hang on a white '
+        'screen during launch.';
+    const expectedPath =
+        r'Once Device Support symbols are finished being copied, they are expected to be found at';
+
+    if (existingDeviceSupportSymbols != null) {
+      if (warnWhenSymbolsExist) {
+        final String action;
+        if (_prepareDeviceSupportCommandAvailable) {
+          action =
+              'Connect the device via USB and trigger a copy:\n'
+              '     ${_prepareDeviceSupportCommand.join(' ')}';
+        } else {
+          action =
+              'Connect the device via USB, close and then re-open Xcode. It may take several '
+              'minutes for Xcode to copy symbols from the device. $expectedPath ${existingDeviceSupportSymbols!.path}';
+        }
+        return 'Xcode Device Support symbols exist for this device, but are being read from '
+            'process memory. $reducePerformance\n'
+            'To re-copy symbols from your device, complete the following steps:\n'
+            '  1. Remove cached symbols:\n'
+            '     rm -rf "${existingDeviceSupportSymbols!.parent.path}"\n'
+            '  2. $action';
+      }
+      return null;
+    }
+
+    final (Directory? symbolDirectory, Directory? archSymbolDirectory) = _findSymbolDirectories();
+
+    const unableToFind = 'Xcode Device Support was not found for this device.';
+    const incompleteCopy = 'Xcode has not finished copying Device Support symbols for this device.';
+    final String action;
+    if (_prepareDeviceSupportCommandAvailable) {
+      action =
+          'To trigger Device Symbols to be copied, connect the device via USB, and run this command:\n'
+          '  "${_prepareDeviceSupportCommand.join(' ')}"';
+    } else {
+      action =
+          'To trigger Device Symbols to be copied, connect the device via USB, close and then '
+          're-open Xcode. It may take several minutes for Xcode to copy symbols from the device.';
+    }
+
+    const retryAction = 'Please retry "flutter run" once symbols are finished being copied.';
+
+    // The symbol directory may be null if the home directory could not be determined.
+    if (symbolDirectory == null) {
+      return '$unableToFind $reducePerformance\n$action\n$expectedPath '
+          '\$HOME/Library/Developer/Xcode/iOS DeviceSupport\n$retryAction';
+    }
+
+    // If the device's directory exists, it means Xcode has at least started copying symbols.
+    final bool deviceDirExists = symbolDirectory.parent.existsSync();
+    final status = deviceDirExists ? incompleteCopy : unableToFind;
+    final archPath = archSymbolDirectory != null ? ' or ${archSymbolDirectory.path}' : '';
+
+    return '$status $reducePerformance\n$action\n$expectedPath ${symbolDirectory.path}$archPath\n'
+        '$retryAction';
+  }
+
+  /// Helper method to find the Device Support Symbols directories for a given device.
+  ///
+  /// Returns a tuple of the symbol directory and the architecture-specific symbol directory.
+  /// If the paths to the directories cannot be constructed, returns (null, null).
+  ///
+  /// The architecture-specific symbol directory is only present on newer versions of iOS (27+).
+  (Directory?, Directory?) _findSymbolDirectories() {
+    if (_deviceSupportDirectory == null || _modelCode == null || _operatingSystemVersion == null) {
+      return (null, null);
+    }
+    final Directory deviceDirectory = _deviceSupportDirectory.childDirectory(
+      '$_modelCode $_operatingSystemVersion',
+    );
+    final Directory symbolDirectory = deviceDirectory.childDirectory('Symbols');
+
+    // iOS 27+ devices seem to store the symbol directory in a sub-directory
+    // /Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPad14,3 27.0 (24A5380h)/arm64e/Symbols
+    final Directory? archSymbolDirectory =
+        _cpuArchitectureString != null && _cpuArchitectureString.isNotEmpty
+        ? deviceDirectory.childDirectory(_cpuArchitectureString).childDirectory('Symbols')
+        : null;
+
+    return (symbolDirectory, archSymbolDirectory);
+  }
+}
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart
index 48f9fa1ebdb70..8f599d5b8279b 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -38,6 +38,7 @@ import '../protocol_discovery.dart';
 import '../vmservice.dart';
 import 'application_package.dart';
 import 'core_devices.dart';
+import 'device_support.dart';
 import 'ios_deploy.dart';
 import 'ios_workflow.dart';
 import 'iproxy.dart';
@@ -308,14 +309,19 @@ class IOSDevice extends Device {
   IOSDevice(
     super.id, {
     required FileSystem fileSystem,
+    required FileSystemUtils fileSystemUtils,
+    required ProcessUtils processUtils,
     required this.name,
     required CpuArch cpuArch,
+    String? cpuArchitectureString,
     required this.connectionInterface,
     required this.isConnected,
     required this.isPaired,
     required this.devModeEnabled,
     required this.isCoreDevice,
     String? sdkVersion,
+    String? modelCode,
+    String? operatingSystemVersion,
     required Platform platform,
     required IOSDeploy iosDeploy,
     required IMobileDevice iMobileDevice,
@@ -325,15 +331,22 @@ class IOSDevice extends Device {
     required IProxy iProxy,
     required super.logger,
     required Analytics analytics,
+    required Xcode? xcode,
   }) : _cpuArch = cpuArch,
        _sdkVersion = sdkVersion,
+       _modelCode = modelCode,
+       _operatingSystemVersion = operatingSystemVersion,
+       _cpuArchitectureString = cpuArchitectureString,
        _iosDeploy = iosDeploy,
        _iMobileDevice = iMobileDevice,
        _coreDeviceControl = coreDeviceControl,
        _coreDeviceLauncher = coreDeviceLauncher,
        _xcodeDebug = xcodeDebug,
+       _xcode = xcode,
        _iproxy = iProxy,
        _fileSystem = fileSystem,
+       _fileSystemUtils = fileSystemUtils,
+       _processUtils = processUtils,
        _logger = logger,
        _analytics = analytics,
        _platform = platform,
@@ -345,15 +358,20 @@ class IOSDevice extends Device {
   }
 
   final String? _sdkVersion;
+  final String? _modelCode;
+  final String? _operatingSystemVersion;
   final IOSDeploy _iosDeploy;
   final Analytics _analytics;
   final FileSystem _fileSystem;
+  final FileSystemUtils _fileSystemUtils;
+  final ProcessUtils _processUtils;
   final Logger _logger;
   final Platform _platform;
   final IMobileDevice _iMobileDevice;
   final IOSCoreDeviceControl _coreDeviceControl;
   final IOSCoreDeviceLauncher _coreDeviceLauncher;
   final XcodeDebug _xcodeDebug;
+  final Xcode? _xcode;
   final IProxy _iproxy;
 
   Version? get sdkVersion {
@@ -365,6 +383,19 @@ class IOSDevice extends Device {
     return sdkVersion?.major ?? 0;
   }
 
+  late final IOSDeviceSupport deviceSupport = IOSDeviceSupport(
+    logger: _logger,
+    processUtils: _processUtils,
+    xcode: _xcode,
+    homeDirectory: _fileSystemUtils.homeDirPath == null
+        ? null
+        : _fileSystem.directory(_fileSystemUtils.homeDirPath),
+    modelCode: _modelCode,
+    operatingSystemVersion: _operatingSystemVersion,
+    cpuArchitectureString: _cpuArchitectureString,
+    deviceId: id,
+  );
+
   @override
   final String name;
 
@@ -373,6 +404,8 @@ class IOSDevice extends Device {
 
   final CpuArch _cpuArch;
 
+  final String? _cpuArchitectureString;
+
   @override
   Future<CpuArch> get cpuArch async => _cpuArch;
 
@@ -563,6 +596,11 @@ class IOSDevice extends Device {
       return LaunchResult.failed();
     }
 
+    final bool shouldAttachDebugger = shouldAttachLLDBDebugger(debuggingOptions);
+    if (shouldAttachDebugger) {
+      await deviceSupport.prepareDeviceSupport();
+    }
+
     // Step 3: Attempt to install the application on the device.
     final List<String> launchArguments = debuggingOptions.getIOSLaunchArguments(
       EnvironmentType.physical,
@@ -611,6 +649,7 @@ class IOSDevice extends Device {
           mainPath: mainPath,
           discoveryTimeout: discoveryTimeout,
           shutdownHooks: shutdownHooks ?? globals.shutdownHooks,
+          shouldAttachDebugger: shouldAttachDebugger,
         );
         installationResult = result ? 0 : 1;
         deploymentMethod = coreDeviceDeploymentMethod;
@@ -867,8 +906,8 @@ class IOSDevice extends Device {
         pattern: RegExp(
           '`UIScene` lifecycle will soon be required|This process does not adopt UIScene lifecycle',
         ),
-        action: () {
-          globals.printWarning(uisceneWarning);
+        action: (String message) {
+          _logger.printWarning(uisceneWarning);
         },
         excludeFromStream: true,
       );
@@ -878,7 +917,7 @@ class IOSDevice extends Device {
     final uisceneCrashInterceptor = LogInterceptor(
       identifier: 'uiscene_crash',
       pattern: RegExp(r'UIScene life\s?cycle is required'),
-      action: () {
+      action: (String message) {
         throwToolExit(kUISceneMigrationRequiredError);
       },
       excludeFromStream: false,
@@ -893,7 +932,7 @@ class IOSDevice extends Device {
     final appTerminatedInterceptor = LogInterceptor(
       identifier: 'app_terminated',
       pattern: RegExp('^App terminated due to signal'),
-      action: () {
+      action: (String message) {
         if (!appTerminatedCompleter.isCompleted) {
           appTerminatedCompleter.complete();
         }
@@ -901,6 +940,20 @@ class IOSDevice extends Device {
       excludeFromStream: false,
     );
     deviceLogReader.addLogInterceptor(appTerminatedInterceptor);
+
+    final missingSymbolsInterceptor = LogInterceptor(
+      identifier: 'missing_symbols',
+      pattern: LLDB.missingSymbolsPattern,
+      action: (String message) {
+        _logger.printTrace(message);
+        final String? warning = deviceSupport.missingSymbolsWarning(warnWhenSymbolsExist: true);
+        if (warning != null) {
+          _logger.printWarning(warning);
+        }
+      },
+      excludeFromStream: true,
+    );
+    deviceLogReader.addLogInterceptor(missingSymbolsInterceptor);
   }
 
   /// Find the Dart VM url using ProtocolDiscovery (logs from `idevicesyslog`)
@@ -972,7 +1025,7 @@ class IOSDevice extends Device {
     return LogInterceptor(
       identifier: kJITCrashLogInterceptorIdentifier,
       pattern: kJITCrashFailureMessage,
-      action: () {
+      action: (String message) {
         throwToolExit(jitCrashFailureInstructions(deviceSdkVersion));
       },
       excludeFromStream: false,
@@ -1018,6 +1071,15 @@ class IOSDevice extends Device {
     );
   }
 
+  /// Whether the LLDB debugger should be attached.
+  ///
+  /// The LLDB debugger should only be attached in debug mode or if the user uses the
+  /// `--ios-profile-debugger` flag in profile mode.
+  bool shouldAttachLLDBDebugger(DebuggingOptions debuggingOptions) {
+    return debuggingOptions.buildInfo.isDebug ||
+        (debuggingOptions.buildInfo.isProfile && (debuggingOptions.iosProfileDebugger ?? false));
+  }
+
   /// Uses either `devicectl` or Xcode automation to install, launch, and debug
   /// apps on physical iOS devices.
   ///
@@ -1041,6 +1103,7 @@ class IOSDevice extends Device {
     required IOSApp package,
     required List<String> launchArguments,
     required String? mainPath,
+    required bool shouldAttachDebugger,
     required ShutdownHooks shutdownHooks,
     @visibleForTesting Duration? discoveryTimeout,
   }) async {
@@ -1073,8 +1136,7 @@ class IOSDevice extends Device {
     // However, it doesn't work reliably until Xcode 26.
     // Use LLDB if Xcode version is greater than 26 and the feature is enabled.
     final Version? xcodeVersion = globals.xcode?.currentVersion;
-    final bool lldbFeatureEnabled = featureFlags.isLLDBDebuggingEnabled;
-    if (xcodeVersion != null && xcodeVersion.major >= 26 && lldbFeatureEnabled) {
+    if (xcodeVersion != null && xcodeVersion.major >= 26 && featureFlags.isLLDBDebuggingEnabled) {
       final DeviceLogReader deviceLogReader = getLogReader(
         app: package,
         usingCISystem: debuggingOptions.usingCISystem,
@@ -1083,13 +1145,10 @@ class IOSDevice extends Device {
         await deviceLogReader.listenToCoreDeviceLauncher(_coreDeviceLauncher);
       }
 
-      final bool shouldAttachDebugger =
-          debuggingOptions.buildInfo.isDebug ||
-          (debuggingOptions.buildInfo.isProfile && (debuggingOptions.iosProfileDebugger ?? false));
-
       if (shouldAttachDebugger) {
         final bool launchSuccess = await _coreDeviceLauncher.launchAppWithLLDBDebugger(
           deviceId: id,
+          deviceSupport: deviceSupport,
           bundlePath: package.deviceBundlePath,
           bundleId: package.id,
           launchArguments: launchArguments,
@@ -1323,17 +1382,42 @@ class IOSDevice extends Device {
 
   @override
   bool get supportsScreenshot {
-    if (isCoreDevice) {
-      // `idevicescreenshot` stopped working with iOS 17 / Xcode 15
-      // (https://github.com/flutter/flutter/issues/128598).
-      return false;
+    final Version? xcodeVersion = globals.xcode?.currentVersion;
+    if (isCoreDevice && xcodeVersion != null && xcodeVersion.major >= 27) {
+      return globals.xcode!.isDevicectlInstalled;
     }
-    return _iMobileDevice.isInstalled;
+    return false;
   }
 
   @override
   Future<void> takeScreenshot(File outputFile) async {
-    await _iMobileDevice.takeScreenshot(outputFile, id, connectionInterface);
+    final Version? xcodeVersion = globals.xcode?.currentVersion;
+    if (isCoreDevice && xcodeVersion != null && xcodeVersion.major >= 27) {
+      var success = false;
+      try {
+        success = await _coreDeviceControl.takeScreenshot(
+          deviceId: id,
+          destination: outputFile.path,
+        );
+      } on Exception catch (error) {
+        final errorMessage = error.toString();
+        if (errorMessage.contains('CoreDeviceError error 4000') ||
+            errorMessage.contains('CoreDeviceError error 4016') ||
+            errorMessage.contains('RemotePairingError error 2') ||
+            errorMessage.contains('Connection was invalidated')) {
+          throwToolExit(
+            'Failed to establish a connection to the device. '
+            'Please make sure the device is available and try again.',
+          );
+        }
+        throwToolExit('Failed to take screenshot with devicectl: $error');
+      }
+      if (success) {
+        return;
+      }
+      throwToolExit('Failed to take screenshot with devicectl.');
+    }
+    throwToolExit('flutter screenshot requires Xcode 27 or higher.');
   }
 
   @override
@@ -1428,7 +1512,7 @@ class LogInterceptor {
   final Pattern pattern;
 
   /// If the log contain the [pattern], the [action] will be called.
-  final void Function() action;
+  final void Function(String message) action;
 
   /// If `true`, the log will be excluded from being added to the stream.
   final bool excludeFromStream;
@@ -1466,7 +1550,7 @@ abstract class SharedIOSDeviceLogReader extends DeviceLogReader {
   bool _interceptLog(String message) {
     for (final LogInterceptor interceptor in _logInterceptors) {
       if (message.contains(interceptor.pattern)) {
-        interceptor.action();
+        interceptor.action(message);
         if (interceptor.excludeFromStream) {
           return true;
         }
diff --git a/packages/flutter_tools/lib/src/ios/lldb.dart b/packages/flutter_tools/lib/src/ios/lldb.dart
index 31f24abbdff50..6df379111c05d 100644
--- a/packages/flutter_tools/lib/src/ios/lldb.dart
+++ b/packages/flutter_tools/lib/src/ios/lldb.dart
@@ -7,11 +7,13 @@ library;
 
 import 'dart:async';
 
+import '../base/file_system.dart';
 import '../base/io.dart';
 import '../base/logger.dart';
 import '../base/process.dart';
 import '../base/utils.dart';
 import '../build_info.dart';
+import 'device_support.dart';
 import 'xcodeproj.dart';
 
 /// LLDB is the default debugger in Xcode on macOS. Once the application has
@@ -39,6 +41,8 @@ class LLDB {
   /// Whether or not the LLDB process has attached and resumed the application process.
   var _isAttached = false;
 
+  var _warnedAboutMissingSymbols = false;
+
   /// The process id of the application running on the iOS device.
   int? get appProcessId => _lldbProcess?.appProcessId;
 
@@ -80,6 +84,12 @@ class LLDB {
     _stopHookProcessedPattern,
   ];
 
+  /// Pattern of lldb log when libobjc.A.dylib is being read from process memory. This indicates
+  /// that Device Support symbols were not found on the host machine.
+  static final missingSymbolsPattern = RegExp(
+    'warning: libobjc.A.dylib is being read from process memory.',
+  );
+
   /// Breakpoint script required for JIT on iOS.
   ///
   /// This should match the "handle_new_rx_page" function in [IosProject._lldbPythonHelperTemplate].
@@ -114,19 +124,24 @@ return False
     required int appProcessId,
     required LLDBLogForwarder lldbLogForwarder,
     required BuildMode mode,
+    required IOSDeviceSupport deviceSupport,
   }) async {
     Timer? timer;
     try {
       timer = Timer(const Duration(minutes: 1), () {
-        _logger.printError(
-          'LLDB is taking longer than expected to start debugging the app. '
-          "LLDB debugging can be disabled for the project by adding the following in the project's pubspec.yaml:\n"
-          'flutter:\n'
-          '  config:\n'
-          '    enable-lldb-debugging: false\n'
-          'Or disable LLDB debugging globally with the following command:\n'
-          '  "flutter config --no-enable-lldb-debugging"',
-        );
+        final String? warning = deviceSupport.missingSymbolsWarning();
+        if (warning != null) {
+          _logger.printWarning(
+            'LLDB is taking longer than expected to start debugging the app. $warning',
+          );
+          _warnedAboutMissingSymbols = true;
+        } else {
+          _logger.printError(
+            'LLDB is taking longer than expected to start debugging the app. Try again using '
+            '--verbose and file a bug including the verbose logs '
+            'at https://github.com/flutter/flutter/issues/new?template=01_activation.yml',
+          );
+        }
       });
 
       final bool start = await _startLLDB(
@@ -137,11 +152,14 @@ return False
         return false;
       }
       await _selectDevice(deviceId);
+      await _addSymbolSearchPaths(deviceSupport);
+
       if (mode == BuildMode.debug) {
         await _setBreakpoint();
       }
       await _attachToAppProcess(appProcessId);
       await _setupStopHooks();
+      await _printDeviceSupportStatus();
       await _resumeProcess(mode);
       _isAttached = true;
     } on _LLDBError catch (e) {
@@ -232,6 +250,7 @@ return False
     }
     _logCompleter = null;
     _isAttached = false;
+    _warnedAboutMissingSymbols = false;
     return success;
   }
 
@@ -240,6 +259,27 @@ return False
     await _lldbProcess?.stdinWriteln('device select $deviceId');
   }
 
+  /// Adds the symbol search paths to the LLDB process.
+  Future<void> _addSymbolSearchPaths(IOSDeviceSupport deviceSupport) async {
+    final Directory? symbolDirectory = deviceSupport.existingDeviceSupportSymbols;
+    if (symbolDirectory == null) {
+      return;
+    }
+    await _lldbProcess?.stdinWriteln(
+      'platform select remote-ios --sysroot "${symbolDirectory.path}"',
+    );
+  }
+
+  /// Prints logs of available Device Support
+  Future<void> _printDeviceSupportStatus() async {
+    final Future<String> futureLog = _startWaitingForLog(
+      RegExp(r'\s*Platform:'),
+    ).then((value) => value, onError: _handleAsyncError);
+
+    await _lldbProcess?.stdinWriteln('platform status');
+    await futureLog;
+  }
+
   /// Attaches LLDB to the [appProcessId] running on the device.
   Future<void> _attachToAppProcess(int appProcessId) async {
     // Since the app starts stopped (--start-stopped), we expect a stopped state
@@ -346,6 +386,13 @@ return False
   }
 
   bool _ignoreLog(String log) {
+    // We only want to warn about missing symbols once.
+    if (log.contains(missingSymbolsPattern)) {
+      if (_warnedAboutMissingSymbols) {
+        return true;
+      }
+      _warnedAboutMissingSymbols = true;
+    }
     return _ignorePatterns.any((Pattern pattern) => log.contains(pattern));
   }
 }
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
index 4a4fa844df7f6..99a02a86e818f 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -79,10 +79,8 @@ class IMobileDevice {
     required ProcessManager processManager,
     required Logger logger,
   }) : _idevicesyslogPath = artifacts.getHostArtifact(HostArtifact.idevicesyslog).path,
-       _idevicescreenshotPath = artifacts.getHostArtifact(HostArtifact.idevicescreenshot).path,
        _dyLdLibEntry = cache.dyLdLibEntry,
-       _processUtils = ProcessUtils(logger: logger, processManager: processManager),
-       _processManager = processManager;
+       _processUtils = ProcessUtils(logger: logger, processManager: processManager);
 
   /// Create an [IMobileDevice] for testing.
   factory IMobileDevice.test({required ProcessManager processManager}) {
@@ -96,13 +94,9 @@ class IMobileDevice {
   }
 
   final String _idevicesyslogPath;
-  final String _idevicescreenshotPath;
   final MapEntry<String, String> _dyLdLibEntry;
-  final ProcessManager _processManager;
   final ProcessUtils _processUtils;
 
-  late final bool isInstalled = _processManager.canRun(_idevicescreenshotPath);
-
   /// Starts `idevicesyslog` and returns the running process.
   Future<Process> startLogger(String deviceID, bool isWirelesslyConnected) {
     return _processUtils.start(<String>[
@@ -112,25 +106,6 @@ class IMobileDevice {
       if (isWirelesslyConnected) '--network',
     ], environment: Map<String, String>.fromEntries(<MapEntry<String, String>>[_dyLdLibEntry]));
   }
-
-  /// Captures a screenshot to the specified outputFile.
-  Future<void> takeScreenshot(
-    File outputFile,
-    String deviceID,
-    DeviceConnectionInterface interfaceType,
-  ) {
-    return _processUtils.run(
-      <String>[
-        _idevicescreenshotPath,
-        outputFile.path,
-        '--udid',
-        deviceID,
-        if (interfaceType == DeviceConnectionInterface.wireless) '--network',
-      ],
-      throwOnError: true,
-      environment: Map<String, String>.fromEntries(<MapEntry<String, String>>[_dyLdLibEntry]),
-    );
-  }
 }
 
 Future<XcodeBuildResult> buildXcodeProject({
@@ -328,7 +303,7 @@ Future<XcodeBuildResult> buildXcodeProject({
       .fetchDependenciesAndGenerateXcodebuildArgs(
         app.project,
         globals.fs.directory(buildDirectoryPath),
-        skipPackageUpdatesAndValidation: false,
+        skipPackageValidation: false,
       );
   final buildCommands = <String>[...xcodebuildCommandArgs, '-configuration', configuration];
 
@@ -1109,16 +1084,14 @@ _XCResultIssueHandlingResult _handleXCResultIssue({
       hasProvisioningProfileIssue: false,
       duplicateModule: duplicateModule,
     );
-  } else if (message.toLowerCase().contains('not found')) {
-    final String? missingModule = _parseMissingModule(message);
-    if (missingModule != null) {
-      return _XCResultIssueHandlingResult(
-        requiresProvisioningProfile: false,
-        hasProvisioningProfileIssue: false,
-        missingModule: missingModule,
-      );
-    }
-  } else if (message.toLowerCase().contains('has been modified since')) {
+  } else if (message.toLowerCase().contains('not found') && _parseMissingModule(message) != null) {
+    return _XCResultIssueHandlingResult(
+      requiresProvisioningProfile: false,
+      hasProvisioningProfileIssue: false,
+      missingModule: _parseMissingModule(message),
+    );
+  } else if (message.toLowerCase().contains('has been modified since') ||
+      (message.toLowerCase().contains('module map file') && message.toLowerCase().contains('not found'))) {
     return _XCResultIssueHandlingResult(
       requiresProvisioningProfile: false,
       hasProvisioningProfileIssue: false,
@@ -1289,7 +1262,7 @@ Future<bool> _handleIssues(
   } else if (modifiedPrecompiledSource) {
     logger.printError(
       '════════════════════════════════════════════════════════════════════════════════\n'
-      'A precompiled file has been changed since last built. Please run "flutter clean" to clear '
+      'A precompiled file has been changed since last built. Please run "flutter clean --include-xcode-workspace" to clear '
       'the cache.\n'
       '════════════════════════════════════════════════════════════════════════════════',
     );
@@ -1557,7 +1530,7 @@ class _XCResultIssueHandlingResult {
   final String? missingModule;
 
   /// An issue indicates that a source file, such as a header in the Flutter framework, has
-  /// changed since last built. This requires "flutter clean" to resolve.
+  /// changed since last built. This requires "flutter clean --include-xcode-workspace" to resolve.
   final bool modifiedPrecompiledSource;
 
   final bool unableToFindArmDestination;
diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart
index f91b650e56adc..8d906d6047b31 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -843,7 +843,7 @@ class _IOSSimulatorLogReader extends SharedIOSDeviceLogReader {
     final uisceneCrashInterceptor = LogInterceptor(
       identifier: 'uiscene_crash',
       pattern: RegExp(r'UIScene life\s?cycle is required'),
-      action: () {
+      action: (String message) {
         throwToolExit(kUISceneMigrationRequiredError);
       },
       excludeFromStream: false,
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
index 7f14e808d3c88..51f55bf405ddf 100644
--- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart
+++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -26,7 +26,6 @@ import '../xcode_project.dart';
 
 final _settingExpr = RegExp(r'(\w+)\s*=\s*(.*)$');
 final _varExpr = RegExp(r'\$\(([^)]*)\)');
-const kSwiftPackageCacheDirectoryName = 'SourcePackages';
 
 /// Interpreter of Xcode projects.
 class XcodeProjectInterpreter {
@@ -189,7 +188,7 @@ class XcodeProjectInterpreter {
   Future<List<String>> fetchDependenciesAndGenerateXcodebuildArgs(
     XcodeBasedProject xcodeProject,
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) async {
     // All `xcodebuild` project commands will download and resolve Swift packages.
     // We should always prefetch Swift packages before running any `xcodebuild` project command
@@ -198,7 +197,7 @@ class XcodeProjectInterpreter {
 
     return _xcodebuildProjectCommandArguments(
       buildDirectory,
-      skipPackageUpdatesAndValidation: skipPackageUpdatesAndValidation,
+      skipPackageValidation: skipPackageValidation,
     );
   }
 
@@ -209,11 +208,11 @@ class XcodeProjectInterpreter {
 
   /// Returns a list of required arguments for the `xcodebuild` Xcode project command.
   ///
-  /// When [skipPackageUpdatesAndValidation] is true, it uses arguments to attempt skipping any
-  /// Swift package updates and validation.
+  /// When [skipPackageValidation] is true, it uses arguments to attempt skipping any Swift
+  /// package validation.
   List<String> _xcodebuildProjectCommandArguments(
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) {
     final String cachePath = swiftPackageCachePath(buildDirectory);
     return <String>[
@@ -221,8 +220,7 @@ class XcodeProjectInterpreter {
       'xcodebuild',
       '-clonedSourcePackagesDirPath',
       cachePath,
-      if (skipPackageUpdatesAndValidation) ...<String>[
-        '-skipPackageUpdates',
+      if (skipPackageValidation) ...<String>[
         '-skipPackagePluginValidation',
         '-skipPackageSignatureValidation',
       ],
@@ -395,9 +393,9 @@ class XcodeProjectInterpreter {
     await xcodeProject.prefetchSwiftPackages(
       xcodebuildProjectCommandArguments: _xcodebuildProjectCommandArguments(
         buildDirectory,
-        // skipPackageUpdatesAndValidation should be false so that when subsequent xcodebuild
+        // skipPackageValidation should be false so that when subsequent xcodebuild
         // commands run, packages should already be resolved, downloaded, updated, and validated.
-        skipPackageUpdatesAndValidation: false,
+        skipPackageValidation: false,
       ),
       processUtils: _processUtils,
       logger: _logger,
diff --git a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
index 3e0ec38639659..bff4e91d19723 100644
--- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
@@ -12,6 +12,7 @@ import 'package:logging/logging.dart' as logging;
 import 'package:package_config/package_config_types.dart';
 
 import '../../base/common.dart';
+import '../../base/error_handling_io.dart';
 import '../../base/file_system.dart';
 import '../../base/logger.dart';
 import '../../base/platform.dart';
@@ -543,6 +544,7 @@ class FlutterNativeAssetsBuildRunnerImpl implements FlutterNativeAssetsBuildRunn
     this.packageConfig,
     this.fileSystem,
     this.logger,
+    this.platform,
     this.runPackageName,
     this.pubspecPath, {
     required this.includeDevDependencies,
@@ -553,6 +555,7 @@ class FlutterNativeAssetsBuildRunnerImpl implements FlutterNativeAssetsBuildRunn
   final PackageConfig packageConfig;
   final FileSystem fileSystem;
   final Logger logger;
+  final Platform platform;
   final String runPackageName;
 
   /// Include the dev dependencies of [runPackageName].
@@ -581,7 +584,7 @@ class FlutterNativeAssetsBuildRunnerImpl implements FlutterNativeAssetsBuildRunn
   late final Uri _dartExecutable = fileSystem
       .directory(Cache.flutterRoot)
       .uri
-      .resolve('bin/cache/dart-sdk/bin/dart');
+      .resolve('bin/cache/dart-sdk/bin/dart${platform.isWindows ? '.exe' : ''}');
 
   late final packageLayout = PackageLayout.fromPackageConfig(
     fileSystem,
@@ -830,8 +833,8 @@ Future<List<File>> _copyNativeCodeAssetsForOS(
   if (!targetDir.existsSync()) {
     targetDir.createSync(recursive: true);
   }
-  await for (final FileSystemEntity entity in targetDir.list()) {
-    await entity.delete(recursive: true);
+  for (final FileSystemEntity entity in await targetDir.list().toList()) {
+    ErrorHandlingFileSystem.deleteIfExists(entity, recursive: true);
   }
 
   if (assetTargetLocations.isEmpty) {
diff --git a/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart b/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart
index 73bc965e29e4e..f81f2a4c59afb 100644
--- a/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart
+++ b/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart
@@ -44,6 +44,7 @@ Future<Uri?> testCompilerBuildNativeAssets(BuildInfo buildInfo) async {
     buildInfo.packageConfig,
     globals.fs,
     globals.logger,
+    globals.platform,
     runPackageName,
     includeDevDependencies: true,
     pubspecPath,
diff --git a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
index 6f49a8bf4470d..8f76a0842b708 100644
--- a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
+++ b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
@@ -26,6 +26,7 @@ import '../base/utils.dart';
 import '../build_info.dart';
 import '../cache.dart';
 import '../dart/language_version.dart';
+import '../dart/package_map.dart';
 import '../devfs.dart';
 import '../device.dart';
 import '../flutter_plugins.dart';
@@ -355,6 +356,7 @@ class ResidentWebRunner extends ResidentRunner {
             debuggingOptions.buildInfo,
             ServiceWorkerStrategy.none,
             compilerConfigs: <WebCompilerConfig>[_compilerConfig],
+            webDefines: _webDefines,
           );
         }
         final webDevFS = flutterDevice!.devFS! as WebDevFS;
@@ -508,6 +510,7 @@ class ResidentWebRunner extends ResidentRunner {
           debuggingOptions.buildInfo,
           ServiceWorkerStrategy.none,
           compilerConfigs: <WebCompilerConfig>[_compilerConfig],
+          webDefines: _webDefines,
         );
       } on ToolExit {
         return OperationResult(1, 'Failed to recompile application.');
@@ -710,7 +713,7 @@ class ResidentWebRunner extends ResidentRunner {
       // the web_plugin_registrant.dart file alongside the generated main.dart
       const generatedImport = 'web_plugin_registrant.dart';
 
-      Uri? importedEntrypoint = packageConfig!.toPackageUri(mainUri);
+      Uri? importedEntrypoint = packageConfig!.toPackageUriForWorkspace(mainUri);
       // Special handling for entrypoints that are not under lib, such as test scripts.
       if (importedEntrypoint == null) {
         final String parent = _fileSystem.file(mainUri).parent.path;
diff --git a/packages/flutter_tools/lib/src/isolated/web_asset_server.dart b/packages/flutter_tools/lib/src/isolated/web_asset_server.dart
index 8ba8c0f06a65a..640925b965f51 100644
--- a/packages/flutter_tools/lib/src/isolated/web_asset_server.dart
+++ b/packages/flutter_tools/lib/src/isolated/web_asset_server.dart
@@ -25,6 +25,7 @@ import '../base/platform.dart';
 import '../build_info.dart';
 import '../cache.dart';
 import '../convert.dart';
+import '../dart/package_map.dart';
 import '../globals.dart' as globals;
 import '../web/bootstrap.dart';
 import '../web/chrome.dart';
@@ -347,7 +348,7 @@ class WebAssetServer implements AssetReader {
                 PackageUriMapper(packageConfig),
                 digestProvider,
                 BuildSettings(
-                  appEntrypoint: packageConfig.toPackageUri(
+                  appEntrypoint: packageConfig.toPackageUriForWorkspace(
                     fileSystem.file(entrypoint).absolute.uri,
                   ),
                   canaryFeatures: canaryFeatures,
@@ -361,7 +362,7 @@ class WebAssetServer implements AssetReader {
                 PackageUriMapper(packageConfig),
                 digestProvider,
                 BuildSettings(
-                  appEntrypoint: packageConfig.toPackageUri(
+                  appEntrypoint: packageConfig.toPackageUriForWorkspace(
                     fileSystem.file(entrypoint).absolute.uri,
                   ),
                   canaryFeatures: canaryFeatures,
diff --git a/packages/flutter_tools/lib/src/macos/build_macos.dart b/packages/flutter_tools/lib/src/macos/build_macos.dart
index 23d183d62406b..916a7c3d36080 100644
--- a/packages/flutter_tools/lib/src/macos/build_macos.dart
+++ b/packages/flutter_tools/lib/src/macos/build_macos.dart
@@ -278,7 +278,7 @@ Future<void> buildMacOS({
         .fetchDependenciesAndGenerateXcodebuildArgs(
           flutterProject.macos,
           globals.fs.directory(buildDirectoryPath),
-          skipPackageUpdatesAndValidation: false,
+          skipPackageValidation: false,
         );
     result = await globals.processUtils.stream(
       <String>[
diff --git a/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart b/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
index 5a676b734d0ec..55f38ff954d64 100644
--- a/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
+++ b/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
@@ -62,6 +62,7 @@ Future<void> processPodsIfNeeded(
       templateRenderer: globals.templateRenderer,
       processUtils: globals.processUtils,
       config: globals.config,
+      logger: globals.logger,
     );
     final FlutterDarwinPlatform platform = xcodeProject is IosProject
         ? FlutterDarwinPlatform.ios
diff --git a/packages/flutter_tools/lib/src/macos/swift_package_manager.dart b/packages/flutter_tools/lib/src/macos/swift_package_manager.dart
index 6c2d83670af80..cb220bab99dfe 100644
--- a/packages/flutter_tools/lib/src/macos/swift_package_manager.dart
+++ b/packages/flutter_tools/lib/src/macos/swift_package_manager.dart
@@ -8,6 +8,7 @@ import '../base/common.dart';
 import '../base/config.dart';
 import '../base/error_handling_io.dart';
 import '../base/file_system.dart';
+import '../base/logger.dart';
 import '../base/process.dart';
 import '../base/template.dart';
 import '../base/version.dart';
@@ -24,6 +25,8 @@ const kFlutterGeneratedPluginSwiftPackageName = 'FlutterGeneratedPluginSwiftPack
 /// a dependency on the Flutter/FlutterMacOS framework.
 const kFlutterGeneratedFrameworkSwiftPackageTargetName = 'FlutterFramework';
 
+const kSwiftPackageCacheDirectoryName = 'SourcePackages';
+
 const kDisableSwiftPMInstructions =
     'You can also disable Swift Package Manager for the project by following these instructions:\n'
     '  https://docs.flutter.dev/packages-and-plugins/swift-package-manager/for-app-developers#how-to-turn-off-swift-package-manager\n'
@@ -43,88 +46,118 @@ class SwiftPackageManager {
     required TemplateRenderer templateRenderer,
     required ProcessUtils processUtils,
     required Config config,
+    Logger? logger,
   }) : _fileSystem = fileSystem,
        _templateRenderer = templateRenderer,
        _processUtils = processUtils,
-       _config = config;
+       _config = config,
+       _logger = logger;
 
   final FileSystem _fileSystem;
   final TemplateRenderer _templateRenderer;
   final ProcessUtils _processUtils;
   final Config _config;
+  final Logger? _logger;
 
-  /// Creates a Swift Package called 'FlutterGeneratedPluginSwiftPackage' that
-  /// has dependencies on Flutter plugins that are compatible with Swift
-  /// Package Manager.
   Future<void> generatePluginsSwiftPackage(
     List<Plugin> plugins,
     FlutterDarwinPlatform platform,
     XcodeBasedProject project, {
     bool flutterAsADependency = true,
   }) async {
-    final Directory symlinkDirectory = project.relativeSwiftPackagesDirectory;
-    ErrorHandlingFileSystem.deleteIfExists(symlinkDirectory, recursive: true);
-    symlinkDirectory.createSync(recursive: true);
-
-    final (
-      List<SwiftPackagePackageDependency> packageDependencies,
-      List<SwiftPackageTargetDependency> targetDependencies,
-    ) = _dependenciesForPlugins(
-      plugins: plugins,
-      platform: platform,
-      symlinkDirectory: symlinkDirectory,
-      pathRelativeTo: project.flutterPluginSwiftPackageDirectory.path,
-    );
+    final String lockPath = project.ephemeralDirectory.childFile('.swift_pm.lock').path;
+    await _fileSystem.runLocked<void>(
+      lockPath: lockPath,
+      logger: _logger,
+      traceMessage:
+          'Waiting to be able to obtain lock of Swift Package Manager directory: $lockPath',
+      warningMessage:
+          'Waiting for another flutter command to release the Swift Package Manager lock...',
+      scope: () async {
+        final Directory symlinkDirectory = project.relativeSwiftPackagesDirectory;
+        try {
+          symlinkDirectory.createSync(recursive: true);
+        } on FileSystemException catch (e) {
+          if (!_fileSystem.isDirectorySync(symlinkDirectory.path)) {
+            throwToolExit(
+              'Failed to create Swift Packages directory at "${symlinkDirectory.path}": $e',
+            );
+          }
+        }
 
-    // If there aren't any Swift Package plugins and the project hasn't been
-    // migrated yet, don't generate a Swift package or migrate the app since
-    // it's not needed. If the project has already been migrated, regenerate
-    // the Package.swift even if there are no dependencies in case there
-    // were dependencies previously.
-    if (packageDependencies.isEmpty && !project.flutterPluginSwiftPackageInProjectSettings) {
-      return;
-    }
+        final (
+          List<SwiftPackagePackageDependency> packageDependencies,
+          List<SwiftPackageTargetDependency> targetDependencies,
+          Set<String> expectedBasenames,
+        ) = _dependenciesForPlugins(
+          plugins: plugins,
+          platform: platform,
+          symlinkDirectory: symlinkDirectory,
+          pathRelativeTo: project.flutterPluginSwiftPackageDirectory.path,
+        );
 
-    // Add Flutter framework Swift package dependency
-    if (flutterAsADependency) {
-      final (
-        SwiftPackagePackageDependency flutterFrameworkPackageDependency,
-        SwiftPackageTargetDependency flutterFrameworkTargetDependency,
-      ) = _dependencyForFlutterFramework(
-        pathRelativeTo: project.flutterPluginSwiftPackageDirectory.path,
-        platform: platform,
-        project: project,
-      );
-      packageDependencies.add(flutterFrameworkPackageDependency);
-      targetDependencies.add(flutterFrameworkTargetDependency);
-    }
+        // If there aren't any Swift Package plugins and the project hasn't been
+        // migrated yet, don't generate a Swift package or migrate the app since
+        // it's not needed. If the project has already been migrated, regenerate
+        // the Package.swift even if there are no dependencies in case there
+        // were dependencies previously.
+        if (packageDependencies.isEmpty && !project.flutterPluginSwiftPackageInProjectSettings) {
+          _cleanStaleSymlinks(
+            symlinkDirectory: symlinkDirectory,
+            expectedBasenames: expectedBasenames,
+            keepFlutterFramework: false,
+          );
+          return;
+        }
 
-    // FlutterGeneratedPluginSwiftPackage must be statically linked to ensure
-    // any dynamic dependencies are linked to Runner and prevent undefined symbols.
-    final generatedProduct = SwiftPackageProduct.library(
-      name: kFlutterGeneratedPluginSwiftPackageName,
-      targets: <String>[kFlutterGeneratedPluginSwiftPackageName],
-      libraryType: SwiftPackageLibraryType.static,
-    );
+        // Add Flutter framework Swift package dependency
+        if (flutterAsADependency) {
+          final (
+            SwiftPackagePackageDependency flutterFrameworkPackageDependency,
+            SwiftPackageTargetDependency flutterFrameworkTargetDependency,
+          ) = _dependencyForFlutterFramework(
+            pathRelativeTo: project.flutterPluginSwiftPackageDirectory.path,
+            platform: platform,
+            project: project,
+          );
+          packageDependencies.add(flutterFrameworkPackageDependency);
+          targetDependencies.add(flutterFrameworkTargetDependency);
+        }
 
-    final generatedTarget = SwiftPackageTarget.defaultTarget(
-      name: kFlutterGeneratedPluginSwiftPackageName,
-      dependencies: targetDependencies,
-    );
+        // FlutterGeneratedPluginSwiftPackage must be statically linked to ensure
+        // any dynamic dependencies are linked to Runner and prevent undefined symbols.
+        final generatedProduct = SwiftPackageProduct.library(
+          name: kFlutterGeneratedPluginSwiftPackageName,
+          targets: <String>[kFlutterGeneratedPluginSwiftPackageName],
+          libraryType: SwiftPackageLibraryType.static,
+        );
 
-    final pluginsPackage = SwiftPackage(
-      manifest: project.flutterPluginSwiftPackageManifest,
-      name: kFlutterGeneratedPluginSwiftPackageName,
-      platforms: <SwiftPackageSupportedPlatform>[platform.supportedPackagePlatform],
-      products: <SwiftPackageProduct>[generatedProduct],
-      dependencies: packageDependencies,
-      targets: <SwiftPackageTarget>[generatedTarget],
-      templateRenderer: _templateRenderer,
+        final generatedTarget = SwiftPackageTarget.defaultTarget(
+          name: kFlutterGeneratedPluginSwiftPackageName,
+          dependencies: targetDependencies,
+        );
+
+        final pluginsPackage = SwiftPackage(
+          manifest: project.flutterPluginSwiftPackageManifest,
+          name: kFlutterGeneratedPluginSwiftPackageName,
+          platforms: <SwiftPackageSupportedPlatform>[platform.supportedPackagePlatform],
+          products: <SwiftPackageProduct>[generatedProduct],
+          dependencies: packageDependencies,
+          targets: <SwiftPackageTarget>[generatedTarget],
+          templateRenderer: _templateRenderer,
+        );
+        pluginsPackage.createSwiftPackage();
+
+        _cleanStaleSymlinks(
+          symlinkDirectory: symlinkDirectory,
+          expectedBasenames: expectedBasenames,
+          keepFlutterFramework: flutterAsADependency,
+        );
+      },
     );
-    pluginsPackage.createSwiftPackage();
   }
 
-  (List<SwiftPackagePackageDependency>, List<SwiftPackageTargetDependency>)
+  (List<SwiftPackagePackageDependency>, List<SwiftPackageTargetDependency>, Set<String>)
   _dependenciesForPlugins({
     required List<Plugin> plugins,
     required FlutterDarwinPlatform platform,
@@ -133,7 +166,12 @@ class SwiftPackageManager {
   }) {
     final packageDependencies = <SwiftPackagePackageDependency>[];
     final targetDependencies = <SwiftPackageTargetDependency>[];
+    final expectedBasenames = <String>{};
 
+    final Set<Plugin> pluginsRequiringPluginNameSymlink = _pluginsRequiringPluginNameSymlink(
+      plugins: plugins,
+      platform: platform,
+    );
     for (final plugin in plugins) {
       final String? pluginSwiftPackageManifestPath = plugin.pluginSwiftPackageManifestPath(
         _fileSystem,
@@ -150,30 +188,31 @@ class SwiftPackageManager {
         continue;
       }
 
-      // Use the plugin basename as the symlink plugin directory name since the basename has the
-      // version number in it. This will make the symlink name change when the plugin version
-      // changes, which forces Xcode to re-process the package manifest.
       final String basename = _fileSystem.directory(plugin.path).basename;
 
-      // Check if the plugin has a dependency on another Flutter plugin.
-      // If the plugin has a dependency on another plugin, copy the plugin to the SourcePackages
-      // cache directory and update the manifest to use the versioned path.
-      final String manifestContent = manifest.readAsStringSync();
-      final List<({String original, String replacement})> pluginDependencies =
-          _getPluginDependencies(manifestContent, plugins);
-      if (pluginDependencies.isNotEmpty) {
+      final Link pluginSymlink;
+      final String linkName;
+      if (pluginsRequiringPluginNameSymlink.contains(plugin)) {
+        // When basename can't be used as the symlink path, copy the plugin and update the
+        // manifest contents so Xcode will re-process the package manifest.
         packagePath = _copyPluginAndUpdateManifest(
           plugin: plugin,
-          pluginDependencies: pluginDependencies,
           pathRelativeTo: pathRelativeTo,
           basename: basename,
           platform: platform,
-          manifestContent: manifestContent,
+          manifest: manifest,
         );
+        linkName = plugin.name;
+      } else {
+        // Use the plugin basename as the symlink plugin directory name since the basename has the
+        // version number in it. This will make the symlink name change when the plugin version
+        // changes, which forces Xcode to re-process the package manifest.
+        linkName = basename;
       }
+      pluginSymlink = symlinkDirectory.childLink(linkName);
 
-      final Link pluginSymlink = symlinkDirectory.childLink(basename);
       _createPluginSymlink(pluginSymlink: pluginSymlink, packagePath: packagePath);
+      expectedBasenames.add(linkName);
 
       final String packageRelativePath = _fileSystem.path.relative(
         pluginSymlink.path,
@@ -195,7 +234,57 @@ class SwiftPackageManager {
         ),
       );
     }
-    return (packageDependencies, targetDependencies);
+    return (packageDependencies, targetDependencies, expectedBasenames);
+  }
+
+  /// Determine plugins that need to be symlinked by plugin name instead of basename.
+  ///
+  /// Xcode caches Swift package manifests and only re-processes them when the path or the contents
+  /// of the manifest change. To ensure that the package manifest is re-processed when the Flutter
+  /// plugin version changes, we use the basename as the symlink plugin directory name since the
+  /// basename has the version number in it. However, the basename cannot be used in the following
+  /// scenarios:
+  ///   - The basename does not match the plugin's name (see https://github.com/flutter/flutter/issues/186881).
+  ///   - The plugin is a dependency of another plugin. Inter-plugin dependencies are defined
+  ///     using relative paths and therefore must use the plugin name and not basename. Example:
+  ///     ```swift
+  ///     .package(name: "firebase_core", path: "../firebase_core"),
+  ///     ```
+  Set<Plugin> _pluginsRequiringPluginNameSymlink({
+    required List<Plugin> plugins,
+    required FlutterDarwinPlatform platform,
+  }) {
+    final Set<Plugin> pluginsToCopy = {};
+    for (final plugin in plugins) {
+      if (!plugin.supportSwiftPackageManagerForPlatform(_fileSystem, platform.name)) {
+        continue;
+      }
+
+      // The basename cannot be used when it does not match the plugin's name
+      // (see https://github.com/flutter/flutter/issues/186881).
+      final String basename = _fileSystem.directory(plugin.path).basename;
+      if (basename != plugin.name && !basename.startsWith('${plugin.name}-')) {
+        pluginsToCopy.add(plugin);
+      }
+
+      // Plugins that are depended on by other plugins cannot use the basename
+      // since their dependency paths are relative using the name of the plugin.
+      final String? manifestPath = plugin.pluginSwiftPackageManifestPath(
+        _fileSystem,
+        platform.name,
+      );
+      if (manifestPath == null) {
+        continue;
+      }
+      final File manifest = _fileSystem.file(manifestPath);
+      final String manifestContent = manifest.readAsStringSync();
+      final List<Plugin> pluginDependencies = _getPluginDependencies(manifestContent, plugins);
+      if (pluginDependencies.isNotEmpty) {
+        pluginsToCopy.addAll(pluginDependencies);
+      }
+    }
+
+    return pluginsToCopy;
   }
 
   /// Safely creates a symlink at [pluginSymlink] pointing to [packagePath].
@@ -203,7 +292,7 @@ class SwiftPackageManager {
   /// If a symlink already exists and points to the correct target, creation is skipped
   /// to avoid potential Xcode parallel target build race conditions.
   /// If creation fails due to sharing violations or locks (e.g., when Xcode is open),
-  /// throws a descriptive [ToolExit] advising the user to close Xcode and run "flutter clean".
+  /// throws a descriptive [ToolExit] advising the user to close Xcode and run "flutter clean --include-xcode-workspace".
   void _createPluginSymlink({required Link pluginSymlink, required String packagePath}) {
     final FileSystemEntityType type = _fileSystem.typeSync(pluginSymlink.path, followLinks: false);
     var skipCreation = false;
@@ -244,40 +333,24 @@ class SwiftPackageManager {
       throwToolExit(
         'Failed to create Swift Package plugin symlink at "${pluginSymlink.path}" to "$packagePath":\n'
         '$e\n'
-        'If Xcode is currently open, please close Xcode, run "flutter clean", and try building again.',
+        'If Xcode is currently open, please close Xcode, run "flutter clean --include-xcode-workspace", and try building again.',
       );
     }
   }
 
-  /// Checks if the plugin has a dependency on another Flutter plugin and returns a list of paths
-  /// that should be replaced in the [manifestContent].
+  /// Returns a list of [Plugin]s that the given plugin's [manifestContent] declares a dependency on.
   ///
-  /// Plugins can declare a SwiftPM dependency on another plugin like this:
+  /// Plugins can declare a SwiftPM dependency on another plugin in their Package.swift like this:
   /// ```swift
   /// dependencies: [
   ///   .package(name: "plugin_1", path: "../plugin_1")
   /// ]
   /// ```
   ///
-  /// However, plugins are symlinked in the [XcodeBasedProject.relativeSwiftPackagesDirectory]
-  /// using the plugin's basename as the symlink name. The basename for non-path dependencies
-  /// includes the version number, e.g. "plugin_1-1.0.0". To make the relative path in the
-  /// manifest match the symlink path, we need to replace the path in the manifest with the
-  /// symlink path.
-  ///
-  /// For example, the manifest would need to updated to:
-  /// ```swift
-  /// dependencies: [
-  ///   .package(name: "plugin_1", path: "../plugin_1-1.0.0")
-  /// ]
-  /// ```
-  List<({String original, String replacement})> _getPluginDependencies(
-    String manifestContent,
-    List<Plugin> plugins,
-  ) {
+  List<Plugin> _getPluginDependencies(String manifestContent, List<Plugin> plugins) {
     final dependencyPattern = RegExp(r'"\.\.\/([^"]+)"');
     final Iterable<Match> matches = dependencyPattern.allMatches(manifestContent);
-    final List<({String original, String replacement})> pluginDependencies = [];
+    final List<Plugin> pluginDependencies = [];
     if (matches.isNotEmpty) {
       for (final match in matches) {
         final String? path = match.group(0);
@@ -289,47 +362,46 @@ class SwiftPackageManager {
         if (pluginDependency == null) {
           continue;
         }
-        final newPath = '"../${_fileSystem.directory(pluginDependency.path).basename}"';
-        if (path == newPath) {
-          continue;
-        }
-        pluginDependencies.add((original: path, replacement: newPath));
+        pluginDependencies.add(pluginDependency);
       }
     }
     return pluginDependencies;
   }
 
-  /// Copy the [plugin] to the build directory and update the manifest to use the versioned path.
-  /// Returns the path to the copied plugin.
+  /// Copy the [plugin] to the build directory and update the manifest with a comment containing
+  /// the version. Returns the path to the copied plugin.
   ///
   /// Plugin must be copied first so that the original plugin in pub cache is not modified.
   ///
   /// Throws a [ToolExit] if the plugin cannot be copied or the manifest cannot be updated.
   String _copyPluginAndUpdateManifest({
     required Plugin plugin,
-    required List<({String original, String replacement})> pluginDependencies,
     required String pathRelativeTo,
     required String basename,
     required FlutterDarwinPlatform platform,
-    required String manifestContent,
+    required File manifest,
   }) {
-    final String destination = _fileSystem
-        .directory(
-          _fileSystem.path.join(
-            platform.buildDirectory(config: _config, fileSystem: _fileSystem),
-            'SourcePackages',
-            basename,
-          ),
-        )
-        .absolute
-        .path;
+    final String manifestContent = manifest.readAsStringSync();
+    final Directory destination = _fileSystem.directory(
+      _fileSystem.path.join(
+        platform.buildDirectory(config: _config, fileSystem: _fileSystem),
+        kSwiftPackageCacheDirectoryName,
+        basename,
+      ),
+    );
+    destination.createSync(recursive: true);
+    final String sourcePath = plugin.path.endsWith('/') ? plugin.path : '${plugin.path}/';
+    final String destinationPath = destination.absolute.path;
     final RunResult result = _processUtils.runSync([
       'rsync',
       '-8', // Avoid mangling filenames with encodings that do not match the current locale.
       '-av', // Archive mode and verbose: preserve permissions, ownership, timestamps, etc.
       '--delete', // Delete files in the destination that are not in the source.
-      plugin.path,
-      destination,
+      // Don't copy the example directory as this can cause rsync to fail or be slow due to
+      // copying build directories and symlinks
+      '--exclude=/example/',
+      sourcePath,
+      destinationPath,
     ]);
     if (result.exitCode != 0) {
       throwToolExit('Failed to copy plugin ${plugin.name}: \n${result.stdout}\n${result.stderr}');
@@ -338,7 +410,7 @@ class SwiftPackageManager {
     final String? packagePath = plugin.pluginSwiftPackagePath(
       _fileSystem,
       platform.name,
-      overridePath: destination,
+      overridePath: destinationPath,
     );
     if (packagePath == null) {
       throwToolExit('Failed to find path to Package.swift for plugin ${plugin.name}');
@@ -350,13 +422,7 @@ class SwiftPackageManager {
         'rsync stdout: \n${result.stdout}\nrsync stderr: \n${result.stderr}',
       );
     }
-    var newManifestContent = manifestContent;
-    for (final dependency in pluginDependencies) {
-      newManifestContent = newManifestContent.replaceAll(
-        dependency.original,
-        dependency.replacement,
-      );
-    }
+    final newManifestContent = '$manifestContent\n\n// Basename of original plugin: $basename';
     copiedManifest.writeAsStringSync(newManifestContent);
     return packagePath;
   }
@@ -454,4 +520,37 @@ class SwiftPackageManager {
       manifestContents.replaceFirst(oldSupportedPlatform, newSupportedPlatform),
     );
   }
+
+  /// Cleans up any stale or unreferenced plugin symlinks from the project's
+  /// symlink directory.
+  ///
+  /// When plugins are removed from `pubspec.yaml` or updated to versions that
+  /// no longer use Swift Package Manager, their old symlinks remain on disk.
+  /// This method removes them to prevent Xcode compilation failures caused by
+  /// trying to resolve broken or obsolete symlinks.
+  void _cleanStaleSymlinks({
+    required Directory symlinkDirectory,
+    required Set<String> expectedBasenames,
+    required bool keepFlutterFramework,
+  }) {
+    if (!symlinkDirectory.existsSync()) {
+      return;
+    }
+    try {
+      for (final FileSystemEntity entity in symlinkDirectory.listSync()) {
+        final String name = _fileSystem.path.basename(entity.path);
+        if (name == 'FlutterFramework') {
+          if (!keepFlutterFramework) {
+            ErrorHandlingFileSystem.deleteIfExists(entity, recursive: true);
+          }
+          continue;
+        }
+        if (!expectedBasenames.contains(name)) {
+          ErrorHandlingFileSystem.deleteIfExists(entity, recursive: true);
+        }
+      }
+    } on FileSystemException catch (_) {
+      // Ignore errors, as another process might be concurrently modifying the directory.
+    }
+  }
 }
diff --git a/packages/flutter_tools/lib/src/macos/swift_packages.dart b/packages/flutter_tools/lib/src/macos/swift_packages.dart
index 5b7613675e09f..c1849f891becf 100644
--- a/packages/flutter_tools/lib/src/macos/swift_packages.dart
+++ b/packages/flutter_tools/lib/src/macos/swift_packages.dart
@@ -18,7 +18,10 @@ const _swiftPackageTemplate = '''
 
 import PackageDescription
 
-{{#hasSwiftCodeBefore}}\n{{swiftCodeBefore}}\n\n{{/hasSwiftCodeBefore}}
+{{#hasSwiftCodeBefore}}
+{{swiftCodeBefore}}
+
+{{/hasSwiftCodeBefore}}
 let package = Package(
     name: "{{packageName}}",
     {{#platforms}}
@@ -120,11 +123,17 @@ class SwiftPackage {
       final Directory targetDirectory = _manifest.parent
           .childDirectory('Sources')
           .childDirectory(target.name);
-      if (generateEmptySources &&
-          (!targetDirectory.existsSync() || targetDirectory.listSync().isEmpty)) {
+      if (generateEmptySources) {
         final File requiredSwiftFile = targetDirectory.childFile('${target.name}.swift');
-        requiredSwiftFile.createSync(recursive: true);
-        requiredSwiftFile.writeAsStringSync(_swiftPackageSourceTemplate);
+        // Skip creating placeholder sources if sources already exist in the
+        // target directory to avoid unnecessary file writes during build.
+        final bool hasSources =
+            requiredSwiftFile.existsSync() ||
+            (targetDirectory.existsSync() && targetDirectory.listSync().isNotEmpty);
+        if (!hasSources) {
+          requiredSwiftFile.createSync(recursive: true);
+          requiredSwiftFile.writeAsStringSync(_swiftPackageSourceTemplate);
+        }
       }
     }
 
@@ -132,8 +141,24 @@ class SwiftPackage {
       _swiftPackageTemplate,
       _templateContext,
     );
-    _manifest.createSync(recursive: true);
-    _manifest.writeAsStringSync(renderedTemplate);
+
+    // Skip writing Package.swift if the existing file content is identical to
+    // renderedTemplate. Preserving file modification time (mtime) prevents
+    // Xcode and Swift Package Manager from invalidating caches and re-resolving
+    // dependencies during parallel builds.
+    var shouldWrite = true;
+    try {
+      if (_manifest.existsSync() && _manifest.readAsStringSync() == renderedTemplate) {
+        shouldWrite = false;
+      }
+    } on FileSystemException {
+      // If reading fails, write it anyway.
+    }
+
+    if (shouldWrite) {
+      _manifest.createSync(recursive: true);
+      _manifest.writeAsStringSync(renderedTemplate);
+    }
   }
 
   String? _formatPlatforms() {
diff --git a/packages/flutter_tools/lib/src/macos/xcdevice.dart b/packages/flutter_tools/lib/src/macos/xcdevice.dart
index 403e292a87768..4a37d8304e7ef 100644
--- a/packages/flutter_tools/lib/src/macos/xcdevice.dart
+++ b/packages/flutter_tools/lib/src/macos/xcdevice.dart
@@ -550,6 +550,9 @@ class XCDevice {
         var devModeEnabled = true;
         var isConnected = true;
         var isPaired = true;
+        final modelCode = device['modelCode'] as String?;
+        final operatingSystemVersion = device['operatingSystemVersion'] as String?;
+        final cpuArchitectureString = device['architecture'] as String?;
         final Map<String, Object?>? errorProperties = _errorProperties(device);
         if (errorProperties != null) {
           final String? errorMessage = _parseErrorMessage(errorProperties);
@@ -633,11 +636,15 @@ class XCDevice {
           identifier,
           name: name,
           cpuArch: _cpuArchitecture(device),
+          cpuArchitectureString: cpuArchitectureString,
           connectionInterface: connectionInterface,
           isConnected: isConnected,
           sdkVersion: sdkVersionString,
+          modelCode: modelCode,
+          operatingSystemVersion: operatingSystemVersion,
           iProxy: _iProxy,
           fileSystem: globals.fs,
+          fileSystemUtils: globals.fsUtils,
           logger: _logger,
           analytics: globals.analytics,
           iosDeploy: _iosDeploy,
@@ -652,10 +659,12 @@ class XCDevice {
             xcodeProjectInterpreter: globals.xcodeProjectInterpreter!,
           ),
           xcodeDebug: _xcodeDebug,
+          xcode: _xcode,
           platform: globals.platform,
           devModeEnabled: devModeEnabled,
           isPaired: isPaired,
           isCoreDevice: coreDevice != null,
+          processUtils: _processUtils,
         );
       }
     }
diff --git a/packages/flutter_tools/lib/src/macos/xcode.dart b/packages/flutter_tools/lib/src/macos/xcode.dart
index edd4fcf671475..261b5f14db7fd 100644
--- a/packages/flutter_tools/lib/src/macos/xcode.dart
+++ b/packages/flutter_tools/lib/src/macos/xcode.dart
@@ -200,7 +200,7 @@ class Xcode {
   /// to run it. `devicectl` is made available in Xcode 15.
   bool get isDevicectlInstalled {
     if (_isDevicectlInstalled == null) {
-      if (currentVersion == null || currentVersion!.major < 15) {
+      if (currentVersion == null) {
         _isDevicectlInstalled = false;
         return _isDevicectlInstalled!;
       }
@@ -235,11 +235,11 @@ class Xcode {
   Future<List<String>> fetchDependenciesAndGenerateXcodebuildArgs(
     XcodeBasedProject xcodeProject,
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) async => _xcodeProjectInterpreter.fetchDependenciesAndGenerateXcodebuildArgs(
     xcodeProject,
     buildDirectory,
-    skipPackageUpdatesAndValidation: skipPackageUpdatesAndValidation,
+    skipPackageValidation: skipPackageValidation,
   );
 
   Future<RunResult> cc(List<String> args) => _run('cc', args);
diff --git a/packages/flutter_tools/lib/src/macos/xcode_validator.dart b/packages/flutter_tools/lib/src/macos/xcode_validator.dart
index dd4fe11fd5207..4f7a57992cb77 100644
--- a/packages/flutter_tools/lib/src/macos/xcode_validator.dart
+++ b/packages/flutter_tools/lib/src/macos/xcode_validator.dart
@@ -113,11 +113,10 @@ class XcodeValidator extends DoctorValidator {
   /// with Xcode and must be downloaded and installed separately.
   /// iOS applications cannot be run without it.
   Future<ValidationMessage?> _validateSimulatorRuntimeInstalled() async {
-    // Skip this validation if Xcode is not installed, Xcode is a version less
-    // than 15, simctl is not installed, or if the EULA is not signed.
+    // Skip this validation if Xcode is not installed, simctl is not installed,
+    // or if the EULA is not signed.
     if (!_xcode.isInstalled ||
         _xcode.currentVersion == null ||
-        _xcode.currentVersion!.major < 15 ||
         !_xcode.isSimctlInstalled ||
         !_xcode.eulaSigned) {
       return null;
diff --git a/packages/flutter_tools/lib/src/migrations/analysis_options_migration.dart b/packages/flutter_tools/lib/src/migrations/analysis_options_migration.dart
index 0d6fbebd5ab6a..35c0abbf105a9 100644
--- a/packages/flutter_tools/lib/src/migrations/analysis_options_migration.dart
+++ b/packages/flutter_tools/lib/src/migrations/analysis_options_migration.dart
@@ -2,19 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:package_config/package_config.dart';
 import 'package:yaml/yaml.dart';
 import 'package:yaml_edit/yaml_edit.dart';
 
 import '../base/file_system.dart';
 import '../base/project_migrator.dart';
+import '../dart/package_map.dart';
 import '../project.dart';
 
 /// Migrates analysis_options.yaml to exclude build and platform directories.
 class AnalysisOptionsMigration extends ProjectMigrator {
-  AnalysisOptionsMigration(FlutterProject project, super.logger)
-    : _analysisOptionsFile = project.directory.childFile('analysis_options.yaml');
+  AnalysisOptionsMigration(FlutterProject project, super.logger, {PackageConfig? packageConfig})
+    : _project = project,
+      _analysisOptionsFile = project.directory.childFile('analysis_options.yaml'),
+      _packageConfig = packageConfig;
 
+  final FlutterProject _project;
   final File _analysisOptionsFile;
+  final PackageConfig? _packageConfig;
+  PackageConfig? _loadedPackageConfig;
 
   @override
   Future<void> migrate() async {
@@ -46,25 +53,15 @@ class AnalysisOptionsMigration extends ProjectMigrator {
       'linux/**',
     ];
 
-    var needsMigration = false;
-    final Object? analyzer = root['analyzer'];
-    if (analyzer is! YamlMap) {
-      needsMigration = true;
-    } else {
-      final exclude = analyzer['exclude'] as Object?;
-      if (exclude is! YamlList) {
-        needsMigration = true;
-      } else {
-        for (final requiredExclude in excludesToExclude) {
-          if (!exclude.contains(requiredExclude)) {
-            needsMigration = true;
-            break;
-          }
-        }
+    final Set<String> activeExcludes = await _collectExcludes(_analysisOptionsFile);
+    final missingExcludes = <String>[];
+    for (final requiredExclude in excludesToExclude) {
+      if (!activeExcludes.contains(requiredExclude)) {
+        missingExcludes.add(requiredExclude);
       }
     }
 
-    if (!needsMigration) {
+    if (missingExcludes.isEmpty) {
       return;
     }
 
@@ -73,18 +70,19 @@ class AnalysisOptionsMigration extends ProjectMigrator {
     );
 
     final editor = YamlEditor(originalContent);
+    final Object? analyzer = root['analyzer'];
 
     try {
       if (analyzer is! YamlMap) {
-        editor.update(<String>['analyzer'], <String, Object>{'exclude': excludesToExclude});
+        editor.update(<String>['analyzer'], <String, Object>{'exclude': missingExcludes});
       } else {
         final exclude = analyzer['exclude'] as Object?;
         if (exclude is! YamlList) {
-          editor.update(<String>['analyzer', 'exclude'], excludesToExclude);
+          editor.update(<String>['analyzer', 'exclude'], missingExcludes);
         } else {
-          for (final requiredExclude in excludesToExclude) {
-            if (!exclude.contains(requiredExclude)) {
-              editor.appendToList(<String>['analyzer', 'exclude'], requiredExclude);
+          for (final missingExclude in missingExcludes) {
+            if (!exclude.contains(missingExclude)) {
+              editor.appendToList(<String>['analyzer', 'exclude'], missingExclude);
             }
           }
         }
@@ -94,4 +92,109 @@ class AnalysisOptionsMigration extends ProjectMigrator {
       logger.printError('Failed to migrate analysis_options.yaml: $e');
     }
   }
+
+  /// Recursively collects analyzer `exclude:` patterns from [file] and any
+  /// configuration files referenced via `include:` directives.
+  ///
+  /// Supports both relative paths and `package:` URIs, handling single string
+  /// or list-based include directives while tracking [visited] canonical paths
+  /// to prevent infinite recursion on cyclic includes.
+  Future<Set<String>> _collectExcludes(File file, {Set<String> visited = const <String>{}}) async {
+    final String canonicalPath = file.fileSystem.path.canonicalize(file.path);
+    if (visited.contains(canonicalPath)) {
+      return <String>{}; // Avoid cycles
+    }
+    if (!file.existsSync()) {
+      return <String>{};
+    }
+    final String content;
+    try {
+      content = file.readAsStringSync();
+    } on FileSystemException {
+      return <String>{};
+    }
+    final YamlNode root;
+    try {
+      root = loadYamlNode(content);
+    } on YamlException {
+      return <String>{};
+    }
+    if (root is! YamlMap) {
+      return <String>{};
+    }
+
+    final excludes = <String>{};
+    final Object? analyzer = root['analyzer'];
+    if (analyzer is YamlMap) {
+      final Object? exclude = analyzer['exclude'];
+      if (exclude is YamlList) {
+        excludes.addAll(exclude.whereType<String>());
+      }
+    }
+
+    final Object? include = root['include'];
+    final includes = <String>[];
+    if (include is String) {
+      includes.add(include);
+    } else if (include is YamlList) {
+      includes.addAll(include.whereType<String>());
+    }
+
+    for (final includeUri in includes) {
+      final File? includedFile = await _resolveInclude(includeUri, file);
+      if (includedFile != null) {
+        excludes.addAll(
+          await _collectExcludes(includedFile, visited: <String>{...visited, canonicalPath}),
+        );
+      }
+    }
+
+    return excludes;
+  }
+
+  Future<File?> _resolveInclude(String includeUri, File referringFile) async {
+    if (includeUri.startsWith('package:')) {
+      final PackageConfig? packageConfig = await _getPackageConfig();
+      if (packageConfig == null) {
+        return null;
+      }
+      try {
+        final Uri? resolvedUri = packageConfig.resolve(Uri.parse(includeUri));
+        if (resolvedUri != null && resolvedUri.scheme == 'file') {
+          return referringFile.fileSystem.file(resolvedUri);
+        }
+      } on FormatException {
+        // Invalid URI
+      }
+      return null;
+    } else {
+      // Relative path
+      final String path = referringFile.fileSystem.path.join(referringFile.parent.path, includeUri);
+      return referringFile.fileSystem.file(path);
+    }
+  }
+
+  Future<PackageConfig?> _getPackageConfig() async {
+    if (_packageConfig != null) {
+      return _packageConfig;
+    }
+    if (_loadedPackageConfig != null) {
+      return _loadedPackageConfig;
+    }
+    final File? configFile = findPackageConfigFile(_project.directory);
+    if (configFile == null) {
+      return null;
+    }
+    try {
+      _loadedPackageConfig = await loadPackageConfigWithLogging(
+        configFile,
+        logger: logger,
+        throwOnError: false,
+      );
+      return _loadedPackageConfig;
+    } on Exception {
+      // Ignore errors loading package config during migration checks.
+      return null;
+    }
+  }
 }
diff --git a/packages/flutter_tools/lib/src/migrations/cocoapods_script_symlink.dart b/packages/flutter_tools/lib/src/migrations/cocoapods_script_symlink.dart
index 48fc620af5d0d..38890ea8199b9 100644
--- a/packages/flutter_tools/lib/src/migrations/cocoapods_script_symlink.dart
+++ b/packages/flutter_tools/lib/src/migrations/cocoapods_script_symlink.dart
@@ -4,7 +4,6 @@
 
 import '../base/file_system.dart';
 import '../base/project_migrator.dart';
-import '../base/version.dart';
 import '../ios/xcodeproj.dart';
 import '../xcode_project.dart';
 
@@ -33,13 +32,9 @@ class CocoaPodsScriptReadlink extends ProjectMigrator {
       return;
     }
 
-    final Version? version = _xcodeProjectInterpreter.version;
-
-    // If Xcode not installed or less than 14.3 with readlink behavior change, skip this migration.
-    if (version == null || version < Version(14, 3, 0)) {
-      logger.printTrace(
-        'Detected Xcode version is $version, below 14.3, skipping "readlink -f" workaround.',
-      );
+    // If Xcode not installed, skip this migration.
+    if (!_xcodeProjectInterpreter.isInstalled) {
+      logger.printTrace('Xcode is not installed, skipping "readlink -f" workaround.');
       return;
     }
 
diff --git a/packages/flutter_tools/lib/src/migrations/cocoapods_toolchain_directory_migration.dart b/packages/flutter_tools/lib/src/migrations/cocoapods_toolchain_directory_migration.dart
index 3221a5fe340fb..938bd26514840 100644
--- a/packages/flutter_tools/lib/src/migrations/cocoapods_toolchain_directory_migration.dart
+++ b/packages/flutter_tools/lib/src/migrations/cocoapods_toolchain_directory_migration.dart
@@ -4,7 +4,6 @@
 
 import '../base/file_system.dart';
 import '../base/project_migrator.dart';
-import '../base/version.dart';
 import '../ios/xcodeproj.dart';
 import '../xcode_project.dart';
 
@@ -34,13 +33,9 @@ class CocoaPodsToolchainDirectoryMigration extends ProjectMigrator {
       return;
     }
 
-    final Version? version = _xcodeProjectInterpreter.version;
-
-    // If Xcode not installed or less than 15, skip this migration.
-    if (version == null || version < Version(15, 0, 0)) {
-      logger.printTrace(
-        'Detected Xcode version is $version, below 15.0, skipping TOOLCHAIN_DIR workaround.',
-      );
+    // If Xcode not installed, skip this migration.
+    if (!_xcodeProjectInterpreter.isInstalled) {
+      logger.printTrace('Xcode is not installed, skipping TOOLCHAIN_DIR workaround.');
       return;
     }
 
diff --git a/packages/flutter_tools/lib/src/platform_plugins.dart b/packages/flutter_tools/lib/src/platform_plugins.dart
index e82469cab6fe7..cd78ee2ada04c 100644
--- a/packages/flutter_tools/lib/src/platform_plugins.dart
+++ b/packages/flutter_tools/lib/src/platform_plugins.dart
@@ -17,12 +17,42 @@ const kDartPluginClass = 'dartPluginClass';
 /// Constant for 'dartPluginFile' key in plugin maps.
 const kDartFileName = 'dartFileName';
 
+/// Constant for 'fileName' key in plugin maps.
+const kFileName = 'fileName';
+
 /// Constant for 'ffiPlugin' key in plugin maps.
 const kFfiPlugin = 'ffiPlugin';
 
 // Constant for 'defaultPackage' key in plugin maps.
 const kDefaultPackage = 'default_package';
 
+/// Matches a valid native plugin class or dot-separated package identifier.
+///
+/// Plugin `class`/`package` values are interpolated verbatim into the generated
+/// GeneratedPluginRegistrant source files (Java/Kotlin, Swift, Objective-C,
+/// C++). Restricting them to identifier characters prevents a (possibly
+/// transitive) dependency from injecting arbitrary native code into the
+/// consuming app's build via its pubspec plugin declaration.
+final RegExp _pluginIdentifierPattern = RegExp(
+  r'^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$',
+);
+
+/// Whether [value] is a valid native plugin class or dot-separated package
+/// identifier. Callers first confirm the value is a String via the schema type
+/// checks; absent fields are not validated here.
+bool isValidPluginIdentifier(String value) => _pluginIdentifierPattern.hasMatch(value);
+
+/// Matches a safe relative Dart source path (e.g. `src/foo_web.dart`) ending in
+/// `.dart`. Plugin `fileName`/`dartFileName` values are interpolated into an
+/// `import` in the generated registrant, so they must not contain quotes,
+/// semicolons, whitespace or parent-directory segments.
+final RegExp pluginDartFileNamePattern = RegExp(r'^\w[\w./-]*\.dart$');
+
+/// Whether [value] is a safe relative Dart source path for a plugin. Callers
+/// first confirm the value is a String via the schema type checks.
+bool isValidPluginDartFileName(String value) =>
+    pluginDartFileNamePattern.hasMatch(value) && !value.contains('..');
+
 /// Constant for 'sharedDarwinSource' key in plugin maps.
 /// Can be set for iOS and macOS plugins.
 const kSharedDarwinSource = 'sharedDarwinSource';
@@ -131,10 +161,34 @@ class AndroidPlugin extends PluginPlatform implements NativeOrDartPlugin {
   bool hasDart() => dartPluginClass != null;
 
   static bool validate(YamlMap yaml) {
-    return (yaml['package'] is String && yaml[kPluginClass] is String) ||
-        yaml[kDartPluginClass] is String ||
+    final Object? package = yaml['package'];
+    final Object? pluginClass = yaml[kPluginClass];
+    final Object? dartPluginClass = yaml[kDartPluginClass];
+
+    final bool hasPluginDeclaration =
+        (package is String && pluginClass is String) ||
+        dartPluginClass is String ||
         yaml[kFfiPlugin] == true ||
         yaml[kDefaultPackage] is String;
+
+    if (!hasPluginDeclaration) {
+      return false;
+    }
+
+    // Validate every identifier that is present, not just the ones that made
+    // the declaration above valid, so a plugin cannot smuggle an unsafe
+    // identifier in alongside an `ffiPlugin` or `default_package` entry.
+    if (package is String && !isValidPluginIdentifier(package)) {
+      return false;
+    }
+    if (pluginClass is String && !isValidPluginIdentifier(pluginClass)) {
+      return false;
+    }
+    if (dartPluginClass is String && !isValidPluginIdentifier(dartPluginClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   static const kConfigKey = 'android';
@@ -288,11 +342,30 @@ class IOSPlugin extends PluginPlatform implements NativeOrDartPlugin, DarwinPlug
   }
 
   static bool validate(YamlMap yaml) {
-    return yaml[kPluginClass] is String ||
-        yaml[kDartPluginClass] is String ||
+    final Object? pluginClass = yaml[kPluginClass];
+    final Object? dartPluginClass = yaml[kDartPluginClass];
+
+    final bool hasPluginDeclaration =
+        pluginClass is String ||
+        dartPluginClass is String ||
         yaml[kFfiPlugin] == true ||
         yaml[kSharedDarwinSource] == true ||
         yaml[kDefaultPackage] is String;
+
+    if (!hasPluginDeclaration) {
+      return false;
+    }
+
+    // Validate every identifier that is present, not just the ones that made
+    // the declaration above valid.
+    if (pluginClass is String && !isValidPluginIdentifier(pluginClass)) {
+      return false;
+    }
+    if (dartPluginClass is String && !isValidPluginIdentifier(dartPluginClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   static const kConfigKey = 'ios';
@@ -381,11 +454,30 @@ class MacOSPlugin extends PluginPlatform implements NativeOrDartPlugin, DarwinPl
   }
 
   static bool validate(YamlMap yaml) {
-    return yaml[kPluginClass] is String ||
-        yaml[kDartPluginClass] is String ||
+    final Object? pluginClass = yaml[kPluginClass];
+    final Object? dartPluginClass = yaml[kDartPluginClass];
+
+    final bool hasPluginDeclaration =
+        pluginClass is String ||
+        dartPluginClass is String ||
         yaml[kFfiPlugin] == true ||
         yaml[kSharedDarwinSource] == true ||
         yaml[kDefaultPackage] is String;
+
+    if (!hasPluginDeclaration) {
+      return false;
+    }
+
+    // Validate every identifier that is present, not just the ones that made
+    // the declaration above valid.
+    if (pluginClass is String && !isValidPluginIdentifier(pluginClass)) {
+      return false;
+    }
+    if (dartPluginClass is String && !isValidPluginIdentifier(dartPluginClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   static const kConfigKey = 'macos';
@@ -488,10 +580,29 @@ class WindowsPlugin extends PluginPlatform implements NativeOrDartPlugin, Varian
   }
 
   static bool validate(YamlMap yaml) {
-    return yaml[kPluginClass] is String ||
-        yaml[kDartPluginClass] is String ||
+    final Object? pluginClass = yaml[kPluginClass];
+    final Object? dartPluginClass = yaml[kDartPluginClass];
+
+    final bool hasPluginDeclaration =
+        pluginClass is String ||
+        dartPluginClass is String ||
         yaml[kFfiPlugin] == true ||
         yaml[kDefaultPackage] is String;
+
+    if (!hasPluginDeclaration) {
+      return false;
+    }
+
+    // Validate every identifier that is present, not just the ones that made
+    // the declaration above valid.
+    if (pluginClass is String && !isValidPluginIdentifier(pluginClass)) {
+      return false;
+    }
+    if (dartPluginClass is String && !isValidPluginIdentifier(dartPluginClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   static const kConfigKey = 'windows';
@@ -575,10 +686,29 @@ class LinuxPlugin extends PluginPlatform implements NativeOrDartPlugin {
   }
 
   static bool validate(YamlMap yaml) {
-    return yaml[kPluginClass] is String ||
-        yaml[kDartPluginClass] is String ||
+    final Object? pluginClass = yaml[kPluginClass];
+    final Object? dartPluginClass = yaml[kDartPluginClass];
+
+    final bool hasPluginDeclaration =
+        pluginClass is String ||
+        dartPluginClass is String ||
         yaml[kFfiPlugin] == true ||
         yaml[kDefaultPackage] is String;
+
+    if (!hasPluginDeclaration) {
+      return false;
+    }
+
+    // Validate every identifier that is present, not just the ones that made
+    // the declaration above valid.
+    if (pluginClass is String && !isValidPluginIdentifier(pluginClass)) {
+      return false;
+    }
+    if (dartPluginClass is String && !isValidPluginIdentifier(dartPluginClass)) {
+      return false;
+    }
+
+    return true;
   }
 
   static const kConfigKey = 'linux';
@@ -622,19 +752,25 @@ class WebPlugin extends PluginPlatform {
   const WebPlugin({required this.name, required this.pluginClass, required this.fileName});
 
   factory WebPlugin.fromYaml(String name, YamlMap yaml) {
-    if (yaml['pluginClass'] is! String) {
+    final Object? pluginClass = yaml[kPluginClass];
+    if (pluginClass is! String) {
       throwToolExit(
         'The plugin `$name` is missing the required field `pluginClass` in pubspec.yaml',
       );
     }
-    if (yaml['fileName'] is! String) {
+    final Object? fileName = yaml[kFileName];
+    if (fileName is! String) {
       throwToolExit('The plugin `$name` is missing the required field `fileName` in pubspec.yaml');
     }
-    return WebPlugin(
-      name: name,
-      pluginClass: yaml['pluginClass'] as String,
-      fileName: yaml['fileName'] as String,
-    );
+    if (!isValidPluginIdentifier(pluginClass)) {
+      throwToolExit(
+        'The plugin `$name` has an invalid `pluginClass` in its web plugin declaration.',
+      );
+    }
+    if (!isValidPluginDartFileName(fileName)) {
+      throwToolExit('The plugin `$name` has an invalid `fileName` in its web plugin declaration.');
+    }
+    return WebPlugin(name: name, pluginClass: pluginClass, fileName: fileName);
   }
 
   static const kConfigKey = 'web';
diff --git a/packages/flutter_tools/lib/src/plugins.dart b/packages/flutter_tools/lib/src/plugins.dart
index 0628199b54c83..ff50729302a64 100644
--- a/packages/flutter_tools/lib/src/plugins.dart
+++ b/packages/flutter_tools/lib/src/plugins.dart
@@ -215,6 +215,7 @@ class Plugin {
     bool isDirectDependency, {
     required bool isDevDependency,
   }) {
+    // SAFETY: This constructor is only invoked from .fromYaml, which validates.
     final platforms = <String, PluginPlatform>{};
     final pluginClass = (pluginYaml as Map<dynamic, dynamic>)['pluginClass'] as String?;
     if (pluginClass != null) {
@@ -349,11 +350,31 @@ class Plugin {
   }
 
   static List<String> _validateLegacyYaml(YamlMap yaml) {
+    final Object? androidPackage = yaml['androidPackage'];
+    final Object? iosPrefix = yaml['iosPrefix'];
+    final Object? pluginClass = yaml['pluginClass'];
+
+    // As in the `platforms:` format, every identifier is checked here: they are
+    // interpolated verbatim into the generated GeneratedPluginRegistrant source
+    // files, so anything that is not a plain identifier would let a (possibly
+    // transitive) dependency inject native code into the consuming app's build.
+    const identifierRequirement =
+        'must be a valid identifier, optionally with dot-separated segments';
+
     return <String>[
-      if (yaml['androidPackage'] is! String?)
-        'The "androidPackage" must either be null or a string.',
-      if (yaml['iosPrefix'] is! String?) 'The "iosPrefix" must either be null or a string.',
-      if (yaml['pluginClass'] is! String?) 'The "pluginClass" must either be null or a string.',
+      if (androidPackage is! String?)
+        'The "androidPackage" must either be null or a string.'
+      else if (androidPackage != null && !isValidPluginIdentifier(androidPackage))
+        'The "androidPackage" $identifierRequirement.',
+      if (iosPrefix is! String?)
+        'The "iosPrefix" must either be null or a string.'
+      // An empty prefix is the default for a legacy plugin that does not set one.
+      else if (iosPrefix != null && iosPrefix.isNotEmpty && !isValidPluginIdentifier(iosPrefix))
+        'The "iosPrefix" $identifierRequirement.',
+      if (pluginClass is! String?)
+        'The "pluginClass" must either be null or a string.'
+      else if (pluginClass != null && !isValidPluginIdentifier(pluginClass))
+        'The "pluginClass" $identifierRequirement.',
     ];
   }
 
@@ -389,6 +410,12 @@ class Plugin {
       final dartClass = (platformsYaml[platformKey] as YamlMap)[kDartPluginClass] as String;
       final String dartFileName =
           (platformsYaml[platformKey] as YamlMap)[kDartFileName] as String? ?? '$pluginName.dart';
+      if (!isValidPluginDartFileName(dartFileName)) {
+        throwToolExit(
+          'The plugin `$pluginName` has an invalid `dartFileName` for platform `$platformKey` '
+          'in pubspec.yaml.',
+        );
+      }
       return (dartClass: dartClass, dartFileName: dartFileName);
     }
     return null;
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart
index 0cbfe1435c031..4879a81e82de9 100644
--- a/packages/flutter_tools/lib/src/project.dart
+++ b/packages/flutter_tools/lib/src/project.dart
@@ -426,7 +426,7 @@ class FlutterProject {
     }
 
     final migration = ProjectMigration(<ProjectMigrator>[
-      AnalysisOptionsMigration(this, globals.logger),
+      AnalysisOptionsMigration(this, globals.logger, packageConfig: packageConfig),
     ]);
     await migration.run();
 
@@ -1099,13 +1099,29 @@ See the link below for more information:
     );
   }
 
-  bool computeHcppEnabled() {
-    return _computeManifestMetadataBoolValue('io.flutter.embedding.android.EnableHcpp', false);
+  /// Returns the `io.flutter.embedding.android.EnableHcpp` manifest value.
+  ///
+  /// If there is no manifest file, or the key is not present, returns
+  /// [ifAbsent]. Callers should pass the value the build injects into the
+  /// manifest when the key is not explicitly set, so that the result reflects
+  /// what is actually packaged.
+  ///
+  /// This reads the app's primary source manifest, so it is an estimate of the
+  /// packaged value: it does not account for contributions from build
+  /// type/flavor overlay manifests or library manifests merged in at build
+  /// time. Intended for analytics, not for correctness-sensitive decisions.
+  bool computeHcppEnabled({bool ifAbsent = false}) {
+    return _computeManifestMetadataBoolValueOrNull('io.flutter.embedding.android.EnableHcpp') ??
+        ifAbsent;
   }
 
   bool _computeManifestMetadataBoolValue(String metadataKey, bool defaultValue) {
+    return _computeManifestMetadataBoolValueOrNull(metadataKey) ?? defaultValue;
+  }
+
+  bool? _computeManifestMetadataBoolValueOrNull(String metadataKey) {
     if (!appManifestFile.existsSync()) {
-      return defaultValue;
+      return null;
     }
     final XmlDocument document;
     try {
@@ -1136,7 +1152,7 @@ See the link below for more information:
         }
       }
     }
-    return defaultValue;
+    return null;
   }
 }
 
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index bbc03a2e9d864..3badb570baeb4 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1319,10 +1319,40 @@ abstract class FlutterCommand extends Command<void> {
     argParser.addFlag(
       'enable-hcpp',
       hide: !verboseHelp,
-      help: 'Whether to enable the HCPP platform view mode on the Impeller rendering backend.',
+      help:
+          'Enable the use of the HCPP platform view rendering mode on the Impeller rendering '
+          'backend. An explicit value takes priority over the EnableHcpp metadata in '
+          'AndroidManifest.xml: build commands write it into the manifest of the artifact they '
+          'produce, and "run", "test", and "drive" additionally apply it at launch. Without the '
+          'flag, the manifest decides.',
     );
   }
 
+  /// The explicit `--[no-]enable-hcpp` value, or null when the flag was not
+  /// passed (or the command does not define it).
+  ///
+  /// This takes priority over the `io.flutter.embedding.android.EnableHcpp`
+  /// manifest entry: it is passed to Gradle, which writes it into the merged
+  /// manifest over any value already there. Commands that launch the app
+  /// (run/test/drive) additionally forward it to the device.
+  bool? get explicitEnableHcpp {
+    final ArgResults? results = argResults;
+    if (results == null ||
+        !results.options.contains('enable-hcpp') ||
+        !results.wasParsed('enable-hcpp')) {
+      return null;
+    }
+    return boolArg('enable-hcpp');
+  }
+
+  /// The HCPP value for an Android artifact when the developer did not pass
+  /// `--[no-]enable-hcpp`: currently always false.
+  ///
+  /// This is only a default. Gradle injects it when the merged manifest does
+  /// not set `io.flutter.embedding.android.EnableHcpp` at all, so an entry in
+  /// the manifest wins over it. [explicitEnableHcpp] in turn wins over both.
+  bool get enableHcpp => explicitEnableHcpp ?? false;
+
   void addTestFlag({required bool verboseHelp}) {
     argParser.addFlag(
       'test-flag',
@@ -1524,6 +1554,8 @@ abstract class FlutterCommand extends Command<void> {
       codeSizeDirectory: codeSizeDirectory,
       androidGradleDaemon: androidGradleDaemon,
       androidSkipBuildDependencyValidation: androidSkipBuildDependencyValidation,
+      androidEnableHcpp: enableHcpp,
+      explicitAndroidEnableHcpp: explicitEnableHcpp,
       packageConfig: packageConfig,
       androidProjectArgs: androidProjectArgs,
       androidGradleProjectCacheDir: androidGradleProjectCacheDir,
@@ -1736,7 +1768,16 @@ abstract class FlutterCommand extends Command<void> {
           );
         }
 
-        final String configRaw = globals.fs.file(path).readAsStringSync();
+        String configRaw;
+        try {
+          configRaw = decodeUtf8OrUtf16(globals.fs.file(path).readAsBytesSync());
+        } on Exception catch (err) {
+          throwToolExit(
+            'Unable to decode the file at path "$path". '
+            'Ensure that the file is encoded in UTF-8 or UTF-16.\n'
+            'Error details: $err',
+          );
+        }
 
         // Determine whether the file content is JSON or .env format.
         String configJsonRaw;
@@ -1941,6 +1982,20 @@ abstract class FlutterCommand extends Command<void> {
   Future<FlutterCommandResult> verifyThenRunCommand(String? commandPath) async {
     globals.preRunValidator.validate();
 
+    if (argParser.options.containsKey(FlutterOptions.kEnableImpeller) &&
+        (argResults?.wasParsed(FlutterOptions.kEnableImpeller) ?? false)) {
+      if (getBuildMode().isRelease) {
+        final bool enableImpeller = boolArg(FlutterOptions.kEnableImpeller);
+        final flagName = enableImpeller
+            ? '--${FlutterOptions.kEnableImpeller}'
+            : '--no-${FlutterOptions.kEnableImpeller}';
+        globals.logger.printWarning(
+          'The "$flagName" flag is ignored in release builds. '
+          'The rendering backend is determined at build time.',
+        );
+      }
+    }
+
     if (globals.os.hostPlatform == .darwin_x64 &&
         globals.persistentToolState!.shouldShowIntelMacWarning) {
       globals.logger.printWarning(
diff --git a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
index 5a31e32024443..568e8a1f5dc28 100644
--- a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
@@ -449,9 +449,13 @@ window.\$dartLoader.loader.nextAttempt();
         headers: <String, String>{'Content-Type': 'text/javascript'},
       );
     } else if (request.requestedUri.path.contains('main.dart.wasm')) {
+      final File wasmFile = _buildDirectory.childFile('main.dart.wasm');
       return shelf.Response.ok(
-        _buildDirectory.childFile('main.dart.wasm').openRead(),
-        headers: <String, String>{'Content-Type': 'application/wasm'},
+        wasmFile.openRead(),
+        headers: <String, String>{
+          HttpHeaders.contentTypeHeader: 'application/wasm',
+          HttpHeaders.contentLengthHeader: wasmFile.lengthSync().toString(),
+        },
       );
     } else {
       return shelf.Response.notFound('Not Found');
@@ -704,7 +708,6 @@ window.\$dartLoader.loader.nextAttempt();
       completer.future,
       headless: !_config.pauseAfterLoad,
       logger: _logger,
-      webBrowserFlags: <String>[if (useWasm) '--disable-dev-shm-usage'],
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/test/runner.dart b/packages/flutter_tools/lib/src/test/runner.dart
index af01c969b26f5..8c0510dbd08cd 100644
--- a/packages/flutter_tools/lib/src/test/runner.dart
+++ b/packages/flutter_tools/lib/src/test/runner.dart
@@ -38,8 +38,9 @@ interface class FlutterTestRunner {
     required DebuggingOptions debuggingOptions,
     List<String> names = const <String>[],
     List<String> plainNames = const <String>[],
-    String? tags,
-    String? excludeTags,
+    List<String> tags = const <String>[],
+    List<String> excludeTags = const <String>[],
+    List<String> presets = const <String>[],
     bool enableVmService = false,
     bool machine = false,
     String? precompiledDillPath,
@@ -82,8 +83,9 @@ interface class FlutterTestRunner {
       for (final String name in names) ...<String>['--name', name],
       for (final String plainName in plainNames) ...<String>['--plain-name', plainName],
       if (randomSeed != null) '--test-randomize-ordering-seed=$randomSeed',
-      if (tags != null) ...<String>['--tags', tags],
-      if (excludeTags != null) ...<String>['--exclude-tags', excludeTags],
+      for (final String tag in tags) ...<String>['--tags', tag],
+      for (final String excludeTag in excludeTags) ...<String>['--exclude-tags', excludeTag],
+      for (final String preset in presets) ...<String>['--preset', preset],
       if (failFast) '--fail-fast',
       if (runSkipped) '--run-skipped',
       if (totalShards != null) '--total-shards=$totalShards',
@@ -216,7 +218,7 @@ interface class FlutterTestRunner {
     if (packageConfigFile.existsSync()) {
       projectPackageConfig = PackageConfig.parseBytes(
         packageConfigFile.readAsBytesSync(),
-        Uri.file(flutterProject.directory.path),
+        packageConfigFile.absolute.uri,
       );
     } else {
       // We can't use this directly, but need to manually check
@@ -240,7 +242,7 @@ interface class FlutterTestRunner {
         .childFile('package_config.json');
     final PackageConfig flutterToolsPackageConfig = PackageConfig.parseBytes(
       flutterToolsPackageConfigFile.readAsBytesSync(),
-      flutterToolsPackageConfigFile.uri,
+      flutterToolsPackageConfigFile.absolute.uri,
     );
 
     final mergedPackages = <Package>[...projectPackageConfig.packages];
@@ -589,8 +591,9 @@ class SpawnPlugin extends PlatformPlugin {
     required DebuggingOptions debuggingOptions,
     List<String> names = const <String>[],
     List<String> plainNames = const <String>[],
-    String? tags,
-    String? excludeTags,
+    List<String> tags = const <String>[],
+    List<String> excludeTags = const <String>[],
+    List<String> presets = const <String>[],
     bool machine = false,
     bool updateGoldens = false,
     required int? concurrency,
@@ -629,7 +632,7 @@ class SpawnPlugin extends PlatformPlugin {
     );
     final PackageConfig isolateSpawningTesterPackageConfig = PackageConfig.parseBytes(
       isolateSpawningTesterPackageConfigFile.readAsBytesSync(),
-      isolateSpawningTesterPackageConfigFile.uri,
+      isolateSpawningTesterPackageConfigFile.absolute.uri,
     );
 
     final File childTestIsolateSpawnerSourceFile = isolateSpawningTesterDirectory.childFile(
@@ -656,8 +659,9 @@ class SpawnPlugin extends PlatformPlugin {
       for (final String name in names) ...<String>['--name', name],
       for (final String plainName in plainNames) ...<String>['--plain-name', plainName],
       if (randomSeed != null) '--test-randomize-ordering-seed=$randomSeed',
-      if (tags != null) ...<String>['--tags', tags],
-      if (excludeTags != null) ...<String>['--exclude-tags', excludeTags],
+      for (final String tag in tags) ...<String>['--tags', tag],
+      for (final String excludeTag in excludeTags) ...<String>['--exclude-tags', excludeTag],
+      for (final String preset in presets) ...<String>['--preset', preset],
       if (failFast) '--fail-fast',
       if (runSkipped) '--run-skipped',
       if (totalShards != null) '--total-shards=$totalShards',
diff --git a/packages/flutter_tools/lib/src/tester/flutter_tester.dart b/packages/flutter_tools/lib/src/tester/flutter_tester.dart
index f87c6573369a6..387f1030a0173 100644
--- a/packages/flutter_tools/lib/src/tester/flutter_tester.dart
+++ b/packages/flutter_tools/lib/src/tester/flutter_tester.dart
@@ -187,14 +187,14 @@ class FlutterTesterDevice extends Device {
         return LaunchResult.succeeded();
       }
 
+      _logReader.listenToProcessOutput(_process!);
       vmServiceDiscovery = ProtocolDiscovery.vmService(
-        getLogReader(),
+        SingleLaunchLogReader(_logReader.logLines, _process!.exitCode),
         hostPort: debuggingOptions.hostVmServicePort,
         devicePort: debuggingOptions.deviceVmServicePort,
         ipv6: debuggingOptions.ipv6,
         logger: _logger,
       );
-      _logReader.initializeProcess(_process!);
 
       final Uri? vmServiceUri = await vmServiceDiscovery.uri;
       if (vmServiceUri != null) {
diff --git a/packages/flutter_tools/lib/src/web/chrome.dart b/packages/flutter_tools/lib/src/web/chrome.dart
index e2d090741829c..d3cb6fc77ba6e 100644
--- a/packages/flutter_tools/lib/src/web/chrome.dart
+++ b/packages/flutter_tools/lib/src/web/chrome.dart
@@ -18,6 +18,9 @@ import '../base/logger.dart';
 import '../base/os.dart';
 import '../base/platform.dart';
 import '../base/utils.dart';
+import 'chrome_constants.dart';
+
+export 'chrome_constants.dart';
 
 /// An environment variable used to override the location of Google Chrome.
 const kChromeEnvironment = 'CHROME_EXECUTABLE';
@@ -49,6 +52,25 @@ const kWindowsEdgeExecutable = r'Microsoft\Edge\Application\msedge.exe';
 ///     Inconsistency detected by ld.so: ../elf/dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!
 const _kGlibcError = 'Inconsistency detected by ld.so';
 
+/// Filters out non-fatal D-Bus connection error messages emitted by Chromium.
+///
+/// Headless Linux Chrome attempts to query Linux D-Bus desktop services (such as
+/// system theme, desktop notifications, and keyrings) when `DBUS_SESSION_BUS_ADDRESS`
+/// is missing or disabled. Chromium logs non-fatal fallback notices to stderr via
+/// `LOG(ERROR)` in `dbus/bus.cc` (see
+/// https://chromium.googlesource.com/chromium/src/+/refs/heads/main/dbus/bus.cc#405)
+/// and `dbus/object_proxy.cc`.
+///
+/// We filter out these benign D-Bus lines to prevent stderr log noise in CI,
+/// following the industry standard pattern used by open source projects to filter
+/// E2E test logs (e.g. https://github.com/kitelev/exocortex/blob/4290cdade669034e5f71c892fb3e1908c5a2fe12/packages/obsidian-plugin/docker-entrypoint-e2e.sh#L48-L49).
+bool _isDbusError(String line) {
+  return line.contains('ERROR:dbus/bus.cc') ||
+      line.contains('ERROR:dbus/object_proxy.cc') ||
+      line.contains('Failed to connect to the bus') ||
+      line.contains('org.freedesktop.DBus');
+}
+
 typedef BrowserFinder = String Function(Platform, FileSystem);
 
 /// Find the chrome executable on the current platform.
@@ -235,6 +257,11 @@ class ChromiumLauncher {
       // When the DevTools has focus we don't want to slow down the application.
       '--disable-background-timer-throttling',
       '--disable-renderer-backgrounding',
+      '--disable-background-networking',
+      '--disable-sync',
+      '--disable-client-side-phishing-detection',
+      '--disable-notifications',
+      ...kGcmDisabledFlags,
       // Since we are using a temp profile, disable features that slow the
       // Chrome launch.
       '--disable-extensions',
@@ -264,11 +291,6 @@ class ChromiumLauncher {
         '--no-sandbox',
         '--headless',
         '--window-size=1024,1024',
-        '--disable-background-networking',
-        '--disable-sync',
-        '--disable-client-side-phishing-detection',
-        '--disable-notifications',
-        '--disable-features=GCM',
         if (_platform.isLinux) ...<String>[
           '--use-gl=angle',
           '--use-angle=swiftshader',
@@ -342,6 +364,9 @@ class ChromiumLauncher {
 
       final StreamSubscription<String> stderrSub = process.stderr.transform(utf8LineDecoder).listen(
         (String line) {
+          if (_isDbusError(line)) {
+            return;
+          }
           addLog('CHROME STDERR', line);
           if (line.contains(_kGlibcError)) {
             hitGlibcBug = true;
diff --git a/packages/flutter_tools/lib/src/web/chrome_constants.dart b/packages/flutter_tools/lib/src/web/chrome_constants.dart
new file mode 100644
index 0000000000000..56f62f711b27f
--- /dev/null
+++ b/packages/flutter_tools/lib/src/web/chrome_constants.dart
@@ -0,0 +1,13 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Flags passed to Chrome to disable GCM (Google Cloud Messaging) and MCS
+/// (Mobile Connection Server) background network registration calls and
+/// prevent deprecation error logs.
+const kGcmDisabledFlags = <String>[
+  '--disable-features=GCM',
+  '--gcm-checkin-url=http://127.0.0.1',
+  '--gcm-registration-url=http://127.0.0.1',
+  '--gcm-mcs-endpoint=127.0.0.1:0',
+];
diff --git a/packages/flutter_tools/lib/src/web/web_constants.dart b/packages/flutter_tools/lib/src/web/web_constants.dart
index 94ec3ab1b19e6..c4e545ae7fd18 100644
--- a/packages/flutter_tools/lib/src/web/web_constants.dart
+++ b/packages/flutter_tools/lib/src/web/web_constants.dart
@@ -2,7 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const kWasmMoreInfo = 'See https://flutter.dev/to/wasm for more information.';
+const String kWasmMoreInfo = 'See https://flutter.dev/to/wasm for more information.';
+const String kWasmErrorsMoreInfo =
+    'See https://flutter.dev/to/wasm-errors for diagnostic and migration guidance.';
+
+/// Legacy web libraries unsupported in WebAssembly compilation.
+const Set<String> kLegacyWebLibraries = <String>{
+  'dart:html',
+  'dart:indexed_db',
+  'dart:js',
+  'dart:js_util',
+  'dart:svg',
+  'dart:web_audio',
+  'dart:web_gl',
+  'dart:web_sql',
+  'package:js',
+};
 
 /// Headers required to run Wasm-compiled applications with multi-threading.
 ///
diff --git a/packages/flutter_tools/lib/src/widget_preview/lsp_preview_detector.dart b/packages/flutter_tools/lib/src/widget_preview/lsp_preview_detector.dart
index ef8d6483ed64d..bf5b1b596e0fd 100644
--- a/packages/flutter_tools/lib/src/widget_preview/lsp_preview_detector.dart
+++ b/packages/flutter_tools/lib/src/widget_preview/lsp_preview_detector.dart
@@ -136,6 +136,10 @@ class LspPreviewDetector {
   }
 
   Future<AnalysisServer> launchAnalysisServer() async {
+    final String? protocolTrafficLog = platform.environment['FLUTTER_LSP_TRAFFIC_LOG'];
+    if (protocolTrafficLog != null) {
+      logger.printTrace('LSP Traffic Log path from env: $protocolTrafficLog');
+    }
     final analysisServer = AnalysisServer(
       artifacts.getArtifactPath(Artifact.engineDartSdkPath),
       [projectRoot.path],
@@ -145,6 +149,7 @@ class LspPreviewDetector {
       processManager: processManager,
       terminal: terminal,
       suppressAnalytics: suppressAnalytics,
+      protocolTrafficLog: protocolTrafficLog,
     );
     return analysisServer;
   }
@@ -186,20 +191,38 @@ class LspPreviewDetector {
       return;
     }
     await _analysisServer?.waitForAnalysis();
-    try {
-      final FlutterWidgetPreviews result = await dtd.getFlutterWidgetPreviews();
-      onChangeDetected(result);
-    } catch (e) {
+    FlutterWidgetPreviews? result;
+    var retries = 5;
+    while (retries > 0) {
       if (_disposed || shutdownHooks.isShuttingDown) {
-        logger.printTrace('Failed to get widget previews during shutdown: $e');
-      } else if (e is StateError || e is Exception) {
-        logger.printWarning(
-          'Lost connection to the Dart Tooling Daemon (DTD). '
-          'Live preview updates are paused. Details: $e',
-        );
-      } else {
-        rethrow;
+        break;
+      }
+      try {
+        result = await dtd.getFlutterWidgetPreviews().timeout(const Duration(seconds: 5));
+        break;
+      } catch (e) {
+        retries--;
+        if (retries == 0) {
+          if (_disposed || shutdownHooks.isShuttingDown) {
+            logger.printTrace('Failed to get widget previews during shutdown: $e');
+          } else if (e is StateError || e is Exception) {
+            logger.printWarning(
+              'Lost connection to the Dart Tooling Daemon (DTD). '
+              'Live preview updates are paused. Details: $e',
+            );
+          } else {
+            rethrow;
+          }
+        } else {
+          logger.printTrace(
+            'Failed to get widget previews, retrying in 200ms... ($retries retries left). Error: $e',
+          );
+          await Future<void>.delayed(const Duration(milliseconds: 200));
+        }
       }
     }
+    if (result != null) {
+      onChangeDetected(result);
+    }
   }
 }
diff --git a/packages/flutter_tools/lib/src/widget_preview/persistent_preferences.dart b/packages/flutter_tools/lib/src/widget_preview/persistent_preferences.dart
index f962f4b4cc5a3..ff0b584280209 100644
--- a/packages/flutter_tools/lib/src/widget_preview/persistent_preferences.dart
+++ b/packages/flutter_tools/lib/src/widget_preview/persistent_preferences.dart
@@ -25,7 +25,7 @@ class PersistentPreferences {
 
   @visibleForTesting
   late final File file = fs.file(
-    fs.path.join(devtools.LocalFileSystem.devToolsDir(), _kPreferencesFileName),
+    fs.path.join(devtools.FileSystemExtension.devToolsDir, _kPreferencesFileName),
   );
 
   late Map<String, Object> _map;
diff --git a/packages/flutter_tools/lib/src/xcode_project.dart b/packages/flutter_tools/lib/src/xcode_project.dart
index 26fcf6f83b576..b83f1cb3279fb 100644
--- a/packages/flutter_tools/lib/src/xcode_project.dart
+++ b/packages/flutter_tools/lib/src/xcode_project.dart
@@ -222,10 +222,8 @@ abstract class XcodeBasedProject extends FlutterProjectPlatform {
       return false;
     }
 
-    // Swift Package Manager requires Xcode 15 or greater.
     final Xcode? xcode = globals.xcode;
-    final Version? xcodeVersion = xcode?.currentVersion;
-    if (xcodeVersion == null || xcodeVersion.major < 15) {
+    if (xcode == null || !xcode.isInstalled) {
       return false;
     }
 
diff --git a/packages/flutter_tools/packages/flutter_tools_core/lib/flutter_tools_core.dart b/packages/flutter_tools/packages/flutter_tools_core/lib/flutter_tools_core.dart
new file mode 100644
index 0000000000000..891c430cb5a31
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_core/lib/flutter_tools_core.dart
@@ -0,0 +1,13 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Core data structures, contracts, and host-side abstractions for Flutter
+/// tools extensibility.
+///
+/// This library provides platform-agnostic representations of devices,
+/// diagnostic validators, project templates, configuration flags, and plugin
+/// bindings shared across host tools and extension packages.
+library flutter_tools_core;
+
+// TODO(bkonyi): export core domain models and contracts.
diff --git a/packages/flutter_tools/packages/flutter_tools_core/pubspec.yaml b/packages/flutter_tools/packages/flutter_tools_core/pubspec.yaml
new file mode 100644
index 0000000000000..56be4a7894966
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_core/pubspec.yaml
@@ -0,0 +1,14 @@
+name: flutter_tools_core
+description: Core definitions, data models, and host adapters for Flutter tools extensibility.
+resolution: workspace
+
+environment:
+  sdk: ^3.11.0-0
+
+dependencies:
+  meta: 1.19.0
+
+dev_dependencies:
+  test: 1.31.1
+
+# PUBSPEC CHECKSUM: ttq919
diff --git a/packages/flutter_tools/packages/flutter_tools_extension/lib/flutter_tools_extension.dart b/packages/flutter_tools/packages/flutter_tools_extension/lib/flutter_tools_extension.dart
new file mode 100644
index 0000000000000..624c7da30b2ee
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension/lib/flutter_tools_extension.dart
@@ -0,0 +1,13 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Generic extension protocol base classes and extension interfaces for Flutter
+/// tools extensibility.
+///
+/// This package defines the platform-agnostic RPC protocol framing, handshake,
+/// and service handler interfaces implemented by extension authors.
+library flutter_tools_extension;
+
+export 'src/protocol_base/provider.dart';
+export 'src/protocol_base/service.dart';
diff --git a/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/provider.dart b/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/provider.dart
new file mode 100644
index 0000000000000..a151d08279dad
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/provider.dart
@@ -0,0 +1,80 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:isolate';
+
+import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
+import 'package:stream_channel/isolate_channel.dart';
+
+import 'service.dart';
+
+/// Entrypoint runner for a Flutter Tool Extension running in an Isolate.
+///
+/// Extension packages invoke [ToolExtensionEntryPoint.run] in their isolate
+/// entrypoint function, passing the initial Isolate send port and list of supported
+/// extension services.
+class ToolExtensionEntryPoint {
+  /// Entrypoint function to serve [services] over the Isolate [sendPort].
+  static Future<void> run(
+    SendPort sendPort,
+    List<ToolExtensionService> services, {
+    Set<String>? supportedPlatforms,
+    void Function(String message)? logger,
+  }) async {
+    logger?.call('[ToolExtensionIsolate] Initializing isolate channel...');
+    final channel = IsolateChannel<Object?>.connectSend(sendPort);
+    final peer = json_rpc.Peer.withoutJson(channel);
+
+    final rpcHandlers = <String, ExtensionRpcHandler>{};
+
+    for (final service in services) {
+      logger?.call(
+        '[ToolExtensionIsolate] Initializing service namespace "${service.namespace}"...',
+      );
+      final Map<String, ExtensionRpcHandler> handlers = await service.initialize();
+      handlers.forEach((String method, ExtensionRpcHandler handler) {
+        final fullMethod = '${service.namespace}.$method';
+        if (rpcHandlers.containsKey(fullMethod)) {
+          throw StateError('Duplicate RPC method registered: "$fullMethod"');
+        }
+        rpcHandlers[fullMethod] = handler;
+        logger?.call('[ToolExtensionIsolate] Registered RPC method handler: "$fullMethod"');
+      });
+    }
+
+    final capabilities = ToolExtensionCapabilities(
+      supportedPlatforms: supportedPlatforms ?? const <String>{'linux', 'macos', 'windows'},
+      services: services.map((ToolExtensionService s) => s.namespace).toList(),
+    );
+
+    peer.registerMethod('extension.getCapabilities', () {
+      logger?.call('[ToolExtensionIsolate] Handling extension.getCapabilities query.');
+      return capabilities.toMap();
+    });
+
+    rpcHandlers.forEach((String fullMethod, ExtensionRpcHandler handler) {
+      peer.registerMethod(fullMethod, (json_rpc.Parameters params) async {
+        logger?.call('[ToolExtensionIsolate] Handling RPC request "$fullMethod"...');
+        final Object? rawValue = params.value;
+        final Map<String, Object?> paramMap = rawValue is Map
+            ? rawValue.cast<String, Object?>()
+            : <String, Object?>{};
+        try {
+          final Object? result = await handler(paramMap);
+          logger?.call('[ToolExtensionIsolate] RPC request "$fullMethod" completed.');
+          return result;
+        } on Object catch (error, stackTrace) {
+          logger?.call(
+            '[ToolExtensionIsolate] RPC request "$fullMethod" failed: $error\n$stackTrace',
+          );
+          rethrow;
+        }
+      });
+    });
+
+    logger?.call('[ToolExtensionIsolate] Isolate peer listening for RPC requests.');
+    await peer.listen();
+  }
+}
diff --git a/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/service.dart b/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/service.dart
new file mode 100644
index 0000000000000..cbdf19e38e6df
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension/lib/src/protocol_base/service.dart
@@ -0,0 +1,65 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:meta/meta.dart';
+
+/// Typedef for an extension RPC handler function.
+typedef ExtensionRpcHandler = FutureOr<Object?> Function(Map<String, Object?> params);
+
+/// Represents a logical service exposed by a Flutter Tool Extension.
+///
+/// Extension authors implement this class to group related RPC endpoints under
+/// a specific [namespace] (e.g. `diagnostics`, `configuration`, `device`, `build`, `templates`).
+abstract class ToolExtensionService {
+  /// The namespace string of the service (e.g. `'diagnostics'`).
+  String get namespace;
+
+  /// Initializes state needed by the service and returns a map of method handlers.
+  ///
+  /// The returned map maps method names (without namespace prefix) to handler functions.
+  Future<Map<String, ExtensionRpcHandler>> initialize();
+
+  /// Cleans up resources held by the service when the extension is shut down.
+  Future<void> shutdown() async {}
+}
+
+/// Represents the capabilities and supported service namespaces reported by an extension.
+@immutable
+class ToolExtensionCapabilities {
+  /// Creates [ToolExtensionCapabilities] listing supported [services] and [supportedPlatforms].
+  const ToolExtensionCapabilities({
+    required this.services,
+    this.supportedPlatforms = const <String>{'linux', 'macos', 'windows'},
+  });
+
+  /// Deserializes [ToolExtensionCapabilities] from a JSON map payload.
+  factory ToolExtensionCapabilities.fromJson(Map<String, Object?> json) {
+    final Object? servicesList = json['services'];
+    final services = servicesList is Iterable ? List<String>.from(servicesList) : <String>[];
+    final Object? platformsList = json['supportedPlatforms'];
+    final Set<String> supportedPlatforms = platformsList is Iterable
+        ? platformsList.map((Object? p) => p.toString().toLowerCase()).toSet()
+        : const <String>{'linux', 'macos', 'windows'};
+    return ToolExtensionCapabilities(services: services, supportedPlatforms: supportedPlatforms);
+  }
+
+  /// The list of service namespace identifiers supported by the extension.
+  final List<String> services;
+
+  /// The set of host operating system platforms supported by the extension in lowercase (e.g., `{'linux'}`).
+  final Set<String> supportedPlatforms;
+
+  /// Returns whether the extension supports the given [hostPlatform].
+  bool supportsHostPlatform(String hostPlatform) {
+    return supportedPlatforms.contains(hostPlatform.toLowerCase());
+  }
+
+  /// Serializes capabilities to a map payload.
+  Map<String, Object?> toMap() => <String, Object?>{
+    'services': services,
+    'supportedPlatforms': supportedPlatforms.toList(),
+  };
+}
diff --git a/packages/flutter_tools/packages/flutter_tools_extension/pubspec.yaml b/packages/flutter_tools/packages/flutter_tools_extension/pubspec.yaml
new file mode 100644
index 0000000000000..88de4b4e37c01
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension/pubspec.yaml
@@ -0,0 +1,15 @@
+name: flutter_tools_extension
+description: Protocol interfaces and base implementation for Flutter tools extensions.
+resolution: workspace
+
+environment:
+  sdk: ^3.11.0-0
+
+dependencies:
+  meta: 1.19.0
+  flutter_tools_core:
+    path: ../flutter_tools_core
+  json_rpc_2: 4.1.0
+  stream_channel: 2.1.4
+
+# PUBSPEC CHECKSUM: 608ed1
diff --git a/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/lib/flutter_tools_extension_linux_prototype.dart b/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/lib/flutter_tools_extension_linux_prototype.dart
new file mode 100644
index 0000000000000..8e5a17cbed080
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/lib/flutter_tools_extension_linux_prototype.dart
@@ -0,0 +1,23 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Prototype Linux platform extension package for Flutter tools extensibility.
+library flutter_tools_extension_linux_prototype;
+
+import 'dart:isolate';
+
+import 'package:flutter_tools_extension/flutter_tools_extension.dart';
+
+/// Isolate entrypoint for the prototype Linux Flutter Tool Extension.
+void linuxExtensionEntryPoint(SendPort sendPort) {
+  ToolExtensionEntryPoint.run(
+    sendPort,
+    <ToolExtensionService>[],
+    supportedPlatforms: const <String>{'linux'},
+    logger: (String message) {
+      // ignore: avoid_print
+      print('[LinuxExtension] $message');
+    },
+  );
+}
diff --git a/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/pubspec.yaml b/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/pubspec.yaml
new file mode 100644
index 0000000000000..3e4d6af5c9e05
--- /dev/null
+++ b/packages/flutter_tools/packages/flutter_tools_extension_linux_prototype/pubspec.yaml
@@ -0,0 +1,18 @@
+name: flutter_tools_extension_linux_prototype
+description: Prototype Linux extension for Flutter tools extensibility.
+resolution: workspace
+
+environment:
+  sdk: ^3.11.0-0
+
+dependencies:
+  meta: 1.19.0
+  flutter_tools_core:
+    path: ../flutter_tools_core
+  flutter_tools_extension:
+    path: ../flutter_tools_extension
+
+dev_dependencies:
+  test: 1.31.1
+
+# PUBSPEC CHECKSUM: i74lku
diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml
index 40a10800ebc9e..af97b3e3eb3f4 100644
--- a/packages/flutter_tools/pubspec.yaml
+++ b/packages/flutter_tools/pubspec.yaml
@@ -5,6 +5,11 @@ homepage: https://flutter.dev
 environment:
   sdk: ^3.11.0-0
 
+workspace:
+  - packages/flutter_tools_core
+  - packages/flutter_tools_extension
+  - packages/flutter_tools_extension_linux_prototype
+
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".
   #
@@ -13,6 +18,7 @@ dependencies:
   analyzer: 10.1.0
   archive: 3.6.1
   args: 2.7.0
+  dap_adapters: 1.0.0
   dds: 5.4.0
   dwds: 27.1.2
   code_builder: 4.11.1
@@ -22,6 +28,12 @@ dependencies:
   crypto: 3.0.7
   ffi: 2.2.0
   file: 7.0.1
+  flutter_tools_core:
+    path: packages/flutter_tools_core
+  flutter_tools_extension:
+    path: packages/flutter_tools_extension
+  flutter_tools_extension_linux_prototype:
+    path: packages/flutter_tools_extension_linux_prototype
   flutter_template_images: 5.0.0
   html: 0.15.6
   http: 1.6.0
@@ -61,6 +73,7 @@ dependencies:
   hooks: 2.1.0
   code_assets: 1.2.1
   data_assets: 0.20.0
+  record_use: 1.1.0
 
   # We depend on very specific internal implementation details of the
   # 'test' package, which change between versions, so when upgrading
@@ -79,7 +92,7 @@ dependencies:
   boolean_selector: 2.1.2
   browser_launcher: 1.1.3
   built_collection: 5.1.1
-  built_value: 8.12.6
+  built_value: 8.12.7
   cli_config: 0.2.0
   clock: 1.1.2
   csslib: 1.0.2
@@ -127,5 +140,4 @@ dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
 
-
-# PUBSPEC CHECKSUM: qi12j
+# PUBSPEC CHECKSUM: 1leejj
diff --git a/packages/flutter_tools/static/index.html b/packages/flutter_tools/static/index.html
index 85ebd46c4c602..cf505d9063009 100644
--- a/packages/flutter_tools/static/index.html
+++ b/packages/flutter_tools/static/index.html
@@ -29,6 +29,7 @@
 </head>
 <body>
   <div id="dark"></div>
+  <div id="play"></div>
   <script src="host.dart.js"></script>
 </body>
 </html>
diff --git a/packages/flutter_tools/templates/add_to_app/darwin/Scripts/flutter_integration.sh.tmpl b/packages/flutter_tools/templates/add_to_app/darwin/Scripts/flutter_integration.sh.tmpl
index ef30cd2e7d5bb..46011b91c0076 100644
--- a/packages/flutter_tools/templates/add_to_app/darwin/Scripts/flutter_integration.sh.tmpl
+++ b/packages/flutter_tools/templates/add_to_app/darwin/Scripts/flutter_integration.sh.tmpl
@@ -28,8 +28,8 @@ FLUTTER_TOOL_BUILD_MODE="release"
 
 buildTool() {
   cd "$FLUTTER_NATIVE_TOOLS_PACKAGE_PATH" || exit 1
-  xcrun --sdk macosx swift package clean --build-path "$FLUTTER_TOOL_BUILD_PATH"
-  xcrun --sdk macosx swift build --product $FLUTTER_TOOL --build-path "$FLUTTER_TOOL_BUILD_PATH" -c $FLUTTER_TOOL_BUILD_MODE --disable-sandbox
+  env -i PATH="$PATH" DEVELOPER_DIR="${DEVELOPER_DIR:-}" xcrun --sdk macosx swift package clean --build-path "$FLUTTER_TOOL_BUILD_PATH"
+  env -i PATH="$PATH" DEVELOPER_DIR="${DEVELOPER_DIR:-}" xcrun --sdk macosx swift build --product $FLUTTER_TOOL --build-path "$FLUTTER_TOOL_BUILD_PATH" -c $FLUTTER_TOOL_BUILD_MODE --disable-sandbox
 }
 
 # Use prebuilt tool if possible, otherwise re-build it for next time
diff --git a/packages/flutter_tools/templates/app/linux.tmpl/runner/my_application.cc.tmpl b/packages/flutter_tools/templates/app/linux.tmpl/runner/my_application.cc.tmpl
index 3b8611caea9fa..e1224f0b76359 100644
--- a/packages/flutter_tools/templates/app/linux.tmpl/runner/my_application.cc.tmpl
+++ b/packages/flutter_tools/templates/app/linux.tmpl/runner/my_application.cc.tmpl
@@ -1,9 +1,6 @@
 #include "my_application.h"
 
 #include <flutter_linux/flutter_linux.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
 
 #include "flutter/generated_plugin_registrant.h"
 
@@ -22,37 +19,21 @@ static void first_frame_cb(MyApplication* self, FlView* view) {
 // Implements GApplication::activate.
 static void my_application_activate(GApplication* application) {
   MyApplication* self = MY_APPLICATION(application);
+
   GtkWindow* window =
       GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+  gtk_window_set_default_size(window, 1280, 720);
 
-  // Use a header bar when running in GNOME as this is the common style used
-  // by applications and is the setup most users will be using (e.g. Ubuntu
-  // desktop).
-  // If running on X and not using GNOME then just use a traditional title bar
-  // in case the window manager does more exotic layout, e.g. tiling.
-  // If running on Wayland assume the header bar will work (may need changing
-  // if future cases occur).
-  gboolean use_header_bar = TRUE;
-#ifdef GDK_WINDOWING_X11
-  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen)) {
-    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-      use_header_bar = FALSE;
-    }
-  }
-#endif
-  if (use_header_bar) {
-    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "{{projectName}}");
-    gtk_header_bar_set_show_close_button(header_bar, TRUE);
-    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  } else {
-    gtk_window_set_title(window, "{{projectName}}");
-  }
+  // If you want to use a header bar, uncomment the following lines.
+  // Header bars are commonly used in GNOME based desktop environments and
+  // allow additional widgets to be added to the title bar.
+  // See https://docs.gtk.org/gtk3/class.HeaderBar.html
+  // GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+  // gtk_widget_show(GTK_WIDGET(header_bar));
+  // gtk_header_bar_set_show_close_button(header_bar, TRUE);
+  // gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
 
-  gtk_window_set_default_size(window, 1280, 720);
+  gtk_window_set_title(window, "{{projectName}}");
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   fl_dart_project_set_dart_entrypoint_arguments(
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analysis_server_mock.dart b/packages/flutter_tools/test/commands.shard/hermetic/analysis_server_mock.dart
new file mode 100644
index 0000000000000..1598b188365f0
--- /dev/null
+++ b/packages/flutter_tools/test/commands.shard/hermetic/analysis_server_mock.dart
@@ -0,0 +1,175 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import '../../src/fake_process_manager.dart' as test_process_manager;
+
+/// A mock LSP server that allows a test to control analysis status, progress
+/// notifications and diagnostics.
+class MockLspServerProcess extends test_process_manager.FakeProcess {
+  factory MockLspServerProcess() {
+    final stdinController = StreamController<List<int>>();
+    final stdinSink = IOSink(stdinController.sink);
+    final exitCompleter = Completer<void>();
+    return MockLspServerProcess._(stdinController, stdin: stdinSink, exitCompleter: exitCompleter);
+  }
+
+  MockLspServerProcess._(
+    this._stdinController, {
+    required super.stdin,
+    required Completer<void> exitCompleter,
+  }) : _exitCompleter = exitCompleter,
+       super(completer: exitCompleter) {
+    _stdinController.stream.transform(utf8.decoder).listen(_handleStdinChunk);
+  }
+
+  final StreamController<List<int>> _stdinController;
+  final _inputBuffer = StringBuffer();
+  final _stdoutController = StreamController<List<int>>();
+  final Completer<void> _exitCompleter;
+
+  Completer<void>? _analysisCompleter;
+  final _initializeRequestCompleter = Completer<Map<String, Object?>>();
+  Future<Map<String, Object?>> get initializeRequest => _initializeRequestCompleter.future;
+
+  @override
+  Stream<List<int>> get stdout => _stdoutController.stream;
+
+  /// Starts simulated analysis on the server, but does not wait for it.
+  void triggerSimulatedAnalysis({Uri? diagnosticsFor, int diagnosticsCount = 1}) {
+    unawaited(
+      runSimulatedAnalysis(diagnosticsFor: diagnosticsFor, diagnosticsCount: diagnosticsCount),
+    );
+  }
+
+  /// Simulates analysis on the server.
+  ///
+  /// This will trigger a progress notification indicating that analysis has
+  /// started, optionally send [diagnosticsCount] diagnostics for
+  /// [diagnosticsFor], then send a progress notification indicating that anlaysis has ended.
+  Future<void> runSimulatedAnalysis({Uri? diagnosticsFor, int diagnosticsCount = 1}) async {
+    _simulateAnalysisStart();
+    await Future<void>.delayed(const Duration(milliseconds: 10));
+
+    if (diagnosticsFor != null) {
+      _simulateDiagnostics(diagnosticsFor, diagnosticsCount);
+      await Future<void>.delayed(const Duration(milliseconds: 10));
+    }
+
+    _simulateAnalysisEnd();
+  }
+
+  /// Causes the process to write a Dart VM Service banner to stdout.
+  void triggerVmServiceUriBanner() {
+    _writeRawOutput('The Dart VM service is listening on http://127.0.0.1:65155/ZkxDXuYz2Aw=/\n');
+  }
+
+  Future<void> _handleRequest(Map<String, Object?> request) async {
+    switch (request['method']) {
+      case 'initialize':
+        _initializeRequestCompleter.complete(request);
+        _writeAsLspToStdout(
+          jsonEncode({
+            'jsonrpc': '2.0',
+            'id': request['id'],
+            'result': {'capabilities': <String, Object?>{}},
+          }),
+        );
+      case 'dart/workspace/analysis/complete':
+        await _analysisCompleter?.future;
+        _sendResponse(request['id'], null);
+    }
+  }
+
+  void _handleStdinChunk(String chunk) {
+    _inputBuffer.write(chunk);
+    var input = _inputBuffer.toString();
+    while (true) {
+      final int headerEnd = input.indexOf('\r\n\r\n');
+      if (headerEnd == -1) {
+        break;
+      }
+      final String header = input.substring(0, headerEnd);
+      final Match? contentLengthMatch = RegExp(r'Content-Length: (\d+)').firstMatch(header);
+      if (contentLengthMatch == null) {
+        throw StateError('LSP request is missing a Content-Length header.');
+      }
+      final int contentLength = int.parse(contentLengthMatch.group(1)!);
+      final int messageEnd = headerEnd + 4 + contentLength;
+      if (input.length < messageEnd) {
+        break;
+      }
+      final String message = input.substring(headerEnd + 4, messageEnd);
+      unawaited(_handleRequest(jsonDecode(message) as Map<String, Object?>));
+      input = input.substring(messageEnd);
+    }
+    _inputBuffer
+      ..clear()
+      ..write(input);
+  }
+
+  void _sendNotification(String method, Map<String, Object?> params) {
+    _writeAsLspToStdout(
+      jsonEncode(<String, Object?>{'jsonrpc': '2.0', 'method': method, 'params': params}),
+    );
+  }
+
+  void _sendResponse(Object? id, Map<String, Object?>? result) {
+    _writeAsLspToStdout(jsonEncode({'jsonrpc': '2.0', 'id': id, 'result': result}));
+  }
+
+  void _simulateAnalysisEnd() {
+    _analysisCompleter?.complete();
+    _analysisCompleter = null;
+    _sendNotification(r'$/progress', <String, Object?>{
+      'token': 'analyze',
+      'value': <String, Object?>{'kind': 'end'},
+    });
+  }
+
+  @override
+  bool kill([ProcessSignal signal = ProcessSignal.sigterm]) {
+    _exitCompleter.complete();
+    return super.kill();
+  }
+
+  void _simulateAnalysisStart() {
+    if (_analysisCompleter case null || Completer(isCompleted: true)) {
+      _analysisCompleter = Completer<void>();
+      _sendNotification(r'$/progress', <String, Object?>{
+        'token': 'analyze',
+        'value': <String, Object?>{'kind': 'begin'},
+      });
+    }
+  }
+
+  void _simulateDiagnostics(Uri targetUri, int count) {
+    _sendNotification('textDocument/publishDiagnostics', {
+      'uri': targetUri.toString(),
+      'diagnostics': <Object?>[
+        for (var i = 0; i < count; i++)
+          <String, Object?>{
+            'range': <String, Object?>{
+              'start': <String, Object?>{'line': 99 + i, 'character': 4},
+              'end': <String, Object?>{'line': 99 + i, 'character': 4},
+            },
+            'severity': 2,
+            'code': '500',
+            'message': "It's an error.",
+          },
+      ],
+    });
+  }
+
+  void _writeAsLspToStdout(String message) {
+    _stdoutController.add(utf8.encode('Content-Length: ${message.length}\r\n\r\n$message'));
+  }
+
+  void _writeRawOutput(String output) {
+    _stdoutController.add(utf8.encode(output));
+  }
+}
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
index 5fa535ee5e439..7829ca44953f9 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
@@ -16,13 +16,13 @@ import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/analyze.dart';
 import 'package:flutter_tools/src/dart/analysis.dart';
-import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/project_validator.dart';
 
 import '../../src/common.dart';
 import '../../src/context.dart';
 import '../../src/fake_process_manager.dart';
 import '../../src/test_flutter_command_runner.dart';
+import 'analysis_server_mock.dart';
 
 void main() {
   setUpAll(() {
@@ -33,10 +33,12 @@ void main() {
   late FileSystem fileSystem;
   late Platform platform;
   late AnsiTerminal terminal;
-  late Logger logger;
+  late BufferLogger logger;
 
   setUp(() {
-    fileSystem = globals.localFileSystem;
+    fileSystem = MemoryFileSystem.test(
+      style: const LocalPlatform().isWindows ? FileSystemStyle.windows : FileSystemStyle.posix,
+    );
     platform = const LocalPlatform();
     terminal = AnsiTerminal(platform: platform, stdio: Stdio());
     logger = BufferLogger(outputPreferences: OutputPreferences.test(), terminal: terminal);
@@ -69,74 +71,63 @@ void main() {
   ''');
   }
 
-  group('analyze --watch', () {
-    testUsingContext('AnalysisServer success', () async {
-      final fileSystem = MemoryFileSystem.test();
-      final Directory tempDir = fileSystem.systemTempDirectory.createTempSync(
-        'flutter_analysis_test.',
-      );
-      createSampleProject(tempDir);
+  testUsingContext('AnalysisServer success', () async {
+    final Directory tempDir = fileSystem.systemTempDirectory.createTempSync(
+      'flutter_analysis_test.',
+    );
+    createSampleProject(tempDir);
 
-      final stdin = StreamController<List<int>>();
-      final processManager = FakeProcessManager.list(<FakeCommand>[
-        FakeCommand(
-          command: const <String>[
-            'Artifact.engineDartSdkPath/bin/dart',
-            'language-server',
-            '--dart-sdk',
-            'Artifact.engineDartSdkPath',
-            '--disable-server-feature-completion',
-            '--disable-server-feature-search',
-            '--suppress-analytics',
-          ],
-          stdin: IOSink(stdin.sink),
-          stdout:
-              'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-              'Content-Length: 93\r\n\r\n'
-              r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-              '"value":{"kind":"begin"}}}'
-              'Content-Length: 91\r\n\r\n'
-              r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-              '"value":{"kind":"end"}}}',
-        ),
-      ]);
+    final process = MockLspServerProcess();
+    final processManager = FakeProcessManager.list(<FakeCommand>[
+      FakeCommand(
+        command: <String>[
+          fileSystem.path.join('Artifact.engineDartSdkPath', 'bin', 'dart'),
+          'language-server',
+          '--dart-sdk',
+          'Artifact.engineDartSdkPath',
+          '--disable-server-feature-completion',
+          '--disable-server-feature-search',
+          '--suppress-analytics',
+        ],
+        process: process,
+      ),
+    ]);
 
-      final server = AnalysisServer(
-        'Artifact.engineDartSdkPath',
-        <String>[tempDir.path],
-        fileSystem: fileSystem,
-        platform: FakePlatform(),
-        processManager: processManager,
-        logger: logger,
-        terminal: terminal,
-        suppressAnalytics: true,
-      );
+    final server = AnalysisServer(
+      'Artifact.engineDartSdkPath',
+      <String>[tempDir.path],
+      fileSystem: fileSystem,
+      platform: FakePlatform(),
+      processManager: processManager,
+      logger: logger,
+      terminal: terminal,
+      suppressAnalytics: true,
+    );
 
-      var errorCount = 0;
-      server.onErrors.listen((FileAnalysisErrors errors) => errorCount += errors.errors.length);
+    var errorCount = 0;
+    server.onErrors.listen((FileAnalysisErrors errors) => errorCount += errors.errors.length);
 
-      await server.start();
-      await server.waitForAnalysis();
+    await server.start();
+    process.triggerSimulatedAnalysis();
+    await server.waitForAnalysis();
 
-      expect(errorCount, 0);
+    expect(errorCount, 0);
 
-      await server.dispose();
-      expect(processManager, hasNoRemainingExpectations);
-    });
+    await server.dispose();
+    expect(processManager, hasNoRemainingExpectations);
   });
 
   testUsingContext('AnalysisServer errors', () async {
-    final fileSystem = MemoryFileSystem.test();
     final Directory tempDir = fileSystem.systemTempDirectory.createTempSync(
       'flutter_analysis_test.',
     );
     createSampleProject(tempDir, brokenCode: true);
 
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
-        command: const <String>[
-          'Artifact.engineDartSdkPath/bin/dart',
+        command: <String>[
+          fileSystem.path.join('Artifact.engineDartSdkPath', 'bin', 'dart'),
           'language-server',
           '--dart-sdk',
           'Artifact.engineDartSdkPath',
@@ -144,20 +135,7 @@ void main() {
           '--disable-server-feature-search',
           '--suppress-analytics',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-            'Content-Length: 93\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"begin"}}}'
-            'Content-Length: 249\r\n\r\n'
-            '{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{'
-            '"uri":"file:///directoryA/foo","diagnostics":[{"range":{"start":{"line":99,'
-            '"character":4},"end":{"line":99,"character":4}},"severity":2,"code":"500",'
-            '"message":"It\'s an error."}]}}'
-            'Content-Length: 91\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"end"}}}',
+        process: process,
       ),
     ]);
 
@@ -176,6 +154,7 @@ void main() {
     server.onErrors.listen((FileAnalysisErrors errors) => errorCount += errors.errors.length);
 
     await server.start();
+    process.triggerSimulatedAnalysis(diagnosticsFor: Uri.parse('file:///directoryA/foo'));
     await server.waitForAnalysis();
 
     expect(errorCount, greaterThan(0));
@@ -185,17 +164,16 @@ void main() {
   });
 
   testUsingContext('Returns no errors when source is error-free', () async {
-    final fileSystem = MemoryFileSystem.test();
     final Directory tempDir = fileSystem.systemTempDirectory.createTempSync(
       'flutter_analysis_test.',
     );
     createSampleProject(tempDir);
 
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
-        command: const <String>[
-          'Artifact.engineDartSdkPath/bin/dart',
+        command: <String>[
+          fileSystem.path.join('Artifact.engineDartSdkPath', 'bin', 'dart'),
           'language-server',
           '--dart-sdk',
           'Artifact.engineDartSdkPath',
@@ -203,15 +181,7 @@ void main() {
           '--disable-server-feature-search',
           '--suppress-analytics',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-            'Content-Length: 93\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"begin"}}}'
-            'Content-Length: 91\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"end"}}}',
+        process: process,
       ),
     ]);
 
@@ -231,6 +201,7 @@ void main() {
       errorCount += errors.errors.length;
     });
     await server.start();
+    process.triggerSimulatedAnalysis();
     await server.waitForAnalysis();
     expect(errorCount, 0);
     await server.dispose();
@@ -238,7 +209,7 @@ void main() {
   });
 
   testUsingContext('Can run AnalysisService without suppressing analytics', () async {
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
         command: const <String>[
@@ -249,9 +220,7 @@ void main() {
           '--disable-server-feature-completion',
           '--disable-server-feature-search',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 53\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{"capabilities":{}}}\r\n',
+        process: process,
       ),
     ]);
 
@@ -259,7 +228,7 @@ void main() {
     final command = AnalyzeCommand(
       terminal: Terminal.test(),
       artifacts: artifacts,
-      logger: BufferLogger.test(),
+      logger: logger,
       platform: FakePlatform(),
       fileSystem: MemoryFileSystem.test(),
       processManager: processManager,
@@ -270,13 +239,13 @@ void main() {
     final commandRunner = TestFlutterCommandRunner();
     commandRunner.addCommand(command);
     unawaited(commandRunner.run(<String>['analyze', '--watch']));
-    await stdin.stream.first;
+    await process.initializeRequest;
 
     expect(processManager, hasNoRemainingExpectations);
   });
 
   testUsingContext('Can run AnalysisService with customized cache location', () async {
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
         command: const <String>[
@@ -288,9 +257,7 @@ void main() {
           '--disable-server-feature-search',
           '--suppress-analytics',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 53\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{"capabilities":{}}}\r\n',
+        process: process,
       ),
     ]);
 
@@ -298,7 +265,7 @@ void main() {
     final command = AnalyzeCommand(
       terminal: Terminal.test(),
       artifacts: artifacts,
-      logger: BufferLogger.test(),
+      logger: logger,
       platform: FakePlatform(),
       fileSystem: MemoryFileSystem.test(),
       processManager: processManager,
@@ -309,28 +276,13 @@ void main() {
     final commandRunner = TestFlutterCommandRunner();
     commandRunner.addCommand(command);
     unawaited(commandRunner.run(<String>['analyze', '--watch']));
-    await stdin.stream.first;
+    await process.initializeRequest;
 
     expect(processManager, hasNoRemainingExpectations);
   });
 
   testUsingContext('Can run AnalysisService with customized cache location --watch', () async {
-    // Use Windows style on Windows host so Uri.toFilePath() parses it correctly with drive letters.
-    final fileSystem = MemoryFileSystem.test(
-      style: const LocalPlatform().isWindows ? FileSystemStyle.windows : FileSystemStyle.posix,
-    );
-    fileSystem.directory('directoryA').childFile('foo').createSync(recursive: true);
-
-    final logger = BufferLogger.test();
-
-    final fooUri = fileSystem.path.toUri(fileSystem.path.absolute('directoryA', 'foo')).toString();
-    final diagnosticsJson =
-        '{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{'
-        '"uri":"$fooUri","diagnostics":[{"range":{"start":{"line":99,'
-        '"character":4},"end":{"line":99,"character":4}},"severity":2,"code":"500",'
-        '"message":"It\'s an error."}]}}';
-
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
         command: <String>[
@@ -342,17 +294,7 @@ void main() {
           '--disable-server-feature-search',
           '--suppress-analytics',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-            'Content-Length: 93\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"begin"}}}'
-            'Content-Length: ${diagnosticsJson.length}\r\n\r\n'
-            '$diagnosticsJson'
-            'Content-Length: 91\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"end"}}}',
+        process: process,
       ),
     ]);
 
@@ -371,6 +313,13 @@ void main() {
     final commandRunner = TestFlutterCommandRunner();
     commandRunner.addCommand(command);
     unawaited(commandRunner.run(<String>['analyze', '--watch']));
+    await process.initializeRequest;
+
+    // Trigger analysis and diagnostics for an existing file.
+    final File targetFile = fileSystem.directory('directoryA').childFile('foo')
+      ..createSync(recursive: true);
+    final Uri targetUri = fileSystem.path.toUri(targetFile.path);
+    process.triggerSimulatedAnalysis(diagnosticsFor: targetUri);
 
     while (!logger.statusText.contains('analyzed 1 file')) {
       await Future<void>.delayed(const Duration(milliseconds: 100));
@@ -383,8 +332,7 @@ void main() {
   });
 
   testUsingContext('AnalysisService --watch skips errors from non-files', () async {
-    final logger = BufferLogger.test();
-    final stdin = StreamController<List<int>>();
+    final process = MockLspServerProcess();
     final processManager = FakeProcessManager.list(<FakeCommand>[
       FakeCommand(
         command: const <String>[
@@ -396,20 +344,7 @@ void main() {
           '--disable-server-feature-search',
           '--suppress-analytics',
         ],
-        stdin: IOSink(stdin.sink),
-        stdout:
-            'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-            'Content-Length: 93\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"begin"}}}'
-            'Content-Length: 249\r\n\r\n'
-            '{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{'
-            '"uri":"file:///directoryA/bar","diagnostics":[{"range":{"start":{"line":99,'
-            '"character":4},"end":{"line":99,"character":4}},"severity":2,"code":"500",'
-            '"message":"It\'s an error."}]}}'
-            'Content-Length: 91\r\n\r\n'
-            r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-            '"value":{"kind":"end"}}}',
+        process: process,
       ),
     ]);
 
@@ -428,6 +363,12 @@ void main() {
     final commandRunner = TestFlutterCommandRunner();
     commandRunner.addCommand(command);
     unawaited(commandRunner.run(<String>['analyze', '--watch']));
+    await process.initializeRequest;
+
+    // Trigger analysis and diagnostics for a non-existing file.
+    final File targetFile = fileSystem.directory('directoryA').childFile('foo');
+    final Uri targetUri = fileSystem.path.toUri(targetFile.path);
+    process.triggerSimulatedAnalysis(diagnosticsFor: targetUri);
 
     while (!logger.statusText.contains('analyzed 1 file')) {
       await Future<void>.delayed(const Duration(milliseconds: 100));
@@ -445,8 +386,7 @@ void main() {
       // invoke json.decode(...) on the VM service message.
       //
       // Regression test for https://github.com/flutter/flutter/issues/58391.
-      final logger = BufferLogger.test();
-      final stdin = StreamController<List<int>>();
+      final process = MockLspServerProcess();
       final processManager = FakeProcessManager.list(<FakeCommand>[
         FakeCommand(
           command: const <String>[
@@ -458,21 +398,7 @@ void main() {
             '--disable-server-feature-search',
             '--suppress-analytics',
           ],
-          stdin: IOSink(stdin.sink),
-          stdout:
-              'The Dart VM service is listening on http://127.0.0.1:65155/ZkxDXuYz2Aw=/\n'
-              'Content-Length: 36\r\n\r\n{"jsonrpc":"2.0","id":1,"result":{}}'
-              'Content-Length: 93\r\n\r\n'
-              r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-              '"value":{"kind":"begin"}}}'
-              'Content-Length: 249\r\n\r\n'
-              '{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{'
-              '"uri":"file:///directoryA/bar","diagnostics":[{"range":{"start":{"line":99,'
-              '"character":4},"end":{"line":99,"character":4}},"severity":2,"code":"500",'
-              '"message":"It\'s an error."}]}}'
-              'Content-Length: 91\r\n\r\n'
-              r'{"jsonrpc":"2.0","method":"$/progress","params":{"token":"analyze",'
-              '"value":{"kind":"end"}}}',
+          process: process,
         ),
       ]);
 
@@ -491,6 +417,10 @@ void main() {
       final commandRunner = TestFlutterCommandRunner();
       commandRunner.addCommand(command);
       unawaited(commandRunner.run(<String>['analyze', '--watch']));
+      await process.initializeRequest;
+      process
+        ..triggerVmServiceUriBanner()
+        ..triggerSimulatedAnalysis(diagnosticsFor: Uri.parse('file:///directoryA/foo'));
 
       while (!logger.statusText.contains('analyzed 1 file')) {
         await Future<void>.delayed(const Duration(milliseconds: 100));
@@ -501,4 +431,66 @@ void main() {
       expect(processManager, hasNoRemainingExpectations);
     },
   );
+
+  testUsingContext('AnalysisService --watch handles errors coming and going', () async {
+    final process = MockLspServerProcess();
+    final processManager = FakeProcessManager.list(<FakeCommand>[
+      FakeCommand(
+        command: <String>[
+          fileSystem.path.join('Artifact.engineDartSdkPath', 'bin', 'dart'),
+          'language-server',
+          '--dart-sdk',
+          'Artifact.engineDartSdkPath',
+          '--disable-server-feature-completion',
+          '--disable-server-feature-search',
+          '--suppress-analytics',
+        ],
+        process: process,
+      ),
+    ]);
+
+    final artifacts = Artifacts.test();
+    final command = AnalyzeCommand(
+      terminal: Terminal.test(),
+      artifacts: artifacts,
+      logger: logger,
+      platform: FakePlatform(),
+      fileSystem: fileSystem,
+      processManager: processManager,
+      allProjectValidators: <ProjectValidator>[],
+      suppressAnalytics: true,
+    );
+
+    final commandRunner = TestFlutterCommandRunner();
+    commandRunner.addCommand(command);
+    unawaited(commandRunner.run(<String>['analyze', '--watch']));
+    await process.initializeRequest;
+
+    // Simulate some diagnostics coming and going. The file must exist.
+    final File targetFile = fileSystem.directory('directoryA').childFile('foo')
+      ..createSync(recursive: true);
+    final Uri targetUri = fileSystem.path.toUri(targetFile.path);
+
+    await process.runSimulatedAnalysis(diagnosticsFor: targetUri); // 1 new
+    await process.runSimulatedAnalysis(diagnosticsFor: targetUri, diagnosticsCount: 0); // 1 fixed
+    await process.runSimulatedAnalysis(diagnosticsFor: targetUri, diagnosticsCount: 2); // 2 new
+    await process.runSimulatedAnalysis(diagnosticsFor: targetUri, diagnosticsCount: 0); // 2 fixed
+
+    // Wait for the final line we expect.
+    while (!logger.statusText.contains('2 fixed')) {
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+    }
+
+    expect(
+      logger.statusText.split('\n'),
+      containsAllInOrder([
+        contains('1 new'),
+        contains('1 fixed'),
+        contains('2 new'),
+        contains('2 fixed'),
+      ]),
+    );
+    expect(logger.errorText, isEmpty);
+    expect(processManager, hasNoRemainingExpectations);
+  });
 }
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
index f448b6a1bd36e..75806cb7f08ad 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/analyze_test.dart
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
-import 'dart:convert';
-
 import 'package:args/command_runner.dart';
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
@@ -20,8 +17,8 @@ import 'package:flutter_tools/src/project_validator.dart';
 
 import '../../src/common.dart';
 import '../../src/context.dart';
-import '../../src/fake_process_manager.dart' as test_process_manager;
 import '../../src/test_flutter_command_runner.dart';
+import 'analysis_server_mock.dart';
 
 const _kFlutterRoot = '/data/flutter';
 const SIGABRT = -6;
@@ -156,10 +153,7 @@ void main() {
     testUsingContext(
       '--flutter-repo analyzes everything in the flutterRoot',
       () async {
-        final streamController = StreamController<List<int>>();
-        final sink = IOSink(streamController.sink);
-        final exitCompleter = Completer<void>();
-        final process = _CustomLspProcess(stdin: sink, exitCompleter: exitCompleter);
+        final process = MockLspServerProcess();
         processManager.addCommands(<FakeCommand>[
           FakeCommand(
             // artifact paths are from Artifacts.test() and stable
@@ -176,41 +170,9 @@ void main() {
           ),
         ]);
 
-        final buffer = StringBuffer();
-        final messageReceived = Completer<void>();
-        String? firstMessage;
-
-        streamController.stream.transform(utf8.decoder).listen((String chunk) {
-          buffer.write(chunk);
-          final current = buffer.toString();
-          if (current.contains('{') && firstMessage == null) {
-            final int startIndex = current.indexOf('{');
-            firstMessage = current.substring(startIndex);
-            final request = jsonDecode(firstMessage!) as Map<String, Object?>;
-            if (request['method'] == 'initialize') {
-              process.addResponse(
-                '{"jsonrpc":"2.0","id":1,"result":'
-                '{"capabilities":{"window":{"workDoneProgress":true}}}}',
-              );
-              process.addResponse(
-                r'{"jsonrpc":"2.0","method":"$/progress","params":'
-                r'{"token":"analyze","value":{"kind":"begin"}}}',
-              );
-              process.addResponse(
-                r'{"jsonrpc":"2.0","method":"$/progress","params":'
-                r'{"token":"analyze","value":{"kind":"end"}}}',
-              );
-              exitCompleter.complete();
-              messageReceived.complete();
-            }
-          }
-        });
-
         await runner.run(<String>['analyze', '--flutter-repo']);
 
-        expect(firstMessage, isNotNull);
-        final request = jsonDecode(firstMessage!) as Map<String, Object?>;
-        expect(request['method'], 'initialize');
+        final Map<String, Object?> request = await process.initializeRequest;
         final params = request['params']! as Map<String, Object?>;
         expect(
           params['workspaceFolders'] as List?,
@@ -271,17 +233,3 @@ bool inRepo(List<String>? fileList, FileSystem fileSystem) {
   }
   return false;
 }
-
-class _CustomLspProcess extends test_process_manager.FakeProcess {
-  _CustomLspProcess({super.stdin, Completer<void>? exitCompleter})
-    : super(completer: exitCompleter);
-
-  final StreamController<List<int>> _stdoutController = StreamController<List<int>>();
-
-  @override
-  Stream<List<int>> get stdout => _stdoutController.stream;
-
-  void addResponse(String message) {
-    _stdoutController.add(utf8.encode('Content-Length: ${message.length}\r\n\r\n$message'));
-  }
-}
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_aar_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_aar_test.dart
index 3afcd16e00e99..e95ef5efc0bf0 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/build_aar_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/build_aar_test.dart
@@ -114,7 +114,7 @@ flutter:
               '-I=/flutter/packages/flutter_tools/gradle/aar_init_script.gradle',
               ...List<RegExp>.filled(4, RegExp(r'-P[a-zA-Z-]+=.*')),
               '-q',
-              ...List<RegExp>.filled(6, RegExp(r'-P[a-zA-Z-]+=.*')),
+              ...List<RegExp>.filled(7, RegExp(r'-P[a-zA-Z-]+=.*')),
               'assembleAar$buildMode',
             ],
             onRun: (_) => fs.directory('/build/host/outputs/repo').createSync(recursive: true),
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_swift_package_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_swift_package_test.dart
index a2b47feabd5a7..d52b1456a5495 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/build_swift_package_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/build_swift_package_test.dart
@@ -40,6 +40,8 @@ const _flutterRoot = '/path/to/flutter';
 const String _engineVersion = '1234567890abcdef1234567890abcdef12345678';
 const String _iosSdkRoot =
     '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.2.sdk';
+const _flutterCachePath = '/path/to/flutter/bin/cache';
+const _engineArtifactPath = '$_flutterCachePath/artifacts/engine/ios/Flutter.xcframework';
 
 void main() {
   const flutterAppDartToolPath = '$_flutterAppPath/.dart_tool';
@@ -61,8 +63,6 @@ void main() {
   const scriptsDirectoryPath = 'output/Scripts';
   const debugCocoapodCache = '$cacheDirectoryPath/Debug/CocoaPods';
   const pluginsDirectoryPath = '$nativeIntegrationSwiftPackagePath/.plugins';
-  const flutterCachePath = '/path/to/flutter/bin/cache';
-  const engineArtifactPath = '$flutterCachePath/artifacts/engine/ios/Flutter.xcframework';
   const codesignIdentity = 'Apple Development: Company (TEAM_ID)';
   const codesignIdentityFile = '$cacheDirectoryPath/.codesign_identity';
 
@@ -74,7 +74,7 @@ void main() {
         final processManager = FakeProcessManager.list([]);
         final command = BuildSwiftPackage(
           analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+          artifacts: FakeArtifacts(_engineArtifactPath),
           buildSystem: FakeBuildSystem(),
           cache: FakeCache(fs, _flutterRoot),
           fileSystem: fs,
@@ -110,7 +110,7 @@ void main() {
         final processManager = FakeProcessManager.list([]);
         final command = BuildSwiftPackage(
           analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+          artifacts: FakeArtifacts(_engineArtifactPath),
           buildSystem: FakeBuildSystem(),
           cache: FakeCache(fs, _flutterRoot),
           fileSystem: fs,
@@ -154,7 +154,7 @@ void main() {
             final logger = BufferLogger.test();
             final command = BuildSwiftPackage(
               analytics: FakeAnalytics(),
-              artifacts: FakeArtifacts(engineArtifactPath),
+              artifacts: FakeArtifacts(_engineArtifactPath),
               buildSystem: FakeBuildSystem(),
               cache: FakeCache(fs, _flutterRoot),
               fileSystem: fs,
@@ -210,7 +210,7 @@ void main() {
             final logger = BufferLogger.test();
             final command = BuildSwiftPackage(
               analytics: FakeAnalytics(),
-              artifacts: FakeArtifacts(engineArtifactPath),
+              artifacts: FakeArtifacts(_engineArtifactPath),
               buildSystem: FakeBuildSystem(),
               cache: FakeCache(fs, _flutterRoot),
               fileSystem: fs,
@@ -268,7 +268,7 @@ void main() {
       final processManager = FakeProcessManager.list([]);
       final command = BuildSwiftPackage(
         analytics: FakeAnalytics(),
-        artifacts: FakeArtifacts(engineArtifactPath),
+        artifacts: FakeArtifacts(_engineArtifactPath),
         buildSystem: FakeBuildSystem(),
         cache: FakeCache(fs, _flutterRoot),
         fileSystem: fs,
@@ -296,7 +296,7 @@ void main() {
       final processManager = FakeProcessManager.list([]);
       final command = BuildSwiftPackage(
         analytics: FakeAnalytics(),
-        artifacts: FakeArtifacts(engineArtifactPath),
+        artifacts: FakeArtifacts(_engineArtifactPath),
         buildSystem: FakeBuildSystem(),
         cache: FakeCache(fs, _flutterRoot),
         fileSystem: fs,
@@ -333,20 +333,10 @@ void main() {
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final package = FlutterPluginRegistrantSwiftPackage(
           targetPlatform: targetPlatform,
@@ -504,26 +494,16 @@ import PluginB
               '--filter',
               '- .DS_Store/',
               '--chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r',
-              engineArtifactPath,
+              _engineArtifactPath,
               xcframeworkOutput.path,
             ],
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final flutterFrameworkDependency = FlutterFrameworkDependency(
           targetPlatform: targetPlatform,
@@ -554,7 +534,7 @@ import PluginB
               '--filter',
               '- .DS_Store/',
               '--chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r',
-              engineArtifactPath,
+              _engineArtifactPath,
               xcframeworkOutput.path,
             ],
           ),
@@ -574,20 +554,10 @@ import PluginB
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final flutterFrameworkDependency = FlutterFrameworkDependency(
           targetPlatform: targetPlatform,
@@ -608,20 +578,10 @@ import PluginB
 
         final processManager = FakeProcessManager.list([]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final flutterFrameworkDependency = FlutterFrameworkDependency(
           targetPlatform: targetPlatform,
@@ -724,9 +684,10 @@ let package = Package(
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .macos;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
+          logger: logger,
+          processManager: processManager,
           buildSystem: FakeBuildSystem(
             expectations: [
               BuildExpectations(
@@ -735,7 +696,7 @@ let package = Package(
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Debug/macosx',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -752,16 +713,6 @@ let package = Package(
               ),
             ],
           ),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
-          logger: logger,
-          platform: FakePlatform(),
-          processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -832,9 +783,10 @@ let package = Package(
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .macos;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
+          logger: logger,
+          processManager: processManager,
           buildSystem: FakeBuildSystem(
             expectations: [
               BuildExpectations(
@@ -843,7 +795,7 @@ let package = Package(
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Release/macosx',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -860,16 +812,6 @@ let package = Package(
               ),
             ],
           ),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
-          logger: logger,
-          platform: FakePlatform(),
-          processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -958,9 +900,10 @@ let package = Package(
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .macos;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
+          logger: logger,
+          processManager: processManager,
           buildSystem: FakeBuildSystem(
             expectations: [
               BuildExpectations(
@@ -969,7 +912,7 @@ let package = Package(
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Release/macosx',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -986,16 +929,6 @@ let package = Package(
               ),
             ],
           ),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
-          logger: logger,
-          platform: FakePlatform(),
-          processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -1069,9 +1002,10 @@ let package = Package(
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
+          logger: logger,
+          processManager: processManager,
           buildSystem: FakeBuildSystem(
             expectations: [
               BuildExpectations(
@@ -1080,7 +1014,7 @@ let package = Package(
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphoneos',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -1102,7 +1036,7 @@ let package = Package(
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphonesimulator',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -1120,16 +1054,6 @@ let package = Package(
               ),
             ],
           ),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
-          logger: logger,
-          platform: FakePlatform(),
-          processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -1203,9 +1127,10 @@ let package = Package(
             ),
           ]);
           const FlutterDarwinPlatform targetPlatform = .ios;
-          final testUtils = BuildSwiftPackageUtils(
-            analytics: FakeAnalytics(),
-            artifacts: FakeArtifacts(engineArtifactPath),
+          final BuildSwiftPackageUtils testUtils = _createTestUtils(
+            fs: fs,
+            logger: logger,
+            processManager: processManager,
             buildSystem: FakeBuildSystem(
               expectations: [
                 BuildExpectations(
@@ -1214,7 +1139,7 @@ let package = Package(
                   expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                   expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphoneos',
                   expectedBuildDirPath: '$flutterAppBuildPath/',
-                  expectedCacheDirPath: flutterCachePath,
+                  expectedCacheDirPath: _flutterCachePath,
                   expectedFlutterRootDirPath: _flutterRoot,
                   expectedEngineVersion: _engineVersion,
                   expectedDefines: <String, String>{
@@ -1236,7 +1161,7 @@ let package = Package(
                   expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                   expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphonesimulator',
                   expectedBuildDirPath: '$flutterAppBuildPath/',
-                  expectedCacheDirPath: flutterCachePath,
+                  expectedCacheDirPath: _flutterCachePath,
                   expectedFlutterRootDirPath: _flutterRoot,
                   expectedEngineVersion: _engineVersion,
                   expectedDefines: <String, String>{
@@ -1254,16 +1179,6 @@ let package = Package(
                 ),
               ],
             ),
-            cache: FakeCache(fs, _flutterRoot),
-            fileSystem: fs,
-            flutterRoot: _flutterRoot,
-            flutterVersion: FakeFlutterVersion(),
-            logger: logger,
-            platform: FakePlatform(),
-            processManager: processManager,
-            project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-            templateRenderer: const MustacheTemplateRenderer(),
-            xcode: FakeXcode(),
           );
           final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
             targetPlatform: targetPlatform,
@@ -1299,20 +1214,10 @@ let package = Package(
         fs
             .directory('$debugNativeAssetsDirectoryPath/my_native_asset.xcframework')
             .createSync(recursive: true);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -1345,20 +1250,10 @@ let package = Package(
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -1480,20 +1375,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -1588,20 +1473,11 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath), isModule: true),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
+          isModule: true,
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -1686,20 +1562,11 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath), isModule: true),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
+          isModule: true,
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -1855,20 +1722,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -1987,20 +1844,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -2042,20 +1889,10 @@ let package = Package(
             .createSync(recursive: true);
         const FlutterDarwinPlatform targetPlatform = .ios;
         final processManager = FakeProcessManager.list([]);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -2150,22 +1987,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(
-            '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-          ),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, '/path/to/flutter'),
-          fileSystem: fs,
-          flutterRoot: '/path/to/flutter',
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: appDirectory),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2206,22 +2031,10 @@ let package = Package(
           ..createSync(recursive: true);
         fs.currentDirectory = appDirectory;
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(
-            '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-          ),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, '/path/to/flutter'),
-          fileSystem: fs,
-          flutterRoot: '/path/to/flutter',
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: appDirectory),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2328,22 +2141,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(
-            '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-          ),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, '/path/to/flutter'),
-          fileSystem: fs,
-          flutterRoot: '/path/to/flutter',
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: appDirectory),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2465,22 +2266,10 @@ let package = Package(
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(
-            '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-          ),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, '/path/to/flutter'),
-          fileSystem: fs,
-          flutterRoot: '/path/to/flutter',
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: appDirectory),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2574,22 +2363,10 @@ let package = Package(
             ),
           ]);
 
-          final testUtils = BuildSwiftPackageUtils(
-            analytics: FakeAnalytics(),
-            artifacts: FakeArtifacts(
-              '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-            ),
-            buildSystem: FakeBuildSystem(),
-            cache: FakeCache(fs, '/path/to/flutter'),
-            fileSystem: fs,
-            flutterRoot: '/path/to/flutter',
-            flutterVersion: FakeFlutterVersion(),
+          final BuildSwiftPackageUtils testUtils = _createTestUtils(
+            fs: fs,
             logger: logger,
-            platform: FakePlatform(),
             processManager: processManager,
-            project: FakeFlutterProject(directory: appDirectory),
-            templateRenderer: const MustacheTemplateRenderer(),
-            xcode: FakeXcode(),
           );
 
           final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2668,22 +2445,10 @@ let package = Package(
             ),
           ]);
 
-          final testUtils = BuildSwiftPackageUtils(
-            analytics: FakeAnalytics(),
-            artifacts: FakeArtifacts(
-              '/path/to/flutter/bin/cache/artifacts/engine/ios/Flutter.xcframework',
-            ),
-            buildSystem: FakeBuildSystem(),
-            cache: FakeCache(fs, '/path/to/flutter'),
-            fileSystem: fs,
-            flutterRoot: '/path/to/flutter',
-            flutterVersion: FakeFlutterVersion(),
+          final BuildSwiftPackageUtils testUtils = _createTestUtils(
+            fs: fs,
             logger: logger,
-            platform: FakePlatform(),
             processManager: processManager,
-            project: FakeFlutterProject(directory: appDirectory),
-            templateRenderer: const MustacheTemplateRenderer(),
-            xcode: FakeXcode(),
           );
 
           final pluginSwiftDependencies = FlutterPluginSwiftDependencies(
@@ -2715,20 +2480,10 @@ let package = Package(
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
         const FlutterDarwinPlatform targetPlatform = .macos;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final package = FlutterPluginRegistrantSwiftPackage(
           targetPlatform: targetPlatform,
@@ -2901,9 +2656,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
           ),
         ]);
         const FlutterDarwinPlatform targetPlatform = .ios;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
+          logger: logger,
+          processManager: processManager,
           buildSystem: FakeBuildSystem(
             expectations: [
               BuildExpectations(
@@ -2912,7 +2668,7 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphoneos',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -2934,7 +2690,7 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
                 expectedPackageConfigPath: '$flutterAppDartToolPath/package_config.json',
                 expectedOutputDirPath: '$cacheDirectoryPath/Debug/iphonesimulator',
                 expectedBuildDirPath: '$flutterAppBuildPath/',
-                expectedCacheDirPath: flutterCachePath,
+                expectedCacheDirPath: _flutterCachePath,
                 expectedFlutterRootDirPath: _flutterRoot,
                 expectedEngineVersion: _engineVersion,
                 expectedDefines: <String, String>{
@@ -2952,16 +2708,6 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
               ),
             ],
           ),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
-          logger: logger,
-          platform: FakePlatform(),
-          processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -2988,20 +2734,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
         fs
             .directory('$debugNativeAssetsDirectoryPath/my_native_asset.xcframework')
             .createSync(recursive: true);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -3034,20 +2770,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
         const FlutterDarwinPlatform targetPlatform = .macos;
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final appAndNativeAssetsDependencies = AppFrameworkAndNativeAssetsDependencies(
           targetPlatform: targetPlatform,
@@ -3129,20 +2855,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
           ),
         ]);
 
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -3184,20 +2900,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
             .createSync(recursive: true);
         const FlutterDarwinPlatform targetPlatform = .macos;
         final processManager = FakeProcessManager.list([]);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
         final cocoapodDependencies = CocoaPodPluginDependenciesSkipPodProcessing(
           targetPlatform: targetPlatform,
@@ -3230,20 +2936,10 @@ public func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
         final FileSystem fs = MemoryFileSystem.test();
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         // Set up templates in fs
@@ -3482,20 +3178,10 @@ let package = Package(
         final FileSystem fs = MemoryFileSystem.test();
         final logger = BufferLogger.test();
         final processManager = FakeProcessManager.list([]);
-        final testUtils = BuildSwiftPackageUtils(
-          analytics: FakeAnalytics(),
-          artifacts: FakeArtifacts(engineArtifactPath),
-          buildSystem: FakeBuildSystem(),
-          cache: FakeCache(fs, _flutterRoot),
-          fileSystem: fs,
-          flutterRoot: _flutterRoot,
-          flutterVersion: FakeFlutterVersion(),
+        final BuildSwiftPackageUtils testUtils = _createTestUtils(
+          fs: fs,
           logger: logger,
-          platform: FakePlatform(),
           processManager: processManager,
-          project: FakeFlutterProject(directory: fs.directory(_flutterAppPath)),
-          templateRenderer: const MustacheTemplateRenderer(),
-          xcode: FakeXcode(),
         );
 
         // Set up templates in fs
@@ -3781,9 +3467,36 @@ void _createPodFingerprintFiles({required FileSystem fs, required String platfor
       .createSync(recursive: true);
 }
 
+BuildSwiftPackageUtils _createTestUtils({
+  required FileSystem fs,
+  required Logger logger,
+  required ProcessManager processManager,
+  bool isModule = false,
+  BuildSystem? buildSystem,
+}) {
+  return BuildSwiftPackageUtils(
+    analytics: FakeAnalytics(),
+    artifacts: FakeArtifacts(_engineArtifactPath),
+    buildSystem: buildSystem ?? FakeBuildSystem(),
+    cache: FakeCache(fs, _flutterRoot),
+    fileSystem: fs,
+    flutterRoot: _flutterRoot,
+    flutterVersion: FakeFlutterVersion(),
+    logger: logger,
+    platform: FakePlatform(),
+    processManager: processManager,
+    project: FakeFlutterProject(directory: fs.directory(_flutterAppPath), isModule: isModule),
+    templateRenderer: const MustacheTemplateRenderer(),
+    xcode: FakeXcode(),
+  );
+}
+
 class FakeAnalytics extends Fake implements Analytics {}
 
 class FakeXcode extends Fake implements Xcode {
+  @override
+  bool get isInstalled => true;
+
   @override
   Version get currentVersion => Version(15, 0, 0);
 
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
index 1733e9efdbff8..49e2530de64e3 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
@@ -9,6 +9,7 @@ import 'package:flutter_tools/src/base/error_handling_io.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/clean.dart';
@@ -58,7 +59,7 @@ void main() {
           xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(1000, 0, 0);
           final CommandRunner<void> runner = createTestCommandRunner(CleanCommand());
-          await runner.run(<String>['clean']);
+          await runner.run(<String>['clean', '--include-xcode-workspace']);
 
           expect(buildDirectory, isNot(exists));
           expect(projectUnderTest.dartTool, isNot(exists));
@@ -101,6 +102,31 @@ void main() {
         },
       );
 
+      testUsingContext(
+        '$CleanCommand does not clean Xcode by default',
+        () async {
+          final FlutterProject projectUnderTest = setupProjectUnderTest(fs.currentDirectory, true);
+          xcodeProjectInterpreter.isInstalled = true;
+          xcodeProjectInterpreter.version = Version(1000, 0, 0);
+          final CommandRunner<void> runner = createTestCommandRunner(CleanCommand());
+          await runner.run(<String>['clean']);
+
+          expect(buildDirectory, isNot(exists));
+          expect(projectUnderTest.dartTool, isNot(exists));
+          expect(projectUnderTest.android.ephemeralDirectory, isNot(exists));
+          expect(projectUnderTest.ios.ephemeralDirectory, isNot(exists));
+
+          // The workspaces should be empty since we didn't pass --include-xcode-workspace.
+          expect(xcodeProjectInterpreter.workspaces, isEmpty);
+        },
+        overrides: <Type, Generator>{
+          FileSystem: () => fs,
+          ProcessManager: () => FakeProcessManager.any(),
+          Xcode: () => xcode,
+          XcodeProjectInterpreter: () => xcodeProjectInterpreter,
+        },
+      );
+
       testUsingContext(
         '$CleanCommand does not clean the example directory by default',
         () async {
@@ -115,7 +141,7 @@ void main() {
           xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(1000, 0, 0);
           final CommandRunner<void> runner = createTestCommandRunner(CleanCommand());
-          await runner.run(<String>['clean']);
+          await runner.run(<String>['clean', '--include-xcode-workspace']);
 
           expect(buildDirectory, isNot(exists));
 
@@ -158,7 +184,7 @@ void main() {
           xcodeProjectInterpreter.version = Version(1000, 0, 0);
 
           final CommandRunner<void> runner = createTestCommandRunner(CleanCommand());
-          await runner.run(<String>['clean', '--include-example']);
+          await runner.run(<String>['clean', '--include-example', '--include-xcode-workspace']);
 
           expect(buildDirectory, isNot(exists));
           expect(projectUnderTest.dartTool, isNot(exists));
@@ -208,7 +234,7 @@ void main() {
           xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(1000, 0, 0);
           final CommandRunner<void> runner = createTestCommandRunner(CleanCommand());
-          await runner.run(<String>['clean', '--include-example']);
+          await runner.run(<String>['clean', '--include-example', '--include-xcode-workspace']);
 
           expect(testLogger.statusText, contains('No example app found'));
         },
@@ -301,7 +327,7 @@ void main() {
 
           final command = CleanCommand(verbose: true);
           final CommandRunner<void> runner = createTestCommandRunner(command);
-          await runner.run(<String>['clean']);
+          await runner.run(<String>['clean', '--include-xcode-workspace']);
 
           expect(xcodeProjectInterpreter.workspaces, const <CleanWorkspaceCall>[
             CleanWorkspaceCall('/ios/Runner.xcworkspace', 'Runner', true),
@@ -323,11 +349,14 @@ void main() {
       late FakePlatform windowsPlatform;
       late MemoryFileSystem fileSystem;
       late FileExceptionHandler exceptionHandler;
+      late FakeProcessManager processManager;
 
       setUp(() {
         windowsPlatform = FakePlatform(operatingSystem: 'windows');
         exceptionHandler = FileExceptionHandler();
         fileSystem = MemoryFileSystem.test(opHandle: exceptionHandler.opHandle);
+        fileSystem.file('pubspec.yaml').createSync(recursive: true);
+        processManager = FakeProcessManager.any();
       });
 
       testUsingContext(
@@ -343,50 +372,217 @@ void main() {
           );
 
           final command = CleanCommand();
-          command.deleteFile(file);
-          expect(testLogger.errorText, contains('A program may still be using a file'));
+          await command.deleteFile(file);
+          expect(
+            testLogger.errorText,
+            contains('A background process (e.g. Gradle daemon or Java) is locking files'),
+          );
         },
         overrides: <Type, Generator>{
           Platform: () => windowsPlatform,
           Xcode: () => xcode,
           FileSystem: () => fileSystem,
-          ProcessManager: () => FakeProcessManager.any(),
+          ProcessManager: () => processManager,
+        },
+      );
+
+      testUsingContext(
+        '$CleanCommand handles missing delete permissions',
+        () async {
+          final handler = FileExceptionHandler();
+
+          // Ensures we handle ErrorHandlingFileSystem appropriately in prod.
+          // See https://github.com/flutter/flutter/issues/108978.
+          final FileSystem fileSystem = ErrorHandlingFileSystem(
+            delegate: MemoryFileSystem.test(opHandle: handler.opHandle),
+            platform: windowsPlatform,
+          );
+          final File throwingFile = fileSystem.file('bad')..createSync();
+          handler.addError(
+            throwingFile,
+            FileSystemOp.delete,
+            const FileSystemException('OS error: Access Denied'),
+          );
+
+          xcodeProjectInterpreter.isInstalled = false;
+
+          final command = CleanCommand();
+          await command.deleteFile(throwingFile);
+
+          expect(
+            testLogger.errorText,
+            contains(
+              'Failed to remove bad. A background process (e.g. Gradle daemon or Java) is locking files',
+            ),
+          );
+          expect(throwingFile, exists);
+        },
+        overrides: <Type, Generator>{Platform: () => windowsPlatform, Xcode: () => xcode},
+      );
+
+      testUsingContext(
+        '$CleanCommand invokes gradlew --stop and retries deletion when --stop-gradle flag is passed',
+        () async {
+          xcodeProjectInterpreter.isInstalled = false;
+
+          var shouldThrow = true;
+          fileSystem = MemoryFileSystem.test(
+            opHandle: (String path, FileSystemOp op) {
+              if (shouldThrow && op == FileSystemOp.delete && path.endsWith('build')) {
+                throw const FileSystemException('Locked');
+              }
+            },
+          );
+          fileSystem.file('pubspec.yaml').createSync(recursive: true);
+
+          final FlutterProject project = setupProjectUnderTest(fileSystem.currentDirectory, false);
+          final File gradlewFile = project.android.hostAppGradleRoot.childFile('gradlew.bat')
+            ..createSync(recursive: true);
+
+          final Directory buildDir = project.directory.childDirectory('build')
+            ..createSync(recursive: true);
+          buildDir.childFile('locked').createSync(recursive: true);
+
+          processManager = FakeProcessManager.list(<FakeCommand>[
+            FakeCommand(
+              command: <String>[gradlewFile.path, '--stop'],
+              workingDirectory: gradlewFile.parent.path,
+              onRun: (_) {
+                shouldThrow = false;
+              },
+            ),
+          ]);
+
+          final command = CleanCommand();
+          final CommandRunner<void> runner = createTestCommandRunner(command);
+          await runner.run(<String>['clean', '--stop-gradle']);
+
+          expect(testLogger.statusText, contains('Stopping Gradle daemons'));
+        },
+        overrides: <Type, Generator>{
+          Platform: () => windowsPlatform,
+          Xcode: () => xcode,
+          FileSystem: () => fileSystem,
+          ProcessManager: () => processManager,
         },
       );
 
-      testUsingContext('$CleanCommand handles missing delete permissions', () async {
-        final handler = FileExceptionHandler();
-
-        // Ensures we handle ErrorHandlingFileSystem appropriately in prod.
-        // See https://github.com/flutter/flutter/issues/108978.
-        final FileSystem fileSystem = ErrorHandlingFileSystem(
-          delegate: MemoryFileSystem.test(opHandle: handler.opHandle),
-          platform: windowsPlatform,
-        );
-        final File throwingFile = fileSystem.file('bad')..createSync();
-        handler.addError(
-          throwingFile,
-          FileSystemOp.delete,
-          const FileSystemException('OS error: Access Denied'),
-        );
-
-        xcodeProjectInterpreter.isInstalled = false;
-
-        final command = CleanCommand();
-        command.deleteFile(throwingFile);
-
-        expect(
-          testLogger.errorText,
-          contains(
-            'Failed to remove bad. A program may still be using a file in the directory or the directory itself',
-          ),
-        );
-        expect(throwingFile, exists);
-      }, overrides: <Type, Generator>{Platform: () => windowsPlatform, Xcode: () => xcode});
+      testUsingContext(
+        '$CleanCommand prompts user and invokes gradlew --stop when locked on Windows interactively',
+        () async {
+          xcodeProjectInterpreter.isInstalled = false;
+
+          var shouldThrow = true;
+          fileSystem = MemoryFileSystem.test(
+            opHandle: (String path, FileSystemOp op) {
+              if (shouldThrow && op == FileSystemOp.delete && path.endsWith('build')) {
+                throw const FileSystemException('Locked');
+              }
+            },
+          );
+          fileSystem.file('pubspec.yaml').createSync(recursive: true);
+
+          final FlutterProject project = setupProjectUnderTest(fileSystem.currentDirectory, false);
+          final File gradlewFile = project.android.hostAppGradleRoot.childFile('gradlew.bat')
+            ..createSync(recursive: true);
+
+          final Directory buildDir = project.directory.childDirectory('build')
+            ..createSync(recursive: true);
+          buildDir.childFile('locked').createSync(recursive: true);
+
+          processManager = FakeProcessManager.list(<FakeCommand>[
+            FakeCommand(
+              command: <String>[gradlewFile.path, '--stop'],
+              workingDirectory: gradlewFile.parent.path,
+              onRun: (_) {
+                shouldThrow = false;
+              },
+            ),
+          ]);
+
+          final command = CleanCommand();
+          final CommandRunner<void> runner = createTestCommandRunner(command);
+          await runner.run(<String>['clean']);
+
+          expect(testLogger.statusText, contains('Stopping Gradle daemons'));
+        },
+        overrides: <Type, Generator>{
+          Platform: () => windowsPlatform,
+          Xcode: () => xcode,
+          FileSystem: () => fileSystem,
+          ProcessManager: () => processManager,
+          AnsiTerminal: () => FakeTerminal(),
+        },
+      );
+
+      testUsingContext(
+        '$CleanCommand prompts user but skips gradlew --stop when user declines prompt',
+        () async {
+          xcodeProjectInterpreter.isInstalled = false;
+
+          fileSystem = MemoryFileSystem.test(
+            opHandle: (String path, FileSystemOp op) {
+              if (op == FileSystemOp.delete && path.endsWith('build')) {
+                throw const FileSystemException('Locked');
+              }
+            },
+          );
+          fileSystem.file('pubspec.yaml').createSync(recursive: true);
+
+          final FlutterProject project = setupProjectUnderTest(fileSystem.currentDirectory, false);
+          project.android.hostAppGradleRoot.childFile('gradlew.bat').createSync(recursive: true);
+
+          final Directory buildDir = project.directory.childDirectory('build')
+            ..createSync(recursive: true);
+          buildDir.childFile('locked').createSync(recursive: true);
+
+          processManager = FakeProcessManager.empty();
+
+          final command = CleanCommand();
+          final CommandRunner<void> runner = createTestCommandRunner(command);
+          await runner.run(<String>['clean']);
+
+          expect(testLogger.statusText, isNot(contains('Stopping Gradle daemons')));
+          expect(
+            testLogger.errorText,
+            contains('A background process (e.g. Gradle daemon or Java) is locking files'),
+          );
+        },
+        overrides: <Type, Generator>{
+          Platform: () => windowsPlatform,
+          Xcode: () => xcode,
+          FileSystem: () => fileSystem,
+          ProcessManager: () => processManager,
+          AnsiTerminal: () => FakeTerminal(response: 'n'),
+        },
+      );
     });
   });
 }
 
+class FakeTerminal extends Fake implements AnsiTerminal {
+  FakeTerminal({this.response = 'y'});
+
+  final String response;
+
+  @override
+  bool get stdinHasTerminal => true;
+
+  @override
+  bool get usesTerminalUi => true;
+
+  @override
+  Future<String> promptForCharInput(
+    List<String> acceptedCharacters, {
+    Logger? logger,
+    String? prompt,
+    int? defaultChoiceIndex,
+    bool displayAcceptedCharacters = true,
+  }) async {
+    return response;
+  }
+}
+
 FlutterProject setupProjectUnderTest(Directory currentDirectory, bool setupXcodeWorkspace) {
   // This needs to be run within testWithoutContext and not setUp since FlutterProject uses context.
   final FlutterProject projectUnderTest = FlutterProject.fromDirectory(currentDirectory);
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart
index 541d2272e8ab3..06aeb295a6658 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart
@@ -125,7 +125,6 @@ void main() {
         expect(response.data['id'], 0);
         expect(response.data['result'], isNotEmpty);
         expect(response.data['result']! as Map<String, Object?>, const <String, Object>{
-          'platforms': <String>['macos', 'windows'],
           'platformTypes': <String, Map<String, Object>>{
             'web': <String, Object>{
               'isSupported': false,
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
index 2271447a6d644..2e7284516b6d4 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
@@ -87,10 +87,12 @@ void main() {
         'chrome',
         '--browser-name=chrome',
         '--chrome-binary=/tmp/custom-chrome',
+        '--web-define=FOO=bar',
       ]);
 
       expect(capturingDriverService.platformArgs, containsPair('no-launch-chrome', true));
       expect(capturingDriverService.platformArgs, isNot(contains('--no-launch-chrome')));
+      expect(capturingDriverService.webDefines, <String, String>{'FOO': 'bar'});
     },
     overrides: <Type, Generator>{
       FileSystem: () => fileSystem,
@@ -1045,6 +1047,7 @@ class FakeDriverService extends Fake implements DriverService {
 
 class CapturingDriverService extends Fake implements DriverService {
   Map<String, Object>? platformArgs;
+  Map<String, String>? webDefines;
 
   @override
   Future<void> start(
@@ -1056,8 +1059,10 @@ class CapturingDriverService extends Fake implements DriverService {
     String? userIdentifier,
     String? mainPath,
     Map<String, Object> platformArgs = const <String, Object>{},
+    Map<String, String> webDefines = const <String, String>{},
   }) async {
     this.platformArgs = platformArgs;
+    this.webDefines = webDefines;
   }
 
   @override
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart
index 4aeb9ae3fd6b4..704439775113d 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/precache_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/precache.dart';
@@ -504,6 +505,18 @@ void main() {
       }),
     );
   });
+
+  testUsingContext('precache --host-arch overrides cache hostPlatformOverride', () async {
+    final command = PrecacheCommand(
+      cache: cache,
+      logger: BufferLogger.test(),
+      featureFlags: TestFeatureFlags(),
+      platform: FakePlatform(operatingSystem: 'macos', environment: <String, String>{}),
+    );
+    await createTestCommandRunner(command).run(const <String>['precache', '--host-arch=x64']);
+
+    expect(cache.osUtils.hostPlatformOverride, HostPlatform.darwin_x64);
+  });
 }
 
 class FakeCache extends Fake implements Cache {
@@ -540,4 +553,7 @@ class FakeCache extends Fake implements Cache {
 
   @override
   bool includeAllPlatforms = false;
+
+  @override
+  late final OperatingSystemUtils osUtils = FakeOperatingSystemUtils();
 }
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/test_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/test_test.dart
index 6145d100308b7..7cb5f8def4e36 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/test_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/test_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:args/command_runner.dart';
 import 'package:file/memory.dart';
@@ -216,6 +217,42 @@ dev_dependencies:
         Cache: () => Cache.test(processManager: FakeProcessManager.any()),
       },
     );
+
+    testUsingContext(
+      'passes boolean selectors and multiple tags/exclude-tags through to package:test',
+      () async {
+        final fakePackageTest = FakePackageTest();
+        final testCommand = TestCommand(testWrapper: fakePackageTest);
+        final CommandRunner<void> commandRunner = createTestCommandRunner(testCommand);
+
+        await commandRunner.run(<String>[
+          'test',
+          '--no-pub',
+          '--tags=a || b',
+          '--tags=c',
+          '--exclude-tags=d && e',
+          '--exclude-tags=f',
+        ]);
+        expect(
+          fakePackageTest.lastArgs,
+          containsAllInOrder(<String>[
+            '--tags',
+            'a || b',
+            '--tags',
+            'c',
+            '--exclude-tags',
+            'd && e',
+            '--exclude-tags',
+            'f',
+          ]),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fs,
+        ProcessManager: () => FakeProcessManager.any(),
+        Cache: () => Cache.test(processManager: FakeProcessManager.any()),
+      },
+    );
   });
 
   group('--reporter/-r', () {
@@ -558,6 +595,46 @@ resolution: workspace
         Cache: () => Cache.test(processManager: FakeProcessManager.any()),
       },
     );
+
+    testUsingContext(
+      'passes --preset through to package:test',
+      () async {
+        final fakePackageTest = FakePackageTest();
+        final testCommand = TestCommand(testWrapper: fakePackageTest);
+        final CommandRunner<void> commandRunner = createTestCommandRunner(testCommand);
+
+        await commandRunner.run(<String>['test', '--no-pub', '--preset=foo', '--preset=bar']);
+        expect(
+          fakePackageTest.lastArgs,
+          containsAllInOrder(<String>['--preset', 'foo', '--preset', 'bar']),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fs,
+        ProcessManager: () => FakeProcessManager.any(),
+        Cache: () => Cache.test(processManager: FakeProcessManager.any()),
+      },
+    );
+
+    testUsingContext(
+      'passes -P through to package:test',
+      () async {
+        final fakePackageTest = FakePackageTest();
+        final testCommand = TestCommand(testWrapper: fakePackageTest);
+        final CommandRunner<void> commandRunner = createTestCommandRunner(testCommand);
+
+        await commandRunner.run(<String>['test', '--no-pub', '-Pfoo', '-Pbar']);
+        expect(
+          fakePackageTest.lastArgs,
+          containsAllInOrder(<String>['--preset', 'foo', '--preset', 'bar']),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fs,
+        ProcessManager: () => FakeProcessManager.any(),
+        Cache: () => Cache.test(processManager: FakeProcessManager.any()),
+      },
+    );
   });
 
   testUsingContext(
@@ -633,6 +710,13 @@ resolution: workspace
           expect(configContents.contains('"name": "test"'), true);
           expect(configContents.contains('"name": "test_api"'), true);
           expect(configContents.contains('"name": "test_core"'), true);
+
+          final config = json.decode(configContents) as Map<String, dynamic>;
+          final packages = config['packages'] as List<dynamic>;
+          final Map<String, dynamic> myApp = packages.cast<Map<String, dynamic>>().firstWhere(
+            (Map<String, dynamic> p) => p['name'] == 'my_app',
+          );
+          expect(myApp['rootUri'], fs.directory('/package').absolute.uri.toString());
         },
       );
       expect(caughtToolExit, true);
@@ -667,6 +751,7 @@ resolution: workspace
           '--test-randomize-ordering-seed=random',
           '--tags=tag1',
           '--exclude-tags=tag2',
+          '--preset=preset1',
           '--fail-fast',
           '--run-skipped',
           '--total-shards=1',
@@ -705,6 +790,8 @@ const List<String> packageTestArgs = <String>[
   'tag1',
   '--exclude-tags',
   'tag2',
+  '--preset',
+  'preset1',
   '--fail-fast',
   '--run-skipped',
   '--total-shards=1',
@@ -1692,8 +1779,9 @@ class FakeFlutterTestRunner implements FlutterTestRunner {
     required DebuggingOptions debuggingOptions,
     List<String> names = const <String>[],
     List<String> plainNames = const <String>[],
-    String? tags,
-    String? excludeTags,
+    List<String> tags = const <String>[],
+    List<String> excludeTags = const <String>[],
+    List<String> presets = const <String>[],
     bool enableVmService = false,
     bool ipv6 = false,
     bool machine = false,
@@ -1750,8 +1838,9 @@ class FakeFlutterTestRunner implements FlutterTestRunner {
     required DebuggingOptions debuggingOptions,
     List<String> names = const <String>[],
     List<String> plainNames = const <String>[],
-    String? tags,
-    String? excludeTags,
+    List<String> tags = const <String>[],
+    List<String> excludeTags = const <String>[],
+    List<String> presets = const <String>[],
     bool machine = false,
     bool updateGoldens = false,
     required int? concurrency,
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart
index 9d66e95a3dfc9..8e9b9bb7584f1 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart
@@ -438,6 +438,153 @@ void main() {
         Logger: () => logger,
       },
     );
+
+    testUsingContext(
+      '--force-upgrade succeeds when flutter_tools has workspace subpackages and path dependencies',
+      () async {
+        const subpackagePubspecYaml = r'''
+name: flutter_tools_core
+description: Core utilities for flutter_tools.
+resolution: workspace
+
+environment:
+  sdk: ^3.7.0-0
+
+dependencies:
+  unified_analytics: 8.0.5
+
+# PUBSPEC CHECKSUM: a1b2c3
+''';
+        const extensionSubpackagePubspecYaml = r'''
+name: flutter_tools_extension
+description: Extension utilities for flutter_tools.
+resolution: workspace
+
+environment:
+  sdk: ^3.7.0-0
+
+dependencies:
+  unified_analytics: 8.0.5
+
+# PUBSPEC CHECKSUM: b2c3d4
+''';
+        const customSubpackagePubspecYaml = r'''
+name: flutter_tools_custom_pkg
+description: Custom package for flutter_tools.
+resolution: workspace
+
+environment:
+  sdk: ^3.7.0-0
+
+dependencies:
+  unified_analytics: 8.0.5
+
+# PUBSPEC CHECKSUM: c3d4e5
+''';
+        const flutterToolsWithWorkspacePubspecYaml = r'''
+name: flutter_tools
+description: Examples for flutter
+homepage: http://flutter.dev
+
+version: 1.0.0
+
+resolution: workspace
+
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+  flutter: ">=2.5.0-6.0.pre.30 <3.0.0"
+
+workspace:
+  - packages/flutter_tools_core
+  - packages/flutter_tools_extension
+  - packages/custom_core_dir
+
+dependencies:
+  test_api: 0.7.4
+  flutter:
+    sdk: flutter
+  flutter_tools_core:
+    path: packages/flutter_tools_core
+  flutter_tools_extension:
+  flutter_tools_custom_pkg:
+
+  archive: 3.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  unified_analytics: 8.0.5
+
+# PUBSPEC CHECKSUM: 6hijp0
+''';
+        final Directory coreSubpackageDir = flutterTools
+            .childDirectory('packages')
+            .childDirectory('flutter_tools_core');
+        coreSubpackageDir.childFile('pubspec.yaml')
+          ..createSync(recursive: true)
+          ..writeAsStringSync(subpackagePubspecYaml);
+
+        final Directory extensionSubpackageDir = flutterTools
+            .childDirectory('packages')
+            .childDirectory('flutter_tools_extension');
+        extensionSubpackageDir.childFile('pubspec.yaml')
+          ..createSync(recursive: true)
+          ..writeAsStringSync(extensionSubpackagePubspecYaml);
+
+        final Directory customSubpackageDir = flutterTools
+            .childDirectory('packages')
+            .childDirectory('custom_core_dir');
+        customSubpackageDir.childFile('pubspec.yaml')
+          ..createSync(recursive: true)
+          ..writeAsStringSync(customSubpackagePubspecYaml);
+
+        flutterTools
+            .childFile('pubspec.yaml')
+            .writeAsStringSync(flutterToolsWithWorkspacePubspecYaml);
+
+        final command = UpdatePackagesCommand(verboseHelp: false);
+        await createTestCommandRunner(
+          command,
+        ).run(<String>['update-packages', '--force-upgrade', '--update-hashes']);
+
+        final File updatedFlutterToolsPubspec = flutterTools.childFile('pubspec.yaml');
+        final parsedToolsPubspec = Pubspec.parse(updatedFlutterToolsPubspec.readAsStringSync());
+        expect(parsedToolsPubspec.dependencies['flutter_tools_core'], isA<PathDependency>());
+        expect(
+          (parsedToolsPubspec.dependencies['flutter_tools_core']! as PathDependency).path,
+          'packages/flutter_tools_core',
+        );
+        expect(parsedToolsPubspec.dependencies.containsKey('flutter_tools_custom_pkg'), isTrue);
+        expect(
+          parsedToolsPubspec.dependencies['unified_analytics'],
+          HostedDependency(version: VersionConstraint.parse('8.0.10')),
+        );
+
+        final File updatedCorePubspec = coreSubpackageDir.childFile('pubspec.yaml');
+        final parsedCorePubspec = Pubspec.parse(updatedCorePubspec.readAsStringSync());
+        expect(
+          parsedCorePubspec.dependencies['unified_analytics'],
+          HostedDependency(version: VersionConstraint.parse('8.0.10')),
+        );
+
+        final File updatedExtensionPubspec = extensionSubpackageDir.childFile('pubspec.yaml');
+        final parsedExtensionPubspec = Pubspec.parse(updatedExtensionPubspec.readAsStringSync());
+        expect(
+          parsedExtensionPubspec.dependencies['unified_analytics'],
+          HostedDependency(version: VersionConstraint.parse('8.0.10')),
+        );
+
+        final File updatedCustomPubspec = customSubpackageDir.childFile('pubspec.yaml');
+        final parsedCustomPubspec = Pubspec.parse(updatedCustomPubspec.readAsStringSync());
+        expect(
+          parsedCustomPubspec.dependencies['unified_analytics'],
+          HostedDependency(version: VersionConstraint.parse('8.0.10')),
+        );
+      },
+      overrides: <Type, Generator>{
+        Pub: () => pub,
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+        Cache: () => Cache.test(processManager: processManager),
+        Logger: () => logger,
+      },
+    );
   });
 }
 
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart
index 420325ae8e98b..1b784c8037aca 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart
@@ -282,6 +282,38 @@ void main() {
       expect(buildInfo.dartObfuscation, isTrue);
       expect(buildInfo.dartDefines.contains('foo=bar'), isTrue);
     }, overrides: <Type, Generator>{AndroidBuilder: () => fakeAndroidBuilder});
+
+    testUsingContext('defaults androidEnableHcpp to false without explicit flag', () async {
+      final String projectPath = await createProject(
+        tempDir,
+        arguments: <String>['--no-pub', '--template=module'],
+      );
+      await runBuildAar(projectPath, arguments: <String>['--no-pub']);
+
+      final Invocation buildAarCall = fakeAndroidBuilder.capturedBuildAarCalls.single;
+      for (final androidBuildInfo
+          in buildAarCall.namedArguments[#androidBuildInfo] as Set<AndroidBuildInfo>) {
+        // The property is piped to the aar gradle build for consistency (defaulting to
+        // false in this PR), but the Flutter Gradle Plugin only consumes it for application
+        // projects: injecting into a module (aar) manifest would conflict
+        // with an explicit value in the add-to-app host's manifest and fail
+        // the host build in the manifest merger.
+        expect(androidBuildInfo.buildInfo.androidEnableHcpp, isFalse);
+      }
+    }, overrides: <Type, Generator>{AndroidBuilder: () => fakeAndroidBuilder});
+
+    testUsingContext('does not define --enable-hcpp', () async {
+      final String projectPath = await createProject(
+        tempDir,
+        arguments: <String>['--no-pub', '--template=module'],
+      );
+      // HCPP for add-to-app is controlled by the host app's manifest; an aar
+      // level flag would be a silent no-op, so the command must reject it.
+      await expectLater(
+        runBuildAar(projectPath, arguments: <String>['--no-pub', '--no-enable-hcpp']),
+        throwsA(isA<UsageException>()),
+      );
+    }, overrides: <Type, Generator>{AndroidBuilder: () => fakeAndroidBuilder});
   });
 
   group('Gradle', () {
@@ -413,6 +445,7 @@ void main() {
               '-Pextra-front-end-options=foo,bar',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               ...ndkProvisioningProperties,
               '-Ptarget-platform=android-arm,android-arm64,android-x64',
               'assembleAarRelease',
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart
index db338b6a4f304..49d4ef1c35f2d 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart
@@ -138,6 +138,142 @@ void main() {
       },
     );
 
+    testUsingContext(
+      'reports hcpp analytics default false when not in the manifest and no explicit flag is passed',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        await runBuildApkCommand(projectPath);
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'apk',
+              commandHasTerminal: false,
+              buildApkTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildApkBuildMode: 'release',
+              buildApkSplitPerAbi: false,
+              buildApkEnableHcpp: false,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
+    testUsingContext(
+      'reports hcpp analytics from an explicit --no-enable-hcpp flag',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        await runBuildApkCommand(projectPath, arguments: <String>['--no-enable-hcpp']);
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'apk',
+              commandHasTerminal: false,
+              buildApkTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildApkBuildMode: 'release',
+              buildApkSplitPerAbi: false,
+              buildApkEnableHcpp: false,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
+    testUsingContext(
+      'reports hcpp analytics from an explicit --enable-hcpp flag when not in the manifest',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        // The manifest does not set EnableHcpp, so the build injects the flag value and the
+        // packaged app has HCPP on. Analytics has to report what was packaged, not what the
+        // source manifest happened to say.
+        await runBuildApkCommand(projectPath, arguments: <String>['--enable-hcpp']);
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'apk',
+              commandHasTerminal: false,
+              buildApkTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildApkBuildMode: 'release',
+              buildApkSplitPerAbi: false,
+              buildApkEnableHcpp: true,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
+    testUsingContext(
+      'reports hcpp analytics from an explicit --enable-hcpp over a manifest value',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+        final File manifestFile = globals.fs.file(
+          globals.fs.path.join(projectPath, 'android', 'app', 'src', 'main', 'AndroidManifest.xml'),
+        );
+        manifestFile.writeAsStringSync(
+          manifestFile.readAsStringSync().replaceFirst(
+            '</application>',
+            '    <meta-data android:name="io.flutter.embedding.android.EnableHcpp" '
+                'android:value="false" />\n'
+                '    </application>',
+          ),
+        );
+
+        // The flag is passed at invocation time, so it wins over the checked in manifest value
+        // and gradle writes true into the merged manifest. Analytics reports what is packaged.
+        await runBuildApkCommand(projectPath, arguments: <String>['--enable-hcpp']);
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'apk',
+              commandHasTerminal: false,
+              buildApkTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildApkBuildMode: 'release',
+              buildApkSplitPerAbi: false,
+              buildApkEnableHcpp: true,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
     testUsingContext(
       'Each build mode respects --target-platform',
       () async {
@@ -534,6 +670,7 @@ void main() {
               '-Pdart-obfuscation=false',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
             exitCode: 1,
@@ -584,6 +721,7 @@ void main() {
               '-Psplit-debug-info=${tempDir.path}',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
             exitCode: 1,
@@ -637,6 +775,7 @@ void main() {
               '-Pextra-front-end-options=foo,bar',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
             exitCode: 1,
@@ -689,6 +828,7 @@ void main() {
               '-Pdart-obfuscation=false',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
             exitCode: 1,
@@ -744,6 +884,7 @@ void main() {
               '-Pdart-obfuscation=false',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
           ),
@@ -804,6 +945,7 @@ void main() {
               '-Pdart-obfuscation=false',
               '-Ptrack-widget-creation=true',
               '-Ptree-shake-icons=true',
+              '-Penable-hcpp=false',
               'assembleRelease',
             ],
           ),
@@ -846,6 +988,59 @@ void main() {
         AndroidStudio: () => FakeAndroidStudio(),
       },
     );
+
+    testUsingContext(
+      'passes enable-hcpp and explicit-enable-hcpp to gradle for --enable-hcpp',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app', '--platform=android'],
+        );
+        processManager.addCommand(
+          FakeCommand(
+            command: <String>[
+              gradlew,
+              '-q',
+              '-Ptarget-platform=android-arm,android-arm64,android-x64',
+              '-Ptarget=${globals.fs.path.join(tempDir.path, 'flutter_project', 'lib', 'main.dart')}',
+              '-Pbase-application-name=android.app.Application',
+              '-Pdart-defines=${encodeDartDefinesMap(<String, String>{
+                'FLUTTER_BUILD_NAME': '1.0.0',
+                'FLUTTER_BUILD_NUMBER': '1',
+                'FLUTTER_VERSION': '0.0.0', //
+                'FLUTTER_CHANNEL': 'master',
+                'FLUTTER_GIT_URL': 'https://github.com/flutter/flutter.git',
+                'FLUTTER_FRAMEWORK_REVISION': '11111',
+                'FLUTTER_ENGINE_REVISION': 'abcde',
+                'FLUTTER_DART_VERSION': '12',
+              })}',
+              '-Pdart-obfuscation=false',
+              '-Ptrack-widget-creation=true',
+              '-Ptree-shake-icons=true',
+              '-Penable-hcpp=true',
+              '-Pexplicit-enable-hcpp=true',
+              'assembleRelease',
+            ],
+          ),
+        );
+
+        // The command throws a [ToolExit] because it expects an APK in the file system.
+        await expectLater(
+          () => runBuildApkCommand(projectPath, arguments: <String>['--enable-hcpp']),
+          throwsToolExit(),
+        );
+
+        expect(processManager, hasNoRemainingExpectations);
+      },
+      overrides: <Type, Generator>{
+        AndroidSdk: () => mockAndroidSdk,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+        Java: () => null,
+        ProcessManager: () => processManager,
+        Analytics: () => analytics,
+        AndroidStudio: () => FakeAndroidStudio(),
+      },
+    );
   });
 }
 
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart
index 6e06eff2f5e7b..81cb6de6e611c 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart
@@ -74,6 +74,99 @@ void main() {
       },
     );
 
+    testUsingContext(
+      'reports hcpp analytics default false when not in the manifest and no explicit flag is passed',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        await runBuildAppBundleCommand(projectPath);
+
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'appbundle',
+              commandHasTerminal: false,
+              buildAppBundleTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildAppBundleBuildMode: 'release',
+              buildBundleEnableHcpp: false,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
+    testUsingContext(
+      'reports hcpp analytics from an explicit --enable-hcpp flag when not in the manifest',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        // The manifest does not set EnableHcpp, so the build injects the flag value and the
+        // packaged app has HCPP on. Analytics has to report what was packaged, not what the
+        // source manifest happened to say.
+        await runBuildAppBundleCommand(projectPath, arguments: <String>['--enable-hcpp']);
+
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'appbundle',
+              commandHasTerminal: false,
+              buildAppBundleTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildAppBundleBuildMode: 'release',
+              buildBundleEnableHcpp: true,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
+    testUsingContext(
+      'reports hcpp analytics from an explicit --no-enable-hcpp flag',
+      () async {
+        final String projectPath = await createProject(
+          tempDir,
+          arguments: <String>['--no-pub', '--template=app'],
+        );
+
+        await runBuildAppBundleCommand(projectPath, arguments: <String>['--no-enable-hcpp']);
+
+        expect(
+          fakeAnalytics.sentEvents,
+          contains(
+            Event.commandUsageValues(
+              workflow: 'appbundle',
+              commandHasTerminal: false,
+              buildAppBundleTargetPlatform: 'android-arm,android-arm64,android-x64',
+              buildAppBundleBuildMode: 'release',
+              buildBundleEnableHcpp: false,
+            ),
+          ),
+        );
+      },
+      overrides: <Type, Generator>{
+        AndroidBuilder: () => FakeAndroidBuilder(),
+        Analytics: () => fakeAnalytics,
+        FlutterProjectFactory: () => FakeFlutterProjectFactory(tempDir),
+      },
+    );
+
     testUsingContext('alias aab', () async {
       final command = BuildAppBundleCommand(logger: BufferLogger.test());
       expect(command.aliases, contains('aab'));
diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
index 0772be2190b5d..8aced1d1c95c0 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart
@@ -350,43 +350,47 @@ void main() {
     },
   );
 
-  testUsingContext(
-    'can create a project in the engine examples directory',
-    () async {
-      final String flutterBin = globals.fs.path.join(
-        getFlutterRoot(),
-        'bin',
-        globals.platform.isWindows ? 'flutter.bat' : 'flutter',
-      );
-      final String engineExamplesDirectory = globals.fs.path.join(
-        getFlutterRoot(),
-        'engine',
-        'src',
-        'flutter',
-        'examples',
-      );
-      const projectName = 'flutter_project';
-      final ProcessResult exec = await Process.run(flutterBin, <String>[
-        'create',
-        projectName,
-      ], workingDirectory: engineExamplesDirectory);
-      expect(exec.exitCode, 0);
-      globals.fs
-          .file(globals.fs.path.join(engineExamplesDirectory, projectName))
-          .deleteSync(recursive: true);
-    },
-    overrides: {
-      Pub: () => Pub.test(
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        processManager: globals.processManager,
-        botDetector: globals.botDetector,
-        platform: globals.platform,
-        stdio: mockStdio,
-      ),
-      ...noColorTerminalOverride,
-    },
-  );
+  for (final (String description, List<String> examplesPath) in [
+    ('examples', ['examples']),
+    ('engine examples', ['engine', 'src', 'flutter', 'examples']),
+    ('package examples', ['packages', 'flutter', 'examples']),
+    ('dev', ['dev']),
+  ]) {
+    testUsingContext(
+      'can create a project in the $description directory',
+      () async {
+        final String flutterBin = globals.fs.path.join(
+          getFlutterRoot(),
+          'bin',
+          globals.platform.isWindows ? 'flutter.bat' : 'flutter',
+        );
+        final String examplesDirectory = globals.fs.path.joinAll([
+          getFlutterRoot(),
+          ...examplesPath,
+        ]);
+        const projectName = 'flutter_project';
+        final ProcessResult exec = await Process.run(flutterBin, <String>[
+          'create',
+          projectName,
+        ], workingDirectory: examplesDirectory);
+        expect(exec.exitCode, 0);
+        globals.fs
+            .file(globals.fs.path.join(examplesDirectory, projectName))
+            .deleteSync(recursive: true);
+      },
+      overrides: {
+        Pub: () => Pub.test(
+          fileSystem: globals.fs,
+          logger: globals.logger,
+          processManager: globals.processManager,
+          botDetector: globals.botDetector,
+          platform: globals.platform,
+          stdio: mockStdio,
+        ),
+        ...noColorTerminalOverride,
+      },
+    );
+  }
 
   testUsingContext(
     'Will create an app project if non-empty non-project directory exists without .metadata',
diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
index 830c8d55c81c6..f886156392d66 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
@@ -458,6 +458,52 @@ workspace:
       },
     );
 
+    testUsingContext(
+      'get does not generate platform tooling for a non-Flutter workspace root',
+      // Regression test for https://github.com/flutter/flutter/issues/189550.
+      () async {
+        tempDir.childFile('pubspec.yaml').writeAsStringSync('''
+name: workspace
+environment:
+  sdk: ^3.7.0-0
+workspace:
+  - flutter_project
+''');
+        // A stray platform directory in the plain Dart workspace root must not
+        // be populated with Flutter project files.
+        tempDir.childDirectory('ios').createSync();
+        tempDir.childDirectory('android').createSync();
+        final String projectPath = await createProject(tempDir, arguments: <String>['--no-pub']);
+        final File pubspecFile = fileSystem.file(fileSystem.path.join(projectPath, 'pubspec.yaml'));
+        final pubspecYaml = loadYaml(pubspecFile.readAsStringSync()) as YamlMap;
+        final pubspec = <String, Object?>{
+          ...pubspecYaml.value.cast<String, Object?>(),
+          'resolution': 'workspace',
+          'environment': <String, Object?>{'sdk': '^3.5.0-0'},
+        };
+        pubspecFile.writeAsStringSync(jsonEncode(pubspec));
+        await runCommandIn(tempDir.path, 'get');
+
+        expectDependenciesResolved(tempDir.path);
+        expect(tempDir.childDirectory('ios').listSync(), isEmpty);
+        expect(tempDir.childDirectory('android').listSync(), isEmpty);
+        // The Flutter app member of the workspace is still processed.
+        expectExists(projectPath, 'ios/Flutter/Generated.xcconfig');
+      },
+      overrides: <Type, Generator>{
+        Stdio: () => mockStdio,
+        Pub: () => Pub.test(
+          fileSystem: globals.fs,
+          logger: globals.logger,
+          processManager: globals.processManager,
+          botDetector: globals.botDetector,
+          platform: globals.platform,
+          stdio: mockStdio,
+        ),
+        Analytics: () => fakeAnalytics,
+      },
+    );
+
     testUsingContext(
       'get generates files into lib/l10n',
       () async {
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
index d1b2c97ac8509..d0e2d1e9e5889 100644
--- a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
@@ -164,6 +164,43 @@ $assetsSection
       },
     );
 
+    testUsingContext(
+      'Package license path that escapes the package directory is rejected',
+      () async {
+        writePubspecFile('pubspec.yaml', 'test');
+        writePackageConfigFiles(
+          directory: globals.fs.currentDirectory,
+          packages: <String, String>{'test_package': 'p/p/'},
+          mainLibName: 'test',
+        );
+        // The dependency declares a license whose relative path escapes its own package
+        // directory. Without containment this would read a file outside the package on the
+        // build machine and bundle its contents into the consuming app's NOTICES, which the
+        // consuming app never declared.
+        globals.fs.file(fixPath('p/p/pubspec.yaml'))
+          ..createSync(recursive: true)
+          ..writeAsStringSync('''
+name: test_package
+flutter:
+  licenses:
+    - ../../../escaped_secret
+''');
+
+        final AssetBundle bundle = AssetBundleFactory.instance.createBundle();
+        expect(
+          () => bundle.build(
+            packageConfigPath: '.dart_tool/package_config.json',
+            targetPlatform: TargetPlatform.tester,
+          ),
+          throwsToolExit(message: 'escapes its package directory'),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => testFileSystem,
+        ProcessManager: () => FakeProcessManager.any(),
+      },
+    );
+
     testUsingContext(
       'No assets are bundled when the package has no assets',
       () async {
diff --git a/packages/flutter_tools/test/general.shard/base/bot_detector_test.dart b/packages/flutter_tools/test/general.shard/base/bot_detector_test.dart
index f50a9d4a14f06..b06b5b7ab6c31 100644
--- a/packages/flutter_tools/test/general.shard/base/bot_detector_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/bot_detector_test.dart
@@ -42,7 +42,7 @@ void main() {
         );
 
         expect(await botDetector.isRunningOnBot, isFalse);
-        expect(persistentToolState.isRunningOnBot, isFalse);
+        expect(persistentToolState.isRunningOnBot, isNull);
       });
 
       testWithoutContext('does not cache BOT environment variable', () async {
@@ -55,12 +55,12 @@ void main() {
         );
 
         expect(await botDetector.isRunningOnBot, isTrue);
-        expect(persistentToolState.isRunningOnBot, isTrue);
+        expect(persistentToolState.isRunningOnBot, isNull);
 
         fakePlatform.environment['BOT'] = 'false';
 
         expect(await botDetector.isRunningOnBot, isFalse);
-        expect(persistentToolState.isRunningOnBot, isFalse);
+        expect(persistentToolState.isRunningOnBot, isNull);
       });
 
       testWithoutContext('returns false unconditionally if FLUTTER_HOST is set', () async {
@@ -74,7 +74,7 @@ void main() {
         );
 
         expect(await botDetector.isRunningOnBot, isFalse);
-        expect(persistentToolState.isRunningOnBot, isFalse);
+        expect(persistentToolState.isRunningOnBot, isNull);
       });
 
       testWithoutContext('returns false with and without a terminal attached', () async {
@@ -107,7 +107,7 @@ void main() {
         );
 
         expect(await botDetector.isRunningOnBot, isFalse);
-        expect(persistentToolState.isRunningOnBot, isFalse);
+        expect(persistentToolState.isRunningOnBot, isNull);
       });
 
       testWithoutContext('returns true when azure metadata is reachable', () async {
@@ -149,8 +149,85 @@ void main() {
         );
 
         expect(await botDetector.isRunningOnBot, isTrue);
-        expect(persistentToolState.isRunningOnBot, isTrue);
+        expect(persistentToolState.isRunningOnBot, isNull);
       });
+
+      testWithoutContext('returns true when running on Azure DevOps (TF_BUILD is set)', () async {
+        fakePlatform.environment['TF_BUILD'] = 'True';
+
+        final botDetector = BotDetector(
+          platform: fakePlatform,
+          httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[]),
+          persistentToolState: persistentToolState,
+        );
+
+        expect(await botDetector.isRunningOnBot, isTrue);
+        expect(persistentToolState.isRunningOnBot, isNull);
+      });
+
+      testWithoutContext(
+        'overrides cached false when CI environment variable is set at runtime without mutating cache',
+        () async {
+          // Simulate an image bake where isRunningOnBot evaluated to false and cached to disk:
+          persistentToolState.setIsRunningOnBot(false);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+
+          fakePlatform.environment['GITHUB_ACTIONS'] = 'true';
+
+          final botDetector = BotDetector(
+            platform: fakePlatform,
+            httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[]),
+            persistentToolState: persistentToolState,
+          );
+
+          expect(await botDetector.isRunningOnBot, isTrue);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+        },
+      );
+
+      testWithoutContext(
+        'running with CI=true does not poison persistentToolState for subsequent runs',
+        () async {
+          persistentToolState.setIsRunningOnBot(false);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+
+          // Invocation 1: Ran in a subshell or test runner with CI=true
+          fakePlatform.environment['CI'] = 'true';
+          final botDetector1 = BotDetector(
+            platform: fakePlatform,
+            httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[]),
+            persistentToolState: persistentToolState,
+          );
+          expect(await botDetector1.isRunningOnBot, isTrue);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+
+          // Invocation 2: Normal interactive terminal run (no CI variable)
+          fakePlatform.environment.clear();
+          final botDetector2 = BotDetector(
+            platform: fakePlatform,
+            httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[]),
+            persistentToolState: persistentToolState,
+          );
+          expect(await botDetector2.isRunningOnBot, isFalse);
+        },
+      );
+
+      testWithoutContext(
+        'returns cached false when no bot environment variables are set',
+        () async {
+          persistentToolState.setIsRunningOnBot(false);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+
+          final botDetector = BotDetector(
+            platform: fakePlatform,
+            httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[]),
+            persistentToolState: persistentToolState,
+          );
+
+          expect(await botDetector.isRunningOnBot, isFalse);
+          expect(persistentToolState.isRunningOnBot, isFalse);
+        },
+      );
     });
   });
 
@@ -182,5 +259,19 @@ void main() {
 
       expect(await azureDetector.isRunningOnAzure, isTrue);
     });
+    testWithoutContext(
+      'isRunningOnAzure returns false when an unexpected exception is thrown',
+      () async {
+        final azureDetector = AzureDetector(
+          httpClientFactory: () => FakeHttpClient.list(<FakeRequest>[
+            FakeRequest(
+              azureUrl,
+              responseError: ArgumentError('No host specified in URI http:///e2gerror.php'),
+            ),
+          ]),
+        );
+        expect(await azureDetector.isRunningOnAzure, isFalse);
+      },
+    );
   });
 }
diff --git a/packages/flutter_tools/test/general.shard/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart
index 2f88ba4a34670..48a34ce131775 100644
--- a/packages/flutter_tools/test/general.shard/base/build_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/build_test.dart
@@ -364,7 +364,6 @@ void main() {
             '--deterministic',
             '--snapshot_kind=app-aot-elf',
             '--elf=build/foo/app.so',
-            '--no-sim-use-hardfp',
             '--no-use-integer-division',
             'main.dill',
           ],
@@ -397,7 +396,6 @@ void main() {
             '--deterministic',
             '--snapshot_kind=app-aot-elf',
             '--elf=build/foo/app.so',
-            '--no-sim-use-hardfp',
             '--no-use-integer-division',
             '--dwarf-stack-traces',
             '--resolve-dwarf-paths',
@@ -433,7 +431,6 @@ void main() {
             '--deterministic',
             '--snapshot_kind=app-aot-elf',
             '--elf=build/foo/app.so',
-            '--no-sim-use-hardfp',
             '--no-use-integer-division',
             '--obfuscate',
             'main.dill',
@@ -468,7 +465,6 @@ void main() {
               '--deterministic',
               '--snapshot_kind=app-aot-elf',
               '--elf=build/foo/app.so',
-              '--no-sim-use-hardfp',
               '--no-use-integer-division',
               'main.dill',
             ],
diff --git a/packages/flutter_tools/test/general.shard/base/os_test.dart b/packages/flutter_tools/test/general.shard/base/os_test.dart
index e105c8d183a3e..c7ebac9742960 100644
--- a/packages/flutter_tools/test/general.shard/base/os_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/os_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:ffi' show Abi;
+
 import 'package:archive/archive.dart';
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
@@ -175,6 +176,61 @@ void main() {
       expect(utils.hostPlatform, HostPlatform.darwin_arm64);
     });
 
+    testWithoutContext('macOS ARM64 with FLUTTER_HOST_ARCH=x64 override', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(
+          operatingSystem: 'macos',
+          environment: <String, String>{'FLUTTER_HOST_ARCH': 'x64'},
+        ),
+        currentAbi: Abi.macosArm64,
+      );
+      expect(utils.hostPlatform, HostPlatform.darwin_x64);
+    });
+
+    testWithoutContext('macOS x64 with FLUTTER_HOST_ARCH=arm64 override', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(
+          operatingSystem: 'macos',
+          environment: <String, String>{'FLUTTER_HOST_ARCH': 'arm64'},
+        ),
+        currentAbi: Abi.macosX64,
+      );
+      expect(utils.hostPlatform, HostPlatform.darwin_arm64);
+    });
+
+    testWithoutContext('Linux x64 with FLUTTER_HOST_ARCH=arm64 override', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(environment: <String, String>{'FLUTTER_HOST_ARCH': 'arm64'}),
+        currentAbi: Abi.linuxX64,
+      );
+      expect(utils.hostPlatform, HostPlatform.linux_arm64);
+    });
+
+    testWithoutContext('FLUTTER_HOST_ARCH override is case-insensitive', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(environment: <String, String>{'FLUTTER_HOST_ARCH': 'ARM64'}),
+        currentAbi: Abi.linuxX64,
+      );
+      expect(utils.hostPlatform, HostPlatform.linux_arm64);
+    });
+
+    testWithoutContext('unrecognized FLUTTER_HOST_ARCH override is ignored', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(environment: <String, String>{'FLUTTER_HOST_ARCH': 'sparc'}),
+        currentAbi: Abi.linuxX64,
+      );
+      expect(utils.hostPlatform, HostPlatform.linux_x64);
+    });
+
+    testWithoutContext('hostPlatformOverride property takes precedence', () async {
+      final OperatingSystemUtils utils = createOSUtils(
+        FakePlatform(operatingSystem: 'macos'),
+        currentAbi: Abi.macosArm64,
+      );
+      utils.hostPlatformOverride = HostPlatform.darwin_x64;
+      expect(utils.hostPlatform, HostPlatform.darwin_x64);
+    });
+
     testWithoutContext('unsupported throws', () async {
       final OperatingSystemUtils utils = createOSUtils(FakePlatform(), currentAbi: Abi.androidArm);
       expect(() => utils.hostPlatform, throwsUnsupportedError);
@@ -422,6 +478,28 @@ void main() {
     );
   });
 
+  group('HostPlatform.fromOsAndArch', () {
+    testWithoutContext('maps supported OS and architecture combinations', () {
+      expect(HostPlatform.fromOsAndArch('macos', 'x64'), HostPlatform.darwin_x64);
+      expect(HostPlatform.fromOsAndArch('macos', 'arm64'), HostPlatform.darwin_arm64);
+      expect(HostPlatform.fromOsAndArch('linux', 'x64'), HostPlatform.linux_x64);
+      expect(HostPlatform.fromOsAndArch('linux', 'arm64'), HostPlatform.linux_arm64);
+      expect(HostPlatform.fromOsAndArch('linux', 'riscv64'), HostPlatform.linux_riscv64);
+      expect(HostPlatform.fromOsAndArch('windows', 'x64'), HostPlatform.windows_x64);
+      expect(HostPlatform.fromOsAndArch('windows', 'arm64'), HostPlatform.windows_arm64);
+    });
+
+    testWithoutContext('matches the architecture case-insensitively', () {
+      expect(HostPlatform.fromOsAndArch('macos', 'ARM64'), HostPlatform.darwin_arm64);
+    });
+
+    testWithoutContext('returns null for unsupported combinations', () {
+      expect(HostPlatform.fromOsAndArch('macos', 'riscv64'), isNull);
+      expect(HostPlatform.fromOsAndArch('fuchsia', 'x64'), isNull);
+      expect(HostPlatform.fromOsAndArch('linux', 'sparc'), isNull);
+    });
+  });
+
   testWithoutContext('If unzip fails, include stderr in exception text', () {
     const exceptionMessage = 'Something really bad happened.';
     final handler = FileExceptionHandler();
diff --git a/packages/flutter_tools/test/general.shard/base_utils_test.dart b/packages/flutter_tools/test/general.shard/base_utils_test.dart
index b55ffafbc272c..9dba4fc1cab4e 100644
--- a/packages/flutter_tools/test/general.shard/base_utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/base_utils_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
 import 'package:flutter_tools/src/base/utils.dart';
 
 import '../src/common.dart';
@@ -59,4 +60,41 @@ void main() {
       expect(list.items, <String>['a']);
     });
   });
+
+  group('decodeUtf8OrUtf16', () {
+    test('decodes UTF-8 without BOM', () {
+      expect(decodeUtf8OrUtf16(utf8.encode('hello world')), 'hello world');
+    });
+
+    test('decodes UTF-8 with BOM', () {
+      expect(
+        decodeUtf8OrUtf16(<int>[0xEF, 0xBB, 0xBF, ...utf8.encode('hello world')]),
+        'hello world',
+      );
+    });
+
+    test('decodes UTF-16 LE with BOM', () {
+      final bytes = <int>[0xFF, 0xFE, 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00];
+      expect(decodeUtf8OrUtf16(bytes), 'hello');
+    });
+
+    test('decodes UTF-16 BE with BOM', () {
+      final bytes = <int>[0xFE, 0xFF, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F];
+      expect(decodeUtf8OrUtf16(bytes), 'hello');
+    });
+
+    test('throws FormatException on odd-length UTF-16 LE payload', () {
+      final bytes = <int>[0xFF, 0xFE, 0x68];
+      expect(() => decodeUtf8OrUtf16(bytes), throwsFormatException);
+    });
+
+    test('throws FormatException on odd-length UTF-16 BE payload', () {
+      final bytes = <int>[0xFE, 0xFF, 0x68];
+      expect(() => decodeUtf8OrUtf16(bytes), throwsFormatException);
+    });
+
+    test('throws ToolExit on invalid UTF-8 bytes', () {
+      expect(() => decodeUtf8OrUtf16(<int>[0xFF, 0xFF, 0xFF]), throwsToolExit());
+    });
+  });
 }
diff --git a/packages/flutter_tools/test/general.shard/build_info_test.dart b/packages/flutter_tools/test/general.shard/build_info_test.dart
index 57fcd7f4dad76..311463af08223 100644
--- a/packages/flutter_tools/test/general.shard/build_info_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_info_test.dart
@@ -292,6 +292,20 @@ void main() {
     });
   });
 
+  testWithoutContext('toEnvironmentConfig includes build name and build number', () {
+    const buildInfo = BuildInfo(
+      BuildMode.release,
+      null,
+      buildName: '4.5.6',
+      buildNumber: '7',
+      treeShakeIcons: false,
+      packageConfigPath: 'foo/.dart_tool/package_config.json',
+    );
+
+    expect(buildInfo.toEnvironmentConfig()['BUILD_NAME'], '4.5.6');
+    expect(buildInfo.toEnvironmentConfig()['BUILD_NUMBER'], '7');
+  });
+
   testWithoutContext('toGradleConfig encoding of standard values', () {
     const buildInfo = BuildInfo(
       BuildMode.debug,
@@ -324,6 +338,58 @@ void main() {
     ]);
   });
 
+  testWithoutContext('toGradleConfig encoding of androidEnableHcpp', () {
+    const buildInfo = BuildInfo(
+      BuildMode.debug,
+      '',
+      treeShakeIcons: true,
+      packageConfigPath: 'foo/.dart_tool/package_config.json',
+      androidEnableHcpp: true,
+      explicitAndroidEnableHcpp: true,
+    );
+
+    expect(buildInfo.toGradleConfig(), contains('-Penable-hcpp=true'));
+    expect(buildInfo.toGradleConfig(), contains('-Pexplicit-enable-hcpp=true'));
+    expect(
+      buildInfo.copyWith().androidEnableHcpp,
+      isTrue,
+      reason: 'copyWith should preserve androidEnableHcpp',
+    );
+    expect(
+      buildInfo.copyWith().explicitAndroidEnableHcpp,
+      isTrue,
+      reason: 'copyWith should preserve explicitAndroidEnableHcpp',
+    );
+
+    const disabledBuildInfo = BuildInfo(
+      BuildMode.debug,
+      '',
+      treeShakeIcons: true,
+      packageConfigPath: 'foo/.dart_tool/package_config.json',
+      androidEnableHcpp: false,
+      explicitAndroidEnableHcpp: false,
+    );
+    expect(disabledBuildInfo.toGradleConfig(), contains('-Penable-hcpp=false'));
+    expect(disabledBuildInfo.toGradleConfig(), contains('-Pexplicit-enable-hcpp=false'));
+
+    const unsetBuildInfo = BuildInfo(
+      BuildMode.debug,
+      '',
+      treeShakeIcons: true,
+      packageConfigPath: 'foo/.dart_tool/package_config.json',
+    );
+    expect(
+      unsetBuildInfo.toGradleConfig(),
+      isNot(anyElement(contains('-Penable-hcpp'))),
+      reason: 'no property should be passed when unset',
+    );
+    expect(
+      unsetBuildInfo.toGradleConfig(),
+      isNot(anyElement(contains('-Pexplicit-enable-hcpp'))),
+      reason: 'no property should be passed when unset',
+    );
+  });
+
   testWithoutContext('encodeDartDefines encodes define values with base64 encoded components', () {
     expect(encodeDartDefines(<String>['"hello"']), 'ImhlbGxvIg==');
     expect(
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
index 64f77221e483f..e072fb9886caf 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart
@@ -4,6 +4,7 @@
 
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
+import 'package:flutter_tools/src/base/config.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
@@ -113,6 +114,7 @@ void main() {
           '--depfile',
           '$build/kernel_snapshot_program.d',
           '--verbosity=error',
+          '--recorded-uses=$build/recorded_uses.json',
           'file:///lib/main.dart',
         ],
         exitCode: 1,
@@ -155,9 +157,13 @@ void main() {
           '--depfile',
           '$build/kernel_snapshot_program.d',
           '--verbosity=error',
+          '--recorded-uses=$build/recorded_uses.json',
           'file:///lib/main.dart',
         ],
         stdout: 'result $kBoundaryKey\n$kBoundaryKey\n$kBoundaryKey $build/app.dill 0\n',
+        onRun: (_) {
+          fileSystem.file('$build/recorded_uses.json').createSync();
+        },
       ),
     ]);
 
@@ -200,9 +206,13 @@ void main() {
             '--depfile',
             '$build/kernel_snapshot_program.d',
             '--verbosity=error',
+            '--recorded-uses=$build/recorded_uses.json',
             'file:///lib/main.dart',
           ],
           stdout: 'result $kBoundaryKey\n$kBoundaryKey\n$kBoundaryKey $build/app.dill 0\n',
+          onRun: (_) {
+            fileSystem.file('$build/recorded_uses.json').createSync();
+          },
         ),
       ]);
 
@@ -245,9 +255,13 @@ void main() {
           '--depfile',
           '$build/kernel_snapshot_program.d',
           '--verbosity=error',
+          '--recorded-uses=$build/recorded_uses.json',
           'file:///lib/main.dart',
         ],
         stdout: 'result $kBoundaryKey\n$kBoundaryKey\n$kBoundaryKey $build/app.dill 0\n',
+        onRun: (_) {
+          fileSystem.file('$build/recorded_uses.json').createSync();
+        },
       ),
     ]);
 
@@ -293,9 +307,13 @@ void main() {
           '--verbosity=error',
           'foo',
           'bar',
+          '--recorded-uses=$build/recorded_uses.json',
           'file:///lib/main.dart',
         ],
         stdout: 'result $kBoundaryKey\n$kBoundaryKey\n$kBoundaryKey $build/app.dill 0\n',
+        onRun: (_) {
+          fileSystem.file('$build/recorded_uses.json').createSync();
+        },
       ),
     ]);
 
@@ -497,6 +515,7 @@ void main() {
       expect(processManager, hasNoRemainingExpectations);
     },
     overrides: <Type, Generator>{
+      Config: () => Config.test(directory: fileSystem.currentDirectory),
       XcodeProjectInterpreter: () =>
           FakeXcodeProjectInterpreter(schemes: <String>['Runner', 'chocolate']),
     },
@@ -554,6 +573,7 @@ void main() {
       expect(processManager, hasNoRemainingExpectations);
     },
     overrides: <Type, Generator>{
+      Config: () => Config.test(directory: fileSystem.currentDirectory),
       XcodeProjectInterpreter: () =>
           FakeXcodeProjectInterpreter(schemes: <String>['Runner', 'chocolate']),
     },
@@ -631,6 +651,7 @@ void main() {
       fileSystem: fileSystem,
       logger: logger,
     );
+    testEnvironment.buildDir.createSync(recursive: true);
     final String build = testEnvironment.buildDir.path;
     final String flutterPatchedSdkPath = artifacts.getArtifactPath(
       Artifact.flutterPatchedSdkPath,
@@ -684,7 +705,6 @@ void main() {
           '--deterministic',
           kElfAot,
           '--elf=$build/app.so',
-          '--no-sim-use-hardfp',
           '--no-use-integer-division',
           '$build/app.dill',
         ],
@@ -714,7 +734,6 @@ void main() {
           '--trace-precompiler-to=code_size_1/trace.android-arm.json',
           kElfAot,
           '--elf=$build/app.so',
-          '--no-sim-use-hardfp',
           '--no-use-integer-division',
           '$build/app.dill',
         ],
@@ -876,7 +895,6 @@ void main() {
           'baz=2',
           kElfAot,
           '--elf=$build/app.so',
-          '--no-sim-use-hardfp',
           '--no-use-integer-division',
           '$build/app.dill',
         ],
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart
index 72aeb07d84ca6..d8391d6e98e7c 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
+
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
@@ -10,6 +12,7 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/targets/icon_tree_shaker.dart';
 import 'package:flutter_tools/src/devfs.dart';
+import 'package:record_use/record_use.dart';
 
 import '../../../src/common.dart';
 import '../../../src/fake_process_manager.dart';
@@ -30,40 +33,19 @@ void main() {
   late Artifacts artifacts;
   late DevFSStringContent fontManifestContent;
 
-  late String dartPath;
-  late String constFinderPath;
   late String fontSubsetPath;
   late List<String> fontSubsetArgs;
 
-  List<String> getConstFinderArgs(String appDillPath) => <String>[
-    dartPath,
-    constFinderPath,
-    '--kernel-file',
-    appDillPath,
-    '--class-library-uri',
-    'package:flutter/src/widgets/icon_data.dart',
-    '--class-name',
-    'IconData',
-    '--annotation-class-name',
-    '_StaticIconProvider',
-    '--annotation-class-library-uri',
-    'package:flutter/src/widgets/icon_data.dart',
-  ];
-
-  void addConstFinderInvocation(
+  void writeRecordedUsesFile(
     String appDillPath, {
-    int exitCode = 0,
-    String stdout = '',
-    String stderr = '',
+    required String content,
+    String fileName = 'recorded_uses.json',
   }) {
-    processManager.addCommand(
-      FakeCommand(
-        command: getConstFinderArgs(appDillPath),
-        exitCode: exitCode,
-        stdout: stdout,
-        stderr: stderr,
-      ),
-    );
+    final File appDillFile = fileSystem.file(appDillPath);
+    final Directory buildDir = appDillFile.parent;
+    buildDir.childFile(fileName)
+      ..createSync(recursive: true)
+      ..writeAsStringSync(content);
   }
 
   void resetFontSubsetInvocation({
@@ -90,14 +72,10 @@ void main() {
     artifacts = Artifacts.test();
     fileSystem = MemoryFileSystem.test();
     logger = BufferLogger.test();
-    dartPath = artifacts.getArtifactPath(Artifact.engineDartBinary);
-    constFinderPath = artifacts.getArtifactPath(Artifact.constFinder);
     fontSubsetPath = artifacts.getArtifactPath(Artifact.fontSubset);
 
     fontSubsetArgs = <String>[fontSubsetPath, outputPath, inputPath];
 
-    fileSystem.file(constFinderPath).createSync(recursive: true);
-    fileSystem.file(dartPath).createSync(recursive: true);
     fileSystem.file(fontSubsetPath).createSync(recursive: true);
     fileSystem.file(inputPath)
       ..createSync(recursive: true)
@@ -131,23 +109,17 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
+    expect(iconTreeShaker.enabled, false);
     expect(
       logger.errorText,
-      'Font subsetting is not supported in debug mode. The --tree-shake-icons'
-      ' flag will be ignored.\n',
-    );
-    expect(iconTreeShaker.enabled, false);
-
-    final bool subsets = await iconTreeShaker.subsetFont(
-      input: fileSystem.file(inputPath),
-      outputPath: outputPath,
-      relativePath: relativePath,
+      contains(
+        'Font subsetting is not supported in debug mode. The --tree-shake-icons flag will be ignored.',
+      ),
     );
-    expect(subsets, false);
     expect(processManager, hasNoRemainingExpectations);
   });
 
-  testWithoutContext('Does not get enabled without font manifest', () {
+  testWithoutContext('Does not get enabled without font manifest', () async {
     final Environment environment = createEnvironment(<String, String>{
       kIconTreeShakerFlag: 'true',
       kBuildMode: 'release',
@@ -163,12 +135,11 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
-    expect(logger.errorText, isEmpty);
     expect(iconTreeShaker.enabled, false);
     expect(processManager, hasNoRemainingExpectations);
   });
 
-  testWithoutContext('Gets enabled', () {
+  testWithoutContext('Gets enabled', () async {
     final Environment environment = createEnvironment(<String, String>{
       kIconTreeShakerFlag: 'true',
       kBuildMode: 'release',
@@ -184,12 +155,11 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
-    expect(logger.errorText, isEmpty);
     expect(iconTreeShaker.enabled, true);
     expect(processManager, hasNoRemainingExpectations);
   });
 
-  test('No app.dill throws exception', () async {
+  testWithoutContext('No recorded uses file throws exception', () async {
     final Environment environment = createEnvironment(<String, String>{
       kIconTreeShakerFlag: 'true',
       kBuildMode: 'release',
@@ -205,12 +175,11 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
+    final File input = fileSystem.file(inputPath)..createSync(recursive: true);
+    input.writeAsBytesSync(_kTtfHeaderBytes);
+
     expect(
-      () async => iconTreeShaker.subsetFont(
-        input: fileSystem.file(inputPath),
-        outputPath: outputPath,
-        relativePath: relativePath,
-      ),
+      iconTreeShaker.subsetFont(input: input, outputPath: outputPath, relativePath: relativePath),
       throwsA(isA<IconTreeShakerException>()),
     );
     expect(processManager, hasNoRemainingExpectations);
@@ -233,7 +202,7 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
     final stdinSink = CompleterIOSink();
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     resetFontSubsetInvocation(stdinSink: stdinSink);
     // Font starts out 2500 bytes long
     final File inputFont = fileSystem.file(inputPath)..writeAsBytesSync(List<int>.filled(2500, 0));
@@ -284,7 +253,7 @@ void main() {
     );
 
     final stdinSink = CompleterIOSink();
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     resetFontSubsetInvocation(stdinSink: stdinSink);
 
     final File notAFont = fileSystem.file('input/foo/bar.txt')
@@ -316,7 +285,7 @@ void main() {
     );
 
     final stdinSink = CompleterIOSink();
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     resetFontSubsetInvocation(stdinSink: stdinSink);
 
     final File notAFont = fileSystem.file(inputPath)..writeAsBytesSync(<int>[0, 1, 2]);
@@ -350,7 +319,7 @@ void main() {
         targetPlatform: platform,
       );
 
-      addConstFinderInvocation(appDill.path, stdout: constFinderResultWithInvalid);
+      writeRecordedUsesFile(appDill.path, content: recordedUsesWithInvalidResult);
 
       await expectLater(
         () => iconTreeShaker.subsetFont(
@@ -385,11 +354,7 @@ void main() {
       targetPlatform: TargetPlatform.android_arm64,
     );
 
-    addConstFinderInvocation(
-      appDill.path,
-      // Does not contain space char
-      stdout: validConstFinderResult,
-    );
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     final stdinSink = CompleterIOSink();
     resetFontSubsetInvocation(stdinSink: stdinSink);
     expect(processManager.hasRemainingExpectations, isTrue);
@@ -428,11 +393,7 @@ void main() {
       targetPlatform: TargetPlatform.web_javascript,
     );
 
-    addConstFinderInvocation(
-      appDill.path,
-      // Does not contain space char
-      stdout: validConstFinderResult,
-    );
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     final stdinSink = CompleterIOSink();
     resetFontSubsetInvocation(stdinSink: stdinSink);
     expect(processManager.hasRemainingExpectations, isTrue);
@@ -473,7 +434,7 @@ void main() {
     );
 
     final stdinSink = CompleterIOSink();
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     resetFontSubsetInvocation(exitCode: -1, stdinSink: stdinSink);
 
     await expectLater(
@@ -505,7 +466,7 @@ void main() {
     );
 
     final stdinSink = CompleterIOSink(throwOnAdd: true);
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
     resetFontSubsetInvocation(exitCode: -1, stdinSink: stdinSink);
 
     await expectLater(
@@ -538,7 +499,7 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
-    addConstFinderInvocation(appDill.path, stdout: validConstFinderResult);
+    writeRecordedUsesFile(appDill.path, content: validRecordedUsesResult);
 
     await expectLater(
       () => iconTreeShaker.subsetFont(
@@ -571,7 +532,12 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
-    addConstFinderInvocation(appDill.path, stdout: emptyConstFinderResult);
+    final stdinSink = CompleterIOSink();
+    writeRecordedUsesFile(appDill.path, content: emptyRecordedUsesResult);
+    resetFontSubsetInvocation(stdinSink: stdinSink);
+    fileSystem.file(outputPath)
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(List<int>.filled(1200, 0));
     // Does not throw
     await iconTreeShaker.subsetFont(
       input: fileSystem.file(inputPath),
@@ -579,6 +545,7 @@ void main() {
       relativePath: relativePath,
     );
 
+    expect(stdinSink.getAndClear(), '57415\n');
     expect(
       logger.traceText,
       contains(
@@ -614,7 +581,7 @@ void main() {
         targetPlatform: TargetPlatform.android,
       );
 
-      addConstFinderInvocation(appDill.path, stdout: emptyConstFinderResult);
+      writeRecordedUsesFile(appDill.path, content: emptyRecordedUsesResult);
       // Does not throw
       await iconTreeShaker.subsetFont(
         input: fileSystem.file(inputPath),
@@ -636,14 +603,14 @@ void main() {
     },
   );
 
-  testWithoutContext('ConstFinder non-zero exit', () async {
+  testWithoutContext('Invalid recorded uses JSON', () async {
     final Environment environment = createEnvironment(<String, String>{
       kIconTreeShakerFlag: 'true',
       kBuildMode: 'release',
     });
     final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
 
-    fontManifestContent = DevFSStringContent(invalidFontManifestJson);
+    fontManifestContent = DevFSStringContent(validFontManifestJson);
 
     final iconTreeShaker = IconTreeShaker(
       environment,
@@ -655,7 +622,7 @@ void main() {
       targetPlatform: TargetPlatform.android,
     );
 
-    addConstFinderInvocation(appDill.path, exitCode: -1);
+    writeRecordedUsesFile(appDill.path, content: 'invalid json content');
 
     await expectLater(
       () async => iconTreeShaker.subsetFont(
@@ -667,55 +634,530 @@ void main() {
     );
     expect(processManager, hasNoRemainingExpectations);
   });
-}
 
-const validConstFinderResult = '''
-{
-  "constantInstances": [
-    {
-      "codePoint": 59470,
-      "fontFamily": "MaterialIcons",
-      "fontPackage": null,
-      "matchTextDirection": false
-    }
-  ],
-  "nonConstantLocations": []
-}
+  testWithoutContext(
+    'Can subset a font using InstanceCreationReference with constant arguments',
+    () async {
+      final Environment environment = createEnvironment(<String, String>{
+        kIconTreeShakerFlag: 'true',
+        kBuildMode: 'release',
+      });
+      final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+      final iconTreeShaker = IconTreeShaker(
+        environment,
+        fontManifestContent,
+        logger: logger,
+        processManager: processManager,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        targetPlatform: TargetPlatform.android,
+      );
+
+      writeRecordedUsesFile(appDill.path, content: validRecordedUsesCreationResult);
+
+      final stdinSink = CompleterIOSink();
+      resetFontSubsetInvocation(stdinSink: stdinSink);
+
+      final File inputFont = fileSystem.file(inputPath)
+        ..writeAsBytesSync(List<int>.filled(2500, 0));
+      fileSystem.file(outputPath)
+        ..createSync(recursive: true)
+        ..writeAsBytesSync(List<int>.filled(1200, 0));
+
+      final bool subsetted = await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: relativePath,
+      );
+
+      expect(subsetted, true);
+      expect(stdinSink.getAndClear(), '59470\n');
+      expect(processManager, hasNoRemainingExpectations);
+    },
+  );
+
+  testWithoutContext(
+    'InstanceCreationReference with non-constant arguments fails icon tree shaking',
+    () async {
+      final Environment environment = createEnvironment(<String, String>{
+        kIconTreeShakerFlag: 'true',
+        kBuildMode: 'release',
+      });
+      final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+      final iconTreeShaker = IconTreeShaker(
+        environment,
+        fontManifestContent,
+        logger: logger,
+        processManager: processManager,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        targetPlatform: TargetPlatform.android,
+      );
+
+      writeRecordedUsesFile(appDill.path, content: recordedUsesNonConstantCreationResult);
+
+      await expectLater(
+        () async => iconTreeShaker.subsetFont(
+          input: fileSystem.file(inputPath),
+          outputPath: outputPath,
+          relativePath: relativePath,
+        ),
+        throwsToolExit(),
+      );
+      expect(processManager, hasNoRemainingExpectations);
+    },
+  );
+
+  testWithoutContext('ConstructorTearoffReference fails icon tree shaking', () async {
+    final Environment environment = createEnvironment(<String, String>{
+      kIconTreeShakerFlag: 'true',
+      kBuildMode: 'release',
+    });
+    final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+    final iconTreeShaker = IconTreeShaker(
+      environment,
+      fontManifestContent,
+      logger: logger,
+      processManager: processManager,
+      fileSystem: fileSystem,
+      artifacts: artifacts,
+      targetPlatform: TargetPlatform.android,
+    );
+
+    writeRecordedUsesFile(appDill.path, content: recordedUsesTearoffResult);
+
+    await expectLater(
+      () async => iconTreeShaker.subsetFont(
+        input: fileSystem.file(inputPath),
+        outputPath: outputPath,
+        relativePath: relativePath,
+      ),
+      throwsToolExit(),
+    );
+    expect(processManager, hasNoRemainingExpectations);
+  });
+
+  testWithoutContext('Combines recorded uses from both js and wasm files', () async {
+    final Environment environment = createEnvironment(<String, String>{
+      kIconTreeShakerFlag: 'true',
+      kBuildMode: 'release',
+    });
+    final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+    final iconTreeShaker = IconTreeShaker(
+      environment,
+      fontManifestContent,
+      logger: logger,
+      processManager: processManager,
+      fileSystem: fileSystem,
+      artifacts: artifacts,
+      targetPlatform: TargetPlatform.web_javascript,
+    );
+
+    writeRecordedUsesFile(
+      appDill.path,
+      content: validRecordedUsesResult,
+      fileName: 'recorded_uses_js.json',
+    );
+    writeRecordedUsesFile(
+      appDill.path,
+      content: validRecordedUsesSecondResult,
+      fileName: 'recorded_uses_wasm.json',
+    );
+
+    final stdinSink = CompleterIOSink();
+    resetFontSubsetInvocation(stdinSink: stdinSink);
+
+    final File inputFont = fileSystem.file(inputPath)..writeAsBytesSync(List<int>.filled(2500, 0));
+    fileSystem.file(outputPath)
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(List<int>.filled(1200, 0));
+
+    expect(
+      await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: relativePath,
+      ),
+      true,
+    );
+
+    final String stdin = stdinSink.getAndClear();
+    expect(stdin, contains('59470'));
+    expect(stdin, contains('59471'));
+    expect(stdin, contains('optional:32'));
+    expect(processManager, hasNoRemainingExpectations);
+  });
+
+  testWithoutContext(
+    'Non-constant instance of non-Flutter IconData does not fail icon tree shaking',
+    () async {
+      final Environment environment = createEnvironment(<String, String>{
+        kIconTreeShakerFlag: 'true',
+        kBuildMode: 'release',
+      });
+      final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+      final iconTreeShaker = IconTreeShaker(
+        environment,
+        fontManifestContent,
+        logger: logger,
+        processManager: processManager,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        targetPlatform: TargetPlatform.android,
+      );
+
+      const customLibrary = Library('package:my_package/custom_icon_data.dart');
+      const customIconDataClass = Class('IconData', customLibrary);
+      const customOtherClass = Class('MyIconData', customLibrary);
+
+      final String mixedRecordings = json.encode(
+        Recordings(
+          calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+          instances: <DefinitionWithInstances, List<InstanceReference>>{
+            iconDataClass: <InstanceReference>[
+              const InstanceConstantReference(
+                instanceConstant: InstanceConstant(
+                  definition: iconDataClass,
+                  fields: <String, Constant>{
+                    'codePoint': IntConstant(59470),
+                    'fontFamily': StringConstant('MaterialIcons'),
+                  },
+                ),
+                loadingUnit: rootLoadingUnit,
+              ),
+            ],
+            customIconDataClass: <InstanceReference>[
+              const InstanceCreationReference(
+                definition: customIconDataClass,
+                loadingUnit: rootLoadingUnit,
+                positionalArguments: <MaybeConstant>[NonConstant()],
+                namedArguments: <String, MaybeConstant>{},
+              ),
+            ],
+            customOtherClass: <InstanceReference>[
+              const InstanceCreationReference(
+                definition: customOtherClass,
+                loadingUnit: rootLoadingUnit,
+                positionalArguments: <MaybeConstant>[NonConstant()],
+                namedArguments: <String, MaybeConstant>{},
+              ),
+            ],
+          },
+        ).toJson(),
+      );
+
+      writeRecordedUsesFile(appDill.path, content: mixedRecordings);
+
+      final stdinSink = CompleterIOSink();
+      resetFontSubsetInvocation(stdinSink: stdinSink);
+
+      final File inputFont = fileSystem.file(inputPath)
+        ..writeAsBytesSync(List<int>.filled(2500, 0));
+      fileSystem.file(outputPath)
+        ..createSync(recursive: true)
+        ..writeAsBytesSync(List<int>.filled(1200, 0));
+
+      final bool subsetted = await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: relativePath,
+      );
+
+      expect(subsetted, true);
+      expect(stdinSink.getAndClear(), '59470\n');
+      expect(processManager, hasNoRemainingExpectations);
+    },
+  );
+
+  testWithoutContext('Skips empty recorded uses files', () async {
+    final Environment environment = createEnvironment(<String, String>{
+      kIconTreeShakerFlag: 'true',
+      kBuildMode: 'release',
+    });
+    final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+    final iconTreeShaker = IconTreeShaker(
+      environment,
+      fontManifestContent,
+      logger: logger,
+      processManager: processManager,
+      fileSystem: fileSystem,
+      artifacts: artifacts,
+      targetPlatform: TargetPlatform.web_javascript,
+    );
+
+    writeRecordedUsesFile(appDill.path, content: '', fileName: 'recorded_uses_js.json');
+    writeRecordedUsesFile(
+      appDill.path,
+      content: validRecordedUsesResult,
+      fileName: 'recorded_uses_wasm.json',
+    );
+
+    final stdinSink = CompleterIOSink();
+    resetFontSubsetInvocation(stdinSink: stdinSink);
+
+    final File inputFont = fileSystem.file(inputPath)..writeAsBytesSync(List<int>.filled(2500, 0));
+    fileSystem.file(outputPath)
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(List<int>.filled(1200, 0));
+
+    expect(
+      await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: relativePath,
+      ),
+      true,
+    );
+
+    final String stdin = stdinSink.getAndClear();
+    expect(stdin, contains('59470'));
+    expect(processManager, hasNoRemainingExpectations);
+  });
+
+  testWithoutContext('Subsets unused CupertinoIcons font to fallback code point', () async {
+    final Environment environment = createEnvironment(<String, String>{
+      kIconTreeShakerFlag: 'true',
+      kBuildMode: 'release',
+    });
+    final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+    const cupertinoFontPath = 'packages/cupertino_icons/assets/CupertinoIcons.ttf';
+    const cupertinoManifestJson =
+        '''
+[
+  {
+    "family": "packages/cupertino_icons/CupertinoIcons",
+    "fonts": [
+      {
+        "asset": "$cupertinoFontPath"
+      }
+    ]
+  }
+]
 ''';
+    fontManifestContent = DevFSStringContent(cupertinoManifestJson);
 
-const emptyConstFinderResult = '''
-{
-  "constantInstances": [
-    {
-      "codePoint": 59470,
-      "fontFamily": null,
-      "fontPackage": null,
-      "matchTextDirection": false
-    }
-  ],
-  "nonConstantLocations": []
-}
+    final iconTreeShaker = IconTreeShaker(
+      environment,
+      fontManifestContent,
+      logger: logger,
+      processManager: processManager,
+      fileSystem: fileSystem,
+      artifacts: artifacts,
+      targetPlatform: TargetPlatform.android,
+    );
+
+    // Empty recordings (0 icons used)
+    writeRecordedUsesFile(appDill.path, content: emptyRecordedUsesResult);
+
+    final stdinSink = CompleterIOSink();
+    fontSubsetArgs = <String>[fontSubsetPath, outputPath, inputPath];
+    resetFontSubsetInvocation(stdinSink: stdinSink);
+
+    final File inputFont = fileSystem.file(inputPath)..writeAsBytesSync(List<int>.filled(2500, 0));
+    fileSystem.file(outputPath)
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(List<int>.filled(1200, 0));
+
+    expect(
+      await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: cupertinoFontPath,
+      ),
+      true,
+    );
+
+    expect(stdinSink.getAndClear(), '62418\n');
+    expect(processManager, hasNoRemainingExpectations);
+  });
+
+  testWithoutContext('Does not subset unused non-icon font', () async {
+    final Environment environment = createEnvironment(<String, String>{
+      kIconTreeShakerFlag: 'true',
+      kBuildMode: 'release',
+    });
+    final File appDill = environment.buildDir.childFile('app.dill')..createSync(recursive: true);
+
+    const customFontPath = 'fonts/Roboto-Regular.ttf';
+    const customManifestJson =
+        '''
+[
+  {
+    "family": "Roboto",
+    "fonts": [
+      {
+        "asset": "$customFontPath"
+      }
+    ]
+  }
+]
 ''';
+    fontManifestContent = DevFSStringContent(customManifestJson);
 
-const constFinderResultWithInvalid = '''
-{
-  "constantInstances": [
-    {
-      "codePoint": 59470,
-      "fontFamily": "MaterialIcons",
-      "fontPackage": null,
-      "matchTextDirection": false
-    }
-  ],
-  "nonConstantLocations": [
-    {
-      "file": "file:///Path/to/hello_world/lib/file.dart",
-      "line": 19,
-      "column": 11
-    }
-  ]
+    final iconTreeShaker = IconTreeShaker(
+      environment,
+      fontManifestContent,
+      logger: logger,
+      processManager: processManager,
+      fileSystem: fileSystem,
+      artifacts: artifacts,
+      targetPlatform: TargetPlatform.android,
+    );
+
+    // Empty recordings (0 icons used)
+    writeRecordedUsesFile(appDill.path, content: emptyRecordedUsesResult);
+
+    final File inputFont = fileSystem.file(inputPath)..writeAsBytesSync(List<int>.filled(2500, 0));
+
+    expect(
+      await iconTreeShaker.subsetFont(
+        input: inputFont,
+        outputPath: outputPath,
+        relativePath: customFontPath,
+      ),
+      false,
+    );
+
+    expect(processManager, hasNoRemainingExpectations);
+  });
 }
-''';
+
+const Library iconDataLibrary = Library('package:flutter/src/widgets/icon_data.dart');
+const Class iconDataClass = Class('IconData', iconDataLibrary);
+const LoadingUnit rootLoadingUnit = LoadingUnit('root');
+
+// Generated from: const IconData(0xe84e, fontFamily: 'MaterialIcons')
+final String validRecordedUsesResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceConstantReference(
+          instanceConstant: InstanceConstant(
+            definition: iconDataClass,
+            fields: <String, Constant>{
+              'codePoint': IntConstant(59470),
+              'fontFamily': StringConstant('MaterialIcons'),
+            },
+          ),
+          loadingUnit: rootLoadingUnit,
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: const IconData(0xe84f, fontFamily: 'MaterialIcons')
+final String validRecordedUsesSecondResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceConstantReference(
+          instanceConstant: InstanceConstant(
+            definition: iconDataClass,
+            fields: <String, Constant>{
+              'codePoint': IntConstant(59471),
+              'fontFamily': StringConstant('MaterialIcons'),
+            },
+          ),
+          loadingUnit: rootLoadingUnit,
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: IconData(0xe84e, fontFamily: 'MaterialIcons')
+final String validRecordedUsesCreationResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceCreationReference(
+          definition: iconDataClass,
+          loadingUnit: rootLoadingUnit,
+          positionalArguments: <MaybeConstant>[IntConstant(59470)],
+          namedArguments: <String, MaybeConstant>{'fontFamily': StringConstant('MaterialIcons')},
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: const IconData(0xe84e)
+final String emptyRecordedUsesResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceConstantReference(
+          instanceConstant: InstanceConstant(
+            definition: iconDataClass,
+            fields: <String, Constant>{
+              'codePoint': IntConstant(59470),
+              'fontFamily': NullConstant(),
+            },
+          ),
+          loadingUnit: rootLoadingUnit,
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: IconData(codePoint) (where codePoint is a non-const variable)
+final String recordedUsesWithInvalidResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceCreationReference(
+          definition: iconDataClass,
+          loadingUnit: rootLoadingUnit,
+          positionalArguments: <MaybeConstant>[NonConstant()],
+          namedArguments: <String, MaybeConstant>{},
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: IconData(codePoint, fontFamily: 'MaterialIcons') (where codePoint is a non-const variable)
+final String recordedUsesNonConstantCreationResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const InstanceCreationReference(
+          definition: iconDataClass,
+          loadingUnit: rootLoadingUnit,
+          positionalArguments: <MaybeConstant>[NonConstant()],
+          namedArguments: <String, MaybeConstant>{'fontFamily': StringConstant('MaterialIcons')},
+        ),
+      ],
+    },
+  ).toJson(),
+);
+
+// Generated from: const fn = IconData.new;
+final String recordedUsesTearoffResult = json.encode(
+  Recordings(
+    calls: <DefinitionWithStaticCalls, List<CallReference>>{},
+    instances: <DefinitionWithInstances, List<InstanceReference>>{
+      iconDataClass: <InstanceReference>[
+        const ConstructorTearoffReference(definition: iconDataClass, loadingUnit: rootLoadingUnit),
+      ],
+    },
+  ).toJson(),
+);
 
 const validFontManifestJson = '''
 [
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
index 94dda581a3f96..600828695aa20 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
@@ -244,6 +244,8 @@ void main() {
           '"/output/shaders/my_shader.frag" failed with exit code 1.',
         ),
       );
+      expect(e.stdout, 'impellerc stdout');
+      expect(e.stderr, 'impellerc stderr');
     }
 
     expect(fileSystem.file(outputPath).existsSync(), false);
@@ -830,6 +832,54 @@ void main() {
       },
     );
 
+    testWithoutContext(
+      'compileShader throws ToolExit and logs friendly message when impellerc is blocked by WDAC (4551) '
+      '(regression test for https://github.com/flutter/flutter/issues/190232)',
+      () async {
+        final blockedException = ProcessException(
+          impellerc,
+          <String>[],
+          'An Application Control policy has blocked this file',
+          4551,
+        );
+        final processManager = FakeProcessManager.list(<FakeCommand>[
+          FakeCommand(
+            command: <String>[
+              impellerc,
+              '--runtime-stage-metal',
+              '--iplr',
+              '--sl=$outputPath',
+              '--spirv=$outputPath.spirv',
+              '--input=$fragPath',
+              '--input-type=frag',
+              '--include=$fragDir',
+              '--include=$shaderLibDir',
+            ],
+            exception: blockedException,
+          ),
+        ]);
+        final shaderCompiler = ShaderCompiler(
+          processManager: processManager,
+          logger: logger,
+          fileSystem: fileSystem,
+          artifacts: artifacts,
+          platform: FakePlatform(operatingSystem: 'windows'),
+        );
+
+        await expectLater(
+          shaderCompiler.compileShader(
+            input: fileSystem.file(fragPath),
+            outputPath: outputPath,
+            targetPlatform: TargetPlatform.ios,
+          ),
+          throwsToolExit(message: 'Impeller shader compiler was blocked by security policy.'),
+        );
+
+        expect(logger.errorText, contains('blocked by system'));
+        expect(logger.errorText, contains(impellerc));
+      },
+    );
+
     testWithoutContext(
       'compileShader throws ToolExit and logs friendly message when impellerc is blocked by group policy',
       () async {
@@ -1034,4 +1084,220 @@ void main() {
       expect(headerLine.allMatches(logger.errorText).length, 2);
     });
   });
+
+  group('ShaderCompiler hints and diagnostics', () {
+    Future<void> expectShaderCompilerException({
+      required ShaderCompiler shaderCompiler,
+      required String inputPath,
+      required String outputPath,
+      required List<Matcher> matchers,
+    }) async {
+      await expectLater(
+        shaderCompiler.compileShader(
+          input: fileSystem.file(inputPath),
+          outputPath: outputPath,
+          targetPlatform: TargetPlatform.web_javascript,
+        ),
+        throwsA(
+          isA<ShaderCompilerException>().having(
+            (ShaderCompilerException e) => e.toString(),
+            'toString()',
+            allOf(matchers),
+          ),
+        ),
+      );
+    }
+
+    testWithoutContext('macOS and exit code -9 adds Gatekeeper/OOM hint', () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            impellerc,
+            '--sksl',
+            '--iplr',
+            '--json',
+            '--sl=$outputPath',
+            '--spirv=$outputSpirvPath',
+            '--input=$notFragPath',
+            '--input-type=frag',
+            '--include=$fragDir',
+            '--include=$shaderLibDir',
+          ],
+          exitCode: -9,
+        ),
+      ]);
+      final shaderCompiler = ShaderCompiler(
+        processManager: processManager,
+        logger: logger,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        platform: FakePlatform(operatingSystem: 'macos'),
+      );
+
+      await expectShaderCompilerException(
+        shaderCompiler: shaderCompiler,
+        inputPath: notFragPath,
+        outputPath: outputPath,
+        matchers: <Matcher>[
+          contains('blocked by macOS Gatekeeper or run out of memory (OOM)'),
+          contains('xattr -d com.apple.quarantine'),
+        ],
+      );
+    });
+
+    testWithoutContext('macOS and exit code -6 adds abort hint', () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            impellerc,
+            '--sksl',
+            '--iplr',
+            '--json',
+            '--sl=$outputPath',
+            '--spirv=$outputSpirvPath',
+            '--input=$notFragPath',
+            '--input-type=frag',
+            '--include=$fragDir',
+            '--include=$shaderLibDir',
+          ],
+          exitCode: -6,
+        ),
+      ]);
+      final shaderCompiler = ShaderCompiler(
+        processManager: processManager,
+        logger: logger,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        platform: FakePlatform(operatingSystem: 'macos'),
+      );
+
+      await expectShaderCompilerException(
+        shaderCompiler: shaderCompiler,
+        inputPath: notFragPath,
+        outputPath: outputPath,
+        matchers: <Matcher>[
+          contains('The shader compiler (impellerc) aborted during compilation.'),
+        ],
+      );
+    });
+
+    testWithoutContext('Linux and exit code -6 adds abort hint', () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            impellerc,
+            '--sksl',
+            '--iplr',
+            '--json',
+            '--sl=$outputPath',
+            '--spirv=$outputSpirvPath',
+            '--input=$notFragPath',
+            '--input-type=frag',
+            '--include=$fragDir',
+            '--include=$shaderLibDir',
+          ],
+          exitCode: -6,
+        ),
+      ]);
+      final shaderCompiler = ShaderCompiler(
+        processManager: processManager,
+        logger: logger,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        platform: FakePlatform(),
+      );
+
+      await expectShaderCompilerException(
+        shaderCompiler: shaderCompiler,
+        inputPath: notFragPath,
+        outputPath: outputPath,
+        matchers: <Matcher>[
+          contains('The shader compiler (impellerc) aborted during compilation.'),
+        ],
+      );
+    });
+
+    testWithoutContext('Windows and exit code 3 adds abort hint', () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            impellerc,
+            '--sksl',
+            '--iplr',
+            '--json',
+            '--sl=$outputPath',
+            '--spirv=$outputSpirvPath',
+            '--input=$notFragPath',
+            '--input-type=frag',
+            '--include=$fragDir',
+            '--include=$shaderLibDir',
+          ],
+          exitCode: 3,
+        ),
+      ]);
+      final shaderCompiler = ShaderCompiler(
+        processManager: processManager,
+        logger: logger,
+        fileSystem: fileSystem,
+        artifacts: artifacts,
+        platform: FakePlatform(operatingSystem: 'windows'),
+      );
+
+      await expectShaderCompilerException(
+        shaderCompiler: shaderCompiler,
+        inputPath: notFragPath,
+        outputPath: outputPath,
+        matchers: <Matcher>[
+          contains('The shader compiler (impellerc) aborted during compilation.'),
+          isNot(contains('Warning: The path contains non-ASCII characters')),
+        ],
+      );
+    });
+
+    testWithoutContext(
+      'Windows and exit code 3 with Unicode path adds Unicode path warning '
+      '(regression test for https://github.com/flutter/flutter/issues/190233)',
+      () async {
+        const unicodeFragPath = '/shaders/my_shåder.frag';
+        const unicodeOutputPath = '/output/shaders/my_shåder.frag';
+        const unicodeOutputSpirvPath = '/output/shaders/my_shåder.frag.spirv';
+        fileSystem.file(unicodeFragPath).createSync(recursive: true);
+
+        final processManager = FakeProcessManager.list(<FakeCommand>[
+          FakeCommand(
+            command: <String>[
+              impellerc,
+              '--sksl',
+              '--iplr',
+              '--json',
+              '--sl=$unicodeOutputPath',
+              '--spirv=$unicodeOutputSpirvPath',
+              '--input=$unicodeFragPath',
+              '--input-type=frag',
+              '--include=$fragDir',
+              '--include=$shaderLibDir',
+            ],
+            exitCode: 3,
+          ),
+        ]);
+        final shaderCompiler = ShaderCompiler(
+          processManager: processManager,
+          logger: logger,
+          fileSystem: fileSystem,
+          artifacts: artifacts,
+          platform: FakePlatform(operatingSystem: 'windows'),
+        );
+
+        await expectShaderCompilerException(
+          shaderCompiler: shaderCompiler,
+          inputPath: unicodeFragPath,
+          outputPath: unicodeOutputPath,
+          matchers: <Matcher>[
+            contains('The shader compiler (impellerc) aborted during compilation.'),
+            contains('Warning: The path contains non-ASCII characters'),
+          ],
+        );
+      },
+    );
+  });
 }
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_dry_run_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_dry_run_test.dart
index 10f17402ba58f..2065c4eda9f0d 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/web_dry_run_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_dry_run_test.dart
@@ -6,6 +6,7 @@ import 'dart:math';
 
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
+import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
@@ -97,7 +98,6 @@ name: my_app
           '-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
           '--extra-compiler-option=--depfile=${environment.buildDir.childFile('dart2wasm.d').path}',
           '--recorded-uses=${environment.buildDir.childFile('recorded_uses_wasm.json').path}',
-          '--enable-experiment=record-use',
           '-O0',
           '--no-strip-wasm',
           '--no-minify',
@@ -174,6 +174,18 @@ package:foo/some/path.dart 6:1 - dart:html unsupported (0)
       final Dart2WasmTarget target = createTarget();
       await target.build(environment);
 
+      final logger = environment.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        contains('Note: WebAssembly compilation failed due to legacy web imports.'),
+      );
+      expect(
+        logger.statusText,
+        contains(
+          'Migrate your project from dart:html and package:js to package:web and dart:js_interop.',
+        ),
+      );
+
       expect(fakeAnalytics.sentEvents, hasLength(1));
 
       final Event event = fakeAnalytics.sentEvents[0];
@@ -184,6 +196,64 @@ package:foo/some/path.dart 6:1 - dart:html unsupported (0)
     }),
   );
 
+  test(
+    'dry run prints JS interop migration footer on dart:svg and dart:js_util unsupported findings',
+    () => testbed.run(() async {
+      processManager.addCommand(
+        FakeCommand(
+          command: commandArgs,
+          exitCode: 254,
+          stdout: '''
+Found incompatibilities with WebAssembly.
+
+package:foo/some/path.dart 6:1 - dart:svg unsupported (5)
+package:bar/some/path.dart 12:4 - dart:js_util unsupported (6)
+''',
+        ),
+      );
+      final Dart2WasmTarget target = createTarget();
+      await target.build(environment);
+
+      final logger = environment.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        contains('Note: WebAssembly compilation failed due to legacy web imports.'),
+      );
+      expect(
+        logger.statusText,
+        contains(
+          'Migrate your project from dart:html and package:js to package:web and dart:js_interop.',
+        ),
+      );
+    }),
+  );
+
+  test(
+    'dry run does not print JS interop migration footer on non-web unsupported libraries like dart:ffi or incidental filenames',
+    () => testbed.run(() async {
+      processManager.addCommand(
+        FakeCommand(
+          command: commandArgs,
+          exitCode: 254,
+          stdout: '''
+Found incompatibilities with WebAssembly.
+
+package:fizz/some/path.dart 80:2 - dart:ffi unsupported (3)
+package:foo/some/my_dart_html_wrapper.dart 103:20 - dart:io unsupported (4)
+''',
+        ),
+      );
+      final Dart2WasmTarget target = createTarget();
+      await target.build(environment);
+
+      final logger = environment.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        isNot(contains('Note: WebAssembly compilation failed due to legacy web imports.')),
+      );
+    }),
+  );
+
   test(
     'dry run findings public packages',
     () => testbed.run(() async {
@@ -508,4 +578,113 @@ package:morelong/some/path.dart 9:20 - dart:html unsupported (0)
       expect(event.eventData['E0'], 'foo:${_fakePackageVersions['foo']}');
     }),
   );
+  test(
+    'wasm dry run extracts correct package version when ancestor directory contains numbers',
+    () => testbed.run(() async {
+      writePackageConfigFiles(
+        directory: fs.currentDirectory,
+        packages: {'foo': 'file:///opt/flutter/3.22.0/.pub-cache/hosted/pub.dev/foo-1.0.0'},
+        mainLibName: 'my_app',
+      );
+
+      processManager.addCommand(
+        FakeCommand(
+          command: commandArgs,
+          exitCode: 254,
+          stdout: '''
+Found incompatibilities with WebAssembly.
+
+package:foo/some/path.dart 6:1 - dart:html unsupported (0)
+''',
+        ),
+      );
+      final Dart2WasmTarget target = createTarget();
+      await target.build(environment);
+
+      expect(fakeAnalytics.sentEvents, hasLength(1));
+
+      final Event event = fakeAnalytics.sentEvents[0];
+      expect(event.eventName, equals(DashEvent.flutterWasmDryRunPackage));
+      expect(event.eventData, hasLength(3));
+      expect(event.eventData['result'], 'findings');
+      expect(event.eventData['exitCode'], 254);
+      expect(event.eventData['E0'], 'foo:1.0.0');
+    }),
+  );
+
+  test(
+    'wasm dry run extracts package version from custom pub mirrors',
+    () => testbed.run(() async {
+      writePackageConfigFiles(
+        directory: fs.currentDirectory,
+        packages: {
+          'foo': 'file:///opt/flutter/3.22.0/.pub-cache/hosted/pub.flutter-io.cn/foo-1.0.0/',
+        },
+        mainLibName: 'my_app',
+      );
+
+      processManager.addCommand(
+        FakeCommand(
+          command: commandArgs,
+          exitCode: 254,
+          stdout: '''
+Found incompatibilities with WebAssembly.
+
+package:foo/some/path.dart 6:1 - dart:html unsupported (0)
+''',
+        ),
+      );
+      final Dart2WasmTarget target = createTarget();
+      await target.build(environment);
+
+      expect(fakeAnalytics.sentEvents, hasLength(1));
+
+      final Event event = fakeAnalytics.sentEvents[0];
+      expect(event.eventName, equals(DashEvent.flutterWasmDryRunPackage));
+      expect(event.eventData, hasLength(3));
+      expect(event.eventData['result'], 'findings');
+      expect(event.eventData['exitCode'], 254);
+      expect(event.eventData['E0'], 'foo:1.0.0');
+    }),
+  );
+
+  test(
+    'wasm dry run extracts package versions across multiple distinct hosted domains',
+    () => testbed.run(() async {
+      writePackageConfigFiles(
+        directory: fs.currentDirectory,
+        packages: {
+          'foo': 'file:///pubcache/.pub-cache/hosted/pub.dev/foo-1.0.0',
+          'bar': 'file:///pubcache/.pub-cache/hosted/pub.flutter-io.cn/bar-2.0.0',
+          'baz': 'file:///pubcache/.pub-cache/hosted/custom.repo.org%47/baz-3.0.0/',
+        },
+        mainLibName: 'my_app',
+      );
+
+      processManager.addCommand(
+        FakeCommand(
+          command: commandArgs,
+          exitCode: 254,
+          stdout: '''
+Found incompatibilities with WebAssembly.
+
+package:foo/some/path.dart 6:1 - dart:html unsupported (0)
+package:bar/some/path.dart 8:1 - dart:html unsupported (0)
+package:baz/some/path.dart 10:1 - dart:html unsupported (0)
+''',
+        ),
+      );
+      final Dart2WasmTarget target = createTarget();
+      await target.build(environment);
+
+      expect(fakeAnalytics.sentEvents, hasLength(1));
+
+      final Event event = fakeAnalytics.sentEvents[0];
+      expect(event.eventName, equals(DashEvent.flutterWasmDryRunPackage));
+      expect(event.eventData, hasLength(3));
+      expect(event.eventData['result'], 'findings');
+      expect(event.eventData['exitCode'], 254);
+      expect(event.eventData['E0'], 'baz:3.0.0,bar:2.0.0,foo:1.0.0');
+    }),
+  );
 }
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
index a51af6e45bfd6..027ff48b7a79a 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'package:file_testing/file_testing.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
+import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/template.dart';
 import 'package:flutter_tools/src/build_info.dart';
@@ -40,7 +41,6 @@ const _kStandardFlutterWebDefines = <String>[
   '-DFLUTTER_WEB_USE_SKWASM=false',
   '-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
   '--write-resources',
-  '--enable-experiment=record-use',
 ];
 
 const _kDart2WasmLinuxArgs = <String>[
@@ -1366,7 +1366,6 @@ _flutter.loader.load();
                           '-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
                           '--extra-compiler-option=--depfile=${depFile.absolute.path}',
                           '--recorded-uses=${environment.buildDir.childFile('recorded_uses_wasm.json').absolute.path}',
-                          '--enable-experiment=record-use',
                           '-O$expectedLevel',
                           if (strip && buildMode == 'release')
                             '--strip-wasm'
@@ -1407,6 +1406,146 @@ _flutter.loader.load();
     }
   }
 
+  void addWasmCompilerErrorCommand(
+    FakeProcessManager processManager,
+    Environment environment,
+    String stderr,
+  ) {
+    processManager.addCommand(
+      FakeCommand(
+        command: <String>[
+          ..._kDart2WasmLinuxArgs,
+          '-Ddart.vm.profile=true',
+          '-Ddart.vm.product=false',
+          '--extra-compiler-option=--delete-tostring-package-uri=dart:ui',
+          '--extra-compiler-option=--delete-tostring-package-uri=package:flutter',
+          '--extra-compiler-option=--import-shared-memory',
+          '--extra-compiler-option=--shared-memory-max-pages=32768',
+          '-DFLUTTER_WEB_USE_SKIA=false',
+          '-DFLUTTER_WEB_USE_SKWASM=true',
+          '-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
+          '--extra-compiler-option=--depfile=${environment.buildDir.childFile('dart2wasm.d').absolute.path}',
+          '--recorded-uses=${environment.buildDir.childFile('recorded_uses_wasm.json').absolute.path}',
+          '-O2',
+          '--no-strip-wasm',
+          '--no-source-maps',
+          '--no-minify',
+          '-o',
+          environment.buildDir.childFile('main.dart.wasm').absolute.path,
+          environment.buildDir.childFile('main.dart').absolute.path,
+        ],
+        exitCode: 254,
+        stderr: stderr,
+      ),
+    );
+  }
+
+  test(
+    'Dart2WasmTarget prints JS interop migration footer on dart:html library import failure',
+    () => testbed.run(() async {
+      environment.defines[kBuildMode] = 'profile';
+      addWasmCompilerErrorCommand(
+        processManager,
+        environment,
+        "Error: Dart library 'dart:html' is not available on this platform.",
+      );
+
+      try {
+        await Dart2WasmTarget(
+          const WasmCompilerConfig(
+            optimizationLevel: 2,
+            stripWasm: false,
+            sourceMaps: false,
+            minify: false,
+          ),
+          const NoOpAnalytics(),
+        ).build(environment);
+        fail('Expected exception');
+      } on Exception catch (e) {
+        expect(e.toString(), contains('Failed to compile application for the Web.'));
+      }
+
+      final logger = globals.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        contains('Note: WebAssembly compilation failed due to legacy web imports.'),
+      );
+      expect(
+        logger.statusText,
+        contains(
+          'Migrate your project from dart:html and package:js to package:web and dart:js_interop.',
+        ),
+      );
+    }, overrides: <Type, Generator>{ProcessManager: () => processManager}),
+  );
+
+  test(
+    'Dart2WasmTarget prints JS interop migration footer on dart:svg and dart:js_util failures',
+    () => testbed.run(() async {
+      environment.defines[kBuildMode] = 'profile';
+      addWasmCompilerErrorCommand(
+        processManager,
+        environment,
+        "Context: The unavailable library 'dart:svg' is imported through these paths:\n"
+        "Error: Dart library 'dart:js_util' is not available on this platform.",
+      );
+
+      try {
+        await Dart2WasmTarget(
+          const WasmCompilerConfig(
+            optimizationLevel: 2,
+            stripWasm: false,
+            sourceMaps: false,
+            minify: false,
+          ),
+          const NoOpAnalytics(),
+        ).build(environment);
+        fail('Expected exception');
+      } on Exception catch (e) {
+        expect(e.toString(), contains('Failed to compile application for the Web.'));
+      }
+
+      final logger = globals.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        contains('Note: WebAssembly compilation failed due to legacy web imports.'),
+      );
+    }, overrides: <Type, Generator>{ProcessManager: () => processManager}),
+  );
+
+  test(
+    'Dart2WasmTarget does not print JS interop migration footer on incidental mentions of dart:html in unrelated errors',
+    () => testbed.run(() async {
+      environment.defines[kBuildMode] = 'profile';
+      addWasmCompilerErrorCommand(
+        processManager,
+        environment,
+        "Error: Syntax error in file:///my_dart_html_test.dart at line 4: print('dart:html');",
+      );
+
+      try {
+        await Dart2WasmTarget(
+          const WasmCompilerConfig(
+            optimizationLevel: 2,
+            stripWasm: false,
+            sourceMaps: false,
+            minify: false,
+          ),
+          const NoOpAnalytics(),
+        ).build(environment);
+        fail('Expected exception');
+      } on Exception catch (e) {
+        expect(e.toString(), contains('Failed to compile application for the Web.'));
+      }
+
+      final logger = globals.logger as BufferLogger;
+      expect(
+        logger.statusText,
+        isNot(contains('Note: WebAssembly compilation failed due to legacy web imports.')),
+      );
+    }, overrides: <Type, Generator>{ProcessManager: () => processManager}),
+  );
+
   test('Dart2WasmTarget.buildFiles respects compilerConfig.sourceMaps and matches modules', () {
     final File wasmFile = environment.buildDir.childFile('main.dart.wasm')..createSync();
     final File mjsFile = environment.buildDir.childFile('main.dart.mjs')..createSync();
diff --git a/packages/flutter_tools/test/general.shard/cache_test.dart b/packages/flutter_tools/test/general.shard/cache_test.dart
index ce8133a794701..a2936dcc97e69 100644
--- a/packages/flutter_tools/test/general.shard/cache_test.dart
+++ b/packages/flutter_tools/test/general.shard/cache_test.dart
@@ -993,13 +993,12 @@ void main() {
         platform: FakePlatform(operatingSystem: 'macos'),
       );
       iosUsbArtifacts.location.createSync();
-      final File ideviceScreenshotFile = iosUsbArtifacts.location.childFile('idevicescreenshot')
+      final File ideviceSyslogFile = iosUsbArtifacts.location.childFile('idevicesyslog')
         ..createSync();
-      iosUsbArtifacts.location.childFile('idevicesyslog').createSync();
 
       expect(iosUsbArtifacts.isUpToDateInner(fileSystem), true);
 
-      ideviceScreenshotFile.deleteSync();
+      ideviceSyslogFile.deleteSync();
 
       expect(iosUsbArtifacts.isUpToDateInner(fileSystem), false);
     },
diff --git a/packages/flutter_tools/test/general.shard/compile_expression_test.dart b/packages/flutter_tools/test/general.shard/compile_expression_test.dart
index 2cfece7bd6466..883718f8a52f8 100644
--- a/packages/flutter_tools/test/general.shard/compile_expression_test.dart
+++ b/packages/flutter_tools/test/general.shard/compile_expression_test.dart
@@ -70,51 +70,148 @@ void main() {
   });
 
   testWithoutContext('compile expression can compile single expression', () async {
-    final compileResponseCompleter = Completer<List<int>>();
-    final compileExpressionResponseCompleter = Completer<List<int>>();
+    final stdoutController = StreamController<List<int>>();
+    processManager.process.stdout = stdoutController.stream;
+
     fileSystem.file('/path/to/main.dart.dill')
       ..createSync(recursive: true)
       ..writeAsBytesSync(<int>[1, 2, 3, 4]);
 
-    processManager.process.stdout = Stream<List<int>>.fromFutures(<Future<List<int>>>[
-      compileResponseCompleter.future,
-      compileExpressionResponseCompleter.future,
-    ]);
-    compileResponseCompleter.complete(
-      Future<List<int>>.value(
-        utf8.encode('result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0\n'),
-      ),
+    final Future<CompilerOutput?> compileFuture = generator.recompile(
+      Uri.file('/path/to/main.dart'),
+      null,
+      /* invalidatedFiles */
+      outputPath: '/build/',
+      packageConfig: PackageConfig.empty,
+      projectRootPath: '',
+      fs: fileSystem,
+    );
+    stdoutController.add(
+      utf8.encode('result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0\n'),
     );
+    final CompilerOutput? output = await compileFuture;
+    expect(frontendServerStdIn.getAndClear(), 'compile file:///path/to/main.dart\n');
+    expect(testLogger.errorText, equals('line1\nline2\n'));
+    expect(output!.outputFilename, equals('/path/to/main.dart.dill'));
 
-    await generator
-        .recompile(
-          Uri.file('/path/to/main.dart'),
-          null,
-          /* invalidatedFiles */
-          outputPath: '/build/',
-          packageConfig: PackageConfig.empty,
-          projectRootPath: '',
-          fs: fileSystem,
-        )
-        .then((CompilerOutput? output) {
-          expect(frontendServerStdIn.getAndClear(), 'compile file:///path/to/main.dart\n');
-          expect(testLogger.errorText, equals('line1\nline2\n'));
-          expect(output!.outputFilename, equals('/path/to/main.dart.dill'));
-
-          compileExpressionResponseCompleter.complete(
-            Future<List<int>>.value(
-              utf8.encode(
-                'result def\nline1\nline2\ndef\ndef /path/to/main.dart.dill.incremental 0\n',
-              ),
-            ),
-          );
-          generator
-              .compileExpression('2+2', null, null, null, null, null, null, null, null, false)
-              .then((CompilerOutput? outputExpression) {
-                expect(outputExpression, isNotNull);
-                expect(outputExpression!.expressionData, <int>[1, 2, 3, 4]);
-              });
-        });
+    fileSystem.file('/path/to/main.dart.dill.incremental')
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(<int>[1, 2, 3, 4]);
+
+    final Future<CompilerOutput?> expressionFuture = generator.compileExpression(
+      '2+2',
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      false,
+    );
+    stdoutController.add(
+      utf8.encode('result def\nline1\nline2\ndef /path/to/main.dart.dill.incremental 0\n'),
+    );
+    final CompilerOutput? outputExpression = await expressionFuture;
+    expect(outputExpression, isNotNull);
+    expect(outputExpression!.expressionData, <int>[1, 2, 3, 4]);
+
+    final List<String> stdinLines = frontendServerStdIn.getAndClear().trim().split('\n');
+    expect(stdinLines, hasLength(2));
+    expect(stdinLines[0], 'JSON_INPUT');
+    expect(
+      json.decode(stdinLines[1]),
+      <String, Object?>{
+        'type': 'COMPILE_EXPRESSION',
+        'data': <String, Object?>{
+          'expression': '2+2',
+          'definitions': <String>[],
+          'definitionTypes': <String>[],
+          'typeDefinitions': <String>[],
+          'typeBounds': <String>[],
+          'typeDefaults': <String>[],
+          'libraryUri': '',
+          'class': null,
+          'method': null,
+          'static': false,
+        },
+      },
+    );
+    await stdoutController.close();
+  });
+
+  testWithoutContext('compile expression sends JSON_INPUT for multiline expressions', () async {
+    final stdoutController = StreamController<List<int>>();
+    processManager.process.stdout = stdoutController.stream;
+
+    fileSystem.file('/path/to/main.dart.dill')
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(<int>[1, 2, 3, 4]);
+    fileSystem.file('/path/to/main.dart.dill.incremental')
+      ..createSync(recursive: true)
+      ..writeAsBytesSync(<int>[1, 2, 3, 4]);
+
+    final Future<CompilerOutput?> compileFuture = generator.recompile(
+      Uri.file('/path/to/main.dart'),
+      null,
+      /* invalidatedFiles */
+      outputPath: '/build/',
+      packageConfig: PackageConfig.empty,
+      projectRootPath: '',
+      fs: fileSystem,
+    );
+    stdoutController.add(
+      utf8.encode('result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0\n'),
+    );
+    final CompilerOutput? output = await compileFuture;
+    expect(frontendServerStdIn.getAndClear(), 'compile file:///path/to/main.dart\n');
+    expect(testLogger.errorText, equals('line1\nline2\n'));
+    expect(output!.outputFilename, equals('/path/to/main.dart.dill'));
+
+    const multilineExpression = 'final a = 1;\nfinal b = 2;\na + b;';
+    final Future<CompilerOutput?> expressionFuture = generator.compileExpression(
+      multilineExpression,
+      <String>['def1'],
+      <String>['int'],
+      <String>['TypeDef1'],
+      <String>['TypeBound1'],
+      <String>['TypeDefault1'],
+      'package:foo/foo.dart',
+      'FooClass',
+      'fooMethod',
+      false,
+    );
+    stdoutController.add(
+      utf8.encode('result def\nline1\nline2\ndef /path/to/main.dart.dill.incremental 0\n'),
+    );
+    final CompilerOutput? outputExpression = await expressionFuture;
+
+    expect(outputExpression, isNotNull);
+    expect(outputExpression!.expressionData, <int>[1, 2, 3, 4]);
+
+    final List<String> stdinLines = frontendServerStdIn.getAndClear().trim().split('\n');
+    expect(stdinLines, hasLength(2));
+    expect(stdinLines[0], 'JSON_INPUT');
+    expect(
+      json.decode(stdinLines[1]),
+      <String, Object?>{
+        'type': 'COMPILE_EXPRESSION',
+        'data': <String, Object?>{
+          'expression': multilineExpression,
+          'definitions': <String>['def1'],
+          'definitionTypes': <String>['int'],
+          'typeDefinitions': <String>['TypeDef1'],
+          'typeBounds': <String>['TypeBound1'],
+          'typeDefaults': <String>['TypeDefault1'],
+          'libraryUri': 'package:foo/foo.dart',
+          'class': 'FooClass',
+          'method': 'fooMethod',
+          'static': false,
+        },
+      },
+    );
+    await stdoutController.close();
   });
 
   testWithoutContext('compile expressions without awaiting', () async {
diff --git a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
index d1881a0e19018..0ec1a5998f11d 100644
--- a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
+++ b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
@@ -131,6 +131,62 @@ void main() {
     expect(fakeProcessManager, hasNoRemainingExpectations);
   });
 
+  testWithoutContext(
+    'incremental compile sends correct package URI for pub workspace member package located under root lib/',
+    () async {
+      final packageConfig = PackageConfig(<Package>[
+        Package(
+          'root',
+          Uri.parse('file:///workspace/'),
+          packageUriRoot: Uri.parse('file:///workspace/lib/'),
+        ),
+        Package(
+          'member',
+          Uri.parse('file:///workspace/lib/member/'),
+          packageUriRoot: Uri.parse('file:///workspace/lib/member/lib/'),
+        ),
+      ]);
+
+      fakeProcessManager.addCommand(
+        FakeCommand(
+          command: const <String>[
+            ...frontendServerCommand,
+            '--initialize-from-dill',
+            expectedCachePath,
+            '--verbosity=error',
+          ],
+          stdout: 'result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0',
+          stdin: frontendServerStdIn,
+        ),
+      );
+
+      await generator.recompile(
+        Uri.parse('file:///workspace/lib/main.dart'),
+        null,
+        outputPath: '/build/',
+        packageConfig: packageConfig,
+        fs: MemoryFileSystem(),
+        projectRootPath: '',
+      );
+      expect(frontendServerStdIn.getAndClear(), 'compile package:root/main.dart\n');
+
+      await _accept(generator, frontendServerStdIn, '');
+      await _reject(generatorStdoutHandler, generator, frontendServerStdIn, '', '');
+
+      await _recompile(
+        generatorStdoutHandler,
+        generator,
+        frontendServerStdIn,
+        'result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0\n',
+        mainUri: Uri.parse('file:///workspace/lib/main.dart'),
+        expectedMainUri: 'package:root/main.dart',
+        updatedUris: <Uri>[Uri.parse('file:///workspace/lib/member/lib/foo.dart')],
+        expectedUpdatedUris: <String>['package:member/foo.dart'],
+        packageConfig: packageConfig,
+      );
+    },
+  );
+
   testWithoutContext('incremental compile single dart compile with filesystem scheme', () async {
     fakeProcessManager.addCommand(
       FakeCommand(
@@ -648,6 +704,7 @@ Future<void> _recompile(
   String expectedMainUri = '/path/to/main.dart',
   List<Uri>? updatedUris,
   List<String>? expectedUpdatedUris,
+  PackageConfig? packageConfig,
 }) async {
   mainUri ??= Uri.parse('/path/to/main.dart');
   updatedUris ??= <Uri>[mainUri];
@@ -657,7 +714,7 @@ Future<void> _recompile(
     mainUri,
     updatedUris,
     outputPath: '/build/',
-    packageConfig: PackageConfig.empty,
+    packageConfig: packageConfig ?? PackageConfig.empty,
     suppressErrors: suppressErrors,
     fs: MemoryFileSystem(),
     projectRootPath: '',
diff --git a/packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart b/packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart
new file mode 100644
index 0000000000000..e0eefadb2f3d8
--- /dev/null
+++ b/packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart
@@ -0,0 +1,136 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:file/memory.dart';
+import 'package:flutter_tools/src/android/android_sdk.dart';
+import 'package:flutter_tools/src/android/android_studio.dart';
+import 'package:flutter_tools/src/base/error_handling_io.dart';
+import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/build_system/build_targets.dart';
+import 'package:flutter_tools/src/context/tool_dependencies.dart';
+import 'package:test/fake.dart';
+import 'package:test/test.dart';
+
+import '../../src/common.dart';
+import '../../src/context.dart';
+
+class FakeAndroidSdk extends Fake implements AndroidSdk {}
+
+class FakeAndroidStudio extends Fake implements AndroidStudio {
+  @override
+  String? get javaPath => null;
+}
+
+class FakeBuildTargets extends Fake implements BuildTargets {}
+
+void main() {
+  group('ToolDependencies.bootstrap', () {
+    late MemoryFileSystem fs;
+    late BufferLogger logger;
+    late FakePlatform platform;
+    late FakeProcessManager processManager;
+
+    setUp(() {
+      fs = MemoryFileSystem.test();
+      logger = BufferLogger.test();
+      platform = FakePlatform(
+        environment: <String, String>{'FLUTTER_ROOT': '/flutter', 'HOME': '/home/user'},
+      );
+      processManager = FakeProcessManager.any();
+
+      // Create flutter root directory and pubspec.yaml to avoid exceptions during bootstrapping
+      fs.directory('/flutter/packages/flutter_tools').createSync(recursive: true);
+      fs.file('/pubspec.yaml').createSync();
+    });
+
+    testUsingContext('successfully bootstraps all contexts with core overrides', () async {
+      // Set up mock Android SDK directory to verify eager location works with overridden FS
+      fs.directory('/home/user/Android/Sdk/licenses').createSync(recursive: true);
+
+      final ToolDependencies dependencies = await ToolDependencies.bootstrap(
+        fs: fs,
+        logger: logger,
+        platform: platform,
+        processManager: processManager,
+      );
+
+      expect(dependencies.toolContext, isNotNull);
+      expect(dependencies.appleContext, isNotNull);
+      expect(dependencies.androidContext, isNotNull);
+
+      // Verify that core overrides were correctly propagated
+      fs.file('/test_override.txt').writeAsStringSync('propagated');
+      expect(
+        dependencies.toolContext.fs.file('/test_override.txt').readAsStringSync(),
+        'propagated',
+      );
+
+      expect(dependencies.toolContext.logger, same(logger));
+      expect(dependencies.toolContext.platform, same(platform));
+      expect(dependencies.toolContext.processManager, isA<ErrorHandlingProcessManager>());
+
+      // Verify that other platform-independent dependencies are constructed
+      expect(dependencies.analytics, isNotNull);
+      expect(dependencies.toolContext.botDetector, isNotNull);
+      expect(dependencies.buildSystem, isNotNull);
+      expect(dependencies.buildTargets, isNull);
+      expect(dependencies.crashReporter, isNotNull);
+      expect(dependencies.toolContext.cache, isNotNull);
+      expect(dependencies.toolContext.config, isNotNull);
+      expect(dependencies.toolContext.git, isNotNull);
+      expect(dependencies.toolContext.processUtils, isNotNull);
+      expect(dependencies.toolContext.projectFactory, isNotNull);
+      expect(dependencies.toolContext.shutdownHooks, isNotNull);
+      expect(dependencies.toolContext.stdio, isNotNull);
+      expect(dependencies.toolContext.systemClock, isNotNull);
+      expect(dependencies.toolContext.terminal, isNotNull);
+      expect(dependencies.toolContext.userMessages, isNotNull);
+
+      // Verify AppleContext (eagerly constructed even on Linux)
+      expect(dependencies.appleContext.cocoaPods, isNotNull);
+      expect(dependencies.appleContext.cocoapodsValidator, isNotNull);
+      expect(dependencies.appleContext.iosSimulatorUtils, isNotNull);
+      expect(dependencies.appleContext.iosWorkflow, isNotNull);
+      expect(dependencies.appleContext.plistParser, isNotNull);
+      expect(dependencies.appleContext.xcdevice, isNotNull);
+      expect(dependencies.appleContext.xcode, isNotNull);
+      expect(dependencies.appleContext.xcodeProjectInterpreter, isNotNull);
+
+      // Verify AndroidContext
+      expect(dependencies.androidContext.gradleUtils, isNotNull);
+    });
+
+    testUsingContext('respects explicit overrides for Android SDK and Studio', () async {
+      final mockSdk = FakeAndroidSdk();
+      final mockStudio = FakeAndroidStudio();
+
+      final ToolDependencies dependencies = await ToolDependencies.bootstrap(
+        androidSdk: mockSdk,
+        androidStudio: mockStudio,
+        fs: fs,
+        logger: logger,
+        platform: platform,
+        processManager: processManager,
+      );
+
+      expect(dependencies.androidContext.androidSdk, same(mockSdk));
+      expect(dependencies.androidContext.androidStudio, same(mockStudio));
+    });
+
+    testUsingContext('respects explicit overrides for BuildTargets', () async {
+      final mockBuildTargets = FakeBuildTargets();
+
+      final ToolDependencies dependencies = await ToolDependencies.bootstrap(
+        buildTargets: mockBuildTargets,
+        fs: fs,
+        logger: logger,
+        platform: platform,
+        processManager: processManager,
+      );
+
+      expect(dependencies.buildTargets, same(mockBuildTargets));
+    });
+  });
+}
diff --git a/packages/flutter_tools/test/general.shard/convert_test.dart b/packages/flutter_tools/test/general.shard/convert_test.dart
index b014b7718e133..815867540e357 100644
--- a/packages/flutter_tools/test/general.shard/convert_test.dart
+++ b/packages/flutter_tools/test/general.shard/convert_test.dart
@@ -23,6 +23,17 @@ void main() {
     expect(decoder.convert(passedString.codeUnits), passedString);
   });
 
+  testWithoutContext('Decode a string containing a valid replacement character', () async {
+    expect(
+      decoder.convert(utf8ForTesting.encode('normal string => \u{FFFD}')),
+      'normal string => \u{FFFD}',
+    );
+  });
+
+  testWithoutContext('Throw on malformed UTF-8 bytes', () async {
+    expect(() => decoder.convert(<int>[0xc3, 0x28]), throwsToolExit());
+  });
+
   testWithoutContext('Decode a malformed string without throwing', () async {
     expect(utf8AllowMalformed.decode(nonpassString.codeUnits), nonpassString);
   });
diff --git a/packages/flutter_tools/test/general.shard/dap/flutter_adapter_test.dart b/packages/flutter_tools/test/general.shard/dap/flutter_adapter_test.dart
index df9af9f2247f5..b26ee2e01392a 100644
--- a/packages/flutter_tools/test/general.shard/dap/flutter_adapter_test.dart
+++ b/packages/flutter_tools/test/general.shard/dap/flutter_adapter_test.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
@@ -16,7 +16,7 @@ import 'package:flutter_tools/src/debug_adapters/flutter_adapter_args.dart';
 import 'package:flutter_tools/src/globals.dart' as globals show fs, platform;
 import 'package:test/fake.dart';
 import 'package:test/test.dart';
-import 'package:vm_service/vm_service.dart';
+import 'package:vm_service/vm_service.dart' as vm;
 
 import 'mocks.dart';
 
@@ -601,6 +601,56 @@ void main() {
           'params': <String, Object?>{'warning': 'This is a test warning'},
         });
       });
+
+      test('forward inspector deep links as dart.flutter.devToolsDeepLink events', () async {
+        final adapter = FakeFlutterDebugAdapter(
+          fileSystem: MemoryFileSystem.test(style: fsStyle),
+          platform: platform,
+        );
+
+        // Simulate startup.
+        final args = FlutterLaunchRequestArguments(cwd: '.', program: 'foo.dart');
+        final responseCompleter = Completer<void>();
+        await adapter.configurationDoneRequest(FakeRequest(), null, () {});
+        await adapter.launchRequest(FakeRequest(), args, responseCompleter.complete);
+
+        // Start listening for the forwarded event (don't await it yet, it won't
+        // be triggered until the call below).
+        final Future<Map<String, Object?>> forwardedEvent = adapter.dapToClientMessages.firstWhere(
+          (Map<String, Object?> data) => data['event'] == 'dart.flutter.devToolsDeepLink',
+        );
+
+        // Simulate Flutter asking for a URL to be launched.
+        await adapter.handleExtensionEvent(
+          vm.Event(
+            kind: vm.EventKind.kExtension,
+            extensionKind: 'Flutter.Error',
+            extensionData: vm.ExtensionData.parse({
+              'properties': <Map<String, Object?>>[
+                {
+                  'type': 'ErrorSummary',
+                  'description': 'An overflow occurred',
+                  'properties': <Map<String, Object?>>[
+                    <String, Object?>{
+                      'type': 'DevToolsDeepLinkProperty',
+                      'description': 'Click to open the inspector',
+                      'value': 'http://127.0.0.1:9100/inspector?uri=x&inspectorRef=y',
+                    },
+                  ],
+                },
+              ],
+            }),
+          ),
+        );
+
+        // Wait for the forwarded event.
+        final Map<String, Object?> message = await forwardedEvent;
+        // Ensure the body of the event matches the original event sent by Flutter.
+        expect(message['body'], <String, Object?>{
+          'summary': 'An overflow occurred',
+          'deepLinkUrl': 'http://127.0.0.1:9100/inspector?uri=x&inspectorRef=y',
+        });
+      });
     });
 
     group('handles reverse requests', () {
@@ -907,11 +957,52 @@ stdout "The relevant error-causing widget was:\n    MyWidget:file:///path/to/wid
 stderr "════════════════════════════════════════════════════════════════════════════════\n"
 ''');
       });
+
+      test('extracts the error summary', () {
+        final formatter = FlutterErrorFormatter()
+          ..formatError(<String, Object?>{
+            'type': 'NotErrorSummary',
+            'description': 'xxx',
+            'properties': <Map<String, Object?>>[
+              <String, Object>{'description': 'yyy'},
+              <String, Object?>{
+                'type': 'ErrorSummary',
+                'description': 'my error summary',
+                'children': <Map<String, Object>>[
+                  <String, Object>{'type': 'NotErrorSummary2', 'description': 'zzz'},
+                ],
+              },
+            ],
+          });
+
+        expect(formatter.errorSummary, 'my error summary');
+      });
+
+      test('extracts a DevTools Deep Link', () {
+        final formatter = FlutterErrorFormatter()
+          ..formatError(<String, Object?>{
+            'type': 'NotErrorSummary',
+            'description': 'xxx',
+            'properties': <Map<String, Object?>>[
+              <String, Object>{'description': 'yyy'},
+              <String, Object?>{
+                'type': 'DevToolsDeepLinkProperty',
+                'description': 'Click to open the inspector',
+                'value': 'http://127.0.0.1:9100/inspector?uri=x&inspectorRef=y',
+              },
+            ],
+          });
+
+        expect(
+          formatter.devToolsDeepLinkUrl,
+          'http://127.0.0.1:9100/inspector?uri=x&inspectorRef=y',
+        );
+      });
     });
   });
 }
 
-class _FakeVm extends Fake implements VM {
+class _FakeVm extends Fake implements vm.VM {
   _FakeVm({this.pid = 1});
 
   @override
diff --git a/packages/flutter_tools/test/general.shard/dap/mocks.dart b/packages/flutter_tools/test/general.shard/dap/mocks.dart
index d9e4c2a78ae45..c77c51c276716 100644
--- a/packages/flutter_tools/test/general.shard/dap/mocks.dart
+++ b/packages/flutter_tools/test/general.shard/dap/mocks.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/convert.dart';
diff --git a/packages/flutter_tools/test/general.shard/dart/package_map_test.dart b/packages/flutter_tools/test/general.shard/dart/package_map_test.dart
index 3f695c9990014..bbee6d58eb4af 100644
--- a/packages/flutter_tools/test/general.shard/dart/package_map_test.dart
+++ b/packages/flutter_tools/test/general.shard/dart/package_map_test.dart
@@ -135,4 +135,36 @@ void main() {
       },
     );
   });
+
+  group('PackageConfigWorkspaceExtension', () {
+    testWithoutContext('toPackageUriForWorkspace finds most specific package in pub workspace', () {
+      final packageConfig = PackageConfig(<Package>[
+        Package(
+          'root',
+          Uri.parse('file:///workspace/'),
+          packageUriRoot: Uri.parse('file:///workspace/lib/'),
+        ),
+        Package(
+          'member',
+          Uri.parse('file:///workspace/lib/member/'),
+          packageUriRoot: Uri.parse('file:///workspace/lib/member/lib/'),
+        ),
+      ]);
+
+      expect(
+        packageConfig.toPackageUriForWorkspace(Uri.parse('file:///workspace/lib/foo.dart')),
+        Uri.parse('package:root/foo.dart'),
+      );
+      expect(
+        packageConfig.toPackageUriForWorkspace(
+          Uri.parse('file:///workspace/lib/member/lib/bar.dart'),
+        ),
+        Uri.parse('package:member/bar.dart'),
+      );
+      expect(
+        packageConfig.toPackageUriForWorkspace(Uri.parse('package:member/bar.dart')),
+        Uri.parse('package:member/bar.dart'),
+      );
+    });
+  });
 }
diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
index 714c3d129a371..e6a9dd6a5d433 100644
--- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
+++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
@@ -57,6 +57,17 @@ void main() {
   group('shouldSkipThirdPartyGenerator', () {
     testUsingContext('does not skip pub get the parameter is false', () async {
       final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+          exitCode: 1,
+        ),
         const FakeCommand(
           command: <String>[
             'bin/cache/dart-sdk/bin/dart',
@@ -77,6 +88,9 @@ void main() {
       fileSystem.file('bin/cache/flutter.version.json')
         ..createSync(recursive: true)
         ..writeAsStringSync(_generateFlutterVersionJson('b'));
+      fileSystem.file('.dart_tool/version')
+        ..createSync(recursive: true)
+        ..writeAsStringSync('b');
       fileSystem.file('.dart_tool/package_config.json')
         ..createSync(recursive: true)
         ..writeAsStringSync('''
@@ -113,6 +127,17 @@ void main() {
       'does not skip pub get if package_config.json has "generator": "pub"',
       () async {
         final processManager = FakeProcessManager.list(<FakeCommand>[
+          const FakeCommand(
+            command: <String>[
+              'bin/cache/dart-sdk/bin/dart',
+              'pub',
+              '--suppress-analytics',
+              '--directory',
+              '.',
+              'check-resolution-up-to-date',
+            ],
+            exitCode: 1,
+          ),
           const FakeCommand(
             command: <String>[
               'bin/cache/dart-sdk/bin/dart',
@@ -141,7 +166,7 @@ void main() {
     "generatorVersion": "2.14.0-276.0.dev"
   }
   ''');
-        fileSystem.file('.dart_tool/version').writeAsStringSync('a');
+        fileSystem.file('.dart_tool/version').writeAsStringSync('b');
         fileSystem.file('bin/cache/flutter.version.json')
           ..createSync(recursive: true)
           ..writeAsStringSync(_generateFlutterVersionJson('b'));
@@ -170,6 +195,17 @@ void main() {
       'does not skip pub get if package_config.json has "generator": "pub"',
       () async {
         final processManager = FakeProcessManager.list(<FakeCommand>[
+          const FakeCommand(
+            command: <String>[
+              'bin/cache/dart-sdk/bin/dart',
+              'pub',
+              '--suppress-analytics',
+              '--directory',
+              '.',
+              'check-resolution-up-to-date',
+            ],
+            exitCode: 1,
+          ),
           const FakeCommand(
             command: <String>[
               'bin/cache/dart-sdk/bin/dart',
@@ -198,7 +234,7 @@ void main() {
     "generatorVersion": "2.14.0-276.0.dev"
   }
   ''');
-        fileSystem.file('.dart_tool/version').writeAsStringSync('a');
+        fileSystem.file('.dart_tool/version').writeAsStringSync('b');
         fileSystem.file('bin/cache/flutter.version.json')
           ..createSync(recursive: true)
           ..writeAsStringSync(_generateFlutterVersionJson('b'));
@@ -257,41 +293,53 @@ void main() {
     });
   });
 
-  testUsingContext('checkUpToDate skips pub get if the package config is newer than the pubspec '
-      'and the current framework version is the same as the last version', () async {
-    final processManager = FakeProcessManager.empty();
-    final logger = BufferLogger.test();
-    final fileSystem = MemoryFileSystem.test();
+  testUsingContext(
+    'checkUpToDate skips pub get if the resolution is up-to-date and the current framework version is the same as the last version',
+    () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+        ),
+      ]);
+      final logger = BufferLogger.test();
+      final fileSystem = MemoryFileSystem.test();
 
-    fileSystem.file('pubspec.yaml').createSync();
-    fileSystem.file('pubspec.lock').createSync();
-    fileSystem.file('.dart_tool/package_config.json').createSync(recursive: true);
-    fileSystem.file('.dart_tool/version').writeAsStringSync('a');
-    fileSystem.file('bin/cache/flutter.version.json')
-      ..createSync(recursive: true)
-      ..writeAsStringSync(_generateFlutterVersionJson('a'));
+      fileSystem.file('pubspec.yaml').createSync();
+      fileSystem.file('pubspec.lock').createSync();
+      fileSystem.file('.dart_tool/package_config.json').createSync(recursive: true);
+      fileSystem.file('.dart_tool/version').writeAsStringSync('a');
+      fileSystem.file('bin/cache/flutter.version.json')
+        ..createSync(recursive: true)
+        ..writeAsStringSync(_generateFlutterVersionJson('a'));
 
-    final pub = Pub.test(
-      fileSystem: fileSystem,
-      logger: logger,
-      processManager: processManager,
-      platform: FakePlatform(),
-      botDetector: const FakeBotDetector(false),
-      stdio: FakeStdio(),
-    );
+      final pub = Pub.test(
+        fileSystem: fileSystem,
+        logger: logger,
+        processManager: processManager,
+        platform: FakePlatform(),
+        botDetector: const FakeBotDetector(false),
+        stdio: FakeStdio(),
+      );
 
-    await pub.get(
-      project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-      context: PubContext.pubGet,
-      checkUpToDate: true,
-    );
+      await pub.get(
+        project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+        context: PubContext.pubGet,
+        checkUpToDate: true,
+      );
 
-    expect(logger.traceText, contains('Skipping pub get: version match.'));
-  });
+      expect(logger.traceText, contains('Skipping pub get: resolution up-to-date.'));
+    },
+  );
 
   testUsingContext(
-    'checkUpToDate does not skip pub get if the package config is newer than the pubspec '
-    'but the current framework version is not the same as the last version',
+    'checkUpToDate does not skip pub get if the current framework version is not the same as the last version',
     () async {
       final processManager = FakeProcessManager.list(<FakeCommand>[
         const FakeCommand(
@@ -338,8 +386,7 @@ void main() {
   );
 
   testUsingContext(
-    'checkUpToDate does not skip pub get if the package config is newer than the pubspec '
-    'but the current framework version does not exist yet',
+    'checkUpToDate does not skip pub get if the last framework version file does not exist',
     () async {
       final processManager = FakeProcessManager.list(<FakeCommand>[
         const FakeCommand(
@@ -384,6 +431,64 @@ void main() {
     },
   );
 
+  testUsingContext(
+    'checkUpToDate does not skip pub get if the current framework version matches but resolution needs updating (exit code 1)',
+    () async {
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+          exitCode: 1,
+        ),
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'get',
+            '--example',
+          ],
+        ),
+      ]);
+      final logger = BufferLogger.test();
+      final fileSystem = MemoryFileSystem.test();
+
+      fileSystem.file('pubspec.yaml').createSync();
+      fileSystem.file('pubspec.lock').createSync();
+      fileSystem.file('.dart_tool/package_config.json').createSync(recursive: true);
+      fileSystem.file('.dart_tool/version').writeAsStringSync('a');
+      fileSystem.file('bin/cache/flutter.version.json')
+        ..createSync(recursive: true)
+        ..writeAsStringSync(_generateFlutterVersionJson('a'));
+
+      final pub = Pub.test(
+        fileSystem: fileSystem,
+        logger: logger,
+        processManager: processManager,
+        platform: FakePlatform(),
+        botDetector: const FakeBotDetector(false),
+        stdio: FakeStdio(),
+      );
+
+      await pub.get(
+        project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+        context: PubContext.pubGet,
+        checkUpToDate: true,
+      );
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(fileSystem.file('.dart_tool/version').readAsStringSync(), 'a');
+    },
+  );
+
   testUsingContext(
     'checkUpToDate does not skip pub get if the package config does not exist',
     () async {
@@ -437,6 +542,17 @@ void main() {
     () async {
       final fileSystem = MemoryFileSystem.test();
       final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+          exitCode: 1,
+        ),
         const FakeCommand(
           command: <String>[
             'bin/cache/dart-sdk/bin/dart',
@@ -482,6 +598,17 @@ void main() {
     'checkUpToDate does not skip pub get if the package config is older that the pubspec',
     () async {
       final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+          exitCode: 1,
+        ),
         const FakeCommand(
           command: <String>[
             'bin/cache/dart-sdk/bin/dart',
@@ -502,6 +629,7 @@ void main() {
       fileSystem.file('.dart_tool/package_config.json')
         ..createSync(recursive: true)
         ..setLastModifiedSync(DateTime(1991));
+      fileSystem.file('.dart_tool/version').writeAsStringSync('b');
       fileSystem.file('bin/cache/flutter.version.json')
         ..createSync(recursive: true)
         ..writeAsStringSync(_generateFlutterVersionJson('b'));
@@ -530,6 +658,17 @@ void main() {
     'checkUpToDate does not skip pub get if the pubspec.lock is older that the pubspec',
     () async {
       final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            '.',
+            'check-resolution-up-to-date',
+          ],
+          exitCode: 1,
+        ),
         const FakeCommand(
           command: <String>[
             'bin/cache/dart-sdk/bin/dart',
@@ -1149,6 +1288,58 @@ exit code: 66
     ); // because nothing should touch it
     logger.clear();
   });
+
+  testUsingContext(
+    'checkUpToDate works and calls check-resolution-up-to-date in a workspace context',
+    () async {
+      final FileSystem fileSystem = MemoryFileSystem.test();
+      final Directory pkg = fileSystem.directory('workspace_pkg')..createSync(recursive: true);
+
+      final processManager = FakeProcessManager.list(<FakeCommand>[
+        const FakeCommand(
+          command: <String>[
+            'bin/cache/dart-sdk/bin/dart',
+            'pub',
+            '--suppress-analytics',
+            '--directory',
+            'workspace_pkg',
+            'check-resolution-up-to-date',
+          ],
+        ),
+      ]);
+      final logger = BufferLogger.test();
+
+      // Workspace package setup
+      pkg.childFile('pubspec.yaml').createSync();
+      fileSystem.file('pubspec.lock').createSync();
+      fileSystem.file('.dart_tool/package_config.json').createSync(recursive: true);
+      pkg.childDirectory('.dart_tool').childDirectory('pub').childFile('workspace_ref.json')
+        ..createSync(recursive: true)
+        ..writeAsStringSync('{"workspaceRoot": "../../../"}');
+      fileSystem.file('bin/cache/flutter.version.json')
+        ..createSync(recursive: true)
+        ..writeAsStringSync(_generateFlutterVersionJson('a'));
+      fileSystem.file('.dart_tool/version').writeAsStringSync('a');
+
+      final pub = Pub.test(
+        fileSystem: fileSystem,
+        logger: logger,
+        processManager: processManager,
+        platform: FakePlatform(),
+        botDetector: const FakeBotDetector(false),
+        stdio: FakeStdio(),
+      );
+
+      await pub.get(
+        project: FlutterProject.fromDirectoryTest(pkg),
+        context: PubContext.pubGet,
+        checkUpToDate: true,
+      );
+
+      expect(logger.traceText, contains('Skipping pub get: resolution up-to-date.'));
+      expect(processManager, hasNoRemainingExpectations);
+    },
+  );
 }
 
 String _generateFlutterVersionJson(String version) {
diff --git a/packages/flutter_tools/test/general.shard/desktop_device_test.dart b/packages/flutter_tools/test/general.shard/desktop_device_test.dart
index 382c94131383d..3b0d792f5f201 100644
--- a/packages/flutter_tools/test/general.shard/desktop_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/desktop_device_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:fake_async/fake_async.dart';
 import 'package:file/memory.dart';
@@ -22,6 +23,7 @@ import 'package:test/fake.dart';
 
 import '../src/common.dart';
 import '../src/context.dart';
+import '../src/fakes.dart';
 
 void main() {
   group('Basic info', () {
@@ -427,6 +429,156 @@ void main() {
       });
     },
   );
+
+  group('DesktopLogReader', () {
+    testWithoutContext('does not close logLines when a process exits', () async {
+      final logReader = DesktopLogReader();
+      final receivedLines = <String>[];
+      final StreamSubscription<String> subscription = logReader.logLines.listen(receivedLines.add);
+
+      final firstProcess = FakeProcess(
+        stdout: Stream<List<int>>.fromIterable(<List<int>>[utf8.encode('first line\n')]),
+      );
+      logReader.listenToProcessOutput(firstProcess);
+      await firstProcess.exitCode;
+      await pumpEventQueue();
+
+      final secondProcess = FakeProcess(
+        stdout: Stream<List<int>>.fromIterable(<List<int>>[utf8.encode('second line\n')]),
+      );
+      logReader.listenToProcessOutput(secondProcess);
+      await secondProcess.exitCode;
+      await pumpEventQueue();
+
+      expect(receivedLines, <String>['first line', 'second line']);
+
+      await subscription.cancel();
+      logReader.dispose();
+    });
+
+    testWithoutContext('dispose does not close logLines', () async {
+      // We should not close loglines on dispose, since Device.dispose() is called
+      // once per launch (e.g. once per integration test file), not once at true end-of-life
+      final logReader = DesktopLogReader();
+      final receivedLines = <String>[];
+      final StreamSubscription<String> subscription = logReader.logLines.listen(receivedLines.add);
+
+      logReader.dispose();
+
+      final process = FakeProcess(
+        stdout: Stream<List<int>>.fromIterable(<List<int>>[utf8.encode('still here\n')]),
+      );
+      logReader.listenToProcessOutput(process);
+      await process.exitCode;
+      await pumpEventQueue();
+
+      expect(receivedLines, <String>['still here']);
+
+      await subscription.cancel();
+    });
+  });
+
+  group('SingleLaunchLogReader', () {
+    testWithoutContext('mirrors the source stream until scope completes', () async {
+      final sourceController = StreamController<String>.broadcast();
+      final scopeCompleter = Completer<void>();
+      final reader = SingleLaunchLogReader(sourceController.stream, scopeCompleter.future);
+
+      final receivedLines = <String>[];
+      final StreamSubscription<String> subscription = reader.logLines.listen(receivedLines.add);
+
+      sourceController.add('hello');
+      await pumpEventQueue();
+      expect(receivedLines, <String>['hello']);
+
+      scopeCompleter.complete();
+      await pumpEventQueue();
+
+      // No longer relayed once scope has completed.
+      sourceController.add('goodbye');
+      await pumpEventQueue();
+      expect(receivedLines, <String>['hello']);
+
+      await subscription.cancel();
+      await sourceController.close();
+    });
+
+    testWithoutContext('closes logLines when scope completes without closing the source', () async {
+      final sourceController = StreamController<String>.broadcast();
+      final scopeCompleter = Completer<void>();
+      final reader = SingleLaunchLogReader(sourceController.stream, scopeCompleter.future);
+
+      final Future<void> done = reader.logLines.listen((String _) {}).asFuture<void>();
+      scopeCompleter.complete();
+      await done;
+
+      expect(sourceController.isClosed, false);
+      await sourceController.close();
+    });
+  });
+
+  testWithoutContext('getLogReader() observes multiple launches of startApp', () async {
+    final firstProcessCompleter = Completer<void>();
+    final processManager = FakeProcessManager.list(<FakeCommand>[
+      FakeCommand(
+        command: const <String>['debug'],
+        stdout:
+            'The Dart VM service is listening on http://127.0.0.1/0\n'
+            'first app output\n',
+        completer: firstProcessCompleter,
+      ),
+      FakeCommand(
+        command: const <String>['debug'],
+        stdout:
+            'The Dart VM service is listening on http://127.0.0.1/1\n'
+            'second app output\n',
+        completer: Completer<void>(),
+      ),
+    ]);
+    final FakeDesktopDevice device = setUpDesktopDevice(processManager: processManager);
+    final package = FakeApplicationPackage();
+
+    // Subscribe to the device's log reader up front, before any launch —
+    // this mirrors how `flutter drive`/`flutter logs` observe device
+    // output, and should keep working across the relaunch below.
+    final logLines = <String>[];
+    final StreamSubscription<String> subscription = device.getLogReader().logLines.listen(
+      logLines.add,
+    );
+
+    final LaunchResult firstResult = await device.startApp(
+      package,
+      prebuiltApplication: true,
+      debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
+    );
+    expect(firstResult.started, true);
+    expect(firstResult.vmServiceUri, Uri.parse('http://127.0.0.1/0'));
+
+    // Regression test for https://github.com/flutter/flutter/issues/135673:
+    // let the first process actually exit before the second launch
+    // begins, which previously crashed with "Bad state: Cannot add new
+    // events after calling close".
+    firstProcessCompleter.complete();
+    await pumpEventQueue();
+
+    // `flutter test`'s IntegrationTestTestDevice calls `device.dispose()`
+    // once per test file, not once at the very end of the whole run —
+    // this must not tear down anything the next launch needs.
+    await device.dispose();
+
+    final LaunchResult secondResult = await device.startApp(
+      package,
+      prebuiltApplication: true,
+      debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
+    );
+    expect(secondResult.started, true);
+    expect(secondResult.vmServiceUri, Uri.parse('http://127.0.0.1/1'));
+
+    await pumpEventQueue();
+    expect(logLines, containsAll(<String>['first app output', 'second app output']));
+
+    await subscription.cancel();
+  });
 }
 
 FakeDesktopDevice setUpDesktopDevice({
diff --git a/packages/flutter_tools/test/general.shard/drive/web_driver_service_test.dart b/packages/flutter_tools/test/general.shard/drive/web_driver_service_test.dart
index 60a6a7f980a31..214510cb09b31 100644
--- a/packages/flutter_tools/test/general.shard/drive/web_driver_service_test.dart
+++ b/packages/flutter_tools/test/general.shard/drive/web_driver_service_test.dart
@@ -17,6 +17,7 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/drive/web_driver_service.dart';
 import 'package:flutter_tools/src/project.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
+import 'package:flutter_tools/src/web/chrome_constants.dart';
 import 'package:flutter_tools/src/web/devfs_config.dart';
 import 'package:flutter_tools/src/web/web_runner.dart';
 import 'package:test/fake.dart';
@@ -30,6 +31,11 @@ final kChromeArgs = <String>[
   '--bwsi',
   '--disable-background-timer-throttling',
   '--disable-renderer-backgrounding',
+  '--disable-background-networking',
+  '--disable-sync',
+  '--disable-client-side-phishing-detection',
+  '--disable-notifications',
+  ...kGcmDisabledFlags,
   '--disable-default-apps',
   '--disable-extensions',
   '--disable-popup-blocking',
@@ -285,6 +291,25 @@ void main() {
     },
   );
 
+  testUsingContext(
+    'WebDriverService forwards web-defines to the web runner',
+    () async {
+      final WebDriverService service = setUpDriverService();
+      final device = FakeDevice();
+      await service.start(
+        BuildInfo.profile,
+        device,
+        DebuggingOptions.enabled(BuildInfo.profile, ipv6: true),
+        webDefines: <String, String>{'VERSION': 'v1.2.3'},
+      );
+      await service.stop();
+      expect(fakeWebRunnerFactory.lastWebDefines, <String, String>{'VERSION': 'v1.2.3'});
+    },
+    overrides: <Type, Generator>{
+      WebRunnerFactory: () => fakeWebRunnerFactory = FakeWebRunnerFactory(),
+    },
+  );
+
   testUsingContext('WebDriverService can start an app with a launch url provided', () async {
     final WebDriverService service = setUpDriverService();
     final device = FakeDevice();
@@ -358,6 +383,7 @@ class FakeWebRunnerFactory implements WebRunnerFactory {
 
   final bool doResolveToError;
   Map<String, Object?>? lastPlatformArgs;
+  Map<String, String>? lastWebDefines;
 
   @override
   ResidentRunner createWebRunner(
@@ -381,6 +407,7 @@ class FakeWebRunnerFactory implements WebRunnerFactory {
   }) {
     expect(stayResident, isTrue);
     lastPlatformArgs = platformArgs;
+    lastWebDefines = webDefines;
     return FakeResidentRunner(
       doResolveToError: doResolveToError,
       debuggingOptions: debuggingOptions,
diff --git a/packages/flutter_tools/test/general.shard/extension_protocol/extension_discovery_test.dart b/packages/flutter_tools/test/general.shard/extension_protocol/extension_discovery_test.dart
new file mode 100644
index 0000000000000..07768907fccbb
--- /dev/null
+++ b/packages/flutter_tools/test/general.shard/extension_protocol/extension_discovery_test.dart
@@ -0,0 +1,116 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:isolate';
+
+import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/experimental/extension_discovery.dart';
+import 'package:flutter_tools_extension/flutter_tools_extension.dart';
+import 'package:test/test.dart';
+
+void _dummyExtensionEntryPoint(SendPort sendPort) {
+  ToolExtensionEntryPoint.run(sendPort, <ToolExtensionService>[]);
+}
+
+void _failingExtensionEntryPoint(SendPort sendPort) {
+  // Throws during isolate initialization before handshake.
+  throw StateError('Simulated isolate startup failure');
+}
+
+class _DummyService extends ToolExtensionService {
+  _DummyService(this.namespace, this.methodName);
+
+  @override
+  final String namespace;
+  final String methodName;
+
+  @override
+  Future<Map<String, ExtensionRpcHandler>> initialize() async {
+    return <String, ExtensionRpcHandler>{methodName: (Map<String, Object?> params) => 'ok'};
+  }
+}
+
+void main() {
+  group('ExtensionDiscovery & Connection Base', () {
+    test('ExtensionConnection completes isolate handshake and retrieves capabilities', () async {
+      final logger = BufferLogger.test();
+      final ExtensionConnection connection = await ExtensionConnection.spawn(
+        _dummyExtensionEntryPoint,
+        logger: logger,
+      );
+      expect(connection.capabilities, isA<ToolExtensionCapabilities>());
+
+      final discovery = ExtensionDiscovery(logger: logger);
+      discovery.registerConnection(connection);
+      expect(discovery.connections, hasLength(1));
+
+      await discovery.dispose();
+      expect(discovery.connections, isEmpty);
+    });
+
+    test('ExtensionConnection.spawn throws and cleans up on isolate startup failure', () async {
+      final logger = BufferLogger.test();
+      expect(
+        () => ExtensionConnection.spawn(_failingExtensionEntryPoint, logger: logger),
+        throwsA(isA<StateError>()),
+      );
+    });
+
+    test('ExtensionDiscovery registers multiple connections and disposes them', () async {
+      final logger = BufferLogger.test();
+      final ExtensionConnection connection1 = await ExtensionConnection.spawn(
+        _dummyExtensionEntryPoint,
+        logger: logger,
+      );
+      final ExtensionConnection connection2 = await ExtensionConnection.spawn(
+        _dummyExtensionEntryPoint,
+        logger: logger,
+      );
+
+      final discovery = ExtensionDiscovery(logger: logger);
+      discovery.registerConnections(<ExtensionConnection>[connection1, connection2]);
+
+      expect(discovery.connections, hasLength(2));
+      await discovery.dispose();
+      expect(discovery.connections, isEmpty);
+    });
+
+    test(
+      'ToolExtensionCapabilities.fromJson eagerly deserializes lists and normalizes platforms',
+      () {
+        final capabilities = ToolExtensionCapabilities.fromJson(const <String, Object?>{
+          'services': <Object?>['diagnostics', 'config'],
+          'supportedPlatforms': <Object?>['Linux', 'MacOS'],
+        });
+
+        expect(capabilities.services, const <String>['diagnostics', 'config']);
+        expect(capabilities.supportedPlatforms, const <String>{'linux', 'macos'});
+        expect(capabilities.supportsHostPlatform('LINUX'), isTrue);
+        expect(capabilities.supportsHostPlatform('windows'), isFalse);
+      },
+    );
+
+    test('ToolExtensionEntryPoint.run rejects duplicate RPC method registration', () async {
+      final service1 = _DummyService('test', 'ping');
+      final service2 = _DummyService('test', 'ping');
+
+      final receivePort = ReceivePort();
+      addTearDown(receivePort.close);
+
+      expect(
+        () => ToolExtensionEntryPoint.run(receivePort.sendPort, <ToolExtensionService>[
+          service1,
+          service2,
+        ]),
+        throwsA(
+          isA<StateError>().having(
+            (StateError e) => e.message,
+            'message',
+            contains('Duplicate RPC method registered: "test.ping"'),
+          ),
+        ),
+      );
+    });
+  });
+}
diff --git a/packages/flutter_tools/test/general.shard/extension_protocol/extension_manager_test.dart b/packages/flutter_tools/test/general.shard/extension_protocol/extension_manager_test.dart
new file mode 100644
index 0000000000000..f507c9a5dfd41
--- /dev/null
+++ b/packages/flutter_tools/test/general.shard/extension_protocol/extension_manager_test.dart
@@ -0,0 +1,57 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:isolate';
+
+import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/base/os.dart';
+import 'package:flutter_tools/src/experimental/extension_discovery.dart';
+import 'package:flutter_tools/src/experimental/extension_manager.dart';
+import 'package:flutter_tools_extension/flutter_tools_extension.dart';
+import 'package:test/test.dart';
+
+import '../../src/fakes.dart';
+
+void _dummyExtensionEntryPoint(SendPort sendPort) {
+  ToolExtensionEntryPoint.run(sendPort, <ToolExtensionService>[]);
+}
+
+void _linuxOnlyExtensionEntryPoint(SendPort sendPort) {
+  ToolExtensionEntryPoint.run(
+    sendPort,
+    <ToolExtensionService>[],
+    supportedPlatforms: const <String>{'linux'},
+  );
+}
+
+void main() {
+  group('ExtensionManager Integration', () {
+    test('ExtensionManager loads extension compatible with hostPlatform', () async {
+      final logger = BufferLogger.test();
+      final manager = ExtensionManager(
+        hostPlatform: HostPlatform.linux_x64,
+        logger: logger,
+        featureFlags: TestFeatureFlags(isToolExtensionsEnabled: true),
+      );
+      await manager.initialize(entryPoints: <ExtensionEntryPoint>[_dummyExtensionEntryPoint]);
+
+      expect(manager.connections, hasLength(1));
+      await manager.dispose();
+      expect(manager.connections, isEmpty);
+    });
+
+    test('ExtensionManager filters out extension incompatible with hostPlatform', () async {
+      final logger = BufferLogger.test();
+      final manager = ExtensionManager(
+        hostPlatform: HostPlatform.darwin_arm64,
+        logger: logger,
+        featureFlags: TestFeatureFlags(isToolExtensionsEnabled: true),
+      );
+      await manager.initialize(entryPoints: <ExtensionEntryPoint>[_linuxOnlyExtensionEntryPoint]);
+
+      expect(manager.connections, isEmpty);
+      await manager.dispose();
+    });
+  });
+}
diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart
index 86b257db3e99b..c41cdfa97aa82 100644
--- a/packages/flutter_tools/test/general.shard/features_test.dart
+++ b/packages/flutter_tools/test/general.shard/features_test.dart
@@ -445,6 +445,29 @@ void main() {
       expect(checkFlags.isMacOSArm64OnlyEnabled, isTrue);
     });
   });
+
+  group('Tool Extensions', () {
+    test('is available only on master', () {
+      expect(
+        toolExtensionsFeature,
+        allOf(<Matcher>[
+          _onChannelIs('master', available: true, enabledByDefault: false),
+          _onChannelIs('stable', available: false, enabledByDefault: false),
+          _onChannelIs('beta', available: false, enabledByDefault: false),
+        ]),
+      );
+    });
+
+    test('can be configured', () {
+      expect(toolExtensionsFeature.configSetting, 'enable-tool-extensions');
+      expect(toolExtensionsFeature.environmentOverride, 'FLUTTER_TOOL_EXTENSIONS');
+    });
+
+    test('forwards to isEnabled', () {
+      final checkFlags = _TestIsGetterForwarding(shouldInvoke: toolExtensionsFeature);
+      expect(checkFlags.isToolExtensionsEnabled, isTrue);
+    });
+  });
 }
 
 final class _FakeFeaturesConfig implements FlutterFeaturesConfig {
diff --git a/packages/flutter_tools/test/general.shard/flutter_validator_test.dart b/packages/flutter_tools/test/general.shard/flutter_validator_test.dart
index aa21b8bb1cf30..21d0b9d879bf8 100644
--- a/packages/flutter_tools/test/general.shard/flutter_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/flutter_validator_test.dart
@@ -860,6 +860,9 @@ class FakeFlutterFeatures extends FeatureFlags {
   @override
   bool get isMacOSArm64OnlyEnabled => _enabled;
 
+  @override
+  bool get isToolExtensionsEnabled => _enabled;
+
   @override
   final List<Feature> allFeatures;
 
diff --git a/packages/flutter_tools/test/general.shard/ios/core_devices_test.dart b/packages/flutter_tools/test/general.shard/ios/core_devices_test.dart
index f73621ed93bd9..ab37d23d50ade 100644
--- a/packages/flutter_tools/test/general.shard/ios/core_devices_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/core_devices_test.dart
@@ -14,11 +14,11 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/base/template.dart';
-import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/ios/application_package.dart';
 import 'package:flutter_tools/src/ios/core_devices.dart';
+import 'package:flutter_tools/src/ios/device_support.dart';
 import 'package:flutter_tools/src/ios/lldb.dart';
 import 'package:flutter_tools/src/ios/xcode_debug.dart';
 import 'package:flutter_tools/src/ios/xcodeproj.dart';
@@ -225,6 +225,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -236,6 +237,126 @@ void main() {
         expect(fakeLLDB.attemptedToAttach, isTrue);
       });
 
+      testWithoutContext('registers shutdown hook to stop app', () async {
+        final fakeCoreDeviceControl = FakeIOSCoreDeviceControl(
+          installResult: IOSCoreDeviceInstallResult.fromJson(const <String, Object?>{
+            'info': <String, Object?>{'outcome': 'success'},
+            'result': <String, Object?>{
+              'installedApplications': [
+                <String, Object?>{'installationURL': '/asdf'},
+              ],
+            },
+          }),
+          launchResult: IOSCoreDeviceLaunchResult.fromJson(const <String, Object?>{
+            'info': <String, Object?>{'outcome': 'success'},
+            'result': <String, Object?>{
+              'process': <String, Object?>{'processIdentifier': 123},
+            },
+          }),
+          runningProcesses: [
+            IOSCoreDeviceRunningProcess.fromJson(const <String, Object?>{
+              'processIdentifier': 123,
+              'executable': '/asdf',
+            }),
+          ],
+        );
+        final processManager = FakeProcessManager.any();
+        final logger = BufferLogger.test();
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+        final fakeLLDB = FakeLLDB();
+        fakeLLDB.setIsRunning(true, 123);
+        final launcher = IOSCoreDeviceLauncher(
+          coreDeviceControl: fakeCoreDeviceControl,
+          logger: logger,
+          xcodeDebug: FakeXcodeDebug(),
+          fileSystem: MemoryFileSystem.test(),
+          processUtils: processUtils,
+          xcodeProjectInterpreter: XcodeProjectInterpreter.test(processManager: processManager),
+          lldb: fakeLLDB,
+        );
+        final shutdownHooks = FakeShutdownHooks();
+
+        final bool result = await launcher.launchAppWithLLDBDebugger(
+          deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(
+            operatingSystemVersion: '17.0',
+            modelCode: 'iPhone15,2',
+            cpuArchitectureString: 'arm64e',
+          ),
+          bundlePath: 'bundle-path',
+          bundleId: 'bundle-id',
+          launchArguments: <String>[],
+          shutdownHooks: shutdownHooks,
+          mode: BuildMode.debug,
+        );
+
+        expect(result, isTrue);
+        expect(shutdownHooks.registeredHooks, hasLength(1));
+        await shutdownHooks.registeredHooks.first();
+        expect(fakeCoreDeviceControl.terminateProcessCalled, isTrue);
+        expect(fakeCoreDeviceControl.processTerminated, 123);
+        expect(fakeLLDB.exitCalled, isTrue);
+      });
+
+      testWithoutContext('shutdown hook catches Exception thrown by stopApp', () async {
+        final fakeCoreDeviceControl = FakeIOSCoreDeviceControl(
+          installResult: IOSCoreDeviceInstallResult.fromJson(const <String, Object?>{
+            'info': <String, Object?>{'outcome': 'success'},
+            'result': <String, Object?>{
+              'installedApplications': [
+                <String, Object?>{'installationURL': '/asdf'},
+              ],
+            },
+          }),
+          launchResult: IOSCoreDeviceLaunchResult.fromJson(const <String, Object?>{
+            'info': <String, Object?>{'outcome': 'success'},
+            'result': <String, Object?>{
+              'process': <String, Object?>{'processIdentifier': 123},
+            },
+          }),
+          runningProcesses: [
+            IOSCoreDeviceRunningProcess.fromJson(const <String, Object?>{
+              'processIdentifier': 123,
+              'executable': '/asdf',
+            }),
+          ],
+        );
+        fakeCoreDeviceControl.terminateException = Exception('failed to terminate');
+        final processManager = FakeProcessManager.any();
+        final logger = BufferLogger.test();
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+        final fakeLLDB = FakeLLDB();
+        fakeLLDB.setIsRunning(true, 123);
+        final launcher = IOSCoreDeviceLauncher(
+          coreDeviceControl: fakeCoreDeviceControl,
+          logger: logger,
+          xcodeDebug: FakeXcodeDebug(),
+          fileSystem: MemoryFileSystem.test(),
+          processUtils: processUtils,
+          xcodeProjectInterpreter: XcodeProjectInterpreter.test(processManager: processManager),
+          lldb: fakeLLDB,
+        );
+        final shutdownHooks = FakeShutdownHooks();
+
+        final bool result = await launcher.launchAppWithLLDBDebugger(
+          deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(
+            operatingSystemVersion: '17.0',
+            modelCode: 'iPhone15,2',
+            cpuArchitectureString: 'arm64e',
+          ),
+          bundlePath: 'bundle-path',
+          bundleId: 'bundle-id',
+          launchArguments: <String>[],
+          shutdownHooks: shutdownHooks,
+          mode: BuildMode.debug,
+        );
+
+        expect(result, isTrue);
+        expect(shutdownHooks.registeredHooks, hasLength(1));
+        await expectLater(shutdownHooks.registeredHooks.first(), completes);
+      });
+
       testWithoutContext('ignores app extension processes', () async {
         final fakeCoreDeviceControl = FakeIOSCoreDeviceControl(
           installResult: IOSCoreDeviceInstallResult.fromJson(const <String, Object?>{
@@ -285,6 +406,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -338,6 +460,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -384,6 +507,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -436,6 +560,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -482,6 +607,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -530,6 +656,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -580,6 +707,7 @@ void main() {
 
         final bool result = await launcher.launchAppWithLLDBDebugger(
           deviceId: 'device-id',
+          deviceSupport: createDeviceSupport(),
           bundlePath: 'bundle-path',
           bundleId: 'bundle-id',
           launchArguments: <String>[],
@@ -890,7 +1018,7 @@ void main() {
     });
   });
 
-  group('Xcode prior to Core Device Control/Xcode 15', () {
+  group('Xcode when devicectl is not installed', () {
     late BufferLogger logger;
     late FakeProcessManager fakeProcessManager;
     late Xcode xcode;
@@ -899,14 +1027,7 @@ void main() {
     setUp(() {
       logger = BufferLogger.test();
       fakeProcessManager = FakeProcessManager.empty();
-      final xcodeProjectInterpreter = XcodeProjectInterpreter.test(
-        processManager: fakeProcessManager,
-        version: Version(14, 0, 0),
-      );
-      xcode = Xcode.test(
-        processManager: fakeProcessManager,
-        xcodeProjectInterpreter: xcodeProjectInterpreter,
-      );
+      xcode = FakeXcodeNotInstalled();
       deviceControl = IOSCoreDeviceControl(
         logger: logger,
         processManager: fakeProcessManager,
@@ -953,6 +1074,16 @@ void main() {
         expect(logger.errorText, contains('devicectl is not installed.'));
         expect(status, isFalse);
       });
+
+      testWithoutContext('fails to take screenshot', () async {
+        final bool status = await deviceControl.takeScreenshot(
+          deviceId: 'device-id',
+          destination: '/path/to/screenshot.png',
+        );
+        expect(fakeProcessManager, hasNoRemainingExpectations);
+        expect(logger.errorText, contains('devicectl is not installed.'));
+        expect(status, isFalse);
+      });
     });
   });
 
@@ -3887,6 +4018,116 @@ invalid JSON
         expect(logger.traceText, contains('Error reading output file'));
       });
     });
+
+    group('take screenshot', () {
+      const deviceId = 'device-id';
+      const destination = '/path/to/screenshot.png';
+
+      testWithoutContext('Successful screenshot', () async {
+        const deviceControlOutput =
+            '''
+{
+  "info" : {
+    "arguments" : [
+      "devicectl",
+      "device",
+      "capture",
+      "screenshot",
+      "--device",
+      "$deviceId",
+      "--destination",
+      "$destination"
+    ],
+    "outcome" : "success"
+  }
+}
+''';
+        final File tempFile = fileSystem.systemTempDirectory
+            .childDirectory('core_devices.rand0')
+            .childFile('screenshot_results.json');
+        fakeProcessManager.addCommand(
+          FakeCommand(
+            command: <String>[
+              'xcrun',
+              'devicectl',
+              'device',
+              'capture',
+              'screenshot',
+              '--device',
+              deviceId,
+              '--destination',
+              destination,
+              '--json-output',
+              tempFile.path,
+            ],
+            onRun: (_) {
+              tempFile.writeAsStringSync(deviceControlOutput);
+            },
+          ),
+        );
+
+        final bool success = await deviceControl.takeScreenshot(
+          deviceId: deviceId,
+          destination: destination,
+        );
+        expect(success, isTrue);
+        expect(fakeProcessManager, hasNoRemainingExpectations);
+        expect(tempFile, isNot(exists));
+      });
+
+      testWithoutContext('failed screenshot', () async {
+        const deviceControlOutput =
+            '''
+{
+  "info" : {
+    "arguments" : [
+      "devicectl",
+      "device",
+      "capture",
+      "screenshot",
+      "--device",
+      "$deviceId",
+      "--destination",
+      "$destination"
+    ],
+    "outcome" : "failure"
+  }
+}
+''';
+        final File tempFile = fileSystem.systemTempDirectory
+            .childDirectory('core_devices.rand0')
+            .childFile('screenshot_results.json');
+        fakeProcessManager.addCommand(
+          FakeCommand(
+            command: <String>[
+              'xcrun',
+              'devicectl',
+              'device',
+              'capture',
+              'screenshot',
+              '--device',
+              deviceId,
+              '--destination',
+              destination,
+              '--json-output',
+              tempFile.path,
+            ],
+            onRun: (_) {
+              tempFile.writeAsStringSync(deviceControlOutput);
+            },
+          ),
+        );
+
+        final bool success = await deviceControl.takeScreenshot(
+          deviceId: deviceId,
+          destination: destination,
+        );
+        expect(success, isFalse);
+        expect(fakeProcessManager, hasNoRemainingExpectations);
+        expect(tempFile, isNot(exists));
+        expect(logger.errorText, contains('devicectl returned unexpected JSON response'));
+      });
+    });
   });
 }
 
@@ -3898,6 +4139,7 @@ class FakeIOSCoreDeviceControl extends Fake implements IOSCoreDeviceControl {
     this.launchResult,
     this.terminateSuccess = true,
     this.runningProcesses = const <IOSCoreDeviceRunningProcess>[],
+    this.takeScreenshotSuccess = true,
   });
 
   bool installSuccess;
@@ -3905,9 +4147,16 @@ class FakeIOSCoreDeviceControl extends Fake implements IOSCoreDeviceControl {
   bool launchSuccess;
   IOSCoreDeviceInstallResult? installResult;
   bool terminateSuccess;
+  Exception? terminateException;
   int? processTerminated;
   List<IOSCoreDeviceRunningProcess> runningProcesses;
   bool get terminateProcessCalled => processTerminated != null;
+  bool takeScreenshotSuccess;
+
+  @override
+  Future<bool> takeScreenshot({required String deviceId, required String destination}) async {
+    return takeScreenshotSuccess;
+  }
 
   @override
   Future<List<IOSCoreDevice>> getCoreDevices({
@@ -3956,6 +4205,9 @@ class FakeIOSCoreDeviceControl extends Fake implements IOSCoreDeviceControl {
   @override
   Future<bool> terminateProcess({required String deviceId, required int processId}) async {
     processTerminated = processId;
+    if (terminateException != null) {
+      throw terminateException!;
+    }
     return terminateSuccess;
   }
 
@@ -4056,6 +4308,7 @@ class FakeLLDB extends Fake implements LLDB {
     required int appProcessId,
     required LLDBLogForwarder lldbLogForwarder,
     required BuildMode mode,
+    required IOSDeviceSupport deviceSupport,
   }) async {
     attemptedToAttach = true;
     attachedProcessId = appProcessId;
@@ -4173,3 +4426,32 @@ class FakeShutdownHooks extends Fake implements ShutdownHooks {
     _isShuttingDown = true;
   }
 }
+
+IOSDeviceSupport createDeviceSupport({
+  Logger? logger,
+  ProcessUtils? processUtils,
+  Directory? homeDirectory,
+  String? modelCode,
+  String? operatingSystemVersion,
+  String? cpuArchitectureString,
+  String deviceId = 'device-id',
+}) {
+  final Logger testLogger = logger ?? BufferLogger.test();
+  return IOSDeviceSupport(
+    logger: testLogger,
+    processUtils:
+        processUtils ??
+        ProcessUtils(processManager: FakeProcessManager.empty(), logger: testLogger),
+    xcode: null,
+    homeDirectory: homeDirectory,
+    modelCode: modelCode,
+    operatingSystemVersion: operatingSystemVersion,
+    cpuArchitectureString: cpuArchitectureString,
+    deviceId: deviceId,
+  );
+}
+
+class FakeXcodeNotInstalled extends Fake implements Xcode {
+  @override
+  bool get isDevicectlInstalled => false;
+}
diff --git a/packages/flutter_tools/test/general.shard/ios/device_support_test.dart b/packages/flutter_tools/test/general.shard/ios/device_support_test.dart
new file mode 100644
index 0000000000000..a86724e799487
--- /dev/null
+++ b/packages/flutter_tools/test/general.shard/ios/device_support_test.dart
@@ -0,0 +1,847 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:fake_async/fake_async.dart';
+import 'package:file/file.dart';
+import 'package:file/memory.dart';
+import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/base/process.dart';
+import 'package:flutter_tools/src/base/version.dart';
+import 'package:flutter_tools/src/ios/device_support.dart';
+import 'package:flutter_tools/src/macos/xcode.dart';
+import 'package:test/fake.dart';
+
+import '../../src/common.dart';
+import '../../src/fake_process_manager.dart';
+
+void main() {
+  group('IOSDeviceSupport', () {
+    testWithoutContext('does nothing when Xcode is null', () async {
+      final processManager = FakeProcessManager.empty();
+      final logger = BufferLogger.test();
+      final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+      final deviceSupport = IOSDeviceSupport(
+        logger: logger,
+        processUtils: processUtils,
+        xcode: null,
+        homeDirectory: null,
+        modelCode: null,
+        operatingSystemVersion: null,
+        cpuArchitectureString: null,
+        deviceId: 'id-123',
+      );
+
+      await deviceSupport.prepareDeviceSupport();
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(logger.statusText, isEmpty);
+      expect(logger.traceText, isEmpty);
+      expect(logger.errorText, isEmpty);
+    });
+
+    testWithoutContext('does nothing when Xcode version is less than 16.3.0', () async {
+      final processManager = FakeProcessManager.empty();
+      final logger = BufferLogger.test();
+      final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+      final deviceSupport = IOSDeviceSupport(
+        logger: logger,
+        processUtils: processUtils,
+        xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+        homeDirectory: null,
+        modelCode: null,
+        operatingSystemVersion: null,
+        cpuArchitectureString: null,
+        deviceId: 'id-123',
+      );
+
+      await deviceSupport.prepareDeviceSupport();
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(logger.statusText, isEmpty);
+      expect(logger.traceText, isEmpty);
+      expect(logger.errorText, isEmpty);
+    });
+
+    testWithoutContext('does nothing when existingDeviceSupportSymbols is non-null', () async {
+      final FileSystem fileSystem = MemoryFileSystem.test();
+      final Directory homeDir = fileSystem.directory('/Users/username');
+      final Directory supportDir = homeDir
+          .childDirectory('Library')
+          .childDirectory('Developer')
+          .childDirectory('Xcode')
+          .childDirectory('iOS DeviceSupport');
+      supportDir
+          .childDirectory('iPhone15,2 17.0')
+          .childDirectory('Symbols')
+          .createSync(recursive: true);
+
+      final processManager = FakeProcessManager.empty();
+      final logger = BufferLogger.test();
+      final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+      final deviceSupport = IOSDeviceSupport(
+        logger: logger,
+        processUtils: processUtils,
+        xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+        homeDirectory: homeDir,
+        modelCode: 'iPhone15,2',
+        operatingSystemVersion: '17.0',
+        cpuArchitectureString: 'arm64e',
+        deviceId: 'id-123',
+      );
+
+      await deviceSupport.prepareDeviceSupport();
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(logger.statusText, isEmpty);
+      expect(logger.traceText, isEmpty);
+      expect(logger.errorText, isEmpty);
+    });
+
+    testWithoutContext(
+      'runs prepareDeviceSupport and logs stdout to trace when Copying is not present',
+      () async {
+        final processManager = FakeProcessManager.empty();
+        final logger = BufferLogger.test();
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+        processManager.addCommand(
+          const FakeCommand(
+            command: <String>[
+              'xcrun',
+              'xcodebuild',
+              '-prepareDeviceSupport',
+              '-destination',
+              'id=id-123',
+            ],
+            stdout: 'Preparing device support...',
+          ),
+        );
+
+        final deviceSupport = IOSDeviceSupport(
+          logger: logger,
+          processUtils: processUtils,
+          xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+          homeDirectory: null,
+          modelCode: null,
+          operatingSystemVersion: null,
+          cpuArchitectureString: null,
+          deviceId: 'id-123',
+        );
+
+        await deviceSupport.prepareDeviceSupport();
+
+        expect(processManager, hasNoRemainingExpectations);
+        expect(logger.traceText, contains('Preparing device support...'));
+        expect(logger.statusText, isEmpty);
+        expect(logger.errorText, isEmpty);
+      },
+    );
+
+    testWithoutContext('runs prepareDeviceSupport and logs Copying messages to status', () async {
+      final processManager = FakeProcessManager.empty();
+      final logger = BufferLogger.test();
+      final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+      processManager.addCommand(
+        const FakeCommand(
+          command: <String>[
+            'xcrun',
+            'xcodebuild',
+            '-prepareDeviceSupport',
+            '-destination',
+            'id=id-123',
+          ],
+          stdout: 'Copying symbols...',
+        ),
+      );
+
+      final deviceSupport = IOSDeviceSupport(
+        logger: logger,
+        processUtils: processUtils,
+        xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+        homeDirectory: null,
+        modelCode: null,
+        operatingSystemVersion: null,
+        cpuArchitectureString: null,
+        deviceId: 'id-123',
+      );
+
+      await deviceSupport.prepareDeviceSupport();
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(
+        logger.statusText,
+        contains(
+          'Copying Device Support symbols. This may take several minutes to complete...\n'
+          'Please do not connect or disconnect your device or open Xcode until finished.',
+        ),
+      );
+      expect(logger.statusText, contains('Copying symbols...'));
+      expect(logger.statusText, endsWith('\n'));
+      expect(
+        logger.traceText,
+        'executing: xcrun xcodebuild -prepareDeviceSupport -destination id=id-123\n',
+      );
+      expect(logger.errorText, isEmpty);
+    });
+
+    testWithoutContext('runs prepareDeviceSupport and logs stderr to error', () async {
+      final processManager = FakeProcessManager.empty();
+      final logger = BufferLogger.test();
+      final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+      processManager.addCommand(
+        const FakeCommand(
+          command: <String>[
+            'xcrun',
+            'xcodebuild',
+            '-prepareDeviceSupport',
+            '-destination',
+            'id=id-123',
+          ],
+          stderr: 'Error occurred',
+        ),
+      );
+
+      final deviceSupport = IOSDeviceSupport(
+        logger: logger,
+        processUtils: processUtils,
+        xcode: FakeXcode(currentVersion: Version(17, 0, 0)),
+        homeDirectory: null,
+        modelCode: null,
+        operatingSystemVersion: null,
+        cpuArchitectureString: null,
+        deviceId: 'id-123',
+      );
+
+      await deviceSupport.prepareDeviceSupport();
+
+      expect(processManager, hasNoRemainingExpectations);
+      expect(logger.errorText, contains('Error occurred'));
+    });
+
+    testWithoutContext(
+      'prints error message when prepareDeviceSupport takes longer than 10 seconds',
+      () {
+        FakeAsync().run((fakeAsync) {
+          final processManager = FakeProcessManager.empty();
+          final logger = BufferLogger.test();
+          final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+          processManager.addCommand(
+            const FakeCommand(
+              command: <String>[
+                'xcrun',
+                'xcodebuild',
+                '-prepareDeviceSupport',
+                '-destination',
+                'id=id-123',
+              ],
+              duration: Duration(seconds: 11),
+            ),
+          );
+
+          final deviceSupport = IOSDeviceSupport(
+            logger: logger,
+            processUtils: processUtils,
+            xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+            homeDirectory: null,
+            modelCode: null,
+            operatingSystemVersion: null,
+            cpuArchitectureString: null,
+            deviceId: 'id-123',
+          );
+
+          deviceSupport.prepareDeviceSupport();
+
+          fakeAsync.elapse(const Duration(seconds: 10));
+
+          expect(
+            logger.errorText,
+            contains(
+              'Xcode is taking longer than expected to start preparing Device Support symbols...\n'
+              'Try closing Xcode, connecting your device via USB, and running the following command:\n'
+              '  "xcrun xcodebuild -prepareDeviceSupport -destination id=id-123"',
+            ),
+          );
+
+          fakeAsync.elapse(const Duration(seconds: 1));
+        });
+      },
+    );
+
+    testWithoutContext('does not print error message if Copying is printed within 10 seconds', () {
+      FakeAsync().run((fakeAsync) {
+        final processManager = FakeProcessManager.empty();
+        final logger = BufferLogger.test();
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+
+        processManager.addCommand(
+          const FakeCommand(
+            command: <String>[
+              'xcrun',
+              'xcodebuild',
+              '-prepareDeviceSupport',
+              '-destination',
+              'id=id-123',
+            ],
+            duration: Duration(seconds: 11),
+            stdout: 'Copying symbols...',
+          ),
+        );
+
+        final deviceSupport = IOSDeviceSupport(
+          logger: logger,
+          processUtils: processUtils,
+          xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+          homeDirectory: null,
+          modelCode: null,
+          operatingSystemVersion: null,
+          cpuArchitectureString: null,
+          deviceId: 'id-123',
+        );
+
+        deviceSupport.prepareDeviceSupport();
+
+        fakeAsync.elapse(const Duration(seconds: 11));
+
+        expect(logger.errorText, isEmpty);
+      });
+    });
+
+    group('missingSymbolsWarning', () {
+      group('Xcode < 16.3', () {
+        testWithoutContext('returns unable to find warning when supportDir is null', () {
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+            homeDirectory: null,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(
+            warning,
+            'Xcode Device Support was not found for this device. This will likely reduce debugging '
+            'performance and may cause the app to hang on a white screen during launch.\n'
+            'To trigger Device Symbols to be copied, connect the device via USB, close and then '
+            're-open Xcode. It may take several minutes for Xcode to copy symbols from the device.\n'
+            'Once Device Support symbols are finished being copied, they are expected to be found at '
+            '\$HOME/Library/Developer/Xcode/iOS DeviceSupport\n'
+            'Please retry "flutter run" once symbols are finished being copied.',
+          );
+        });
+
+        testWithoutContext('returns unable to find warning when device directory does not exist', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(
+            warning,
+            'Xcode Device Support was not found for this device. This will likely reduce debugging '
+            'performance and may cause the app to hang on a white screen during launch.\n'
+            'To trigger Device Symbols to be copied, connect the device via USB, close and then '
+            're-open Xcode. It may take several minutes for Xcode to copy symbols from the device.\n'
+            'Once Device Support symbols are finished being copied, they are expected to be found at '
+            '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/Symbols or '
+            '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/arm64e/Symbols\n'
+            'Please retry "flutter run" once symbols are finished being copied.',
+          );
+        });
+
+        testWithoutContext(
+          'returns incomplete copy warning when device directory exists but symbols folder does not',
+          () {
+            final FileSystem fileSystem = MemoryFileSystem.test();
+            final Directory homeDir = fileSystem.directory('/Users/username');
+            final Directory supportDir = homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport');
+            supportDir.childDirectory('iPhone15,2 17.0').createSync(recursive: true);
+
+            final deviceSupport = IOSDeviceSupport(
+              logger: BufferLogger.test(),
+              processUtils: ProcessUtils(
+                processManager: FakeProcessManager.empty(),
+                logger: BufferLogger.test(),
+              ),
+              xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+              homeDirectory: homeDir,
+              modelCode: 'iPhone15,2',
+              operatingSystemVersion: '17.0',
+              cpuArchitectureString: 'arm64e',
+              deviceId: 'id-123',
+            );
+            final String? warning = deviceSupport.missingSymbolsWarning();
+            expect(
+              warning,
+              'Xcode has not finished copying Device Support symbols for this device. This will '
+              'likely reduce debugging performance and may cause the app to hang on a white screen '
+              'during launch.\n'
+              'To trigger Device Symbols to be copied, connect the device via USB, close and then '
+              're-open Xcode. It may take several minutes for Xcode to copy symbols from the device.\n'
+              'Once Device Support symbols are finished being copied, they are expected to be found at '
+              '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/Symbols or '
+              '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/arm64e/Symbols\n'
+              'Please retry "flutter run" once symbols are finished being copied.',
+            );
+          },
+        );
+
+        testWithoutContext('returns null when symbol directory exists', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final Directory supportDir = homeDir
+              .childDirectory('Library')
+              .childDirectory('Developer')
+              .childDirectory('Xcode')
+              .childDirectory('iOS DeviceSupport');
+          supportDir
+              .childDirectory('iPhone15,2 17.0')
+              .childDirectory('Symbols')
+              .createSync(recursive: true);
+
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(warning, isNull);
+        });
+
+        testWithoutContext('returns null when architecture symbol directory exists', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final Directory supportDir = homeDir
+              .childDirectory('Library')
+              .childDirectory('Developer')
+              .childDirectory('Xcode')
+              .childDirectory('iOS DeviceSupport');
+          supportDir
+              .childDirectory('iPhone15,2 17.0')
+              .childDirectory('arm64e')
+              .childDirectory('Symbols')
+              .createSync(recursive: true);
+
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(warning, isNull);
+        });
+
+        testWithoutContext(
+          'returns warning when symbol directory exists and warnWhenSymbolsExist is true',
+          () {
+            final FileSystem fileSystem = MemoryFileSystem.test();
+            final Directory homeDir = fileSystem.directory('/Users/username');
+            final Directory supportDir = homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport');
+            supportDir
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('Symbols')
+                .createSync(recursive: true);
+
+            final deviceSupport = IOSDeviceSupport(
+              logger: BufferLogger.test(),
+              processUtils: ProcessUtils(
+                processManager: FakeProcessManager.empty(),
+                logger: BufferLogger.test(),
+              ),
+              xcode: FakeXcode(currentVersion: Version(16, 2, 0)),
+              homeDirectory: homeDir,
+              modelCode: 'iPhone15,2',
+              operatingSystemVersion: '17.0',
+              cpuArchitectureString: 'arm64e',
+              deviceId: 'id-123',
+            );
+            final String? warning = deviceSupport.missingSymbolsWarning(warnWhenSymbolsExist: true);
+            expect(
+              warning,
+              'Xcode Device Support symbols exist for this device, but are being read from '
+              'process memory. This will likely reduce debugging performance and may cause the app to hang on a white screen during launch.\n'
+              'To re-copy symbols from your device, complete the following steps:\n'
+              '  1. Remove cached symbols:\n'
+              '     rm -rf "/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0"\n'
+              '  2. Connect the device via USB, close and then re-open Xcode. It may take several '
+              'minutes for Xcode to copy symbols from the device. Once Device Support symbols are finished being copied, they are expected to be found at '
+              '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/Symbols',
+            );
+          },
+        );
+      });
+
+      group('Xcode 16.3+', () {
+        testWithoutContext('returns unable to find warning when supportDir is null', () {
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+            homeDirectory: null,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(
+            warning,
+            'Xcode Device Support was not found for this device. This will likely reduce debugging '
+            'performance and may cause the app to hang on a white screen during launch.\n'
+            'To trigger Device Symbols to be copied, connect the device via USB, and run this command:\n'
+            '  "xcrun xcodebuild -prepareDeviceSupport -destination id=id-123"\n'
+            'Once Device Support symbols are finished being copied, they are expected to be found at '
+            '\$HOME/Library/Developer/Xcode/iOS DeviceSupport\n'
+            'Please retry "flutter run" once symbols are finished being copied.',
+          );
+        });
+
+        testWithoutContext('returns unable to find warning when device directory does not exist', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(
+            warning,
+            'Xcode Device Support was not found for this device. This will likely reduce debugging '
+            'performance and may cause the app to hang on a white screen during launch.\n'
+            'To trigger Device Symbols to be copied, connect the device via USB, and run this command:\n'
+            '  "xcrun xcodebuild -prepareDeviceSupport -destination id=id-123"\n'
+            'Once Device Support symbols are finished being copied, they are expected to be found at '
+            '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/Symbols or '
+            '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/arm64e/Symbols\n'
+            'Please retry "flutter run" once symbols are finished being copied.',
+          );
+        });
+
+        testWithoutContext(
+          'returns incomplete copy warning when device directory exists but symbols folder does not',
+          () {
+            final FileSystem fileSystem = MemoryFileSystem.test();
+            final Directory homeDir = fileSystem.directory('/Users/username');
+            final Directory supportDir = homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport');
+            supportDir.childDirectory('iPhone15,2 17.0').createSync(recursive: true);
+
+            final deviceSupport = IOSDeviceSupport(
+              logger: BufferLogger.test(),
+              processUtils: ProcessUtils(
+                processManager: FakeProcessManager.empty(),
+                logger: BufferLogger.test(),
+              ),
+              xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+              homeDirectory: homeDir,
+              modelCode: 'iPhone15,2',
+              operatingSystemVersion: '17.0',
+              cpuArchitectureString: 'arm64e',
+              deviceId: 'id-123',
+            );
+            final String? warning = deviceSupport.missingSymbolsWarning();
+            expect(
+              warning,
+              'Xcode has not finished copying Device Support symbols for this device. This will '
+              'likely reduce debugging performance and may cause the app to hang on a white screen '
+              'during launch.\n'
+              'To trigger Device Symbols to be copied, connect the device via USB, and run this command:\n'
+              '  "xcrun xcodebuild -prepareDeviceSupport -destination id=id-123"\n'
+              'Once Device Support symbols are finished being copied, they are expected to be found at '
+              '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/Symbols or '
+              '/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0/arm64e/Symbols\n'
+              'Please retry "flutter run" once symbols are finished being copied.',
+            );
+          },
+        );
+
+        testWithoutContext('returns null when symbol directory exists', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final Directory supportDir = homeDir
+              .childDirectory('Library')
+              .childDirectory('Developer')
+              .childDirectory('Xcode')
+              .childDirectory('iOS DeviceSupport');
+          supportDir
+              .childDirectory('iPhone15,2 17.0')
+              .childDirectory('Symbols')
+              .createSync(recursive: true);
+
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(warning, isNull);
+        });
+
+        testWithoutContext('returns null when architecture symbol directory exists', () {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final Directory homeDir = fileSystem.directory('/Users/username');
+          final Directory supportDir = homeDir
+              .childDirectory('Library')
+              .childDirectory('Developer')
+              .childDirectory('Xcode')
+              .childDirectory('iOS DeviceSupport');
+          supportDir
+              .childDirectory('iPhone15,2 17.0')
+              .childDirectory('arm64e')
+              .childDirectory('Symbols')
+              .createSync(recursive: true);
+
+          final deviceSupport = IOSDeviceSupport(
+            logger: BufferLogger.test(),
+            processUtils: ProcessUtils(
+              processManager: FakeProcessManager.empty(),
+              logger: BufferLogger.test(),
+            ),
+            xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+            homeDirectory: homeDir,
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            deviceId: 'id-123',
+          );
+          final String? warning = deviceSupport.missingSymbolsWarning();
+          expect(warning, isNull);
+        });
+
+        testWithoutContext(
+          'returns warning when symbol directory exists and warnWhenSymbolsExist is true',
+          () {
+            final FileSystem fileSystem = MemoryFileSystem.test();
+            final Directory homeDir = fileSystem.directory('/Users/username');
+            final Directory supportDir = homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport');
+            supportDir
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('Symbols')
+                .createSync(recursive: true);
+
+            final deviceSupport = IOSDeviceSupport(
+              logger: BufferLogger.test(),
+              processUtils: ProcessUtils(
+                processManager: FakeProcessManager.empty(),
+                logger: BufferLogger.test(),
+              ),
+              xcode: FakeXcode(currentVersion: Version(16, 3, 0)),
+              homeDirectory: homeDir,
+              modelCode: 'iPhone15,2',
+              operatingSystemVersion: '17.0',
+              cpuArchitectureString: 'arm64e',
+              deviceId: 'id-123',
+            );
+            final String? warning = deviceSupport.missingSymbolsWarning(warnWhenSymbolsExist: true);
+            expect(
+              warning,
+              'Xcode Device Support symbols exist for this device, but are being read from '
+              'process memory. This will likely reduce debugging performance and may cause the app to hang on a white screen during launch.\n'
+              'To re-copy symbols from your device, complete the following steps:\n'
+              '  1. Remove cached symbols:\n'
+              '     rm -rf "/Users/username/Library/Developer/Xcode/iOS DeviceSupport/iPhone15,2 17.0"\n'
+              '  2. Connect the device via USB and trigger a copy:\n'
+              '     xcrun xcodebuild -prepareDeviceSupport -destination id=id-123',
+            );
+          },
+        );
+      });
+    });
+
+    group('existingDeviceSupportSymbols', () {
+      testWithoutContext('returns null when neither directory exists', () {
+        final FileSystem fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final deviceSupport = IOSDeviceSupport(
+          logger: BufferLogger.test(),
+          processUtils: ProcessUtils(
+            processManager: FakeProcessManager.empty(),
+            logger: BufferLogger.test(),
+          ),
+          xcode: null,
+          homeDirectory: homeDir,
+          modelCode: 'iPhone15,2',
+          operatingSystemVersion: '17.0',
+          cpuArchitectureString: 'arm64e',
+          deviceId: 'id-123',
+        );
+        expect(deviceSupport.existingDeviceSupportSymbols, isNull);
+      });
+
+      testWithoutContext('is dynamic getter and re-evaluates symbol directories', () {
+        final FileSystem fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final deviceSupport = IOSDeviceSupport(
+          logger: BufferLogger.test(),
+          processUtils: ProcessUtils(
+            processManager: FakeProcessManager.empty(),
+            logger: BufferLogger.test(),
+          ),
+          xcode: null,
+          homeDirectory: homeDir,
+          modelCode: 'iPhone15,2',
+          operatingSystemVersion: '17.0',
+          cpuArchitectureString: 'arm64e',
+          deviceId: 'id-123',
+        );
+        expect(deviceSupport.existingDeviceSupportSymbols, isNull);
+
+        final Directory symbolDir =
+            homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport')
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('Symbols')
+              ..createSync(recursive: true);
+
+        expect(deviceSupport.existingDeviceSupportSymbols?.path, symbolDir.path);
+      });
+
+      testWithoutContext('returns symbolDirectory when symbolDirectory exists', () {
+        final FileSystem fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final Directory supportDir = homeDir
+            .childDirectory('Library')
+            .childDirectory('Developer')
+            .childDirectory('Xcode')
+            .childDirectory('iOS DeviceSupport');
+        final Directory symbolDir =
+            supportDir.childDirectory('iPhone15,2 17.0').childDirectory('Symbols')
+              ..createSync(recursive: true);
+
+        final deviceSupport = IOSDeviceSupport(
+          logger: BufferLogger.test(),
+          processUtils: ProcessUtils(
+            processManager: FakeProcessManager.empty(),
+            logger: BufferLogger.test(),
+          ),
+          xcode: null,
+          homeDirectory: homeDir,
+          modelCode: 'iPhone15,2',
+          operatingSystemVersion: '17.0',
+          cpuArchitectureString: 'arm64e',
+          deviceId: 'id-123',
+        );
+        expect(deviceSupport.existingDeviceSupportSymbols?.path, symbolDir.path);
+      });
+
+      testWithoutContext('returns archSymbolDirectory when archSymbolDirectory exists', () {
+        final FileSystem fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final Directory supportDir = homeDir
+            .childDirectory('Library')
+            .childDirectory('Developer')
+            .childDirectory('Xcode')
+            .childDirectory('iOS DeviceSupport');
+        supportDir
+            .childDirectory('iPhone15,2 17.0')
+            .childDirectory('Symbols')
+            .createSync(recursive: true);
+        final Directory archSymbolDir =
+            supportDir
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('arm64e')
+                .childDirectory('Symbols')
+              ..createSync(recursive: true);
+
+        final deviceSupport = IOSDeviceSupport(
+          logger: BufferLogger.test(),
+          processUtils: ProcessUtils(
+            processManager: FakeProcessManager.empty(),
+            logger: BufferLogger.test(),
+          ),
+          xcode: null,
+          homeDirectory: homeDir,
+          modelCode: 'iPhone15,2',
+          operatingSystemVersion: '17.0',
+          cpuArchitectureString: 'arm64e',
+          deviceId: 'id-123',
+        );
+        expect(deviceSupport.existingDeviceSupportSymbols?.path, archSymbolDir.path);
+      });
+    });
+  });
+}
+
+class FakeXcode extends Fake implements Xcode {
+  FakeXcode({this.currentVersion});
+
+  @override
+  final Version? currentVersion;
+}
diff --git a/packages/flutter_tools/test/general.shard/ios/devices_test.dart b/packages/flutter_tools/test/general.shard/ios/devices_test.dart
index 2ae98c8f8a4ad..da2f871be3a7f 100644
--- a/packages/flutter_tools/test/general.shard/ios/devices_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/devices_test.dart
@@ -5,7 +5,6 @@
 import 'dart:async';
 import 'dart:io' as io;
 
-import 'package:file/file.dart';
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
@@ -13,11 +12,13 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/device_port_forwarder.dart';
+import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/ios/application_package.dart';
 import 'package:flutter_tools/src/ios/core_devices.dart';
 import 'package:flutter_tools/src/ios/devices.dart';
@@ -32,7 +33,7 @@ import 'package:test/fake.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
 import '../../src/common.dart';
-import '../../src/fake_process_manager.dart';
+import '../../src/context.dart';
 
 void main() {
   final macPlatform = FakePlatform(operatingSystem: 'macos');
@@ -46,15 +47,19 @@ void main() {
     late IOSDeploy iosDeploy;
     late IMobileDevice iMobileDevice;
     late FileSystem fileSystem;
+    late FileSystemUtils fileSystemUtils;
     late IOSCoreDeviceControl coreDeviceControl;
     late IOSCoreDeviceLauncher coreDeviceLauncher;
     late XcodeDebug xcodeDebug;
+    late ProcessUtils processUtils;
 
     setUp(() {
       final artifacts = Artifacts.test();
       cache = Cache.test(processManager: FakeProcessManager.any());
       logger = BufferLogger.test();
+      processUtils = ProcessUtils(processManager: FakeProcessManager.any(), logger: logger);
       fileSystem = MemoryFileSystem.test();
+      fileSystemUtils = FileSystemUtils(fileSystem: fileSystem, platform: macPlatform);
       iosDeploy = IOSDeploy(
         artifacts: artifacts,
         cache: cache,
@@ -78,6 +83,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -94,15 +100,69 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       );
       expect(await device.isSupported(), isTrue);
     });
 
+    group('shouldAttachLLDBDebugger', () {
+      testWithoutContext('returns expected values for different BuildInfo and options', () {
+        final device = IOSDevice(
+          'device-123',
+          iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+          fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
+          logger: logger,
+          platform: macPlatform,
+          iosDeploy: iosDeploy,
+          analytics: FakeAnalytics(),
+          iMobileDevice: iMobileDevice,
+          coreDeviceControl: coreDeviceControl,
+          coreDeviceLauncher: coreDeviceLauncher,
+          xcodeDebug: xcodeDebug,
+          name: 'iPhone 1',
+          sdkVersion: '13.3',
+          cpuArch: .arm64,
+          connectionInterface: DeviceConnectionInterface.attached,
+          isConnected: true,
+          isPaired: true,
+          devModeEnabled: true,
+          isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
+        );
+
+        expect(device.shouldAttachLLDBDebugger(DebuggingOptions.enabled(BuildInfo.debug)), isTrue);
+        expect(
+          device.shouldAttachLLDBDebugger(
+            DebuggingOptions.enabled(BuildInfo.profile, iosProfileDebugger: true),
+          ),
+          isTrue,
+        );
+        expect(
+          device.shouldAttachLLDBDebugger(DebuggingOptions.enabled(BuildInfo.profile)),
+          isFalse,
+        );
+        expect(
+          device.shouldAttachLLDBDebugger(
+            DebuggingOptions.enabled(BuildInfo.profile, iosProfileDebugger: false),
+          ),
+          isFalse,
+        );
+        expect(
+          device.shouldAttachLLDBDebugger(DebuggingOptions.enabled(BuildInfo.release)),
+          isFalse,
+        );
+      });
+    });
+
     testWithoutContext('32-bit devices are unsupported', () async {
       final device = IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -118,6 +178,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       );
       expect(await device.isSupported(), isFalse);
     });
@@ -128,6 +190,7 @@ void main() {
           'device-123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -144,6 +207,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         ).majorSdkVersion,
         1,
       );
@@ -152,6 +217,7 @@ void main() {
           'device-123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -168,6 +234,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         ).majorSdkVersion,
         13,
       );
@@ -176,6 +244,7 @@ void main() {
           'device-123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -192,6 +261,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         ).majorSdkVersion,
         10,
       );
@@ -200,6 +271,7 @@ void main() {
           'device-123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -216,6 +288,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         ).majorSdkVersion,
         0,
       );
@@ -224,6 +298,7 @@ void main() {
           'device-123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -240,6 +315,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         ).majorSdkVersion,
         0,
       );
@@ -250,6 +327,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -266,6 +344,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       var expectedVersion = Version(13, 3, 1, text: '13.3.1');
       expect(sdkVersion, isNotNull);
@@ -276,6 +356,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -292,6 +373,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       expectedVersion = Version(13, 3, 1, text: '13.3.1 (20ADBC)');
       expect(sdkVersion, isNotNull);
@@ -302,6 +385,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -318,6 +402,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       expectedVersion = Version(16, 4, 1, text: '16.4.1(a) (20ADBC)');
       expect(sdkVersion, isNotNull);
@@ -328,6 +414,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -344,6 +431,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       expectedVersion = Version(0, 0, 0, text: '0');
       expect(sdkVersion, isNotNull);
@@ -354,6 +443,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -369,6 +459,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       expect(sdkVersion, isNull);
 
@@ -376,6 +468,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -392,6 +485,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       ).sdkVersion;
       expect(sdkVersion, isNull);
     });
@@ -401,6 +496,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -417,6 +513,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       );
 
       expect(await device.sdkNameAndVersion, 'iOS 13.3 17C54');
@@ -427,6 +525,7 @@ void main() {
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
         fileSystem: fileSystem,
+        fileSystemUtils: fileSystemUtils,
         logger: logger,
         analytics: FakeAnalytics(),
         platform: macPlatform,
@@ -443,6 +542,8 @@ void main() {
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: processUtils,
+        xcode: null,
       );
 
       expect(device.supportsRuntimeMode(BuildMode.debug), true);
@@ -460,6 +561,7 @@ void main() {
               'device-123',
               iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
               fileSystem: fileSystem,
+              fileSystemUtils: fileSystemUtils,
               logger: logger,
               analytics: FakeAnalytics(),
               platform: platform,
@@ -476,6 +578,8 @@ void main() {
               isPaired: true,
               devModeEnabled: true,
               isCoreDevice: false,
+              processUtils: processUtils,
+              xcode: null,
             );
           }, throwsAssertionError);
         },
@@ -551,6 +655,7 @@ void main() {
           '123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
           fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
           logger: logger,
           analytics: FakeAnalytics(),
           platform: macPlatform,
@@ -567,6 +672,8 @@ void main() {
           isPaired: true,
           devModeEnabled: true,
           isCoreDevice: false,
+          processUtils: processUtils,
+          xcode: null,
         );
         logReader1 = createLogReader(device, appPackage1, process1);
         logReader2 = createLogReader(device, appPackage2, process2);
@@ -582,6 +689,191 @@ void main() {
         expect(process3.killed, true);
       });
     });
+
+    group('screenshot', () {
+      late FakeIOSCoreDeviceControl fakeCoreDeviceControl;
+      late IOSDevice device;
+      late File outputFile;
+
+      setUp(() {
+        fakeCoreDeviceControl = coreDeviceControl as FakeIOSCoreDeviceControl;
+        outputFile = fileSystem.file('screenshot.png');
+      });
+
+      testUsingContext('supportsScreenshot is false on CoreDevice with Xcode < 27', () async {
+        device = IOSDevice(
+          'device-123',
+          iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+          fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
+          logger: logger,
+          platform: macPlatform,
+          iosDeploy: iosDeploy,
+          analytics: FakeAnalytics(),
+          iMobileDevice: iMobileDevice,
+          coreDeviceControl: fakeCoreDeviceControl,
+          coreDeviceLauncher: coreDeviceLauncher,
+          xcodeDebug: xcodeDebug,
+          name: 'iPhone 1',
+          sdkVersion: '17.0',
+          cpuArch: CpuArch.arm64,
+          connectionInterface: DeviceConnectionInterface.attached,
+          isConnected: true,
+          isPaired: true,
+          devModeEnabled: true,
+          isCoreDevice: true,
+          processUtils: processUtils,
+          xcode: null,
+        );
+
+        expect(device.supportsScreenshot, isFalse);
+      }, overrides: <Type, Generator>{Xcode: () => FakeXcode(currentVersion: Version(15, 0, 0))});
+
+      testUsingContext(
+        'supportsScreenshot is true on CoreDevice with Xcode 27+ and devicectl installed',
+        () async {
+          device = IOSDevice(
+            'device-123',
+            iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+            fileSystem: fileSystem,
+            fileSystemUtils: fileSystemUtils,
+            logger: logger,
+            platform: macPlatform,
+            iosDeploy: iosDeploy,
+            analytics: FakeAnalytics(),
+            iMobileDevice: iMobileDevice,
+            coreDeviceControl: fakeCoreDeviceControl,
+            coreDeviceLauncher: coreDeviceLauncher,
+            xcodeDebug: xcodeDebug,
+            name: 'iPhone 1',
+            sdkVersion: '17.0',
+            cpuArch: CpuArch.arm64,
+            connectionInterface: DeviceConnectionInterface.attached,
+            isConnected: true,
+            isPaired: true,
+            devModeEnabled: true,
+            isCoreDevice: true,
+            processUtils: processUtils,
+            xcode: null,
+          );
+
+          final fakeXcode = globals.xcode! as FakeXcode;
+          fakeXcode.isDevicectlInstalled = true;
+          expect(device.supportsScreenshot, isTrue);
+
+          fakeXcode.isDevicectlInstalled = false;
+          expect(device.supportsScreenshot, isFalse);
+        },
+        overrides: <Type, Generator>{Xcode: () => FakeXcode(currentVersion: Version(27, 0, 0))},
+      );
+
+      testUsingContext('takeScreenshot uses devicectl on CoreDevice with Xcode 27+', () async {
+        device = IOSDevice(
+          'device-123',
+          iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+          fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
+          logger: logger,
+          platform: macPlatform,
+          iosDeploy: iosDeploy,
+          analytics: FakeAnalytics(),
+          iMobileDevice: iMobileDevice,
+          coreDeviceControl: fakeCoreDeviceControl,
+          coreDeviceLauncher: coreDeviceLauncher,
+          xcodeDebug: xcodeDebug,
+          name: 'iPhone 1',
+          sdkVersion: '17.0',
+          cpuArch: CpuArch.arm64,
+          connectionInterface: DeviceConnectionInterface.attached,
+          isConnected: true,
+          isPaired: true,
+          devModeEnabled: true,
+          isCoreDevice: true,
+          processUtils: processUtils,
+          xcode: null,
+        );
+
+        fakeCoreDeviceControl.takeScreenshotSuccess = true;
+        await device.takeScreenshot(outputFile);
+
+        fakeCoreDeviceControl.takeScreenshotSuccess = false;
+        expect(() => device.takeScreenshot(outputFile), throwsToolExit());
+      }, overrides: <Type, Generator>{Xcode: () => FakeXcode(currentVersion: Version(27, 0, 0))});
+
+      testUsingContext(
+        'takeScreenshot throws a ToolExit with actionable message when CoreDevice is locked/unreachable',
+        () async {
+          device = IOSDevice(
+            'device-123',
+            iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+            fileSystem: fileSystem,
+            fileSystemUtils: fileSystemUtils,
+            logger: logger,
+            platform: macPlatform,
+            iosDeploy: iosDeploy,
+            analytics: FakeAnalytics(),
+            iMobileDevice: iMobileDevice,
+            coreDeviceControl: fakeCoreDeviceControl,
+            coreDeviceLauncher: coreDeviceLauncher,
+            xcodeDebug: xcodeDebug,
+            name: 'iPhone 1',
+            sdkVersion: '17.0',
+            cpuArch: CpuArch.arm64,
+            connectionInterface: DeviceConnectionInterface.attached,
+            isConnected: true,
+            isPaired: true,
+            devModeEnabled: true,
+            isCoreDevice: true,
+            processUtils: processUtils,
+            xcode: null,
+          );
+
+          fakeCoreDeviceControl.takeScreenshotException = Exception(
+            'ERROR: A connection to this device could not be established. (com.apple.dt.CoreDeviceError error 4000 (0xFA0))',
+          );
+          expect(
+            () => device.takeScreenshot(outputFile),
+            throwsToolExit(
+              message:
+                  'Failed to establish a connection to the device. Please make sure the device is available and try again.',
+            ),
+          );
+        },
+        overrides: <Type, Generator>{Xcode: () => FakeXcode(currentVersion: Version(27, 0, 0))},
+      );
+
+      testUsingContext('takeScreenshot throws ToolExit on CoreDevice with Xcode < 27', () async {
+        device = IOSDevice(
+          'device-123',
+          iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
+          fileSystem: fileSystem,
+          fileSystemUtils: fileSystemUtils,
+          logger: logger,
+          platform: macPlatform,
+          iosDeploy: iosDeploy,
+          analytics: FakeAnalytics(),
+          iMobileDevice: iMobileDevice,
+          coreDeviceControl: fakeCoreDeviceControl,
+          coreDeviceLauncher: coreDeviceLauncher,
+          xcodeDebug: xcodeDebug,
+          name: 'iPhone 1',
+          sdkVersion: '17.0',
+          cpuArch: CpuArch.arm64,
+          connectionInterface: DeviceConnectionInterface.attached,
+          isConnected: true,
+          isPaired: true,
+          devModeEnabled: true,
+          isCoreDevice: true,
+          processUtils: processUtils,
+          xcode: null,
+        );
+
+        expect(
+          () => device.takeScreenshot(outputFile),
+          throwsToolExit(message: 'flutter screenshot requires Xcode 27 or higher.'),
+        );
+      }, overrides: <Type, Generator>{Xcode: () => FakeXcode(currentVersion: Version(26, 0, 0))});
+    });
   });
 
   group('polling', () {
@@ -622,6 +914,12 @@ void main() {
       coreDeviceLauncher = FakeIOSCoreDeviceLauncher();
       xcodeDebug = FakeXcodeDebug();
 
+      final testFileSystem = MemoryFileSystem.test();
+      final testFileSystemUtils = FileSystemUtils(
+        fileSystem: testFileSystem,
+        platform: macPlatform,
+      );
+
       device1 = IOSDevice(
         'd83d5bc53967baa0ee18626ba87b6254b2ab5418',
         name: 'Paired iPhone',
@@ -636,12 +934,15 @@ void main() {
         xcodeDebug: xcodeDebug,
         logger: logger,
         platform: macPlatform,
-        fileSystem: MemoryFileSystem.test(),
+        fileSystem: testFileSystem,
+        fileSystemUtils: testFileSystemUtils,
         connectionInterface: DeviceConnectionInterface.attached,
         isConnected: true,
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: ProcessUtils(processManager: fakeProcessManager, logger: logger),
+        xcode: null,
       );
 
       device2 = IOSDevice(
@@ -658,12 +959,15 @@ void main() {
         xcodeDebug: xcodeDebug,
         logger: logger,
         platform: macPlatform,
-        fileSystem: MemoryFileSystem.test(),
+        fileSystem: testFileSystem,
+        fileSystemUtils: testFileSystemUtils,
         connectionInterface: DeviceConnectionInterface.attached,
         isConnected: true,
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: ProcessUtils(processManager: fakeProcessManager, logger: logger),
+        xcode: null,
       );
     });
 
@@ -974,6 +1278,11 @@ void main() {
       coreDeviceControl = FakeIOSCoreDeviceControl();
       coreDeviceLauncher = FakeIOSCoreDeviceLauncher();
       xcodeDebug = FakeXcodeDebug();
+      final testFileSystem = MemoryFileSystem.test();
+      final testFileSystemUtils = FileSystemUtils(
+        fileSystem: testFileSystem,
+        platform: macPlatform,
+      );
       notConnected1 = IOSDevice(
         '00000001-0000000000000000',
         name: 'iPad',
@@ -988,12 +1297,15 @@ void main() {
         xcodeDebug: xcodeDebug,
         logger: logger,
         platform: macPlatform,
-        fileSystem: MemoryFileSystem.test(),
+        fileSystem: testFileSystem,
+        fileSystemUtils: testFileSystemUtils,
         connectionInterface: DeviceConnectionInterface.attached,
         isConnected: false,
         isPaired: true,
         devModeEnabled: true,
         isCoreDevice: false,
+        processUtils: ProcessUtils(processManager: fakeProcessManager, logger: logger),
+        xcode: null,
       );
     });
 
@@ -1161,10 +1473,29 @@ class FakeXcodeDebug extends Fake implements XcodeDebug {
   bool get debugStarted => false;
 }
 
-class FakeIOSCoreDeviceControl extends Fake implements IOSCoreDeviceControl {}
+class FakeIOSCoreDeviceControl extends Fake implements IOSCoreDeviceControl {
+  bool takeScreenshotSuccess = true;
+  Exception? takeScreenshotException;
+
+  @override
+  Future<bool> takeScreenshot({required String deviceId, required String destination}) async {
+    if (takeScreenshotException != null) {
+      throw takeScreenshotException!;
+    }
+    return takeScreenshotSuccess;
+  }
+}
 
 class FakeIOSCoreDeviceLauncher extends Fake implements IOSCoreDeviceLauncher {}
 
 class FakeAnalytics extends Fake implements Analytics {}
 
-class FakeXcode extends Fake implements Xcode {}
+class FakeXcode extends Fake implements Xcode {
+  FakeXcode({this.currentVersion, this.isDevicectlInstalled = true});
+
+  @override
+  final Version? currentVersion;
+
+  @override
+  bool isDevicectlInstalled;
+}
diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart
index a5a2699c6c29c..931497993ee74 100644
--- a/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/ios/application_package.dart';
@@ -359,11 +360,15 @@ IOSDevice setUpIOSDevice({
     artifacts: <ArtifactSet>[FakeDyldEnvironmentArtifact()],
     processManager: FakeProcessManager.any(),
   );
+  final FileSystem testFileSystem = fileSystem ?? MemoryFileSystem.test();
   return IOSDevice(
     '1234',
     name: 'iPhone 1',
     logger: logger,
-    fileSystem: fileSystem ?? MemoryFileSystem.test(),
+    fileSystem: testFileSystem,
+    fileSystemUtils: FileSystemUtils(fileSystem: testFileSystem, platform: platform),
+    processUtils: ProcessUtils(processManager: processManager, logger: logger),
+    xcode: null,
     sdkVersion: '13.3',
     cpuArch: .arm64,
     platform: platform,
diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_project_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_project_test.dart
index cc3ddc77ef8ad..5d019301aaf18 100644
--- a/packages/flutter_tools/test/general.shard/ios/ios_device_project_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/ios_device_project_test.dart
@@ -7,6 +7,7 @@ import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/ios/core_devices.dart';
@@ -99,7 +100,10 @@ IOSDevice setUpIOSDevice(FileSystem fileSystem) {
   return IOSDevice(
     'test',
     fileSystem: fileSystem,
+    fileSystemUtils: FileSystemUtils(fileSystem: fileSystem, platform: platform),
     logger: logger,
+    processUtils: ProcessUtils(processManager: processManager, logger: logger),
+    xcode: null,
     iosDeploy: IOSDeploy(
       platform: platform,
       logger: logger,
diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart
index 925c291684e6b..faef02b0572c7 100644
--- a/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart
@@ -21,6 +21,7 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/device_port_forwarder.dart';
 import 'package:flutter_tools/src/ios/application_package.dart';
 import 'package:flutter_tools/src/ios/core_devices.dart';
+import 'package:flutter_tools/src/ios/device_support.dart';
 import 'package:flutter_tools/src/ios/devices.dart';
 import 'package:flutter_tools/src/ios/ios_deploy.dart';
 import 'package:flutter_tools/src/ios/iproxy.dart';
@@ -1052,6 +1053,85 @@ void main() {
         },
       );
 
+      testUsingContext(
+        'logs warning when missing symbols pattern is detected in log reader',
+        () async {
+          final IOSDevice iosDevice = setUpIOSDevice(
+            fileSystem: fileSystem,
+            processManager: FakeProcessManager.any(),
+            logger: logger,
+            artifacts: artifacts,
+            isCoreDevice: true,
+            coreDeviceControl: FakeIOSCoreDeviceControl(),
+            xcodeDebug: FakeXcodeDebug(
+              expectedProject: XcodeDebugProject(
+                scheme: 'Runner',
+                xcodeWorkspace: fileSystem.directory('/ios/Runner.xcworkspace'),
+                xcodeProject: fileSystem.directory('/ios/Runner.xcodeproj'),
+                hostAppProjectName: 'Runner',
+              ),
+              expectedDeviceId: '123',
+              expectedLaunchArguments: <String>['--enable-dart-profiling'],
+            ),
+          );
+
+          setUpIOSProject(fileSystem);
+          final FlutterProject flutterProject = FlutterProject.fromDirectory(
+            fileSystem.currentDirectory,
+          );
+          final buildableIOSApp = BuildableIOSApp(
+            flutterProject.ios,
+            'flutter',
+            'My Super Awesome App',
+          );
+          fileSystem
+              .directory('build/ios/Release-iphoneos/My Super Awesome App.app')
+              .createSync(recursive: true);
+
+          final deviceLogReader = FakeSharedIOSDeviceLogReader();
+
+          iosDevice.portForwarder = const NoOpDevicePortForwarder();
+          iosDevice.setLogReader(buildableIOSApp, deviceLogReader);
+
+          Timer.run(() {
+            deviceLogReader.addLine('The Dart VM service is listening on http://127.0.0.1:456');
+            deviceLogReader.addLine('warning: libobjc.A.dylib is being read from process memory.');
+          });
+
+          final LaunchResult launchResult = await iosDevice.startApp(
+            buildableIOSApp,
+            debuggingOptions: DebuggingOptions.enabled(
+              const BuildInfo(
+                BuildMode.debug,
+                null,
+                buildName: '1.2.3',
+                buildNumber: '4',
+                treeShakeIcons: false,
+                packageConfigPath: '.dart_tool/package_config.json',
+              ),
+            ),
+            platformArgs: <String, Object>{},
+          );
+
+          expect(launchResult.started, true);
+          expect(
+            logger.warningText,
+            contains('Xcode Device Support was not found for this device.'),
+          );
+        },
+        overrides: <Type, Generator>{
+          ProcessManager: () => FakeProcessManager.any(),
+          Pub: () => const ThrowingPub(),
+          FileSystem: () => fileSystem,
+          Logger: () => logger,
+          OperatingSystemUtils: () => os,
+          Platform: () => macPlatform,
+          XcodeProjectInterpreter: () => fakeXcodeProjectInterpreter,
+          Xcode: () => xcode,
+          Artifacts: () => artifacts,
+        },
+      );
+
       group('with flavor', () {
         setUp(() {
           projectInfo = XcodeProjectInfo(
@@ -1475,12 +1555,19 @@ IOSDevice setUpIOSDevice({
   );
 
   logger ??= BufferLogger.test();
+  final FileSystem testFileSystem = fileSystem ?? MemoryFileSystem.test();
   return IOSDevice(
     '123',
     name: 'iPhone 1',
     sdkVersion: sdkVersion,
-    fileSystem: fileSystem ?? MemoryFileSystem.test(),
+    fileSystem: testFileSystem,
+    fileSystemUtils: FileSystemUtils(fileSystem: testFileSystem, platform: macPlatform),
     platform: macPlatform,
+    processUtils: ProcessUtils(
+      processManager: processManager ?? FakeProcessManager.any(),
+      logger: logger,
+    ),
+    xcode: null,
     iProxy: IProxy.test(logger: logger, processManager: processManager ?? FakeProcessManager.any()),
     logger: logger,
     iosDeploy: IOSDeploy(
@@ -1539,7 +1626,7 @@ class FakeXcodeProjectInterpreter extends Fake implements XcodeProjectInterprete
   Future<List<String>> fetchDependenciesAndGenerateXcodebuildArgs(
     XcodeBasedProject xcodeProject,
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) async {
     return <String>['xcrun', 'xcodebuild'];
   }
@@ -1731,6 +1818,7 @@ class FakeIOSCoreDeviceLauncher extends Fake implements IOSCoreDeviceLauncher {
   @override
   Future<bool> launchAppWithLLDBDebugger({
     required String deviceId,
+    required IOSDeviceSupport deviceSupport,
     required String bundlePath,
     required String bundleId,
     required List<String> launchArguments,
@@ -1778,3 +1866,42 @@ class FakeArtifacts extends Fake implements Artifacts {
   @override
   LocalEngineInfo? get localEngineInfo => null;
 }
+
+class FakeSharedIOSDeviceLogReader extends SharedIOSDeviceLogReader {
+  @override
+  String get name => 'FakeLogReader';
+
+  bool disposed = false;
+
+  final _lineQueue = <String>[];
+  late final _linesController = StreamController<String>.broadcast(onListen: _onListen);
+
+  @override
+  Stream<String> get logLines => _linesController.stream;
+
+  @override
+  StreamController<String> get linesController => _linesController;
+
+  void _onListen() {
+    _lineQueue.forEach(addLogToStream);
+    _lineQueue.clear();
+  }
+
+  void addLine(String line) {
+    if (_linesController.hasListener) {
+      addLogToStream(line);
+    } else {
+      _lineQueue.add(line);
+    }
+  }
+
+  @override
+  Future<void> dispose() async {
+    _lineQueue.clear();
+    await _linesController.close();
+    disposed = true;
+  }
+
+  @override
+  Future<void> provideVmService(Object? connectedVmService) async {}
+}
diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart
index e1df4bc55456f..ed8d1bd1de883 100644
--- a/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart
@@ -22,6 +22,7 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/device_port_forwarder.dart';
 import 'package:flutter_tools/src/ios/application_package.dart';
 import 'package:flutter_tools/src/ios/core_devices.dart';
+import 'package:flutter_tools/src/ios/device_support.dart';
 import 'package:flutter_tools/src/ios/devices.dart';
 import 'package:flutter_tools/src/ios/ios_deploy.dart';
 import 'package:flutter_tools/src/ios/iproxy.dart';
@@ -908,6 +909,72 @@ void main() {
         },
       );
 
+      testUsingContext(
+        'calls prepareDeviceSupport when Xcode version is >= 16.3',
+        () async {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final processManager = FakeProcessManager.empty();
+          processManager.addCommand(
+            const FakeCommand(
+              command: <String>[
+                'xcrun',
+                'xcodebuild',
+                '-prepareDeviceSupport',
+                '-destination',
+                'id=123',
+              ],
+            ),
+          );
+          final Directory bundleLocation = fileSystem.currentDirectory;
+          final fakeAnalytics = FakeAnalytics();
+          final fakeLauncher = FakeIOSCoreDeviceLauncher();
+          final IOSDevice device = setUpIOSDevice(
+            processManager: processManager,
+            fileSystem: fileSystem,
+            isCoreDevice: true,
+            coreDeviceLauncher: fakeLauncher,
+            analytics: fakeAnalytics,
+            xcode: FakeXcode(currentVersion: Version(26, 0, 0)),
+          );
+          final IOSApp iosApp = PrebuiltIOSApp(
+            projectBundleId: 'app',
+            bundleName: 'Runner',
+            uncompressedBundle: bundleLocation,
+            applicationPackage: bundleLocation,
+          );
+          final DeviceLogReader deviceLogReader = IOSDeviceLogReader.test(
+            iMobileDevice: FakeIMobileDevice(),
+            xcode: FakeXcode(currentVersion: Version(26, 0, 0)),
+            isCoreDevice: true,
+          );
+
+          device.portForwarder = const NoOpDevicePortForwarder();
+          device.setLogReader(iosApp, deviceLogReader);
+
+          // Start writing messages to the log reader.
+          Timer(const Duration(milliseconds: 50), () {
+            fakeLauncher.coreDeviceLogForwarder.addLog('Foo');
+            fakeLauncher.coreDeviceLogForwarder.addLog(
+              'The Dart VM service is listening on http://127.0.0.1:456',
+            );
+          });
+
+          final LaunchResult launchResult = await device.startApp(
+            iosApp,
+            prebuiltApplication: true,
+            debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
+            platformArgs: <String, dynamic>{},
+          );
+
+          expect(launchResult.started, true);
+          expect(processManager, hasNoRemainingExpectations);
+        },
+        overrides: {
+          Xcode: () => FakeXcode(currentVersion: Version(26, 0, 0)),
+          Analytics: () => FakeAnalytics(),
+        },
+      );
+
       testUsingContext('uses Xcode if LLDB fails', () async {
         final FileSystem fileSystem = MemoryFileSystem.test();
         final processManager = FakeProcessManager.empty();
@@ -1614,6 +1681,7 @@ void main() {
               fileSystem: fileSystem,
               isCoreDevice: true,
               coreDeviceControl: FakeIOSCoreDeviceControl(),
+              logger: testLogger,
               xcodeDebug: FakeXcodeDebug(
                 expectedProject: XcodeDebugProject(
                   scheme: 'Runner',
@@ -1859,6 +1927,72 @@ void main() {
         },
       );
 
+      testUsingContext(
+        'calls prepareDeviceSupport when iosProfileDebugger is true and Xcode version is >= 16.3',
+        () async {
+          final FileSystem fileSystem = MemoryFileSystem.test();
+          final processManager = FakeProcessManager.empty();
+          processManager.addCommand(
+            const FakeCommand(
+              command: <String>[
+                'xcrun',
+                'xcodebuild',
+                '-prepareDeviceSupport',
+                '-destination',
+                'id=123',
+              ],
+            ),
+          );
+          final Directory bundleLocation = fileSystem.currentDirectory;
+          final fakeAnalytics = FakeAnalytics();
+          final fakeLauncher = FakeIOSCoreDeviceLauncher();
+          final IOSDevice device = setUpIOSDevice(
+            processManager: processManager,
+            fileSystem: fileSystem,
+            isCoreDevice: true,
+            coreDeviceLauncher: fakeLauncher,
+            analytics: fakeAnalytics,
+            xcode: FakeXcode(currentVersion: Version(26, 0, 0)),
+          );
+          final IOSApp iosApp = PrebuiltIOSApp(
+            projectBundleId: 'app',
+            bundleName: 'Runner',
+            uncompressedBundle: bundleLocation,
+            applicationPackage: bundleLocation,
+          );
+          final DeviceLogReader deviceLogReader = IOSDeviceLogReader.test(
+            iMobileDevice: FakeIMobileDevice(),
+            xcode: FakeXcode(currentVersion: Version(26, 0, 0)),
+            isCoreDevice: true,
+          );
+
+          device.portForwarder = const NoOpDevicePortForwarder();
+          device.setLogReader(iosApp, deviceLogReader);
+
+          // Start writing messages to the log reader.
+          Timer(const Duration(milliseconds: 50), () {
+            fakeLauncher.coreDeviceLogForwarder.addLog('Foo');
+            fakeLauncher.coreDeviceLogForwarder.addLog(
+              'The Dart VM service is listening on http://127.0.0.1:456',
+            );
+          });
+
+          final LaunchResult launchResult = await device.startApp(
+            iosApp,
+            prebuiltApplication: true,
+            debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile, iosProfileDebugger: true),
+            platformArgs: <String, dynamic>{},
+          );
+
+          expect(launchResult.started, true);
+          expect(processManager, hasNoRemainingExpectations);
+        },
+        overrides: {
+          Xcode: () => FakeXcode(currentVersion: Version(26, 0, 0)),
+          Analytics: () => FakeAnalytics(),
+        },
+      );
+
       testUsingContext(
         'uses Xcode if less than Xcode 26',
         () async {
@@ -1945,6 +2079,7 @@ IOSDevice setUpIOSDevice({
   Analytics? analytics,
   FakeXcodeDebug? xcodeDebug,
   FakePlatform? platform,
+  Xcode? xcode,
 }) {
   final artifacts = Artifacts.test();
   final FakePlatform macPlatform =
@@ -1956,12 +2091,19 @@ IOSDevice setUpIOSDevice({
     processManager: FakeProcessManager.any(),
   );
   logger ??= BufferLogger.test();
+  final FileSystem testFileSystem = fileSystem ?? MemoryFileSystem.test();
   return IOSDevice(
     '123',
     name: 'iPhone 1',
     sdkVersion: sdkVersion,
-    fileSystem: fileSystem ?? MemoryFileSystem.test(),
+    fileSystem: testFileSystem,
+    fileSystemUtils: FileSystemUtils(fileSystem: testFileSystem, platform: macPlatform),
     platform: macPlatform,
+    processUtils: ProcessUtils(
+      processManager: processManager ?? FakeProcessManager.any(),
+      logger: logger,
+    ),
+    xcode: xcode,
     iProxy: IProxy.test(logger: logger, processManager: processManager ?? FakeProcessManager.any()),
     logger: logger,
     iosDeploy:
@@ -2136,6 +2278,7 @@ class FakeIOSCoreDeviceLauncher extends Fake implements IOSCoreDeviceLauncher {
   @override
   Future<bool> launchAppWithLLDBDebugger({
     required String deviceId,
+    required IOSDeviceSupport deviceSupport,
     required String bundlePath,
     required String bundleId,
     required List<String> launchArguments,
diff --git a/packages/flutter_tools/test/general.shard/ios/lldb_test.dart b/packages/flutter_tools/test/general.shard/ios/lldb_test.dart
index c0a544e172970..3c869437d8133 100644
--- a/packages/flutter_tools/test/general.shard/ios/lldb_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/lldb_test.dart
@@ -7,10 +7,13 @@ import 'dart:convert';
 import 'dart:io' as io;
 
 import 'package:fake_async/fake_async.dart';
+import 'package:file/memory.dart';
+import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/build_info.dart';
+import 'package:flutter_tools/src/ios/device_support.dart';
 import 'package:flutter_tools/src/ios/lldb.dart';
 import 'package:test/fake.dart';
 
@@ -49,6 +52,7 @@ void main() {
       appProcessId: appProcessId,
       lldbLogForwarder: FakeLLDBLogForwarder(),
       mode: BuildMode.debug,
+      deviceSupport: createDeviceSupport(),
     );
     expect(success, isFalse);
     expect(lldb.isRunning, isFalse);
@@ -65,12 +69,14 @@ void main() {
     final breakPointCompleter = Completer<List<int>>();
     final processAttachCompleter = Completer<List<int>>();
     final setupStopHooksCompleter = Completer<List<int>>();
+    final platformStatusCompleter = Completer<List<int>>();
     final processResumedCompleted = Completer<List<int>>();
 
     final stdoutStream = Stream<List<int>>.fromFutures([
       breakPointCompleter.future,
       processAttachCompleter.future,
       setupStopHooksCompleter.future,
+      platformStatusCompleter.future,
       processResumedCompleted.future,
     ]);
 
@@ -99,6 +105,7 @@ void main() {
     const processAttachMatcher = 'device process attach --pid $appProcessId';
     const processResumedMatcher = 'process continue';
     const setupStopHooksMatcher = 'target stop-hook add -o "thread backtrace all" -o "detach"';
+    const platformStatusMatcher = 'platform status';
     final expectedInputs = [
       'device select $deviceId',
       breakPointMatcher,
@@ -106,6 +113,7 @@ void main() {
       'script lldb.debugger.SetAsync(False)',
       processAttachMatcher,
       setupStopHooksMatcher,
+      platformStatusMatcher,
       processResumedMatcher,
     ];
 
@@ -136,6 +144,9 @@ Target 0: (Runner) stopped.
       if (line == setupStopHooksMatcher) {
         setupStopHooksCompleter.complete(utf8.encode('Stop hook #1 added.\n'));
       }
+      if (line == platformStatusMatcher) {
+        platformStatusCompleter.complete(utf8.encode('  Platform: remote-ios\n'));
+      }
       if (line == processResumedMatcher) {
         processResumedCompleted.complete(utf8.encode('1 location added to breakpoint 1\n'));
       }
@@ -146,6 +157,7 @@ Target 0: (Runner) stopped.
       appProcessId: appProcessId,
       lldbLogForwarder: FakeLLDBLogForwarder(),
       mode: BuildMode.debug,
+      deviceSupport: createDeviceSupport(),
     );
     expect(success, isTrue);
     expect(lldb.isRunning, isTrue);
@@ -161,11 +173,13 @@ Target 0: (Runner) stopped.
 
     final processAttachCompleter = Completer<List<int>>();
     final setupStopHooksCompleter = Completer<List<int>>();
+    final platformStatusCompleter = Completer<List<int>>();
     final processResumedCompleted = Completer<List<int>>();
 
     final stdoutStream = Stream<List<int>>.fromFutures([
       processAttachCompleter.future,
       setupStopHooksCompleter.future,
+      platformStatusCompleter.future,
       processResumedCompleted.future,
     ]);
 
@@ -193,10 +207,12 @@ Target 0: (Runner) stopped.
     const processAttachMatcher = 'device process attach --pid $appProcessId';
     const processResumedMatcher = 'process continue';
     const setupStopHooksMatcher = 'target stop-hook add -o "thread backtrace all" -o "detach"';
+    const platformStatusMatcher = 'platform status';
     final expectedInputs = [
       'device select $deviceId',
       processAttachMatcher,
       setupStopHooksMatcher,
+      platformStatusMatcher,
       processResumedMatcher,
     ];
 
@@ -222,6 +238,9 @@ Target 0: (Runner) stopped.
       if (line == setupStopHooksMatcher) {
         setupStopHooksCompleter.complete(utf8.encode('Stop hook #1 added.\n'));
       }
+      if (line == platformStatusMatcher) {
+        platformStatusCompleter.complete(utf8.encode('  Platform: remote-ios\n'));
+      }
       if (line == processResumedMatcher) {
         processResumedCompleted.complete(utf8.encode('Process 568 resuming\n'));
       }
@@ -232,6 +251,7 @@ Target 0: (Runner) stopped.
       appProcessId: appProcessId,
       lldbLogForwarder: FakeLLDBLogForwarder(),
       mode: BuildMode.profile,
+      deviceSupport: createDeviceSupport(),
     );
     expect(success, isTrue);
     expect(lldb.isRunning, isTrue);
@@ -291,6 +311,7 @@ Target 0: (Runner) stopped.
       appProcessId: appProcessId,
       lldbLogForwarder: FakeLLDBLogForwarder(),
       mode: BuildMode.debug,
+      deviceSupport: createDeviceSupport(),
     );
     expect(success, isFalse);
     expect(lldb.isRunning, isFalse);
@@ -351,6 +372,7 @@ Target 0: (Runner) stopped.
       appProcessId: appProcessId,
       lldbLogForwarder: FakeLLDBLogForwarder(),
       mode: BuildMode.debug,
+      deviceSupport: createDeviceSupport(),
     );
     expect(success, isFalse);
     expect(lldb.isRunning, isFalse);
@@ -401,6 +423,7 @@ Target 0: (Runner) stopped.
         appProcessId: appProcessId,
         lldbLogForwarder: FakeLLDBLogForwarder(),
         mode: BuildMode.debug,
+        deviceSupport: createDeviceSupport(),
       );
       time.elapse(const Duration(minutes: 2));
       time.flushMicrotasks();
@@ -408,7 +431,7 @@ Target 0: (Runner) stopped.
     });
 
     expect(
-      logger.errorText,
+      logger.warningText,
       contains('LLDB is taking longer than expected to start debugging the app'),
     );
   });
@@ -421,6 +444,7 @@ Target 0: (Runner) stopped.
     final breakPointCompleter = Completer<List<int>>();
     final processAttachCompleter = Completer<List<int>>();
     final setupStopHooksCompleter = Completer<List<int>>();
+    final platformStatusCompleter = Completer<List<int>>();
     final processResumedCompleted = Completer<List<int>>();
     final logAfterAttachCompleter = Completer<List<int>>();
 
@@ -428,6 +452,7 @@ Target 0: (Runner) stopped.
       breakPointCompleter.future,
       processAttachCompleter.future,
       setupStopHooksCompleter.future,
+      platformStatusCompleter.future,
       processResumedCompleted.future,
       logAfterAttachCompleter.future,
     ]);
@@ -457,6 +482,7 @@ Target 0: (Runner) stopped.
     const processAttachMatcher = 'device process attach --pid $appProcessId';
     const processResumedMatcher = 'process continue';
     const setupStopHooksMatcher = 'target stop-hook add -o "thread backtrace all" -o "detach"';
+    const platformStatusMatcher = 'platform status';
     final expectedInputs = [
       'device select $deviceId',
       breakPointMatcher,
@@ -464,6 +490,7 @@ Target 0: (Runner) stopped.
       'script lldb.debugger.SetAsync(False)',
       processAttachMatcher,
       setupStopHooksMatcher,
+      platformStatusMatcher,
       processResumedMatcher,
     ];
 
@@ -494,6 +521,9 @@ Target 0: (Runner) stopped.
       if (line == setupStopHooksMatcher) {
         setupStopHooksCompleter.complete(utf8.encode('Stop hook #1 added.\n'));
       }
+      if (line == platformStatusMatcher) {
+        platformStatusCompleter.complete(utf8.encode('  Platform: remote-ios\n'));
+      }
       if (line == processResumedMatcher) {
         processResumedCompleted.complete(utf8.encode('1 location added to breakpoint 1\n'));
       }
@@ -508,6 +538,7 @@ Target 0: (Runner) stopped.
       appProcessId: appProcessId,
       lldbLogForwarder: lldbLogForwarder,
       mode: BuildMode.debug,
+      deviceSupport: createDeviceSupport(),
     );
 
     logAfterAttachCompleter.complete(utf8.encode('$ignoreLog\n$expectedForwardedLog\n'));
@@ -564,6 +595,7 @@ Target 0: (Runner) stopped.
         appProcessId: appProcessId,
         lldbLogForwarder: FakeLLDBLogForwarder(),
         mode: BuildMode.debug,
+        deviceSupport: createDeviceSupport(),
       ),
     );
 
@@ -593,6 +625,227 @@ Target 0: (Runner) stopped.
     expect(lldb.appProcessId, isNull);
   });
 
+  group('addSymbolSearchPaths', () {
+    testWithoutContext(
+      'sends platform select remote-ios sysroot for arch symbol directory',
+      () async {
+        final fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final Directory archSymbols =
+            homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport')
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('arm64e')
+                .childDirectory('Symbols')
+              ..createSync(recursive: true);
+
+        const deviceId = '123';
+        const appProcessId = 5678;
+
+        final platformSelectCompleter = Completer<List<int>>();
+        final processAttachCompleter = Completer<List<int>>();
+        final setupStopHooksCompleter = Completer<List<int>>();
+        final platformStatusCompleter = Completer<List<int>>();
+        final processResumedCompleted = Completer<List<int>>();
+
+        final stdoutStream = Stream<List<int>>.fromFutures([
+          platformSelectCompleter.future,
+          processAttachCompleter.future,
+          setupStopHooksCompleter.future,
+          platformStatusCompleter.future,
+          processResumedCompleted.future,
+        ]);
+
+        final stdinController = StreamController<List<int>>();
+
+        final processCompleter = Completer<void>();
+        final lldbCommand = FakeLLDBCommand(
+          command: const <String>['xcrun', 'lldb'],
+          completer: processCompleter,
+          stdin: io.IOSink(stdinController.sink),
+          stdout: stdoutStream,
+          stderr: const Stream.empty(),
+        );
+
+        final logger = BufferLogger.test();
+
+        final processManager = FakeLLDBProcessManager([lldbCommand]);
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+        final lldb = LLDB(
+          logger: logger,
+          processUtils: processUtils,
+          xcodeProjectInterpreter: FakeXcodeProjectInterpreter(),
+        );
+
+        final platformSelectMatcher = 'platform select remote-ios --sysroot "${archSymbols.path}"';
+        const processAttachMatcher = 'device process attach --pid $appProcessId';
+        const setupStopHooksMatcher = 'target stop-hook add -o "thread backtrace all" -o "detach"';
+        const processResumedMatcher = 'process continue';
+        const platformStatusMatcher = 'platform status';
+        final expectedInputs = [
+          'device select $deviceId',
+          platformSelectMatcher,
+          processAttachMatcher,
+          setupStopHooksMatcher,
+          platformStatusMatcher,
+          processResumedMatcher,
+        ];
+
+        stdinController.stream
+            .transform<String>(utf8.decoder)
+            .transform(const LineSplitter())
+            .listen((String line) {
+              expectedInputs.remove(line);
+              if (line == platformSelectMatcher) {
+                platformSelectCompleter.complete(utf8.encode('\n'));
+              }
+              if (line == processAttachMatcher) {
+                processAttachCompleter.complete(
+                  utf8.encode('Process 568 stopped\nTarget 0: (Runner) stopped.\n'),
+                );
+              }
+              if (line == setupStopHooksMatcher) {
+                setupStopHooksCompleter.complete(utf8.encode('Stop hook #1 added.\n'));
+              }
+              if (line == platformStatusMatcher) {
+                platformStatusCompleter.complete(utf8.encode('  Platform: remote-ios\n'));
+              }
+              if (line == processResumedMatcher) {
+                processResumedCompleted.complete(utf8.encode('Process 568 resuming\n'));
+              }
+            });
+
+        final bool success = await lldb.attachAndStart(
+          deviceId: deviceId,
+          appProcessId: appProcessId,
+          lldbLogForwarder: FakeLLDBLogForwarder(),
+          mode: BuildMode.profile,
+          deviceSupport: createDeviceSupport(
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            homeDirectory: homeDir,
+          ),
+        );
+
+        expect(success, isTrue);
+        expect(expectedInputs, isEmpty);
+      },
+    );
+
+    testWithoutContext(
+      'sends platform select remote-ios sysroot for non-arch symbol directory',
+      () async {
+        final fileSystem = MemoryFileSystem.test();
+        final Directory homeDir = fileSystem.directory('/Users/username');
+        final Directory symbols =
+            homeDir
+                .childDirectory('Library')
+                .childDirectory('Developer')
+                .childDirectory('Xcode')
+                .childDirectory('iOS DeviceSupport')
+                .childDirectory('iPhone15,2 17.0')
+                .childDirectory('Symbols')
+              ..createSync(recursive: true);
+
+        const deviceId = '123';
+        const appProcessId = 5678;
+
+        final platformSelectCompleter = Completer<List<int>>();
+        final processAttachCompleter = Completer<List<int>>();
+        final setupStopHooksCompleter = Completer<List<int>>();
+        final platformStatusCompleter = Completer<List<int>>();
+        final processResumedCompleted = Completer<List<int>>();
+
+        final stdoutStream = Stream<List<int>>.fromFutures([
+          platformSelectCompleter.future,
+          processAttachCompleter.future,
+          setupStopHooksCompleter.future,
+          platformStatusCompleter.future,
+          processResumedCompleted.future,
+        ]);
+
+        final stdinController = StreamController<List<int>>();
+
+        final processCompleter = Completer<void>();
+        final lldbCommand = FakeLLDBCommand(
+          command: const <String>['xcrun', 'lldb'],
+          completer: processCompleter,
+          stdin: io.IOSink(stdinController.sink),
+          stdout: stdoutStream,
+          stderr: const Stream.empty(),
+        );
+
+        final logger = BufferLogger.test();
+
+        final processManager = FakeLLDBProcessManager([lldbCommand]);
+        final processUtils = ProcessUtils(processManager: processManager, logger: logger);
+        final lldb = LLDB(
+          logger: logger,
+          processUtils: processUtils,
+          xcodeProjectInterpreter: FakeXcodeProjectInterpreter(),
+        );
+
+        final platformSelectMatcher = 'platform select remote-ios --sysroot "${symbols.path}"';
+        const processAttachMatcher = 'device process attach --pid $appProcessId';
+        const setupStopHooksMatcher = 'target stop-hook add -o "thread backtrace all" -o "detach"';
+        const processResumedMatcher = 'process continue';
+        const platformStatusMatcher = 'platform status';
+        final expectedInputs = [
+          'device select $deviceId',
+          platformSelectMatcher,
+          processAttachMatcher,
+          setupStopHooksMatcher,
+          platformStatusMatcher,
+          processResumedMatcher,
+        ];
+
+        stdinController.stream
+            .transform<String>(utf8.decoder)
+            .transform(const LineSplitter())
+            .listen((String line) {
+              expectedInputs.remove(line);
+              if (line == platformSelectMatcher) {
+                platformSelectCompleter.complete(utf8.encode('\n'));
+              }
+              if (line == processAttachMatcher) {
+                processAttachCompleter.complete(
+                  utf8.encode('Process 568 stopped\nTarget 0: (Runner) stopped.\n'),
+                );
+              }
+              if (line == setupStopHooksMatcher) {
+                setupStopHooksCompleter.complete(utf8.encode('Stop hook #1 added.\n'));
+              }
+              if (line == platformStatusMatcher) {
+                platformStatusCompleter.complete(utf8.encode('  Platform: remote-ios\n'));
+              }
+              if (line == processResumedMatcher) {
+                processResumedCompleted.complete(utf8.encode('Process 568 resuming\n'));
+              }
+            });
+
+        final bool success = await lldb.attachAndStart(
+          deviceId: deviceId,
+          appProcessId: appProcessId,
+          lldbLogForwarder: FakeLLDBLogForwarder(),
+          mode: BuildMode.profile,
+          deviceSupport: createDeviceSupport(
+            modelCode: 'iPhone15,2',
+            operatingSystemVersion: '17.0',
+            cpuArchitectureString: 'arm64e',
+            homeDirectory: homeDir,
+          ),
+        );
+
+        expect(success, isTrue);
+        expect(expectedInputs, isEmpty);
+      },
+    );
+  });
+
   group('LLDBLogForwarder', () {
     testWithoutContext('addLog', () async {
       const expectedLog = 'hello world';
@@ -825,3 +1078,27 @@ class FakeLLDBLogForwarder extends Fake implements LLDBLogForwarder {
     }
   }
 }
+
+IOSDeviceSupport createDeviceSupport({
+  Logger? logger,
+  ProcessUtils? processUtils,
+  Directory? homeDirectory,
+  String? modelCode,
+  String? operatingSystemVersion,
+  String? cpuArchitectureString,
+  String deviceId = '123',
+}) {
+  final Logger testLogger = logger ?? BufferLogger.test();
+  return IOSDeviceSupport(
+    logger: testLogger,
+    processUtils:
+        processUtils ??
+        ProcessUtils(processManager: FakeProcessManager.empty(), logger: testLogger),
+    xcode: null,
+    homeDirectory: homeDirectory,
+    modelCode: modelCode,
+    operatingSystemVersion: operatingSystemVersion,
+    cpuArchitectureString: cpuArchitectureString,
+    deviceId: deviceId,
+  );
+}
diff --git a/packages/flutter_tools/test/general.shard/ios/mac_test.dart b/packages/flutter_tools/test/general.shard/ios/mac_test.dart
index 620e20c2fe094..ad8164e9ef235 100644
--- a/packages/flutter_tools/test/general.shard/ios/mac_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/mac_test.dart
@@ -91,85 +91,6 @@ void main() {
         expect(fakeProcessManager, hasNoRemainingExpectations);
       });
     });
-
-    group('screenshot', () {
-      late FakeProcessManager fakeProcessManager;
-      late File outputFile;
-
-      setUp(() {
-        fakeProcessManager = FakeProcessManager.empty();
-        outputFile = MemoryFileSystem.test().file('image.png');
-      });
-
-      testWithoutContext('error if idevicescreenshot is not installed', () async {
-        // Let `idevicescreenshot` fail with exit code 1.
-        fakeProcessManager.addCommand(
-          FakeCommand(
-            command: <String>['HostArtifact.idevicescreenshot', outputFile.path, '--udid', '1234'],
-            environment: const <String, String>{'DYLD_LIBRARY_PATH': '/path/to/libraries'},
-            exitCode: 1,
-          ),
-        );
-
-        final iMobileDevice = IMobileDevice(
-          artifacts: artifacts,
-          cache: cache,
-          processManager: fakeProcessManager,
-          logger: logger,
-        );
-
-        expect(
-          () async =>
-              iMobileDevice.takeScreenshot(outputFile, '1234', DeviceConnectionInterface.attached),
-          throwsA(anything),
-        );
-        expect(fakeProcessManager, hasNoRemainingExpectations);
-      });
-
-      testWithoutContext('idevicescreenshot captures and returns USB screenshot', () async {
-        fakeProcessManager.addCommand(
-          FakeCommand(
-            command: <String>['HostArtifact.idevicescreenshot', outputFile.path, '--udid', '1234'],
-            environment: const <String, String>{'DYLD_LIBRARY_PATH': '/path/to/libraries'},
-          ),
-        );
-
-        final iMobileDevice = IMobileDevice(
-          artifacts: artifacts,
-          cache: cache,
-          processManager: fakeProcessManager,
-          logger: logger,
-        );
-
-        await iMobileDevice.takeScreenshot(outputFile, '1234', DeviceConnectionInterface.attached);
-        expect(fakeProcessManager, hasNoRemainingExpectations);
-      });
-
-      testWithoutContext('idevicescreenshot captures and returns network screenshot', () async {
-        fakeProcessManager.addCommand(
-          FakeCommand(
-            command: <String>[
-              'HostArtifact.idevicescreenshot',
-              outputFile.path,
-              '--udid',
-              '1234',
-              '--network',
-            ],
-            environment: const <String, String>{'DYLD_LIBRARY_PATH': '/path/to/libraries'},
-          ),
-        );
-
-        final iMobileDevice = IMobileDevice(
-          artifacts: artifacts,
-          cache: cache,
-          processManager: fakeProcessManager,
-          logger: logger,
-        );
-
-        await iMobileDevice.takeScreenshot(outputFile, '1234', DeviceConnectionInterface.wireless);
-        expect(fakeProcessManager, hasNoRemainingExpectations);
-      });
-    });
   });
 
   group('Diagnose Xcode build failure', () {
@@ -688,6 +609,47 @@ duplicate symbol '_$s29plugin_1_name23PluginNamePluginC9setDouble3key5valueySS_S
       },
     );
 
+    testWithoutContext('parses missing module map error', () async {
+      const buildCommands = <String>['xcrun', 'cc', 'blah'];
+      final buildResult = XcodeBuildResult(
+        success: false,
+        stdout: '',
+        xcodeBuildExecution: XcodeBuildExecution(
+          buildCommands: buildCommands,
+          appDirectory: '/blah/blah',
+          environmentType: EnvironmentType.physical,
+          buildSettings: buildSettings,
+        ),
+        xcResult: XCResult.test(
+          issues: <XCResultIssue>[
+            XCResultIssue.test(
+              message:
+                  "module map file '.../test_app/build/ios/Release-iphoneos/url_launcher_ios/url_launcher_ios.framework/Modules/module.modulemap' not found",
+              subType: 'Error',
+            ),
+          ],
+        ),
+      );
+      final fs = MemoryFileSystem.test();
+      final project = FakeFlutterProject(fileSystem: fs, usesSwiftPackageManager: true);
+      project.ios.podfile.createSync(recursive: true);
+      await diagnoseXcodeBuildFailure(
+        buildResult,
+        logger: logger,
+        analytics: fakeAnalytics,
+        fileSystem: fs,
+        platform: FlutterDarwinPlatform.ios,
+        project: project,
+      );
+      expect(
+        logger.errorText,
+        contains(
+          'A precompiled file has been changed since last built. Please run "flutter clean --include-xcode-workspace" to '
+          'clear the cache.',
+        ),
+      );
+    });
+
     testWithoutContext('parses file has been modified error', () async {
       const buildCommands = <String>['xcrun', 'cc', 'blah'];
       final buildResult = XcodeBuildResult(
@@ -732,7 +694,7 @@ duplicate symbol '_$s29plugin_1_name23PluginNamePluginC9setDouble3key5valueySS_S
       expect(
         logger.errorText,
         contains(
-          'A precompiled file has been changed since last built. Please run "flutter clean" to '
+          'A precompiled file has been changed since last built. Please run "flutter clean --include-xcode-workspace" to '
           'clear the cache.',
         ),
       );
@@ -1412,7 +1374,7 @@ class FakeXcodeProjectInterpreter extends Fake implements XcodeProjectInterprete
   Future<List<String>> fetchDependenciesAndGenerateXcodebuildArgs(
     XcodeBasedProject xcodeProject,
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) async {
     return <String>['xcrun', 'xcodebuild'];
   }
diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
index a06c451fd999f..c1e4cb14a924b 100644
--- a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
@@ -15,6 +15,7 @@ import 'package:flutter_tools/src/base/version.dart';
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/ios/xcode_build_settings.dart';
 import 'package:flutter_tools/src/ios/xcodeproj.dart';
+import 'package:flutter_tools/src/macos/swift_package_manager.dart';
 import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:flutter_tools/src/plugins.dart';
 import 'package:flutter_tools/src/project.dart';
@@ -279,7 +280,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -325,7 +325,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -371,7 +370,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -417,7 +415,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -463,7 +460,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -507,7 +503,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -559,7 +554,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/macos/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-project',
@@ -605,7 +599,6 @@ void main() {
           'xcodebuild',
           '-clonedSourcePackagesDirPath',
           '/build/ios/SourcePackages',
-          '-skipPackageUpdates',
           '-skipPackagePluginValidation',
           '-skipPackageSignatureValidation',
           '-workspace',
@@ -644,7 +637,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-list',
@@ -688,7 +680,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-list',
@@ -734,7 +725,6 @@ void main() {
             'xcodebuild',
             '-clonedSourcePackagesDirPath',
             '/build/ios/SourcePackages',
-            '-skipPackageUpdates',
             '-skipPackagePluginValidation',
             '-skipPackageSignatureValidation',
             '-list',
@@ -838,7 +828,6 @@ Information about project "Runner":
           'xcodebuild',
           '-clonedSourcePackagesDirPath',
           '/build/ios/SourcePackages',
-          '-skipPackageUpdates',
           '-skipPackagePluginValidation',
           '-skipPackageSignatureValidation',
           '-list',
diff --git a/packages/flutter_tools/test/general.shard/isolated/native_assets_test.dart b/packages/flutter_tools/test/general.shard/isolated/native_assets_test.dart
index 6926e7ece5988..de19fba961649 100644
--- a/packages/flutter_tools/test/general.shard/isolated/native_assets_test.dart
+++ b/packages/flutter_tools/test/general.shard/isolated/native_assets_test.dart
@@ -393,6 +393,50 @@ CMAKE_LINKER:FILEPATH=/usr/bin/ld.ldd
       expect(target.didSetCCompilerConfig, isTrue);
     },
   );
+
+  testUsingContext(
+    'installCodeAssets cleans up existing stale files in target directory without crashing '
+    '(regression test for https://github.com/flutter/flutter/issues/190234)',
+    overrides: <Type, Generator>{ProcessManager: () => FakeProcessManager.empty()},
+    () async {
+      final File packageConfig = environment.projectDir.childFile('.dart_tool/package_config.json');
+      final Uri nonFlutterTesterAssetUri = environment.buildDir
+          .childFile(InstallCodeAssets.nativeAssetsFilename)
+          .uri;
+      await packageConfig.parent.create();
+      await packageConfig.create();
+
+      final environmentDefines = <String, String>{kBuildMode: BuildMode.debug.cliName};
+      final DartHooksResult dartHookResult = await runFlutterSpecificHooks(
+        environmentDefines: environmentDefines,
+        targetPlatform: TargetPlatform.windows_x64,
+        projectUri: projectUri,
+        fileSystem: fileSystem,
+        buildRunner: FakeFlutterNativeAssetsBuildRunner(
+          packagesWithNativeAssetsResult: <String>['bar'],
+        ),
+        buildCodeAssets: const BuildCodeAssetsOptions(appBuildDirectory: null),
+        buildDataAssets: true,
+        recordedUsesFile: null,
+      );
+      final Directory targetDirectory = environment.buildDir.childDirectory('native_assets');
+      await targetDirectory.create(recursive: true);
+      final File staleFile = targetDirectory.childFile('stale.txt');
+      staleFile.writeAsStringSync('stale');
+
+      await installCodeAssets(
+        dartHookResult: dartHookResult,
+        environmentDefines: environmentDefines,
+        targetPlatform: TargetPlatform.windows_x64,
+        projectUri: projectUri,
+        fileSystem: fileSystem,
+        nativeAssetsFileUri: nonFlutterTesterAssetUri,
+        targetUri: targetDirectory.uri,
+      );
+      expect(targetDirectory, exists);
+      expect(staleFile, isNot(exists));
+    },
+  );
 }
 
 class _SetCCompilerConfigTarget extends FakeFlutterNativeAssetsBuildRunner {
diff --git a/packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart
index b31b284e0ad5c..a2fc6b6204294 100644
--- a/packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart
@@ -502,8 +502,11 @@ class FakeMacOSProject extends Fake implements MacOSProject {
       hostAppRoot.childDirectory('Runner.xcodeproj').childFile('project.pbxproj');
 
   @override
-  Directory get flutterSwiftPackagesDirectory =>
-      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral').childDirectory('Packages');
+  Directory get ephemeralDirectory =>
+      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral');
+
+  @override
+  Directory get flutterSwiftPackagesDirectory => ephemeralDirectory.childDirectory('Packages');
 
   @override
   Directory get relativeSwiftPackagesDirectory =>
@@ -551,8 +554,11 @@ class FakeIosProject extends Fake implements IosProject {
       hostAppRoot.childDirectory('Runner.xcodeproj').childFile('project.pbxproj');
 
   @override
-  Directory get flutterSwiftPackagesDirectory =>
-      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral').childDirectory('Packages');
+  Directory get ephemeralDirectory =>
+      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral');
+
+  @override
+  Directory get flutterSwiftPackagesDirectory => ephemeralDirectory.childDirectory('Packages');
 
   @override
   Directory get relativeSwiftPackagesDirectory =>
diff --git a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
index 1c693c87d2592..13dcf45c75c06 100644
--- a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
@@ -1478,19 +1478,16 @@ end''');
         FakeCommand(command: <String>['touch', 'project/ios/Podfile.lock']),
       ]);
 
-      final cocoaPodsUnderTestXcode143 = CocoaPods(
+      final cocoaPods = CocoaPods(
         fileSystem: fileSystem,
         processManager: fakeProcessManager,
         logger: logger,
         platform: FakePlatform(operatingSystem: 'macos'),
-        xcodeProjectInterpreter: XcodeProjectInterpreter.test(
-          processManager: fakeProcessManager,
-          version: Version(14, 3, 0),
-        ),
+        xcodeProjectInterpreter: XcodeProjectInterpreter.test(processManager: fakeProcessManager),
         analytics: fakeAnalytics,
       );
 
-      final bool didInstall = await cocoaPodsUnderTestXcode143.processPods(
+      final bool didInstall = await cocoaPods.processPods(
         xcodeProject: projectUnderTest.ios,
         buildMode: BuildMode.debug,
       );
diff --git a/packages/flutter_tools/test/general.shard/macos/swift_package_manager_test.dart b/packages/flutter_tools/test/general.shard/macos/swift_package_manager_test.dart
index c928b0c37bbae..813567efa287e 100644
--- a/packages/flutter_tools/test/general.shard/macos/swift_package_manager_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/swift_package_manager_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
 import 'dart:io' as io;
 
 import 'package:file/file.dart';
@@ -421,8 +422,9 @@ let package = Package(
             plugin1ManifestFile
               ..createSync(recursive: true)
               ..writeAsStringSync(plugin1ManifestContents);
-            final File plugin1CopiedManifest = fs.file(
-              '$buildSourcePackagesPath/valid_plugin_1-1.0.0/${platform.name}/valid_plugin_1/Package.swift',
+
+            final File plugin2CopiedManifest = fs.file(
+              '$buildSourcePackagesPath/valid_plugin_2-1.0.0/${platform.name}/valid_plugin_2/Package.swift',
             );
 
             final validPlugin2 = FakePlugin(
@@ -433,6 +435,10 @@ let package = Package(
                 .file('${validPlugin2.path}/${platform.name}/${validPlugin2.name}/Package.swift')
                 .createSync(recursive: true);
 
+            final File plugin3CopiedManifest = fs.file(
+              '$buildSourcePackagesPath/valid_plugin_3-1.0.0/${platform.name}/valid_plugin_3/Package.swift',
+            );
+
             final validPlugin3 = FakePlugin(
               name: 'valid_plugin_3',
               platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
@@ -448,13 +454,26 @@ let package = Package(
                   '-8',
                   '-av',
                   '--delete',
-                  validPlugin1.path,
-                  '$buildSourcePackagesPath/valid_plugin_1-1.0.0',
+                  '--exclude=/example/',
+                  '${validPlugin2.path}/',
+                  '$buildSourcePackagesPath/valid_plugin_2-1.0.0',
                 ],
                 onRun: (_) {
-                  plugin1CopiedManifest
-                    ..createSync(recursive: true)
-                    ..writeAsStringSync(plugin1ManifestContents);
+                  plugin2CopiedManifest.createSync(recursive: true);
+                },
+              ),
+              FakeCommand(
+                command: [
+                  'rsync',
+                  '-8',
+                  '-av',
+                  '--delete',
+                  '--exclude=/example/',
+                  '${validPlugin3.path}/',
+                  '$buildSourcePackagesPath/valid_plugin_3-1.0.0',
+                ],
+                onRun: (_) {
+                  plugin3CopiedManifest.createSync(recursive: true);
                 },
               ),
             ]);
@@ -481,48 +500,129 @@ let package = Package(
             );
             expect(
               project.relativeSwiftPackagesDirectory.childLink('valid_plugin_1-1.0.0').targetSync(),
-              '$buildSourcePackagesPath/valid_plugin_1-1.0.0/${platform.name}/valid_plugin_1',
+              '${validPlugin1.path}/${platform.name}/valid_plugin_1',
+            );
+            expect(
+              plugin2CopiedManifest.readAsStringSync(),
+              '\n\n// Basename of original plugin: valid_plugin_2-1.0.0',
             );
-            expect(plugin1CopiedManifest.readAsStringSync(), '''
+            expect(
+              plugin3CopiedManifest.readAsStringSync(),
+              '\n\n// Basename of original plugin: valid_plugin_3-1.0.0',
+            );
+            expect(project.relativeSwiftPackagesDirectory.childLink('valid_plugin_2'), exists);
+            expect(
+              project.relativeSwiftPackagesDirectory.childLink('valid_plugin_2').targetSync(),
+              '$buildSourcePackagesPath/valid_plugin_2-1.0.0/${platform.name}/valid_plugin_2',
+            );
+            expect(project.relativeSwiftPackagesDirectory.childLink('valid_plugin_3'), exists);
+            expect(
+              project.relativeSwiftPackagesDirectory.childLink('valid_plugin_3').targetSync(),
+              '$buildSourcePackagesPath/valid_plugin_3-1.0.0/${platform.name}/valid_plugin_3',
+            );
+            expect(project.flutterPluginSwiftPackageManifest.readAsStringSync(), '''
 // swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+// Generated file. Do not edit.
+//
 
 import PackageDescription
 
 let package = Package(
-    name: "valid_plugin_1",
+    name: "FlutterGeneratedPluginSwiftPackage",
     platforms: [
-        .iOS("15.0")
+        $supportedPlatform
     ],
     products: [
-        .library(name: "valid-plugin-1", targets: ["valid-plugin-1"])
+        .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
     ],
     dependencies: [
-        .package(name: "valid_plugin_2", path: "../valid_plugin_2-1.0.0"),
-        .package(name: "FlutterFramework", path: "../FlutterFramework"),
-        .package(name: "valid_plugin_3", path: "../valid_plugin_3-1.0.0")
+        .package(name: "valid_plugin_1", path: "../.packages/valid_plugin_1-1.0.0"),
+        .package(name: "valid_plugin_2", path: "../.packages/valid_plugin_2"),
+        .package(name: "valid_plugin_3", path: "../.packages/valid_plugin_3"),
+        .package(name: "FlutterFramework", path: "../.packages/FlutterFramework")
     ],
     targets: [
         .target(
-            name: "valid-plugin-1",
+            name: "FlutterGeneratedPluginSwiftPackage",
             dependencies: [
+                .product(name: "valid-plugin-1", package: "valid_plugin_1"),
                 .product(name: "valid-plugin-2", package: "valid_plugin_2"),
-                .product(name: "FlutterFramework", package: "FlutterFramework"),
-                .product(name: "valid-plugin-3", package: "valid_plugin_3")
-            ],
-            path: "../Classes",
+                .product(name: "valid-plugin-3", package: "valid_plugin_3"),
+                .product(name: "FlutterFramework", package: "FlutterFramework")
+            ]
         )
     ]
 )
 ''');
+            expect(processManager, hasNoRemainingExpectations);
+          });
+
+          testWithoutContext('generate with plugin whose basename does not match its name', () async {
+            final fs = MemoryFileSystem();
+            final logger = BufferLogger.test();
+            final project = FakeXcodeProject(platform: platform.name, fileSystem: fs);
+
+            final buildSourcePackagesPath = '/build/${platform.name}/SourcePackages';
+            final File pluginCopiedManifest = fs.file(
+              '$buildSourcePackagesPath/custom_basename/${platform.name}/valid_plugin_1/Package.swift',
+            );
+
+            // The plugin name is valid_plugin_1, but the path ends with custom_basename.
+            // This means basename is custom_basename, which does not match valid_plugin_1,
+            // and does not start with valid_plugin_1-.
+            final validPlugin1 = FakePlugin(
+              name: 'valid_plugin_1',
+              platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
+              path: '/local/path/to/plugins/custom_basename',
+            );
+            fs
+                .file('${validPlugin1.path}/${platform.name}/${validPlugin1.name}/Package.swift')
+                .createSync(recursive: true);
+
+            final processManager = FakeProcessManager.list([
+              FakeCommand(
+                command: [
+                  'rsync',
+                  '-8',
+                  '-av',
+                  '--delete',
+                  '--exclude=/example/',
+                  '${validPlugin1.path}/',
+                  '$buildSourcePackagesPath/custom_basename',
+                ],
+                onRun: (_) {
+                  pluginCopiedManifest.createSync(recursive: true);
+                },
+              ),
+            ]);
+
+            final spm = SwiftPackageManager(
+              fileSystem: fs,
+              templateRenderer: const MustacheTemplateRenderer(),
+              processUtils: ProcessUtils(processManager: processManager, logger: logger),
+              config: FakeConfig(),
+            );
+            await spm.generatePluginsSwiftPackage(<Plugin>[validPlugin1], platform, project);
+
+            final supportedPlatform = platform == FlutterDarwinPlatform.ios
+                ? '.iOS("15.0")'
+                : '.macOS("12.0")';
+            expect(project.flutterPluginSwiftPackageManifest.existsSync(), isTrue);
+
+            // Since basename did not match the plugin name, the plugin is copied to the
+            // build directory under custom_basename, but the symlink name uses the plugin name.
             expect(
-              project.relativeSwiftPackagesDirectory.childLink('valid_plugin_2-1.0.0'),
-              exists,
+              pluginCopiedManifest.readAsStringSync(),
+              '\n\n// Basename of original plugin: custom_basename',
             );
+            expect(project.relativeSwiftPackagesDirectory.childLink('valid_plugin_1'), exists);
             expect(
-              project.relativeSwiftPackagesDirectory.childLink('valid_plugin_2-1.0.0').targetSync(),
-              '${validPlugin2.path}/${platform.name}/valid_plugin_2',
+              project.relativeSwiftPackagesDirectory.childLink('valid_plugin_1').targetSync(),
+              '$buildSourcePackagesPath/custom_basename/${platform.name}/valid_plugin_1',
             );
+
             expect(project.flutterPluginSwiftPackageManifest.readAsStringSync(), '''
 // swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
@@ -541,9 +641,7 @@ let package = Package(
         .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
     ],
     dependencies: [
-        .package(name: "valid_plugin_1", path: "../.packages/valid_plugin_1-1.0.0"),
-        .package(name: "valid_plugin_2", path: "../.packages/valid_plugin_2-1.0.0"),
-        .package(name: "valid_plugin_3", path: "../.packages/valid_plugin_3-1.0.0"),
+        .package(name: "valid_plugin_1", path: "../.packages/valid_plugin_1"),
         .package(name: "FlutterFramework", path: "../.packages/FlutterFramework")
     ],
     targets: [
@@ -551,8 +649,6 @@ let package = Package(
             name: "FlutterGeneratedPluginSwiftPackage",
             dependencies: [
                 .product(name: "valid-plugin-1", package: "valid_plugin_1"),
-                .product(name: "valid-plugin-2", package: "valid_plugin_2"),
-                .product(name: "valid-plugin-3", package: "valid_plugin_3"),
                 .product(name: "FlutterFramework", package: "FlutterFramework")
             ]
         )
@@ -738,6 +834,173 @@ let package = Package(
             );
           });
         });
+
+        group('concurrency and optimization', () {
+          late MemoryFileSystem fs;
+          late LockTrackingFileSystem trackingFs;
+          late FakeProcessManager processManager;
+          late BufferLogger logger;
+          late FakeXcodeProject project;
+          late SwiftPackageManager spm;
+
+          setUp(() {
+            fs = MemoryFileSystem.test();
+            trackingFs = LockTrackingFileSystem(fs);
+            processManager = FakeProcessManager.any();
+            logger = BufferLogger.test();
+            project = FakeXcodeProject(platform: platform.name, fileSystem: trackingFs);
+
+            spm = SwiftPackageManager(
+              fileSystem: trackingFs,
+              templateRenderer: const MustacheTemplateRenderer(),
+              processUtils: ProcessUtils(processManager: processManager, logger: logger),
+              config: FakeConfig(),
+              logger: logger,
+            );
+          });
+
+          testWithoutContext('acquires and releases lock successfully', () async {
+            project.xcodeProjectInfoFile.createSync(recursive: true);
+            project.xcodeProjectInfoFile.writeAsStringSync('FlutterGeneratedPluginSwiftPackage');
+
+            await spm.generatePluginsSwiftPackage(<Plugin>[], platform, project);
+
+            expect(trackingFs.lockCount, 1);
+            expect(trackingFs.unlockCount, 1);
+            expect(trackingFs.lockAttempts, 1);
+          });
+
+          testWithoutContext(
+            'retries lock on FileSystemException and eventually succeeds',
+            () async {
+              project.xcodeProjectInfoFile.createSync(recursive: true);
+              project.xcodeProjectInfoFile.writeAsStringSync('FlutterGeneratedPluginSwiftPackage');
+
+              trackingFs.throwErrorOnLock = true;
+              trackingFs.throwErrorOnLockTimes = 2; // Fail twice, succeed on 3rd attempt
+
+              await spm.generatePluginsSwiftPackage(<Plugin>[], platform, project);
+
+              expect(trackingFs.lockCount, 1);
+              expect(trackingFs.unlockCount, 3); // Closed on every retry + final release
+              expect(trackingFs.lockAttempts, 3); // 2 failures + 1 success
+
+              // Verify the warning was printed to the logger
+              expect(
+                logger.warningText,
+                contains(
+                  'Waiting for another flutter command to release the Swift Package Manager lock...',
+                ),
+              );
+            },
+          );
+
+          testWithoutContext('proceeds without lock on UnimplementedError', () async {
+            project.xcodeProjectInfoFile.createSync(recursive: true);
+            project.xcodeProjectInfoFile.writeAsStringSync('FlutterGeneratedPluginSwiftPackage');
+
+            trackingFs.throwUnimplementedOnLock = true;
+
+            await spm.generatePluginsSwiftPackage(<Plugin>[], platform, project);
+
+            expect(trackingFs.lockCount, 0); // No successful locks recorded
+            expect(trackingFs.unlockCount, 1); // Still closed
+            expect(trackingFs.lockAttempts, 1); // 1 attempt that threw
+          });
+
+          testWithoutContext(
+            'non-destructive symlink update: preserves active, creates new, deletes obsolete',
+            () async {
+              project.xcodeProjectInfoFile.createSync(recursive: true);
+              project.xcodeProjectInfoFile.writeAsStringSync('FlutterGeneratedPluginSwiftPackage');
+
+              final plugin1 = FakePlugin(
+                name: 'plugin_1',
+                platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
+              );
+              final plugin2 = FakePlugin(
+                name: 'plugin_2',
+                platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
+              );
+              final plugin3 = FakePlugin(
+                name: 'plugin_3',
+                platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
+              );
+
+              // Pre-populate symlink directory with plugin_1 (active), plugin_3 (obsolete), and a stale file
+              final Directory symlinkDir = project.relativeSwiftPackagesDirectory;
+              symlinkDir.createSync(recursive: true);
+
+              final Link link1 = symlinkDir.childLink('plugin_1-1.0.0');
+              link1.createSync('${plugin1.path}/${platform.name}/plugin_1');
+
+              final Link link3 = symlinkDir.childLink('plugin_3-1.0.0');
+              link3.createSync('${plugin3.path}/${platform.name}/plugin_3');
+
+              final File staleFile = symlinkDir.childFile('stale_file.txt');
+              staleFile.createSync();
+              staleFile.writeAsStringSync('stale content');
+
+              // Create fake Package.swift manifests for active plugins to prevent them from being skipped
+              trackingFs
+                  .file('${plugin1.path}/${platform.name}/${plugin1.name}/Package.swift')
+                  .createSync(recursive: true);
+              trackingFs
+                  .file('${plugin2.path}/${platform.name}/${plugin2.name}/Package.swift')
+                  .createSync(recursive: true);
+
+              // Reset tracking counters after pre-population
+              trackingFs.linkCreateCount.clear();
+              trackingFs.linkDeleteCount.clear();
+
+              // Run with plugin_1 and plugin_2
+              await spm.generatePluginsSwiftPackage(<Plugin>[plugin1, plugin2], platform, project);
+
+              // Verify plugin_1 was preserved (not deleted, not recreated)
+              expect(trackingFs.linkDeleteCount['plugin_1-1.0.0'], isNull);
+              expect(trackingFs.linkCreateCount['plugin_1-1.0.0'], isNull);
+
+              // Verify plugin_2 was created
+              expect(trackingFs.linkCreateCount['plugin_2-1.0.0'], 1);
+
+              // Verify plugin_3 was deleted
+              expect(trackingFs.linkDeleteCount['plugin_3-1.0.0'], 1);
+              expect(symlinkDir.childLink('plugin_3-1.0.0').existsSync(), isFalse);
+
+              // Verify stale file was deleted
+              expect(staleFile.existsSync(), isFalse);
+            },
+          );
+
+          testWithoutContext(
+            'optimizes Package.swift generation: does not rewrite if identical',
+            () async {
+              project.xcodeProjectInfoFile.createSync(recursive: true);
+              project.xcodeProjectInfoFile.writeAsStringSync('FlutterGeneratedPluginSwiftPackage');
+
+              final plugin1 = FakePlugin(
+                name: 'plugin_1',
+                platforms: <String, PluginPlatform>{platform.name: FakePluginPlatform()},
+              );
+              trackingFs
+                  .file('${plugin1.path}/${platform.name}/${plugin1.name}/Package.swift')
+                  .createSync(recursive: true);
+
+              // Reset write count after setup to only track writes during SPM generation
+              trackingFs.writeCount = 0;
+
+              // First run: generates Package.swift and placeholders
+              await spm.generatePluginsSwiftPackage(<Plugin>[plugin1], platform, project);
+              expect(trackingFs.writeCount, 4); // 2 Package.swift + 2 placeholder .swift files
+
+              trackingFs.writeCount = 0;
+
+              // Second run with same plugin: should skip writing everything
+              await spm.generatePluginsSwiftPackage(<Plugin>[plugin1], platform, project);
+              expect(trackingFs.writeCount, 0); // All skipped!
+            },
+          );
+        });
       });
     }
   });
@@ -760,8 +1023,11 @@ class FakeXcodeProject extends Fake implements IosProject {
   String hostAppProjectName = 'Runner';
 
   @override
-  Directory get flutterSwiftPackagesDirectory =>
-      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral').childDirectory('Packages');
+  Directory get ephemeralDirectory =>
+      hostAppRoot.childDirectory('Flutter').childDirectory('ephemeral');
+
+  @override
+  Directory get flutterSwiftPackagesDirectory => ephemeralDirectory.childDirectory('Packages');
 
   @override
   Directory get relativeSwiftPackagesDirectory =>
@@ -787,8 +1053,12 @@ class FakeXcodeProject extends Fake implements IosProject {
 }
 
 class FakePlugin extends Fake implements Plugin {
-  FakePlugin({required this.name, required this.platforms, this.hasSwiftPackage = true})
-    : path = '/local/path/to/plugins/$name-1.0.0';
+  FakePlugin({
+    required this.name,
+    required this.platforms,
+    this.hasSwiftPackage = true,
+    String? path,
+  }) : path = path ?? '/local/path/to/plugins/$name-1.0.0';
 
   @override
   final String name;
@@ -819,6 +1089,14 @@ class FakePlugin extends Fake implements Plugin {
     }
     return '$path/$platform/$name/Package.swift';
   }
+
+  @override
+  bool supportSwiftPackageManagerForPlatform(FileSystem fileSystem, String platform) {
+    final String? manifestPath = pluginSwiftPackageManifestPath(fileSystem, platform);
+    return platforms[platform] != null &&
+        manifestPath != null &&
+        fileSystem.file(manifestPath).existsSync();
+  }
 }
 
 class FakePluginPlatform extends Fake implements PluginPlatform {}
@@ -870,3 +1148,163 @@ class _ErrorInjectingLink extends ForwardingFileSystemEntity<Link, io.Link> with
     super.createSync(target, recursive: recursive);
   }
 }
+
+class LockTrackingFileSystem extends ForwardingFileSystem {
+  LockTrackingFileSystem(super.delegate);
+
+  int lockCount = 0;
+  int unlockCount = 0;
+  int lockAttempts = 0;
+  int writeCount = 0;
+  bool throwErrorOnLock = false;
+  int throwErrorOnLockTimes = 0;
+  bool throwUnimplementedOnLock = false;
+
+  final Map<String, int> linkDeleteCount = <String, int>{};
+  final Map<String, int> linkCreateCount = <String, int>{};
+
+  @override
+  Directory directory(dynamic path) => _TrackingDirectory(this, delegate.directory(path));
+
+  @override
+  File file(dynamic path) => _TrackingFile(this, delegate.file(path));
+
+  @override
+  Link link(dynamic path) => _TrackingLink(this, delegate.link(path));
+}
+
+class _TrackingDirectory extends ForwardingFileSystemEntity<Directory, io.Directory>
+    with ForwardingDirectory {
+  _TrackingDirectory(this._fileSystem, this.delegate);
+
+  final LockTrackingFileSystem _fileSystem;
+
+  @override
+  final io.Directory delegate;
+
+  @override
+  FileSystem get fileSystem => _fileSystem;
+
+  @override
+  File wrapFile(io.File delegate) => _fileSystem.file(delegate.path);
+
+  @override
+  Directory wrapDirectory(io.Directory delegate) => _fileSystem.directory(delegate.path);
+
+  @override
+  Link wrapLink(io.Link delegate) => _fileSystem.link(delegate.path);
+
+  @override
+  Directory childDirectory(String basename) =>
+      fileSystem.directory(fileSystem.path.join(path, basename));
+
+  @override
+  File childFile(String basename) => fileSystem.file(fileSystem.path.join(path, basename));
+
+  @override
+  Link childLink(String basename) => fileSystem.link(fileSystem.path.join(path, basename));
+}
+
+class _TrackingFile extends ForwardingFileSystemEntity<File, io.File> with ForwardingFile {
+  _TrackingFile(this._fileSystem, this.delegate);
+
+  final LockTrackingFileSystem _fileSystem;
+
+  @override
+  final io.File delegate;
+
+  @override
+  FileSystem get fileSystem => _fileSystem;
+
+  @override
+  File wrapFile(io.File delegate) => _fileSystem.file(delegate.path);
+
+  @override
+  Directory wrapDirectory(io.Directory delegate) => _fileSystem.directory(delegate.path);
+
+  @override
+  Link wrapLink(io.Link delegate) => _fileSystem.link(delegate.path);
+
+  @override
+  void writeAsStringSync(
+    String contents, {
+    FileMode mode = FileMode.write,
+    Encoding encoding = utf8,
+    bool flush = false,
+  }) {
+    _fileSystem.writeCount++;
+    super.writeAsStringSync(contents, mode: mode, encoding: encoding, flush: flush);
+  }
+
+  @override
+  RandomAccessFile openSync({FileMode mode = FileMode.read}) {
+    final RandomAccessFile delegateOpened = super.openSync(mode: mode);
+    if (path.endsWith('.swift_pm.lock')) {
+      return _LockTrackingRandomAccessFile(_fileSystem, delegateOpened);
+    }
+    return delegateOpened;
+  }
+}
+
+class _LockTrackingRandomAccessFile extends Fake implements RandomAccessFile {
+  _LockTrackingRandomAccessFile(this._fileSystem, this._delegate);
+
+  final LockTrackingFileSystem _fileSystem;
+  final RandomAccessFile _delegate;
+
+  @override
+  void lockSync([FileLock mode = FileLock.exclusive, int start = 0, int end = -1]) {
+    _fileSystem.lockAttempts++;
+    if (_fileSystem.throwUnimplementedOnLock) {
+      throw UnimplementedError('Lock not supported');
+    }
+    if (_fileSystem.throwErrorOnLock) {
+      if (_fileSystem.throwErrorOnLockTimes > 0) {
+        _fileSystem.throwErrorOnLockTimes--;
+        throw const FileSystemException('Lock failed');
+      }
+    }
+    _fileSystem.lockCount++;
+  }
+
+  @override
+  void closeSync() {
+    _fileSystem.unlockCount++;
+    _delegate.closeSync();
+  }
+}
+
+class _TrackingLink extends ForwardingFileSystemEntity<Link, io.Link> with ForwardingLink {
+  _TrackingLink(this._fileSystem, this.delegate);
+
+  final LockTrackingFileSystem _fileSystem;
+
+  @override
+  final io.Link delegate;
+
+  @override
+  FileSystem get fileSystem => _fileSystem;
+
+  @override
+  File wrapFile(io.File delegate) => _fileSystem.file(delegate.path);
+
+  @override
+  Directory wrapDirectory(io.Directory delegate) => _fileSystem.directory(delegate.path);
+
+  @override
+  Link wrapLink(io.Link delegate) => _fileSystem.link(delegate.path);
+
+  @override
+  void createSync(String target, {bool recursive = false}) {
+    final String name = _fileSystem.path.basename(path);
+    _fileSystem.linkCreateCount[name] = (_fileSystem.linkCreateCount[name] ?? 0) + 1;
+    super.createSync(target, recursive: recursive);
+  }
+
+  @override
+  void deleteSync({bool recursive = false}) {
+    final String name = _fileSystem.path.basename(path);
+    _fileSystem.linkDeleteCount[name] = (_fileSystem.linkDeleteCount[name] ?? 0) + 1;
+    super.deleteSync(recursive: recursive);
+  }
+}
diff --git a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart
index 8c63fd11af424..d0d8807af8b0e 100644
--- a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart
@@ -122,6 +122,7 @@ void main() {
           fakeProcessManager.addCommand(
             const FakeCommand(command: <String>['xcrun', 'devicectl', '--version']),
           );
+          xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(15, 0, 0);
           final xcode = Xcode.test(
             processManager: fakeProcessManager,
@@ -136,6 +137,7 @@ void main() {
           fakeProcessManager.addCommand(
             const FakeCommand(command: <String>['xcrun', 'devicectl', '--version'], exitCode: 1),
           );
+          xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(15, 0, 0);
           final xcode = Xcode.test(
             processManager: fakeProcessManager,
@@ -157,6 +159,7 @@ void main() {
               exception: ProcessException('xcrun', <String>['devicectl']),
             ),
           );
+          xcodeProjectInterpreter.isInstalled = true;
           xcodeProjectInterpreter.version = Version(15, 0, 0);
           final xcode = Xcode.test(
             processManager: fakeProcessManager,
@@ -170,17 +173,6 @@ void main() {
           expect(logger.errorText, isEmpty);
           expect(logger.traceText, contains('ProcessException'));
         });
-
-        testWithoutContext('is false when Xcode is less than 15', () {
-          xcodeProjectInterpreter.version = Version(14, 0, 0);
-          final xcode = Xcode.test(
-            processManager: fakeProcessManager,
-            xcodeProjectInterpreter: xcodeProjectInterpreter,
-          );
-
-          expect(xcode.isDevicectlInstalled, isFalse);
-          expect(fakeProcessManager, hasNoRemainingExpectations);
-        });
       });
 
       group('pathToXcodeApp', () {
diff --git a/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
index 0135fe3f6af59..e52fbf6737275 100644
--- a/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
+++ b/packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
@@ -88,8 +88,11 @@ void main() {
       );
       final ValidationResult result = await validator.validate();
       expect(result.type, ValidationType.partial);
-      expect(result.messages.last.type, ValidationMessageType.error);
-      expect(result.messages.last.message, contains('Flutter requires Xcode 15 or higher'));
+      final bool hasOutdatedError = result.messages.any(
+        (ValidationMessage message) =>
+            message.message.contains('Flutter requires Xcode 15 or higher'),
+      );
+      expect(hasOutdatedError, isTrue);
     });
 
     testWithoutContext('Emits partial status when Xcode below recommended version', () async {
diff --git a/packages/flutter_tools/test/general.shard/migrations/analysis_options_migration_test.dart b/packages/flutter_tools/test/general.shard/migrations/analysis_options_migration_test.dart
index 73ecb6a133b51..15fea3862e2d6 100644
--- a/packages/flutter_tools/test/general.shard/migrations/analysis_options_migration_test.dart
+++ b/packages/flutter_tools/test/general.shard/migrations/analysis_options_migration_test.dart
@@ -8,6 +8,7 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/migrations/analysis_options_migration.dart';
 import 'package:flutter_tools/src/project.dart';
+import 'package:package_config/package_config.dart';
 import 'package:test/fake.dart';
 
 import '../../src/common.dart';
@@ -202,6 +203,228 @@ analyzer:
       expect(migratedContents, contains('macos/**'));
       expect(migratedContents, contains('linux/**'));
     });
+
+    testWithoutContext('skipped if exclusions are inherited via relative include', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include: shared_options.yaml
+''';
+      const sharedOptionsContents = '''
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+      context.memoryFileSystem.file('shared_options.yaml').writeAsStringSync(sharedOptionsContents);
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('skipped if exclusions are inherited via package include', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include: package:shared_options/analysis_options.yaml
+''';
+      const sharedOptionsContents = '''
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+
+      final Directory sharedPackageDir = context.memoryFileSystem.directory('/shared_options');
+      final File sharedOptionsFile = sharedPackageDir.childFile('lib/analysis_options.yaml');
+      sharedOptionsFile.createSync(recursive: true);
+      sharedOptionsFile.writeAsStringSync(sharedOptionsContents);
+
+      final packageConfig = FakePackageConfig(<String, Uri>{
+        'shared_options': sharedPackageDir.childDirectory('lib').uri,
+      });
+
+      final migration = AnalysisOptionsMigration(
+        context.mockProject,
+        context.testLogger,
+        packageConfig: packageConfig,
+      );
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('skipped if exclusions are inherited via multiple includes', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include:
+  - shared_options_1.yaml
+  - shared_options_2.yaml
+''';
+      const sharedOptions1Contents = '''
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+''';
+      const sharedOptions2Contents = '''
+analyzer:
+  exclude:
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+      context.memoryFileSystem
+          .file('shared_options_1.yaml')
+          .writeAsStringSync(sharedOptions1Contents);
+      context.memoryFileSystem
+          .file('shared_options_2.yaml')
+          .writeAsStringSync(sharedOptions2Contents);
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('handles cyclic includes without crashing', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include: shared_options_1.yaml
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+      const sharedOptions1Contents = '''
+include: shared_options_2.yaml
+''';
+      const sharedOptions2Contents = '''
+include: shared_options_1.yaml
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+      context.memoryFileSystem
+          .file('shared_options_1.yaml')
+          .writeAsStringSync(sharedOptions1Contents);
+      context.memoryFileSystem
+          .file('shared_options_2.yaml')
+          .writeAsStringSync(sharedOptions2Contents);
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+
+      // Should not throw StackOverflowError or hang
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('handles invalid exclude types without crashing', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+    - 123 # Invalid exclude type (int)
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+
+      // Should not throw TypeError
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('handles unreadable include file without crashing', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include: some_dir
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+      // Create 'some_dir' as a directory so reading it throws FileSystemException
+      context.memoryFileSystem.directory('some_dir').createSync();
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
+
+    testWithoutContext('handles cyclic includes with different casing without crashing', () async {
+      final _TestContext context = _createTestContext();
+      const analysisOptionsContents = '''
+include: shared_options.yaml
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+''';
+      const sharedOptionsContents = '''
+include: SHARED_OPTIONS.YAML
+''';
+
+      context.analysisOptionsFile.writeAsStringSync(analysisOptionsContents);
+      context.memoryFileSystem.file('shared_options.yaml').writeAsStringSync(sharedOptionsContents);
+
+      final migration = AnalysisOptionsMigration(context.mockProject, context.testLogger);
+      await migration.migrate();
+
+      expect(context.analysisOptionsFile.readAsStringSync(), analysisOptionsContents);
+      expect(context.testLogger.statusText, isEmpty);
+    });
   });
 }
 
@@ -234,3 +457,28 @@ class FakeFlutterProject extends Fake implements FlutterProject {
   @override
   final Directory directory;
 }
+
+class FakePackageConfig extends Fake implements PackageConfig {
+  FakePackageConfig(this._packages);
+
+  final Map<String, Uri> _packages;
+
+  @override
+  Uri? resolve(Uri packageUri) {
+    if (packageUri.scheme != 'package') {
+      return null;
+    }
+    final String path = packageUri.path;
+    final int slashIndex = path.indexOf('/');
+    if (slashIndex == -1) {
+      return null;
+    }
+    final String packageName = path.substring(0, slashIndex);
+    final String packagePath = path.substring(slashIndex + 1);
+    final Uri? packageRoot = _packages[packageName];
+    if (packageRoot == null) {
+      return null;
+    }
+    return packageRoot.resolve(packagePath);
+  }
+}
diff --git a/packages/flutter_tools/test/general.shard/plugins_test.dart b/packages/flutter_tools/test/general.shard/plugins_test.dart
index 1d2e0632488dd..9dc8389be13ac 100644
--- a/packages/flutter_tools/test/general.shard/plugins_test.dart
+++ b/packages/flutter_tools/test/general.shard/plugins_test.dart
@@ -492,9 +492,9 @@ dependencies:
             'bad_plugin',
           ]);
           // Write bytes that are not valid UTF-8, so readAsString throws a FileSystemException.
-          pluginDirs[1].childFile('pubspec.yaml').writeAsBytesSync(
-            Uint8List.fromList(<int>[0xff, 0xfe, 0xfd]),
-          );
+          pluginDirs[1]
+              .childFile('pubspec.yaml')
+              .writeAsBytesSync(Uint8List.fromList(<int>[0xff, 0xfe, 0xfd]));
 
           // The tool must not crash when a plugin's pubspec.yaml cannot be read.
           final Future<List<Plugin>> pluginsFuture = findPlugins(flutterProject);
@@ -2020,6 +2020,195 @@ flutter:
         );
       });
 
+      testUsingContext(
+        'Plugin.fromYaml rejects a plugin class with code-injection characters',
+        () async {
+          // A (possibly transitive) dependency must not be able to smuggle
+          // arbitrary source into the generated GeneratedPluginRegistrant by
+          // declaring a pluginClass that is not a plain identifier.
+          const maliciousYaml = '''
+platforms:
+  macos:
+    pluginClass: "SomePlugin(); evilInjectedCall(); if (false) { SomePlugin"
+''';
+          expect(
+            () => Plugin.fromYaml(
+              'evil_plugin',
+              '',
+              loadYaml(maliciousYaml) as YamlMap,
+              null,
+              const <String>[],
+              fileSystem: globals.fs,
+              isDevDependency: false,
+            ),
+            throwsToolExit(message: 'Invalid plugin specification evil_plugin'),
+          );
+        },
+      );
+
+      testUsingContext(
+        'Plugin.fromYaml rejects a web plugin whose pluginClass/fileName contain injection',
+        () async {
+          const maliciousYaml = '''
+platforms:
+  web:
+    pluginClass: "P; void pwn() {} //"
+    fileName: some_file.dart
+''';
+          expect(
+            () => Plugin.fromYaml(
+              'evil_web_plugin',
+              '',
+              loadYaml(maliciousYaml) as YamlMap,
+              null,
+              const <String>[],
+              fileSystem: globals.fs,
+              isDevDependency: false,
+            ),
+            throwsToolExit(),
+          );
+        },
+      );
+
+      testUsingContext(
+        'Plugin.fromYaml rejects a dartPluginClass with code-injection characters',
+        () async {
+          // A dart plugin class is also interpolated into generated registrant
+          // source, so it must be a plain identifier like the native one.
+          const maliciousYaml = '''
+platforms:
+  android:
+    dartPluginClass: "Evil(); evilInjectedCall(); class Evil"
+''';
+          expect(
+            () => Plugin.fromYaml(
+              'evil_dart_plugin',
+              '',
+              loadYaml(maliciousYaml) as YamlMap,
+              null,
+              const <String>[],
+              fileSystem: globals.fs,
+              isDevDependency: false,
+            ),
+            throwsToolExit(message: 'Invalid plugin specification evil_dart_plugin'),
+          );
+        },
+      );
+
+      testUsingContext(
+        'Plugin.fromYaml rejects legacy-format identifiers with code-injection characters',
+        () async {
+          // The legacy plugin format is parsed by Plugin._fromLegacyYaml, which
+          // builds AndroidPlugin/IOSPlugin through their plain constructors and
+          // so never reaches the platform `fromYaml` validation. Its fields are
+          // interpolated into the generated registrant just the same.
+          const maliciousYaml = '''
+androidPackage: com.example.evil
+pluginClass: "Evil(); evilInjectedCall(); //"
+''';
+          expect(
+            () => Plugin.fromYaml(
+              'evil_legacy_plugin',
+              '',
+              loadYaml(maliciousYaml) as YamlMap,
+              null,
+              const <String>[],
+              fileSystem: globals.fs,
+              isDevDependency: false,
+            ),
+            throwsToolExit(message: 'The "pluginClass" must be a valid identifier'),
+          );
+        },
+      );
+
+      testUsingContext(
+        'Plugin.fromYaml rejects a legacy-format androidPackage injection',
+        () async {
+          const maliciousYaml = '''
+androidPackage: "com.example.evil.Payload.run(); //"
+pluginClass: EvilPlugin
+''';
+          expect(
+            () => Plugin.fromYaml(
+              'evil_legacy_plugin',
+              '',
+              loadYaml(maliciousYaml) as YamlMap,
+              null,
+              const <String>[],
+              fileSystem: globals.fs,
+              isDevDependency: false,
+            ),
+            throwsToolExit(message: 'The "androidPackage" must be a valid identifier'),
+          );
+        },
+      );
+
+      testUsingContext('Plugin.fromYaml rejects a legacy-format iosPrefix injection', () async {
+        const maliciousYaml = '''
+androidPackage: com.example.evil
+pluginClass: EvilPlugin
+iosPrefix: "FLT; evilInjectedCall(); //"
+''';
+        expect(
+          () => Plugin.fromYaml(
+            'evil_legacy_plugin',
+            '',
+            loadYaml(maliciousYaml) as YamlMap,
+            null,
+            const <String>[],
+            fileSystem: globals.fs,
+            isDevDependency: false,
+          ),
+          throwsToolExit(message: 'The "iosPrefix" must be a valid identifier'),
+        );
+      });
+
+      testUsingContext('Plugin.fromYaml reports every invalid legacy-format field at once', () async {
+        const maliciousYaml = '''
+androidPackage: "com.example.evil.Payload.run(); //"
+pluginClass: "Evil(); evilInjectedCall(); //"
+iosPrefix: "FLT; evilInjectedCall(); //"
+''';
+        expect(
+          () => Plugin.fromYaml(
+            'evil_legacy_plugin',
+            '',
+            loadYaml(maliciousYaml) as YamlMap,
+            null,
+            const <String>[],
+            fileSystem: globals.fs,
+            isDevDependency: false,
+          ),
+          throwsToolExit(
+            message:
+                'Invalid plugin specification evil_legacy_plugin.\n'
+                'The "androidPackage" must be a valid identifier, optionally with dot-separated segments.\n'
+                'The "iosPrefix" must be a valid identifier, optionally with dot-separated segments.\n'
+                'The "pluginClass" must be a valid identifier, optionally with dot-separated segments.',
+          ),
+        );
+      });
+
+      testUsingContext('Plugin.fromYaml accepts a legacy-format plugin declaration', () async {
+        const legacyYaml = '''
+androidPackage: com.example.sample
+pluginClass: SamplePlugin
+iosPrefix: FLT
+''';
+        final plugin = Plugin.fromYaml(
+          'sample_plugin',
+          '',
+          loadYaml(legacyYaml) as YamlMap,
+          null,
+          const <String>[],
+          fileSystem: globals.fs,
+          isDevDependency: false,
+        );
+
+        expect(plugin.platforms, contains(AndroidPlugin.kConfigKey));
+        expect(plugin.platforms, contains(IOSPlugin.kConfigKey));
+      });
+
       testUsingContext('createPlatformsYamlMap should create the correct map', () async {
         final YamlMap map = Plugin.createPlatformsYamlMap(
           <String>['ios', 'android', 'linux'],
diff --git a/packages/flutter_tools/test/general.shard/pub_workspace_test.dart b/packages/flutter_tools/test/general.shard/pub_workspace_test.dart
new file mode 100644
index 0000000000000..94c9b1cce631e
--- /dev/null
+++ b/packages/flutter_tools/test/general.shard/pub_workspace_test.dart
@@ -0,0 +1,58 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_tools/src/base/file_system.dart';
+import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:yaml/yaml.dart';
+
+import '../src/common.dart';
+
+void main() {
+  final FileSystem fs = globals.localFileSystem;
+  final String flutterToolsRoot = fs.path.join(getFlutterRoot(), 'packages', 'flutter_tools');
+  const expectedWorkspaceMembers = <String>[
+    'packages/flutter_tools_core',
+    'packages/flutter_tools_extension',
+    'packages/flutter_tools_extension_linux_prototype',
+  ];
+
+  group('Flutter Tools Pub Workspace', () {
+    testWithoutContext('root pubspec.yaml declares all sub-packages in workspace', () {
+      final File pubspecFile = fs.file(fs.path.join(flutterToolsRoot, 'pubspec.yaml'));
+      expect(pubspecFile.existsSync(), isTrue);
+
+      final Object? yamlContent = loadYaml(pubspecFile.readAsStringSync());
+      expect(yamlContent, isA<YamlMap>());
+      final yamlMap = yamlContent! as YamlMap;
+
+      expect(yamlMap.containsKey('workspace'), isTrue);
+      final List<String> workspaceList = (yamlMap['workspace'] as YamlList).cast<String>().toList();
+
+      for (final member in expectedWorkspaceMembers) {
+        expect(workspaceList, contains(member), reason: 'Expected workspace to include $member');
+      }
+    });
+
+    testWithoutContext('member pubspec.yaml files declare workspace resolution', () {
+      for (final member in expectedWorkspaceMembers) {
+        final File memberPubspec = fs.file(fs.path.join(flutterToolsRoot, member, 'pubspec.yaml'));
+        expect(
+          memberPubspec.existsSync(),
+          isTrue,
+          reason: 'Expected pubspec.yaml to exist for $member',
+        );
+
+        final Object? yamlContent = loadYaml(memberPubspec.readAsStringSync());
+        expect(yamlContent, isA<YamlMap>());
+        final yamlMap = yamlContent! as YamlMap;
+
+        expect(
+          yamlMap['resolution'],
+          equals('workspace'),
+          reason: 'Expected $member to declare resolution: workspace',
+        );
+      }
+    });
+  });
+}
diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
index 754492f7ae180..e9deba25ed7c1 100644
--- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
@@ -2183,6 +2183,117 @@ flutter:
       ProcessManager: () => processManager,
     },
   );
+
+  group('web-defines', () {
+    testUsingContext(
+      'passes web-defines to the build in profile mode',
+      () async {
+        fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
+        setupMocks();
+        final residentWebRunner = ResidentWebRunner(
+          flutterDevice,
+          flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+          debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile),
+          stayResident: false,
+          fileSystem: fileSystem,
+          logger: BufferLogger.test(),
+          terminal: Terminal.test(),
+          platform: FakePlatform(),
+          outputPreferences: OutputPreferences.test(),
+          analytics: globals.analytics,
+          systemClock: globals.systemClock,
+          webDefines: const <String, String>{'VERSION': 'v1.2.3'},
+        );
+
+        expect(await residentWebRunner.run(), 0);
+      },
+      overrides: <Type, Generator>{
+        BuildSystem: () => TestBuildSystem.all(BuildResult(success: true), (
+          Target target,
+          Environment environment,
+        ) {
+          expect(environment.defines['webDefine:VERSION'], 'v1.2.3');
+        }),
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+        Pub: ThrowingPub.new,
+      },
+    );
+
+    testUsingContext(
+      'passes web-defines to the rebuild after a hot restart in release mode',
+      () async {
+        fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
+        setupMocks();
+        final residentWebRunner = ResidentWebRunner(
+          flutterDevice,
+          flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+          debuggingOptions: DebuggingOptions.enabled(BuildInfo.release),
+          fileSystem: fileSystem,
+          logger: BufferLogger.test(),
+          terminal: Terminal.test(),
+          platform: FakePlatform(),
+          outputPreferences: OutputPreferences.test(),
+          analytics: globals.analytics,
+          systemClock: globals.systemClock,
+          webDefines: const <String, String>{'VERSION': 'v1.2.3'},
+        );
+
+        final connectionInfoCompleter = Completer<DebugConnectionInfo>();
+        unawaited(residentWebRunner.run(connectionInfoCompleter: connectionInfoCompleter));
+        await connectionInfoCompleter.future;
+
+        final OperationResult result = await residentWebRunner.restart();
+        expect(result.code, 0);
+      },
+      overrides: <Type, Generator>{
+        BuildSystem: () => TestBuildSystem.all(BuildResult(success: true), (
+          Target target,
+          Environment environment,
+        ) {
+          expect(environment.defines['webDefine:VERSION'], 'v1.2.3');
+        }),
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+        Pub: ThrowingPub.new,
+      },
+    );
+
+    testUsingContext(
+      'passes web-defines to the build in debug --wasm mode',
+      () async {
+        fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
+        setupMocks();
+        final residentWebRunner = ResidentWebRunner(
+          flutterDevice,
+          flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+          debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug, webUseWasm: true),
+          stayResident: false,
+          fileSystem: fileSystem,
+          logger: BufferLogger.test(),
+          terminal: Terminal.test(),
+          platform: FakePlatform(),
+          outputPreferences: OutputPreferences.test(),
+          analytics: globals.analytics,
+          systemClock: globals.systemClock,
+          webDefines: const <String, String>{'VERSION': 'v1.2.3'},
+        );
+
+        expect(await residentWebRunner.run(), 0);
+      },
+      overrides: <Type, Generator>{
+        BuildSystem: () => TestBuildSystem.all(BuildResult(success: true), (
+          Target target,
+          Environment environment,
+        ) {
+          expect(environment.defines['webDefine:VERSION'], 'v1.2.3');
+        }),
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+        Pub: ThrowingPub.new,
+      },
+    );
+  });
 }
 
 ResidentRunner setUpResidentRunner(
diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
index 39face9966bf0..cb298d8be8a84 100644
--- a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
+++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
@@ -236,6 +236,100 @@ void main() {
       },
     );
 
+    testUsingContext(
+      'prints warning when enable-impeller flag is used with release build',
+      () async {
+        final flutterCommand = DummyFlutterCommand()
+          ..addBuildModeFlags(verboseHelp: false)
+          ..addEnableImpellerFlag(verboseHelp: false);
+
+        final CommandRunner<void> runner = createTestCommandRunner(flutterCommand);
+        await runner.run(<String>['dummy', '--release', '--enable-impeller']);
+
+        expect(
+          testLogger.warningText,
+          contains('The "--enable-impeller" flag is ignored in release builds'),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
+    testUsingContext(
+      'prints warning when no-enable-impeller flag is used with release build',
+      () async {
+        final flutterCommand = DummyFlutterCommand()
+          ..addBuildModeFlags(verboseHelp: false)
+          ..addEnableImpellerFlag(verboseHelp: false);
+
+        final CommandRunner<void> runner = createTestCommandRunner(flutterCommand);
+        await runner.run(<String>['dummy', '--release', '--no-enable-impeller']);
+
+        expect(
+          testLogger.warningText,
+          contains('The "--no-enable-impeller" flag is ignored in release builds'),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
+    testUsingContext(
+      'does not print warning when enable-impeller flag is used with debug build',
+      () async {
+        final flutterCommand = DummyFlutterCommand()
+          ..addBuildModeFlags(verboseHelp: false)
+          ..addEnableImpellerFlag(verboseHelp: false);
+
+        final CommandRunner<void> runner = createTestCommandRunner(flutterCommand);
+        await runner.run(<String>['dummy', '--debug', '--enable-impeller']);
+
+        expect(testLogger.warningText, isEmpty);
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
+    testUsingContext(
+      'does not print warning when no impeller flags are used with release build',
+      () async {
+        final flutterCommand = DummyFlutterCommand()
+          ..addBuildModeFlags(verboseHelp: false)
+          ..addEnableImpellerFlag(verboseHelp: false);
+
+        final CommandRunner<void> runner = createTestCommandRunner(flutterCommand);
+        await runner.run(<String>['dummy', '--release']);
+
+        expect(testLogger.warningText, isEmpty);
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
+    testUsingContext(
+      'does not fail or warn on command without build mode flags',
+      () async {
+        final flutterCommand = DummyFlutterCommand();
+
+        final CommandRunner<void> runner = createTestCommandRunner(flutterCommand);
+        await runner.run(<String>['dummy']);
+
+        expect(testLogger.warningText, isEmpty);
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
     testUsingContext(
       'uses the error handling file system',
       () async {
@@ -652,6 +746,45 @@ void main() {
       },
     );
 
+    testUsingContext(
+      'reports an explicit --[no-]enable-hcpp to gradle so it overrides the manifest',
+      () async {
+        final enabledCommand = DummyHcppFlutterCommand();
+        await createTestCommandRunner(enabledCommand).run(<String>['dummy', '--enable-hcpp']);
+        final BuildInfo enabledBuildInfo = await enabledCommand.getBuildInfo(
+          forcedBuildMode: BuildMode.debug,
+        );
+        expect(enabledBuildInfo.explicitAndroidEnableHcpp, isTrue);
+        expect(enabledBuildInfo.toGradleConfig(), contains('-Pexplicit-enable-hcpp=true'));
+
+        // The negation has to be reported too, otherwise gradle cannot tell it apart from the
+        // flag being absent and would leave a manifest value of true in place.
+        final disabledCommand = DummyHcppFlutterCommand();
+        await createTestCommandRunner(disabledCommand).run(<String>['dummy', '--no-enable-hcpp']);
+        final BuildInfo disabledBuildInfo = await disabledCommand.getBuildInfo(
+          forcedBuildMode: BuildMode.debug,
+        );
+        expect(disabledBuildInfo.explicitAndroidEnableHcpp, isFalse);
+        expect(disabledBuildInfo.toGradleConfig(), contains('-Pexplicit-enable-hcpp=false'));
+
+        // Without the flag nothing is reported, so the manifest decides.
+        final defaultCommand = DummyHcppFlutterCommand();
+        await createTestCommandRunner(defaultCommand).run(<String>['dummy']);
+        final BuildInfo defaultBuildInfo = await defaultCommand.getBuildInfo(
+          forcedBuildMode: BuildMode.debug,
+        );
+        expect(defaultBuildInfo.explicitAndroidEnableHcpp, isNull);
+        expect(
+          defaultBuildInfo.toGradleConfig(),
+          isNot(anyElement(contains('-Pexplicit-enable-hcpp'))),
+        );
+      },
+      overrides: <Type, Generator>{
+        FileSystem: () => fileSystem,
+        ProcessManager: () => processManager,
+      },
+    );
+
     testUsingContext(
       'use fileSystemScheme to generate BuildInfo',
       () async {
@@ -1240,6 +1373,61 @@ void main() {
         },
       );
 
+      testUsingContext(
+        'parses values from JSON files encoded in UTF-16 LE with BOM',
+        () async {
+          fileSystem.file(fileSystem.path.join('lib', 'main.dart')).createSync(recursive: true);
+          fileSystem.file('pubspec.yaml').createSync();
+          final utf16Bytes = <int>[
+            0xFF, 0xFE, // UTF-16 LE BOM
+            ...'{ "kInt": 1 }'.codeUnits.expand(
+              (int codeUnit) => <int>[codeUnit & 0xFF, (codeUnit >> 8) & 0xFF],
+            ),
+          ];
+          fileSystem.file('config.json').writeAsBytesSync(utf16Bytes);
+
+          await dummyCommandRunner.run(<String>['dummy', '--dart-define-from-file=config.json']);
+
+          final BuildInfo buildInfo = await dummyCommand.getBuildInfo(
+            forcedBuildMode: BuildMode.debug,
+          );
+          expect(buildInfo.dartDefines, containsAll(const <String>['kInt=1']));
+        },
+        overrides: <Type, Generator>{
+          FileSystem: () => fileSystem,
+          Logger: () => logger,
+          FileSystemUtils: () => fileSystemUtils,
+          Platform: () => platform,
+          ProcessManager: () => processManager,
+        },
+      );
+
+      testUsingContext(
+        'throws a ToolExit when the given file cannot be decoded',
+        () async {
+          fileSystem.file(fileSystem.path.join('lib', 'main.dart')).createSync(recursive: true);
+          fileSystem.file('pubspec.yaml').createSync();
+          fileSystem.file('config.json').writeAsBytesSync(<int>[0xFF, 0xFF, 0xFF, 0xFF, 0x01]);
+
+          await dummyCommandRunner.run(<String>['dummy', '--dart-define-from-file=config.json']);
+          expect(
+            dummyCommand.getBuildInfo(forcedBuildMode: BuildMode.debug),
+            throwsToolExit(
+              message:
+                  'Unable to decode the file at path "config.json". '
+                  'Ensure that the file is encoded in UTF-8 or UTF-16.\n',
+            ),
+          );
+        },
+        overrides: <Type, Generator>{
+          FileSystem: () => fileSystem,
+          Logger: () => logger,
+          FileSystemUtils: () => fileSystemUtils,
+          Platform: () => platform,
+          ProcessManager: () => processManager,
+        },
+      );
+
       testUsingContext(
         'throws a ToolExit when the given JSON file is malformed',
         () async {
@@ -2108,3 +2296,9 @@ class DummyMachineFlutterCommand extends DummyFlutterCommand {
     addMachineOutputFlag(verboseHelp: false);
   }
 }
+
+class DummyHcppFlutterCommand extends DummyFlutterCommand {
+  DummyHcppFlutterCommand() : super(name: 'dummy') {
+    addEnableHcppFlag(verboseHelp: false);
+  }
+}
diff --git a/packages/flutter_tools/test/general.shard/vmservice_test.dart b/packages/flutter_tools/test/general.shard/vmservice_test.dart
index 53a7e0228394d..c56742ea5114e 100644
--- a/packages/flutter_tools/test/general.shard/vmservice_test.dart
+++ b/packages/flutter_tools/test/general.shard/vmservice_test.dart
@@ -638,6 +638,16 @@ void main() {
     expect(processVmServiceMessage(event), 'Hello There');
   });
 
+  testWithoutContext('Can process log events containing a valid replacement character', () {
+    final event = vm_service.Event(
+      bytes: base64.encode(utf8ForTesting.encode('flutter: \u{FFFD}\n')),
+      timestamp: 0,
+      kind: vm_service.EventKind.kLogging,
+    );
+
+    expect(processVmServiceMessage(event), 'flutter: \u{FFFD}');
+  });
+
   testUsingContext('WebSocket URL construction uses correct URI join primitives', () async {
     final completer = Completer<String>();
     openChannelForTesting =
diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart
index bca727bbbb4cf..626c26986cd78 100644
--- a/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/devfs_web_ddc_modules_test.dart
@@ -12,10 +12,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/build_info.dart';
-import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart';
 import 'package:flutter_tools/src/compile.dart';
 import 'package:flutter_tools/src/convert.dart';
-import 'package:flutter_tools/src/devfs.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/isolated/devfs_web.dart';
 import 'package:flutter_tools/src/isolated/release_asset_server.dart';
@@ -28,10 +26,10 @@ import 'package:logging/logging.dart' as logging;
 import 'package:meta/meta.dart';
 import 'package:package_config/package_config.dart';
 import 'package:shelf/shelf.dart';
-import 'package:test/fake.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
 import '../../src/common.dart';
+import '../../src/fake_web_devfs.dart';
 import '../../src/testbed.dart';
 
 const kTransparentImage = <int>[
@@ -775,37 +773,20 @@ void main() {
     final ResidentCompiler residentCompiler = FakeResidentCompiler()
       ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-    const webDevServerConfig = WebDevServerConfig();
-    final webDevFS = WebDevFS(
-      packagesFilePath: '.dart_tool/package_config.json',
-      urlTunneller: null,
+    final WebDevFS webDevFS = createWebDevFS(
       useSseForDebugProxy: true,
       useSseForDebugBackend: true,
       useSseForInjectedClient: true,
-      nativeNullAssertions: true,
       buildInfo: const BuildInfo(
         BuildMode.debug,
         '',
         treeShakeIcons: false,
         packageConfigPath: '.dart_tool/package_config.json',
       ),
-      enableDwds: false,
       ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
       entrypoint: Uri.base,
-      testMode: true,
-      expressionCompiler: null,
-      chromiumLauncher: null,
       ddcModuleSystem: usesDdcModuleSystem,
       canaryFeatures: canaryFeatures,
-      webRenderer: WebRendererMode.canvaskit,
-      isWasm: false,
-      useLocalCanvasKit: false,
-      rootDirectory: globals.fs.currentDirectory,
-      webDevServerConfig: webDevServerConfig,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-      platform: globals.platform,
-      webCrossOriginIsolation: false,
     );
     webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
     webDevFS.flutterJs.createSync(recursive: true);
@@ -878,14 +859,10 @@ void main() {
       outputFile.parent.childFile('a.map').writeAsStringSync('{}');
       outputFile.parent.childFile('a.metadata').writeAsStringSync('{}');
 
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
         buildInfo: const BuildInfo(
           BuildMode.debug,
           '',
@@ -895,20 +872,8 @@ void main() {
         enableDwds: true,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
         ddcModuleSystem: usesDdcModuleSystem,
         canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
       webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -952,32 +917,14 @@ void main() {
     outputFile.parent.childFile('a.json').writeAsStringSync('{}');
     outputFile.parent.childFile('a.map').writeAsStringSync('{}');
 
-    const webDevServerConfig = WebDevServerConfig();
-    final webDevFS = WebDevFS(
-      packagesFilePath: '.dart_tool/package_config.json',
-      urlTunneller: null,
+    final WebDevFS webDevFS = createWebDevFS(
       useSseForDebugProxy: true,
       useSseForDebugBackend: true,
       useSseForInjectedClient: true,
-      buildInfo: BuildInfo.debug,
-      enableDwds: false,
       ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
       entrypoint: Uri.base,
-      testMode: true,
-      expressionCompiler: null,
-      chromiumLauncher: null,
-      nativeNullAssertions: true,
       ddcModuleSystem: usesDdcModuleSystem,
       canaryFeatures: canaryFeatures,
-      webRenderer: WebRendererMode.canvaskit,
-      isWasm: false,
-      useLocalCanvasKit: false,
-      rootDirectory: globals.fs.currentDirectory,
-      webDevServerConfig: webDevServerConfig,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-      platform: globals.platform,
-      webCrossOriginIsolation: false,
     );
     webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
     webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -995,14 +942,10 @@ void main() {
     outputFile.parent.childFile('a.json').writeAsStringSync('{}');
     outputFile.parent.childFile('a.map').writeAsStringSync('{}');
 
-    const webDevServerConfig = WebDevServerConfig();
-    final webDevFS = WebDevFS(
-      packagesFilePath: '.dart_tool/package_config.json',
-      urlTunneller: null,
+    final WebDevFS webDevFS = createWebDevFS(
       useSseForDebugProxy: true,
       useSseForDebugBackend: true,
       useSseForInjectedClient: true,
-      nativeNullAssertions: true,
       buildInfo: const BuildInfo(
         BuildMode.debug,
         '',
@@ -1010,23 +953,10 @@ void main() {
         dartDefines: <String>['FLUTTER_WEB_USE_SKIA=true'],
         packageConfigPath: '.dart_tool/package_config.json',
       ),
-      enableDwds: false,
       ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
       entrypoint: Uri.base,
-      testMode: true,
-      expressionCompiler: null,
-      chromiumLauncher: null,
       ddcModuleSystem: usesDdcModuleSystem,
       canaryFeatures: canaryFeatures,
-      webRenderer: WebRendererMode.canvaskit,
-      isWasm: false,
-      useLocalCanvasKit: false,
-      rootDirectory: globals.fs.currentDirectory,
-      webDevServerConfig: webDevServerConfig,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-      platform: globals.platform,
-      webCrossOriginIsolation: false,
     );
     webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
     webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -1054,31 +984,15 @@ void main() {
     final webDevServerConfig = WebDevServerConfig(
       https: HttpsConfig(certPath: dummyCertPath, certKeyPath: dummyCertKeyPath),
     );
-    final webDevFS = WebDevFS(
-      packagesFilePath: '.dart_tool/package_config.json',
-      urlTunneller: null,
+    final WebDevFS webDevFS = createWebDevFS(
       useSseForDebugProxy: true,
       useSseForDebugBackend: true,
       useSseForInjectedClient: true,
-      nativeNullAssertions: true,
-      buildInfo: BuildInfo.debug,
-      enableDwds: false,
       ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
       entrypoint: Uri.base,
-      testMode: true,
-      expressionCompiler: null,
-      chromiumLauncher: null,
       ddcModuleSystem: usesDdcModuleSystem,
       canaryFeatures: canaryFeatures,
-      webRenderer: WebRendererMode.canvaskit,
-      isWasm: false,
-      useLocalCanvasKit: false,
-      rootDirectory: globals.fs.currentDirectory,
       webDevServerConfig: webDevServerConfig,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-      platform: globals.platform,
-      webCrossOriginIsolation: false,
     );
     webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
     webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -1221,32 +1135,14 @@ void main() {
     outputFile.parent.childFile('a.map').writeAsStringSync('{}');
     outputFile.parent.childFile('a.metadata').writeAsStringSync('{}');
 
-    const webDevServerConfig = WebDevServerConfig();
-    final webDevFS = WebDevFS(
-      packagesFilePath: '.dart_tool/package_config.json',
-      urlTunneller: null,
+    final WebDevFS webDevFS = createWebDevFS(
       useSseForDebugProxy: true,
       useSseForDebugBackend: true,
       useSseForInjectedClient: true,
-      nativeNullAssertions: true,
-      buildInfo: BuildInfo.debug,
-      enableDwds: false,
       ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
       entrypoint: Uri.base,
-      testMode: true,
-      expressionCompiler: null,
-      chromiumLauncher: null,
       ddcModuleSystem: usesDdcModuleSystem,
       canaryFeatures: canaryFeatures,
-      webRenderer: WebRendererMode.canvaskit,
-      isWasm: false,
-      useLocalCanvasKit: false,
-      rootDirectory: globals.fs.currentDirectory,
-      webDevServerConfig: webDevServerConfig,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-      platform: globals.platform,
-      webCrossOriginIsolation: false,
     );
     webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
     webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -1261,78 +1157,3 @@ void main() {
     await webDevFS.destroy();
   }, overrides: <Type, Generator>{Artifacts: Artifacts.test});
 }
-
-class FakeHttpServer extends Fake implements HttpServer {
-  bool closed = false;
-
-  @override
-  Future<void> close({bool force = false}) async {
-    closed = true;
-  }
-}
-
-class FakeResidentCompiler extends Fake implements ResidentCompiler {
-  CompilerOutput? output;
-
-  @override
-  void addFileSystemRoot(String root) {}
-
-  @override
-  Future<CompilerOutput?> recompile(
-    Uri mainUri,
-    List<Uri>? invalidatedFiles, {
-    String? outputPath,
-    PackageConfig? packageConfig,
-    String? projectRootPath,
-    FileSystem? fs,
-    bool suppressErrors = false,
-    bool checkDartPluginRegistry = false,
-    File? dartPluginRegistrant,
-    Uri? nativeAssetsYaml,
-    bool recompileRestart = false,
-  }) async {
-    return output;
-  }
-}
-
-class FakeShaderCompiler implements DevelopmentShaderCompiler {
-  const FakeShaderCompiler();
-
-  @override
-  void configureCompiler(TargetPlatform? platform) {}
-
-  @override
-  Future<DevFSContent> recompileShader(DevFSContent inputShader) {
-    throw UnimplementedError();
-  }
-
-  @override
-  bool areDependenciesModified(DevFSContent shaderContent) => false;
-}
-
-class FakeDwds extends Fake implements Dwds {
-  FakeDwds(Iterable<AppConnection> connectedAppsIterable)
-    : connectedApps = Stream<AppConnection>.fromIterable(connectedAppsIterable);
-
-  @override
-  final Stream<AppConnection> connectedApps;
-
-  @override
-  Future<DebugConnection> debugConnection(AppConnection appConnection) {
-    return Future<DebugConnection>.value(FakeDebugConnection());
-  }
-}
-
-class FakeAppConnection extends Fake implements AppConnection {
-  @override
-  void runMain() {}
-}
-
-class FakeDebugConnection extends Fake implements DebugConnection {
-  FakeDebugConnection({this.uri = 'http://foo'});
-
-  @override
-  final String uri;
-}
-
-class FakeVmService extends Fake implements vm_service.VmService {}
diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart
index 9ceb9aa1bb64f..1ffcbbe5fa9c4 100644
--- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart
@@ -14,7 +14,6 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/build_info.dart';
-import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart';
 import 'package:flutter_tools/src/compile.dart';
 import 'package:flutter_tools/src/convert.dart';
 import 'package:flutter_tools/src/devfs.dart';
@@ -30,10 +29,10 @@ import 'package:flutter_tools/src/web_template.dart';
 import 'package:logging/logging.dart' as logging;
 import 'package:package_config/package_config.dart';
 import 'package:shelf/shelf.dart';
-import 'package:test/fake.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
 import '../../src/common.dart';
+import '../../src/fake_web_devfs.dart';
 import '../../src/testbed.dart';
 
 const kTransparentImage = <int>[
@@ -101,31 +100,10 @@ void main() {
   test(
     'WebDevFS.assetPathsToEvict is mutable and can be cleared/modified',
     () => testbed.run(() {
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
-        useSseForDebugProxy: false,
-        useSseForDebugBackend: false,
-        useSseForInjectedClient: false,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
-        ddsConfig: const DartDevelopmentServiceConfiguration(),
+      final WebDevFS webDevFS = createWebDevFS(
         entrypoint: Uri.parse('org-dartlang-app:///main.dart'),
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: false,
-        canaryFeatures: false,
-        webDevServerConfig: const WebDevServerConfig(),
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        fileSystem: globals.fs,
         logger: BufferLogger.test(),
         platform: FakePlatform(),
-        webCrossOriginIsolation: false,
-        testMode: true,
       );
 
       expect(() => webDevFS.assetPathsToEvict.clear(), returnsNormally);
@@ -957,37 +935,18 @@ void main() {
       final ResidentCompiler residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
         buildInfo: const BuildInfo(
           BuildMode.debug,
           '',
           treeShakeIcons: false,
           packageConfigPath: '.dart_tool/package_config.json',
         ),
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1066,32 +1025,7 @@ void main() {
       final residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
-        useSseForDebugProxy: false,
-        useSseForDebugBackend: false,
-        useSseForInjectedClient: false,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
-        ddsConfig: const DartDevelopmentServiceConfiguration(),
-        entrypoint: globals.fs.file('lib/main.dart').uri,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: false,
-        canaryFeatures: false,
-        webDevServerConfig: const WebDevServerConfig(),
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        fileSystem: globals.fs,
-        logger: logger,
-        platform: linux,
-        webCrossOriginIsolation: false,
-        testMode: true,
-      );
+      final WebDevFS webDevFS = createWebDevFS(logger: logger, platform: linux);
 
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1174,32 +1108,7 @@ void main() {
       final residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
-        useSseForDebugProxy: false,
-        useSseForDebugBackend: false,
-        useSseForInjectedClient: false,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
-        ddsConfig: const DartDevelopmentServiceConfiguration(),
-        entrypoint: globals.fs.file('lib/main.dart').uri,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: false,
-        canaryFeatures: false,
-        webDevServerConfig: const WebDevServerConfig(),
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        fileSystem: globals.fs,
-        logger: logger,
-        platform: linux,
-        webCrossOriginIsolation: false,
-        testMode: true,
-      );
+      final WebDevFS webDevFS = createWebDevFS(logger: logger, platform: linux);
 
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1281,32 +1190,7 @@ void main() {
       final residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
-        useSseForDebugProxy: false,
-        useSseForDebugBackend: false,
-        useSseForInjectedClient: false,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
-        ddsConfig: const DartDevelopmentServiceConfiguration(),
-        entrypoint: globals.fs.file('lib/main.dart').uri,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: false,
-        canaryFeatures: false,
-        webDevServerConfig: const WebDevServerConfig(),
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        fileSystem: globals.fs,
-        logger: logger,
-        platform: linux,
-        webCrossOriginIsolation: false,
-        testMode: true,
-      );
+      final WebDevFS webDevFS = createWebDevFS(logger: logger, platform: linux);
 
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1382,32 +1266,7 @@ void main() {
       final residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
-        useSseForDebugProxy: false,
-        useSseForDebugBackend: false,
-        useSseForInjectedClient: false,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
-        ddsConfig: const DartDevelopmentServiceConfiguration(),
-        entrypoint: globals.fs.file('lib/main.dart').uri,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: false,
-        canaryFeatures: false,
-        webDevServerConfig: const WebDevServerConfig(),
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        fileSystem: globals.fs,
-        logger: logger,
-        platform: linux,
-        webCrossOriginIsolation: false,
-        testMode: true,
-      );
+      final WebDevFS webDevFS = createWebDevFS(logger: logger, platform: linux);
 
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1496,37 +1355,18 @@ void main() {
       final ResidentCompiler residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a', 0, <Uri>[]);
 
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
         buildInfo: const BuildInfo(
           BuildMode.debug,
           '',
           treeShakeIcons: false,
           packageConfigPath: '.dart_tool/package_config.json',
         ),
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -1608,15 +1448,11 @@ void main() {
         outputFile.parent.childFile('a.json').writeAsStringSync('{}');
         outputFile.parent.childFile('a.map').writeAsStringSync('{}');
         outputFile.parent.childFile('a.metadata').writeAsStringSync('{}');
-        const webDevServerConfig = WebDevServerConfig();
-        final webDevFS = WebDevFS(
+        final WebDevFS webDevFS = createWebDevFS(
           // if this is any other value, we will do a real ip lookup
-          packagesFilePath: '.dart_tool/package_config.json',
-          urlTunneller: null,
           useSseForDebugProxy: true,
           useSseForDebugBackend: true,
           useSseForInjectedClient: true,
-          nativeNullAssertions: true,
           buildInfo: const BuildInfo(
             BuildMode.debug,
             '',
@@ -1626,20 +1462,6 @@ void main() {
           enableDwds: true,
           ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
           entrypoint: Uri.base,
-          testMode: true,
-          expressionCompiler: null,
-          chromiumLauncher: null,
-          ddcModuleSystem: usesDdcModuleSystem,
-          canaryFeatures: canaryFeatures,
-          webRenderer: WebRendererMode.canvaskit,
-          isWasm: false,
-          useLocalCanvasKit: false,
-          rootDirectory: globals.fs.currentDirectory,
-          webDevServerConfig: webDevServerConfig,
-          fileSystem: globals.fs,
-          logger: globals.logger,
-          platform: globals.platform,
-          webCrossOriginIsolation: false,
         );
         webDevFS.requireJS.createSync(recursive: true);
         webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -1690,32 +1512,12 @@ void main() {
       outputFile.parent.childFile('a.sources').writeAsStringSync('');
       outputFile.parent.childFile('a.json').writeAsStringSync('{}');
       outputFile.parent.childFile('a.map').writeAsStringSync('{}');
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        nativeNullAssertions: true,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
 
@@ -1733,14 +1535,10 @@ void main() {
       outputFile.parent.childFile('a.sources').writeAsStringSync('');
       outputFile.parent.childFile('a.json').writeAsStringSync('{}');
       outputFile.parent.childFile('a.map').writeAsStringSync('{}');
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
         buildInfo: const BuildInfo(
           BuildMode.debug,
           '',
@@ -1748,23 +1546,8 @@ void main() {
           dartDefines: <String>['FLUTTER_WEB_USE_SKIA=true'],
           packageConfigPath: '.dart_tool/package_config.json',
         ),
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -1795,31 +1578,13 @@ void main() {
         host: '::1',
         https: HttpsConfig(certPath: dummyCertPath, certKeyPath: dummyCertKeyPath),
       );
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
         webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -2033,32 +1798,12 @@ void main() {
       outputFile.parent.childFile('a.json').writeAsStringSync('{}');
       outputFile.parent.childFile('a.map').writeAsStringSync('{}');
       outputFile.parent.childFile('a.metadata').writeAsStringSync('{}');
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
-        buildInfo: BuildInfo.debug,
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        ddcModuleSystem: usesDdcModuleSystem,
-        canaryFeatures: canaryFeatures,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.requireJS.createSync(recursive: true);
       webDevFS.stackTraceMapper.createSync(recursive: true);
@@ -2293,38 +2038,20 @@ const config = {
       final residentCompiler = FakeResidentCompiler()
         ..output = const CompilerOutput('a.lib.js', 0, <Uri>[]);
 
-      const webDevServerConfig = WebDevServerConfig();
-      final webDevFS = WebDevFS(
-        packagesFilePath: '.dart_tool/package_config.json',
-        urlTunneller: null,
+      final WebDevFS webDevFS = createWebDevFS(
         useSseForDebugProxy: true,
         useSseForDebugBackend: true,
         useSseForInjectedClient: true,
-        nativeNullAssertions: true,
         buildInfo: const BuildInfo(
           BuildMode.debug,
           '',
           treeShakeIcons: false,
           packageConfigPath: '.dart_tool/package_config.json',
         ),
-        enableDwds: false,
         ddsConfig: const DartDevelopmentServiceConfiguration(enable: false),
         entrypoint: Uri.base,
-        testMode: true,
-        expressionCompiler: null,
-        chromiumLauncher: null,
-        // Use DDC library bundle.
         ddcModuleSystem: true,
         canaryFeatures: true,
-        webRenderer: WebRendererMode.canvaskit,
-        isWasm: false,
-        useLocalCanvasKit: false,
-        rootDirectory: globals.fs.currentDirectory,
-        webDevServerConfig: webDevServerConfig,
-        fileSystem: globals.fs,
-        logger: globals.logger,
-        platform: globals.platform,
-        webCrossOriginIsolation: false,
       );
       webDevFS.ddcModuleLoaderJS.createSync(recursive: true);
       webDevFS.flutterJs.createSync(recursive: true);
@@ -2437,88 +2164,3 @@ const config = {
     }, overrides: <Type, Generator>{Artifacts: () => Artifacts.test()}),
   );
 }
-
-class FakeHttpServer extends Fake implements HttpServer {
-  bool closed = false;
-
-  @override
-  Future<void> close({bool force = false}) async {
-    closed = true;
-  }
-}
-
-class FakeResidentCompiler extends Fake implements ResidentCompiler {
-  CompilerOutput? output;
-
-  @override
-  void addFileSystemRoot(String root) {}
-
-  @override
-  Future<CompilerOutput?> recompile(
-    Uri mainUri,
-    List<Uri>? invalidatedFiles, {
-    String? outputPath,
-    PackageConfig? packageConfig,
-    String? projectRootPath,
-    FileSystem? fs,
-    bool suppressErrors = false,
-    bool checkDartPluginRegistry = false,
-    File? dartPluginRegistrant,
-    Uri? nativeAssetsYaml,
-    bool recompileRestart = false,
-  }) async {
-    return output;
-  }
-}
-
-class FakeShaderCompiler implements DevelopmentShaderCompiler {
-  const FakeShaderCompiler({this.returnNull = false});
-
-  final bool returnNull;
-
-  @override
-  void configureCompiler(TargetPlatform? platform) {}
-
-  @override
-  Future<DevFSContent?> recompileShader(DevFSContent inputShader) async {
-    if (returnNull) {
-      return null;
-    }
-    final String source = utf8.decode(await inputShader.contentsAsBytes());
-    return DevFSStringContent('compiled_shader: $source');
-  }
-
-  @override
-  bool areDependenciesModified(DevFSContent shaderContent) => false;
-}
-
-class FakeAssetBundle extends Fake implements AssetBundle {
-  @override
-  final Map<String, AssetBundleEntry> entries = <String, AssetBundleEntry>{};
-}
-
-class FakeDwds extends Fake implements Dwds {
-  FakeDwds(Iterable<AppConnection> connectedAppsIterable)
-    : connectedApps = Stream<AppConnection>.fromIterable(connectedAppsIterable);
-
-  @override
-  final Stream<AppConnection> connectedApps;
-
-  @override
-  Future<DebugConnection> debugConnection(AppConnection appConnection) =>
-      Future<DebugConnection>.value(FakeDebugConnection());
-}
-
-class FakeAppConnection extends Fake implements AppConnection {
-  @override
-  void runMain() {}
-}
-
-class FakeDebugConnection extends Fake implements DebugConnection {
-  FakeDebugConnection({this.uri = 'http://foo'});
-
-  @override
-  final String uri;
-}
-
-class FakeVmService extends Fake implements vm_service.VmService {}
diff --git a/packages/flutter_tools/test/general.shard/xcode_project_test.dart b/packages/flutter_tools/test/general.shard/xcode_project_test.dart
index 919940659623f..510a63f309f28 100644
--- a/packages/flutter_tools/test/general.shard/xcode_project_test.dart
+++ b/packages/flutter_tools/test/general.shard/xcode_project_test.dart
@@ -244,22 +244,6 @@ void main() {
         },
       );
 
-      testUsingContext(
-        'is false when Xcode is less than 15',
-        () async {
-          final fs = MemoryFileSystem.test();
-          final Directory projectDirectory = fs.directory('path');
-          projectDirectory.childDirectory('ios').createSync(recursive: true);
-          final FlutterManifest manifest = FakeFlutterManifest();
-          final project = FlutterProject(projectDirectory, manifest, manifest);
-          expect(project.ios.usesSwiftPackageManager, isFalse);
-        },
-        overrides: <Type, Generator>{
-          FeatureFlags: () => TestFeatureFlags(isSwiftPackageManagerEnabled: true),
-          XcodeProjectInterpreter: () => FakeXcodeProjectInterpreter(version: Version(14, 0, 0)),
-        },
-      );
-
       testUsingContext(
         'is false when Swift Package Manager feature is not enabled',
         () async {
@@ -516,22 +500,6 @@ void main() {
         },
       );
 
-      testUsingContext(
-        'is false when Xcode is less than 15',
-        () async {
-          final fs = MemoryFileSystem.test();
-          final Directory projectDirectory = fs.directory('path');
-          projectDirectory.childDirectory('macos').createSync(recursive: true);
-          final FlutterManifest manifest = FakeFlutterManifest();
-          final project = FlutterProject(projectDirectory, manifest, manifest);
-          expect(project.macos.usesSwiftPackageManager, isFalse);
-        },
-        overrides: <Type, Generator>{
-          FeatureFlags: () => TestFeatureFlags(isSwiftPackageManagerEnabled: true),
-          XcodeProjectInterpreter: () => FakeXcodeProjectInterpreter(version: Version(14, 0, 0)),
-        },
-      );
-
       testUsingContext(
         'is false when Swift Package Manager feature is not enabled',
         () async {
diff --git a/packages/flutter_tools/test/integration.shard/android_run_flutter_gradle_plugin_tests_test.dart b/packages/flutter_tools/test/integration.shard/android_run_flutter_gradle_plugin_tests_test.dart
index 2aee2296511b4..913979e1a44aa 100644
--- a/packages/flutter_tools/test/integration.shard/android_run_flutter_gradle_plugin_tests_test.dart
+++ b/packages/flutter_tools/test/integration.shard/android_run_flutter_gradle_plugin_tests_test.dart
@@ -4,6 +4,7 @@
 
 import 'dart:io';
 
+import 'package:flutter_tools/src/android/gradle_utils.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/process.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
@@ -12,22 +13,40 @@ import '../src/common.dart';
 import '../src/context.dart';
 import 'test_utils.dart';
 
+Future<void> runFlutterGradlePluginTests({
+  List<String> extraGradleArguments = const <String>[],
+}) async {
+  final gradleFileName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
+  final gradleExecutable = Platform.isWindows ? '.\\$gradleFileName' : './$gradleFileName';
+  final Directory flutterGradlePluginDirectory = fileSystem
+      .directory(getFlutterRoot())
+      .childDirectory('packages')
+      .childDirectory('flutter_tools')
+      .childDirectory('gradle');
+  globals.gradleUtils?.injectGradleWrapperIfNeeded(flutterGradlePluginDirectory);
+  makeExecutable(flutterGradlePluginDirectory.childFile(gradleFileName));
+  final RunResult runResult = await globals.processUtils.run(<String>[
+    gradleExecutable,
+    'test',
+    ...extraGradleArguments,
+  ], workingDirectory: flutterGradlePluginDirectory.path);
+  expect(runResult.processResult, const ProcessResultMatcher());
+}
+
 void main() {
   testUsingContext('Flutter Gradle Plugin unit tests pass', () async {
-    final gradleFileName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
-    final gradleExecutable = Platform.isWindows ? '.\\$gradleFileName' : './$gradleFileName';
-    final Directory flutterGradlePluginDirectory = fileSystem
-        .directory(getFlutterRoot())
-        .childDirectory('packages')
-        .childDirectory('flutter_tools')
-        .childDirectory('gradle');
-    globals.gradleUtils?.injectGradleWrapperIfNeeded(flutterGradlePluginDirectory);
-    makeExecutable(flutterGradlePluginDirectory.childFile(gradleFileName));
-    final RunResult runResult = await globals.processUtils.run(<String>[
-      gradleExecutable,
-      'test',
-    ], workingDirectory: flutterGradlePluginDirectory.path);
-    expect(runResult.processResult, const ProcessResultMatcher());
+    await runFlutterGradlePluginTests();
+  });
+
+  testUsingContext('Flutter Gradle Plugin unit tests pass against the AGP 9 line', () async {
+    // The public AGP DSL is not binary-compatible between major versions everywhere (see
+    // AgpCommonExtensionWrapper.kt), so the plugin must compile and pass its tests against
+    // both the default AGP version in build.gradle.kts and the AGP version used by the
+    // project templates. This also runs the bytecode check that no compiled class
+    // references CommonExtension.
+    await runFlutterGradlePluginTests(
+      extraGradleArguments: <String>['-PagpVersion=$templateAndroidGradlePluginVersion'],
+    );
   });
 }
 
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/flutter_adapter_test.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/flutter_adapter_test.dart
index 0e9477c32083f..0cd90768ac938 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/flutter_adapter_test.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/flutter_adapter_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:file/file.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/convert.dart';
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_adapter_test.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_adapter_test.dart
index 66f8ddffc2bed..8c30d599d7371 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_adapter_test.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_adapter_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:file/file.dart';
 import 'package:flutter_tools/src/cache.dart';
 
@@ -119,6 +119,16 @@ void main() {
 
     standardTests(toolArgs: toolArgs);
   });
+
+  group('fail fast', () {
+    test('launch fails if process exits early', () async {
+      await client.initialize();
+      expect(
+        client.launch(program: 'non_existent_file.dart', cwd: tempDir.path),
+        throwsA(isA<Response>().having((Response r) => r.success, 'success', isFalse)),
+      );
+    });
+  });
 }
 
 /// Matchers for the expected console output of [TestsProject].
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_client.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_client.dart
index 04776a23e6fef..108f7d17a04de 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_client.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_client.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:flutter_tools/src/debug_adapters/flutter_adapter_args.dart';
 
 import 'test_server.dart';
@@ -39,6 +39,9 @@ class DapTestClient {
           ),
         );
         _pendingRequests.clear();
+        if (!_eventController.isClosed) {
+          unawaited(_eventController.close());
+        }
       },
     );
   }
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart
index 3c6a02bf0f248..c9c28c261b221 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:dds/dap.dart' show Logger;
+import 'package:dap_adapters/dap_adapters.dart' show Logger;
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/debug_adapters/server.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
index 84ac28524032e..48fa663e418f1 100644
--- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
+++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_support.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:dds/dap.dart';
+import 'package:dap_adapters/dap_adapters.dart';
 import 'package:file/file.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/convert.dart';
@@ -130,12 +130,13 @@ class DapTestSession {
   }
 
   static Future<DapTestSession> setUp({List<String>? additionalArgs}) async {
-    final DapTestServer server = await _startServer(additionalArgs: additionalArgs);
+    // ignore: avoid_print
+    final Logger? logger = verboseLogging ? print : null;
+    final DapTestServer server = await _startServer(logger: logger, additionalArgs: additionalArgs);
     final DapTestClient client = await DapTestClient.connect(
       server,
       captureVmServiceTraffic: verboseLogging,
-      // ignore: avoid_print
-      logger: verboseLogging ? print : null,
+      logger: logger,
     );
     return DapTestSession._(server, client);
   }
diff --git a/packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart b/packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart
index d1f67105242a7..d084eb50fbc5c 100644
--- a/packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart
+++ b/packages/flutter_tools/test/integration.shard/isolated/record_use_flutter_build_test.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+@Timeout(Duration(minutes: 10))
+library;
+
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ -39,6 +42,21 @@ void main() {
             'flutter build failed: ${result.exitCode}\n${result.stderr}\n${result.stdout}',
           );
         }
+        final String stdout = result.stdout.join('\n');
+        if (target.first == hostOs) {
+          // Verify that IconTreeShaker detects dummyIcon with null fontFamily.
+          // Icon tree shaking for this icon fails with a trace message, but the overall build succeeds.
+          expect(
+            stdout,
+            contains('Expected to find fontFamily for constant IconData with codepoint: 4660'),
+          );
+        }
+        if (target case ['web', '--wasm']) {
+          // Verify that both wasm (Icons.fastfood: 57946) and js (Icons.favorite: 57947)
+          // codepoints are retained when merging recorded uses.
+          expect(stdout, contains('57946'));
+          expect(stdout, contains('57947'));
+        }
         final Directory buildTargetDir = appRoot
             .childDirectory('build')
             .childDirectory(target.first);
diff --git a/packages/flutter_tools/test/integration.shard/swift_package_manager_add2app_test.dart b/packages/flutter_tools/test/integration.shard/swift_package_manager_add2app_test.dart
index a5b3a954ef5cb..47649121fd472 100644
--- a/packages/flutter_tools/test/integration.shard/swift_package_manager_add2app_test.dart
+++ b/packages/flutter_tools/test/integration.shard/swift_package_manager_add2app_test.dart
@@ -200,9 +200,10 @@ void main() {
             ],
             codesign: codesign,
             expectedOutput: [
-              "Build of product 'flutter-prebuild-tool' complete!",
+              RegExp(r'Gatekeeper check failed.*\.build\/prebuild\/release\/flutter-prebuild-tool'),
+              RegExp(r'Gatekeeper check failed.*\.build\/assemble\/release\/flutter-assemble-tool'),
+              RegExp(r'Build(?: of product .*)? complete!'),
               'FlutterPluginRegistrant symlink updated to ./Release',
-              "Build of product 'flutter-assemble-tool' complete!",
               'flutter --verbose assemble',
               'release_unpack_${targetPlatform.name.toLowerCase()}: Starting',
             ],
@@ -225,8 +226,9 @@ void main() {
               'Verification complete.',
             ],
             unexpectedOutput: [
-              "Build of product 'flutter-prebuild-tool' complete!",
-              "Build of product 'flutter-assemble-tool' complete!",
+              RegExp(r'Gatekeeper check failed.*\.build\/prebuild\/release\/flutter-prebuild-tool'),
+              RegExp(r'Gatekeeper check failed.*\.build\/assemble\/release\/flutter-assemble-tool'),
+              RegExp(r'Build(?: of product .*)? complete!'),
               'flutter --verbose assemble',
               'note: Transfer starting',
             ],
@@ -255,8 +257,9 @@ void main() {
               'warning: Alternatively, you can remove FLUTTER_APPLICATION_PATH from your build settings to dismiss this warning.',
             ],
             unexpectedOutput: [
-              "Build of product 'flutter-prebuild-tool' complete!",
-              "Build of product 'flutter-assemble-tool' complete!",
+              RegExp(r'Gatekeeper check failed.*\.build\/prebuild\/release\/flutter-prebuild-tool'),
+              RegExp(r'Gatekeeper check failed.*\.build\/assemble\/release\/flutter-assemble-tool'),
+              RegExp(r'Build(?: of product .*)? complete!'),
               'flutter --verbose assemble',
               'note: Transfer starting',
             ],
@@ -276,8 +279,9 @@ void main() {
             expectedOutput: ['Verification complete.'],
             unexpectedOutput: [
               'FlutterPluginRegistrant symlink updated to ./Release',
-              "Build of product 'flutter-prebuild-tool' complete!",
-              "Build of product 'flutter-assemble-tool' complete!",
+              RegExp(r'Gatekeeper check failed.*\.build\/prebuild\/release\/flutter-prebuild-tool'),
+              RegExp(r'Gatekeeper check failed.*\.build\/assemble\/release\/flutter-assemble-tool'),
+              RegExp(r'Build(?: of product .*)? complete!'),
               'flutter --verbose assemble',
               'note: Transfer starting',
             ],
@@ -401,7 +405,8 @@ void main() {
             'FLUTTER_APPLICATION_PATH=\$SRCROOT/../$appName',
           ],
           expectedOutput: [
-            "Build of product 'flutter-assemble-tool' complete!",
+            RegExp(r'Gatekeeper check failed.*\.build\/assemble\/release\/flutter-assemble-tool'),
+            RegExp(r'Build(?: of product .*)? complete!'),
             'FlutterPluginRegistrant symlink updated to ./Release',
             'flutter --verbose assemble',
             'release_unpack_${targetPlatform.name.toLowerCase()}: Starting',
@@ -452,8 +457,8 @@ Future<String> _buildNativeProject({
   required FlutterDarwinPlatform platform,
   required List<String> buildSettings,
   bool expectFailure = false,
-  List<String> expectedOutput = const [],
-  List<String> unexpectedOutput = const [],
+  List<Pattern> expectedOutput = const [],
+  List<Pattern> unexpectedOutput = const [],
   required bool codesign,
 }) async {
   final Map<String, String> environment = Platform.environment;
diff --git a/packages/flutter_tools/test/integration.shard/test_data/web_define_project.dart b/packages/flutter_tools/test/integration.shard/test_data/web_define_project.dart
new file mode 100644
index 0000000000000..398de80d69089
--- /dev/null
+++ b/packages/flutter_tools/test/integration.shard/test_data/web_define_project.dart
@@ -0,0 +1,85 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:file/file.dart';
+
+import '../test_utils.dart';
+import 'project.dart';
+
+/// A project whose `web/index.html` and `web/flutter_bootstrap.js` contain user
+/// `--web-define` placeholders (`{{MY_VERSION}}` and `{{API_URL}}`), used by the
+/// end-to-end tests that verify `--web-define` substitution.
+class WebDefineProject extends Project {
+  WebDefineProject() : super(indexHtml: _indexHtml);
+
+  static const String kVersion = 'v9.9.9';
+  static const String kApiUrl = 'https://example.invalid/api';
+
+  static const String _indexHtml = '''
+<html>
+    <head>
+        <meta charset='utf-8'>
+        <title>Hello, World</title>
+        <meta name="app-version" content="{{MY_VERSION}}">
+        <meta name="api-url" content="{{API_URL}}">
+    </head>
+    <body>
+        <script src="main.dart.js"></script>
+    </body>
+</html>
+''';
+
+  // The default generated bootstrap has no user placeholder, so the fixture
+  // supplies a template with one to make bootstrap substitution observable.
+  static const String _flutterBootstrapJs = '''
+// build: {{MY_VERSION}} api: {{API_URL}}
+{{flutter_js}}
+{{flutter_build_config}}
+_flutter.loader.load();
+''';
+
+  @override
+  String get pubspec =>
+      '''
+  name: $name
+  environment:
+    sdk: ^3.7.0-0
+
+  dependencies:
+    flutter:
+      sdk: flutter
+  ''';
+
+  // Rebuild continuously so hot reload/restart have an observable effect.
+  @override
+  final main = r'''
+  import 'dart:async';
+
+  import 'package:flutter/material.dart';
+
+  Future<void> main() async {
+    while (true) {
+      runApp(MyApp());
+      await Future.delayed(const Duration(milliseconds: 50));
+    }
+  }
+
+  class MyApp extends StatelessWidget {
+    @override
+    Widget build(BuildContext context) {
+      return MaterialApp(
+        title: 'Flutter Demo',
+        home: Container(),
+      );
+    }
+  }
+  ''';
+
+  @override
+  Future<void> setUpIn(Directory dir, {bool generateMain = true}) async {
+    await super.setUpIn(dir, generateMain: generateMain);
+    // Project.setUpIn does not write a flutter_bootstrap.js, so add the custom template here.
+    writeFile(fileSystem.path.join(dir.path, 'web', 'flutter_bootstrap.js'), _flutterBootstrapJs);
+  }
+}
diff --git a/packages/flutter_tools/test/integration.shard/web_define_build_test.dart b/packages/flutter_tools/test/integration.shard/web_define_build_test.dart
new file mode 100644
index 0000000000000..976be4770a406
--- /dev/null
+++ b/packages/flutter_tools/test/integration.shard/web_define_build_test.dart
@@ -0,0 +1,62 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:file/file.dart';
+import 'package:file_testing/file_testing.dart';
+import 'package:flutter_tools/src/base/io.dart';
+
+import '../src/common.dart';
+import 'test_data/web_define_project.dart';
+import 'test_utils.dart';
+
+/// Asserts --web-define placeholders were substituted and none remain.
+void _expectSubstituted(String contents) {
+  expect(contents, contains(WebDefineProject.kVersion));
+  expect(contents, contains(WebDefineProject.kApiUrl));
+  expect(contents, isNot(contains('{{MY_VERSION}}')));
+  expect(contents, isNot(contains('{{API_URL}}')));
+}
+
+void main() {
+  late Directory tempDir;
+  final project = WebDefineProject();
+
+  setUp(() async {
+    tempDir = createResolvedTempDirectorySync('web_define_build_test.');
+    await project.setUpIn(tempDir);
+  });
+
+  tearDown(() {
+    tryToDelete(tempDir);
+  });
+
+  for (final mode in const <String>['--debug', '--profile', '--release']) {
+    testWithoutContext('flutter build web $mode substitutes --web-define in output', () async {
+      final ProcessResult result = processManager.runSync(<String>[
+        flutterBin,
+        ...getLocalEngineArguments(),
+        'build',
+        'web',
+        '--no-pub',
+        '--no-web-resources-cdn',
+        '--web-define=MY_VERSION=${WebDefineProject.kVersion}',
+        '--web-define=API_URL=${WebDefineProject.kApiUrl}',
+        mode,
+      ], workingDirectory: tempDir.path);
+      expect(result, const ProcessResultMatcher());
+
+      final File indexHtml = fileSystem.file(
+        fileSystem.path.join(tempDir.path, 'build', 'web', 'index.html'),
+      );
+      expect(indexHtml, exists);
+      _expectSubstituted(indexHtml.readAsStringSync());
+
+      final File bootstrapJs = fileSystem.file(
+        fileSystem.path.join(tempDir.path, 'build', 'web', 'flutter_bootstrap.js'),
+      );
+      expect(bootstrapJs, exists);
+      _expectSubstituted(bootstrapJs.readAsStringSync());
+    });
+  }
+}
diff --git a/packages/flutter_tools/test/integration.shard/widget_preview_test_helpers.dart b/packages/flutter_tools/test/integration.shard/widget_preview_test_helpers.dart
index 47ead4c2b58bc..2cae70dc75610 100644
--- a/packages/flutter_tools/test/integration.shard/widget_preview_test_helpers.dart
+++ b/packages/flutter_tools/test/integration.shard/widget_preview_test_helpers.dart
@@ -76,13 +76,23 @@ Future<Stream<String>> startWidgetPreview({
   });
 
   final controller = StreamController<String>.broadcast();
-  process.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen((String msg) {
-    // ignore: avoid_print
-    print('[stdout] $msg');
-    if (!controller.isClosed) {
-      controller.add(msg);
-    }
-  });
+  process.stdout
+      .transform(utf8.decoder)
+      .transform(const LineSplitter())
+      .listen(
+        (String msg) {
+          // ignore: avoid_print
+          print('[stdout] $msg');
+          if (!controller.isClosed) {
+            controller.add(msg);
+          }
+        },
+        onDone: () {
+          if (!controller.isClosed) {
+            controller.close();
+          }
+        },
+      );
 
   process.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen((String msg) {
     // ignore: avoid_print
@@ -91,9 +101,8 @@ Future<Stream<String>> startWidgetPreview({
 
   unawaited(
     process.exitCode.then((int exitCode) {
-      if (!controller.isClosed) {
-        controller.close();
-      }
+      // ignore: avoid_print
+      print('widget-preview process exited with code $exitCode');
     }),
   );
 
diff --git a/packages/flutter_tools/test/integration.shard/workspace_pub_get_test.dart b/packages/flutter_tools/test/integration.shard/workspace_pub_get_test.dart
new file mode 100644
index 0000000000000..ec100375864af
--- /dev/null
+++ b/packages/flutter_tools/test/integration.shard/workspace_pub_get_test.dart
@@ -0,0 +1,129 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:file/file.dart';
+import 'package:process/process.dart';
+
+import '../src/common.dart';
+import 'isolated/native_assets_test_utils.dart';
+import 'test_utils.dart';
+
+void main() {
+  const ProcessManager processManager = LocalProcessManager();
+
+  testWithoutContext(
+    'flutter tools correctly skip pub get when resolution is up-to-date in a workspace',
+    () async {
+      await inTempDir((Directory tempDir) async {
+        final Directory workspaceDir = tempDir.childDirectory('my_workspace');
+        final Directory appDir = workspaceDir.childDirectory('packages').childDirectory('my_app');
+
+        // 1. Create workspace root pubspec
+        workspaceDir.createSync(recursive: true);
+        workspaceDir.childFile('pubspec.yaml').writeAsStringSync('''
+name: my_workspace
+environment:
+  sdk: ^3.10.0-0
+workspace:
+  - packages/my_app
+''');
+
+        // 2. Create sub-package app pubspec and main.dart
+        appDir.createSync(recursive: true);
+        appDir.childFile('pubspec.yaml').writeAsStringSync('''
+name: my_app
+environment:
+  sdk: ^3.10.0-0
+resolution: workspace
+dependencies:
+  flutter:
+    sdk: flutter
+''');
+        appDir.childDirectory('lib').childFile('main.dart')
+          ..createSync(recursive: true)
+          ..writeAsStringSync('void main() {}');
+
+        // 3. Run initial pub get to resolve the workspace
+        final io.ProcessResult getResult = await processManager.run(<String>[
+          flutterBin,
+          '--verbose',
+          'pub',
+          'get',
+        ], workingDirectory: appDir.path);
+        expect(
+          getResult.exitCode,
+          0,
+          reason: 'Initial pub get failed:\n${getResult.stderr}\n${getResult.stdout}',
+        );
+
+        // Validate workspace output structure
+        expect(
+          workspaceDir.childDirectory('.dart_tool').childFile('package_config.json').existsSync(),
+          true,
+        );
+        expect(workspaceDir.childFile('pubspec.lock').existsSync(), true);
+        expect(
+          appDir
+              .childDirectory('.dart_tool')
+              .childDirectory('pub')
+              .childFile('workspace_ref.json')
+              .existsSync(),
+          true,
+        );
+
+        // 4. Run flutter analyze once to populate any SDK caches/unpacks
+        final io.ProcessResult analyzeResultPrep = await processManager.run(<String>[
+          flutterBin,
+          '--verbose',
+          'analyze',
+        ], workingDirectory: appDir.path);
+        io.stderr.writeln(
+          'PREP ANALYZE OUTPUT:\n${analyzeResultPrep.stdout}\n${analyzeResultPrep.stderr}',
+        );
+
+        // 5. Run flutter analyze again and verify that it skips pub get
+        final io.ProcessResult analyzeResult1 = await processManager.run(<String>[
+          flutterBin,
+          '--verbose',
+          'analyze',
+        ], workingDirectory: appDir.path);
+
+        expect(analyzeResult1.exitCode, 0);
+        expect(
+          analyzeResult1.stdout.toString(),
+          contains('Skipping pub get: resolution up-to-date.'),
+        );
+        expect(analyzeResult1.stdout.toString(), isNot(contains('get --example')));
+
+        // 6. Dirty the pubspec to invalidate resolution
+        appDir.childFile('pubspec.yaml').writeAsStringSync('''
+name: my_app
+environment:
+  sdk: ^3.10.0-0
+resolution: workspace
+dependencies:
+  flutter:
+    sdk: flutter
+# Dirty comment to trigger out-of-date resolution
+''');
+
+        // 7. Run flutter analyze again and verify it does NOT skip pub get
+        final io.ProcessResult analyzeResult2 = await processManager.run(<String>[
+          flutterBin,
+          '--verbose',
+          'analyze',
+        ], workingDirectory: appDir.path);
+
+        expect(analyzeResult2.exitCode, 0);
+        expect(
+          analyzeResult2.stdout.toString(),
+          isNot(contains('Skipping pub get: resolution up-to-date.')),
+        );
+        expect(analyzeResult2.stdout.toString(), contains('get --example'));
+      });
+    },
+  );
+}
diff --git a/packages/flutter_tools/test/src/android_common.dart b/packages/flutter_tools/test/src/android_common.dart
index dc0d4835f2f51..6ae190afa96b5 100644
--- a/packages/flutter_tools/test/src/android_common.dart
+++ b/packages/flutter_tools/test/src/android_common.dart
@@ -111,7 +111,7 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE_ME-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE_ME-bin.zip
 
 ''';
 
diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart
index 8d5ec2b1a98aa..5bde0cd635294 100644
--- a/packages/flutter_tools/test/src/context.dart
+++ b/packages/flutter_tools/test/src/context.dart
@@ -413,7 +413,7 @@ class FakeXcodeProjectInterpreter implements XcodeProjectInterpreter {
   Future<List<String>> fetchDependenciesAndGenerateXcodebuildArgs(
     XcodeBasedProject xcodeProject,
     Directory buildDirectory, {
-    bool skipPackageUpdatesAndValidation = true,
+    bool skipPackageValidation = true,
   }) async {
     return <String>['xcrun', 'xcodebuild'];
   }
diff --git a/packages/flutter_tools/test/src/fake_web_devfs.dart b/packages/flutter_tools/test/src/fake_web_devfs.dart
new file mode 100644
index 0000000000000..3bd27276d9b02
--- /dev/null
+++ b/packages/flutter_tools/test/src/fake_web_devfs.dart
@@ -0,0 +1,178 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:io' hide Directory, File;
+
+import 'package:dwds/dwds.dart';
+import 'package:flutter_tools/src/asset.dart';
+import 'package:flutter_tools/src/base/file_system.dart';
+import 'package:flutter_tools/src/base/logger.dart';
+import 'package:flutter_tools/src/base/net.dart';
+import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/build_info.dart';
+import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart';
+import 'package:flutter_tools/src/compile.dart';
+import 'package:flutter_tools/src/convert.dart';
+import 'package:flutter_tools/src/devfs.dart';
+import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:flutter_tools/src/isolated/devfs_web.dart';
+import 'package:flutter_tools/src/web/chrome.dart';
+import 'package:flutter_tools/src/web/compile.dart';
+import 'package:flutter_tools/src/web/devfs_config.dart';
+import 'package:package_config/package_config.dart';
+import 'package:test/fake.dart';
+import 'package:vm_service/vm_service.dart' as vm_service;
+
+/// Helper function to create a [WebDevFS] with sensible testbed defaults.
+WebDevFS createWebDevFS({
+  String packagesFilePath = '.dart_tool/package_config.json',
+  UrlTunneller? urlTunneller,
+  bool useSseForDebugProxy = false,
+  bool useSseForDebugBackend = false,
+  bool useSseForInjectedClient = false,
+  BuildInfo buildInfo = BuildInfo.debug,
+  bool enableDwds = false,
+  DartDevelopmentServiceConfiguration ddsConfig = const DartDevelopmentServiceConfiguration(),
+  Uri? entrypoint,
+  ExpressionCompiler? expressionCompiler,
+  ChromiumLauncher? chromiumLauncher,
+  bool nativeNullAssertions = true,
+  bool ddcModuleSystem = false,
+  bool canaryFeatures = false,
+  WebDevServerConfig webDevServerConfig = const WebDevServerConfig(),
+  WebRendererMode webRenderer = WebRendererMode.canvaskit,
+  bool isWasm = false,
+  bool useLocalCanvasKit = false,
+  Directory? rootDirectory,
+  bool useDwdsWebSocketConnection = false,
+  bool webCrossOriginIsolation = false,
+  FileSystem? fileSystem,
+  Logger? logger,
+  Platform? platform,
+  bool testMode = true,
+  Map<String, String> webDefines = const <String, String>{},
+}) {
+  return WebDevFS(
+    packagesFilePath: packagesFilePath,
+    urlTunneller: urlTunneller,
+    useSseForDebugProxy: useSseForDebugProxy,
+    useSseForDebugBackend: useSseForDebugBackend,
+    useSseForInjectedClient: useSseForInjectedClient,
+    buildInfo: buildInfo,
+    enableDwds: enableDwds,
+    ddsConfig: ddsConfig,
+    entrypoint: entrypoint ?? globals.fs.file('lib/main.dart').uri,
+    expressionCompiler: expressionCompiler,
+    chromiumLauncher: chromiumLauncher,
+    nativeNullAssertions: nativeNullAssertions,
+    ddcModuleSystem: ddcModuleSystem,
+    canaryFeatures: canaryFeatures,
+    webDevServerConfig: webDevServerConfig,
+    webRenderer: webRenderer,
+    isWasm: isWasm,
+    useLocalCanvasKit: useLocalCanvasKit,
+    rootDirectory: rootDirectory ?? globals.fs.currentDirectory,
+    useDwdsWebSocketConnection: useDwdsWebSocketConnection,
+    webCrossOriginIsolation: webCrossOriginIsolation,
+    fileSystem: fileSystem ?? globals.fs,
+    logger: logger ?? globals.logger,
+    platform: platform ?? globals.platform,
+    testMode: testMode,
+    webDefines: webDefines,
+  );
+}
+
+/// A fake [HttpServer] for testing.
+class FakeHttpServer extends Fake implements HttpServer {
+  bool closed = false;
+
+  @override
+  Future<void> close({bool force = false}) async {
+    closed = true;
+  }
+}
+
+/// A fake [ResidentCompiler] for testing.
+class FakeResidentCompiler extends Fake implements ResidentCompiler {
+  CompilerOutput? output;
+
+  @override
+  void addFileSystemRoot(String root) {}
+
+  @override
+  Future<CompilerOutput?> recompile(
+    Uri mainUri,
+    List<Uri>? invalidatedFiles, {
+    String? outputPath,
+    PackageConfig? packageConfig,
+    String? projectRootPath,
+    FileSystem? fs,
+    bool suppressErrors = false,
+    bool checkDartPluginRegistry = false,
+    File? dartPluginRegistrant,
+    Uri? nativeAssetsYaml,
+    bool recompileRestart = false,
+  }) async {
+    return output;
+  }
+}
+
+/// A fake [DevelopmentShaderCompiler] for testing.
+class FakeShaderCompiler implements DevelopmentShaderCompiler {
+  const FakeShaderCompiler({this.returnNull = false});
+
+  final bool returnNull;
+
+  @override
+  void configureCompiler(TargetPlatform? platform) {}
+
+  @override
+  Future<DevFSContent?> recompileShader(DevFSContent inputShader) async {
+    if (returnNull) {
+      return null;
+    }
+    final String source = utf8.decode(await inputShader.contentsAsBytes());
+    return DevFSStringContent('compiled_shader: $source');
+  }
+
+  @override
+  bool areDependenciesModified(DevFSContent shaderContent) => false;
+}
+
+/// A fake [AssetBundle] for testing.
+class FakeAssetBundle extends Fake implements AssetBundle {
+  @override
+  final Map<String, AssetBundleEntry> entries = <String, AssetBundleEntry>{};
+}
+
+/// A fake [Dwds] service for testing.
+class FakeDwds extends Fake implements Dwds {
+  FakeDwds(Iterable<AppConnection> connectedAppsIterable)
+    : connectedApps = Stream<AppConnection>.fromIterable(connectedAppsIterable);
+
+  @override
+  final Stream<AppConnection> connectedApps;
+
+  @override
+  Future<DebugConnection> debugConnection(AppConnection appConnection) =>
+      Future<DebugConnection>.value(FakeDebugConnection());
+}
+
+/// A fake [AppConnection] for testing.
+class FakeAppConnection extends Fake implements AppConnection {
+  @override
+  void runMain() {}
+}
+
+/// A fake [DebugConnection] for testing.
+class FakeDebugConnection extends Fake implements DebugConnection {
+  FakeDebugConnection({this.uri = 'http://foo'});
+
+  @override
+  final String uri;
+}
+
+/// A fake [vm_service.VmService] for testing.
+class FakeVmService extends Fake implements vm_service.VmService {}
diff --git a/packages/flutter_tools/test/src/fakes.dart b/packages/flutter_tools/test/src/fakes.dart
index 4f327ebbc48da..735fe023bd1c6 100644
--- a/packages/flutter_tools/test/src/fakes.dart
+++ b/packages/flutter_tools/test/src/fakes.dart
@@ -6,8 +6,10 @@ import 'dart:async';
 import 'dart:io' as io show IOSink, ProcessSignal, Stdout, StdoutException;
 
 import 'package:dds/dds_launcher.dart';
+import 'package:file/memory.dart';
 import 'package:flutter_tools/src/android/android_sdk.dart';
 import 'package:flutter_tools/src/android/android_studio.dart';
+import 'package:flutter_tools/src/android/gradle_utils.dart';
 import 'package:flutter_tools/src/android/java.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/bot_detector.dart';
@@ -16,22 +18,47 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/os.dart';
+import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/process.dart';
+import 'package:flutter_tools/src/base/signals.dart';
 import 'package:flutter_tools/src/base/template.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/base/time.dart';
+import 'package:flutter_tools/src/base/user_messages.dart';
 import 'package:flutter_tools/src/base/version.dart';
+import 'package:flutter_tools/src/build_info.dart';
+import 'package:flutter_tools/src/build_system/build_system.dart';
+import 'package:flutter_tools/src/build_system/build_targets.dart';
 import 'package:flutter_tools/src/cache.dart';
+import 'package:flutter_tools/src/context/android_context.dart';
+import 'package:flutter_tools/src/context/apple_context.dart';
+import 'package:flutter_tools/src/context/tool_context.dart';
+import 'package:flutter_tools/src/context/tool_dependencies.dart';
 import 'package:flutter_tools/src/convert.dart';
+import 'package:flutter_tools/src/custom_devices/custom_devices_config.dart';
 import 'package:flutter_tools/src/features.dart';
+import 'package:flutter_tools/src/git.dart';
+import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:flutter_tools/src/ios/plist_parser.dart';
+import 'package:flutter_tools/src/ios/simulators.dart';
+import 'package:flutter_tools/src/ios/xcodeproj.dart';
+import 'package:flutter_tools/src/macos/cocoapods.dart';
+import 'package:flutter_tools/src/macos/cocoapods_validator.dart';
+import 'package:flutter_tools/src/macos/xcdevice.dart';
 import 'package:flutter_tools/src/macos/xcode.dart';
+import 'package:flutter_tools/src/native_assets.dart';
+import 'package:flutter_tools/src/pre_run_validator.dart';
 import 'package:flutter_tools/src/project.dart';
+import 'package:flutter_tools/src/reporting/crash_reporting.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
+import 'package:flutter_tools/src/runner/local_engine.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:test/fake.dart';
+import 'package:unified_analytics/unified_analytics.dart';
+
+import 'context.dart';
 
-/// Environment with DYLD_LIBRARY_PATH=/path/to/libraries
 class FakeDyldEnvironmentArtifact extends ArtifactSet {
   FakeDyldEnvironmentArtifact() : super(DevelopmentArtifact.iOS);
   @override
@@ -554,6 +581,7 @@ class TestFeatureFlags implements FeatureFlags {
     this.isUISceneMigrationEnabled = false,
     this.isRiscv64SupportEnabled = false,
     this.isMacOSArm64OnlyEnabled = false,
+    this.isToolExtensionsEnabled = false,
   });
 
   @override
@@ -616,6 +644,9 @@ class TestFeatureFlags implements FeatureFlags {
   @override
   final bool isMacOSArm64OnlyEnabled;
 
+  @override
+  final bool isToolExtensionsEnabled;
+
   @override
   bool isEnabled(Feature feature) {
     return switch (feature) {
@@ -638,6 +669,7 @@ class TestFeatureFlags implements FeatureFlags {
       riscv64 => isRiscv64SupportEnabled,
       macOSArm64Only => isMacOSArm64OnlyEnabled,
       recordUse => isRecordUseEnabled,
+      toolExtensionsFeature => isToolExtensionsEnabled,
       _ => false,
     };
   }
@@ -664,6 +696,7 @@ class TestFeatureFlags implements FeatureFlags {
     uiSceneMigration,
     riscv64,
     macOSArm64Only,
+    toolExtensionsFeature,
   ];
 
   @override
@@ -685,6 +718,9 @@ class FakeOperatingSystemUtils extends Fake implements OperatingSystemUtils {
   @override
   void makeExecutable(File file) {}
 
+  @override
+  HostPlatform? hostPlatformOverride;
+
   @override
   HostPlatform hostPlatform = HostPlatform.linux_x64;
 
@@ -916,7 +952,33 @@ class ClosedStdinController extends Fake implements StreamSink<List<int>> {
   }
 }
 
-class FakeConfig extends Fake implements Config {}
+class FakeConfig extends Fake implements Config {
+  FakeConfig([Map<String, Object?>? values, this.configPath = '/.flutter_settings'])
+    : _values = values ?? <String, Object?>{};
+  final Map<String, Object?> _values;
+
+  @override
+  final String configPath;
+
+  @override
+  Object? getValue(String key) => _values[key];
+
+  @override
+  void setValue(String key, Object value) {
+    _values[key] = value;
+  }
+
+  @override
+  void removeValue(String key) {
+    _values.remove(key);
+  }
+
+  @override
+  bool containsKey(String key) => _values.containsKey(key);
+
+  @override
+  Iterable<String> get keys => _values.keys;
+}
 
 class FakeFileSystemUtils extends Fake implements FileSystemUtils {}
 
@@ -926,8 +988,558 @@ class FakeProcessUtils extends Fake implements ProcessUtils {}
 
 class FakeTemplateRenderer extends Fake implements TemplateRenderer {}
 
-class FakeXcode extends Fake implements Xcode {}
+class FakeXcode extends Fake implements Xcode {
+  FakeXcode({this.currentVersion, this.isDevicectlInstalled = true});
+
+  @override
+  Version? currentVersion;
+
+  @override
+  bool isDevicectlInstalled;
+
+  @override
+  Future<String> sdkLocation(EnvironmentType environmentType) async => '/fake/sdk/path';
+
+  @override
+  List<String> xcrunCommand() => <String>['xcrun'];
+}
+
+class FakeArtifacts extends Fake implements Artifacts {
+  FakeArtifacts({FileSystem? fileSystem}) : _delegate = Artifacts.test(fileSystem: fileSystem);
+
+  final Artifacts _delegate;
+
+  @override
+  LocalEngineInfo? get localEngineInfo => _delegate.localEngineInfo;
+
+  @override
+  bool get usesLocalArtifacts => _delegate.usesLocalArtifacts;
+
+  @override
+  FileSystemEntity getHostArtifact(HostArtifact artifact) => _delegate.getHostArtifact(artifact);
+
+  @override
+  String getArtifactPath(
+    Artifact artifact, {
+    TargetPlatform? platform,
+    BuildMode? mode,
+    EnvironmentType? environmentType,
+  }) => _delegate.getArtifactPath(
+    artifact,
+    platform: platform,
+    mode: mode,
+    environmentType: environmentType,
+  );
+
+  @override
+  String getEngineType(TargetPlatform platform, [BuildMode? mode]) =>
+      _delegate.getEngineType(platform, mode);
+}
+
+class FakeCache extends Fake implements Cache {
+  FakeCache({FileSystem? fileSystem}) : _fileSystem = fileSystem ?? MemoryFileSystem.test();
+
+  final FileSystem _fileSystem;
+
+  @override
+  Future<void> lock() async {}
+
+  @override
+  void releaseLock() {}
+
+  @override
+  Future<void> updateAll(
+    Set<DevelopmentArtifact> requiredArtifacts, {
+    bool offline = false,
+  }) async {}
+
+  @override
+  Directory getRoot() => _fileSystem.directory('/bin/cache');
+
+  @override
+  Directory getCacheDir(String name, {bool shouldCreate = true}) =>
+      _fileSystem.directory('/bin/cache/$name');
+
+  @override
+  Directory getArtifactDirectory(String name) =>
+      _fileSystem.directory('/bin/cache/artifacts/$name');
+
+  @override
+  Directory getWebSdkDirectory() => _fileSystem.directory('/bin/cache/flutter_web_sdk');
+
+  @override
+  MapEntry<String, String> get dyLdLibEntry =>
+      const MapEntry<String, String>('DYLD_LIBRARY_PATH', 'fake_path');
+}
+
+class FakeGit extends Fake implements Git {}
+
+class FakeGradleUtils extends Fake implements GradleUtils {}
+
+class FakeCocoaPods extends Fake implements CocoaPods {}
+
+class FakeCocoaPodsValidator extends Fake implements CocoaPodsValidator {}
+
+class FakeIOSSimulatorUtils extends Fake implements IOSSimulatorUtils {}
+
+class FakeIOSWorkflow extends Fake implements IOSWorkflow {}
+
+class FakeXCDevice extends Fake implements XCDevice {}
+
+class FakeBuildSystem extends Fake implements BuildSystem {}
+
+class FakeBuildTargets extends Fake implements BuildTargets {}
+
+class FakeCrashReporter extends Fake implements CrashReporter {}
+
+class FakeToolDependencies extends Fake implements ToolDependencies {
+  FakeToolDependencies({
+    Analytics? analytics,
+    AndroidContext? androidContext,
+    AppleContext? appleContext,
+    BuildSystem? buildSystem,
+    BuildTargets? buildTargets,
+    CrashReporter? crashReporter,
+    ToolContext? toolContext,
+  }) : _analytics = analytics,
+       _androidContext = androidContext,
+       _appleContext = appleContext,
+       _buildSystem = buildSystem,
+       _buildTargets = buildTargets,
+       _crashReporter = crashReporter,
+       _toolContext = toolContext;
+
+  final Analytics? _analytics;
+  final AndroidContext? _androidContext;
+  final AppleContext? _appleContext;
+  final BuildSystem? _buildSystem;
+  final BuildTargets? _buildTargets;
+  final CrashReporter? _crashReporter;
+  final ToolContext? _toolContext;
+
+  @override
+  Analytics get analytics => _analytics ?? const NoOpAnalytics();
+
+  @override
+  AndroidContext get androidContext => _androidContext ?? FakeAndroidContext();
+
+  @override
+  AppleContext get appleContext => _appleContext ?? FakeAppleContext();
+
+  @override
+  BuildSystem get buildSystem => _buildSystem ?? FakeBuildSystem();
+
+  @override
+  BuildTargets get buildTargets => _buildTargets ?? FakeBuildTargets();
+
+  @override
+  CrashReporter get crashReporter => _crashReporter ?? FakeCrashReporter();
+
+  @override
+  ToolContext get toolContext => _toolContext ?? FakeToolContext();
+}
+
+class FakeToolContext extends Fake implements ToolContext {
+  FakeToolContext({
+    Artifacts? artifacts,
+    BotDetector? botDetector,
+    Cache? cache,
+    Config? config,
+    CustomDevicesConfig? customDevicesConfig,
+    FlutterVersion? flutterVersion,
+    FileSystem? fs,
+    Git? git,
+    LocalEngineLocator? localEngineLocator,
+    Logger? logger,
+    TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
+    OperatingSystemUtils? os,
+    OutputPreferences? outputPreferences,
+    Platform? platform,
+    PreRunValidator? preRunValidator,
+    ProcessManager? processManager,
+    ProcessUtils? processUtils,
+    FlutterProjectFactory? projectFactory,
+    ShutdownHooks? shutdownHooks,
+    Signals? signals,
+    Stdio? stdio,
+    SystemClock? systemClock,
+    AnsiTerminal? terminal,
+    UserMessages? userMessages,
+  }) : _artifacts = artifacts,
+       _botDetector = botDetector,
+       _cache = cache,
+       _config = config,
+       _customDevicesConfig = customDevicesConfig,
+       _flutterVersion = flutterVersion,
+       _fs = fs,
+       _git = git,
+       _localEngineLocator = localEngineLocator,
+       _logger = logger,
+       _nativeAssetsBuilder = nativeAssetsBuilder,
+       _os = os,
+       _outputPreferences = outputPreferences,
+       _platform = platform,
+       _preRunValidator = preRunValidator,
+       _processManager = processManager,
+       _processUtils = processUtils,
+       _projectFactory = projectFactory,
+       _shutdownHooks = shutdownHooks,
+       _signals = signals,
+       _stdio = stdio,
+       _systemClock = systemClock,
+       _terminal = terminal,
+       _userMessages = userMessages;
+
+  final Artifacts? _artifacts;
+  final BotDetector? _botDetector;
+  final Cache? _cache;
+  final Config? _config;
+  final CustomDevicesConfig? _customDevicesConfig;
+  final FlutterVersion? _flutterVersion;
+  final FileSystem? _fs;
+  final Git? _git;
+  final LocalEngineLocator? _localEngineLocator;
+  final Logger? _logger;
+  final TestCompilerNativeAssetsBuilder? _nativeAssetsBuilder;
+  final OperatingSystemUtils? _os;
+  final OutputPreferences? _outputPreferences;
+  final Platform? _platform;
+  final PreRunValidator? _preRunValidator;
+  final ProcessManager? _processManager;
+  final ProcessUtils? _processUtils;
+  final FlutterProjectFactory? _projectFactory;
+  final ShutdownHooks? _shutdownHooks;
+  final Signals? _signals;
+  final Stdio? _stdio;
+  final SystemClock? _systemClock;
+  final AnsiTerminal? _terminal;
+  final UserMessages? _userMessages;
+
+  @override
+  late final Artifacts artifacts = _artifacts ?? FakeArtifacts(fileSystem: fs);
+
+  @override
+  late final BotDetector botDetector = _botDetector ?? const FakeBotDetector(false);
+
+  @override
+  late final Cache cache = _cache ?? FakeCache(fileSystem: fs);
+
+  @override
+  late final Config config = _config ?? FakeConfig();
+
+  @override
+  late final CustomDevicesConfig customDevicesConfig =
+      _customDevicesConfig ??
+      CustomDevicesConfig.test(fileSystem: fs, logger: logger, platform: platform);
+
+  @override
+  late final FlutterVersion flutterVersion = _flutterVersion ?? FakeFlutterVersion();
+
+  @override
+  late final FileSystem fs = _fs ?? MemoryFileSystem.test();
+
+  @override
+  late final Git git = _git ?? Git(currentPlatform: platform, runProcessWith: processUtils);
+
+  @override
+  late final LocalEngineLocator localEngineLocator =
+      _localEngineLocator ??
+      LocalEngineLocator(
+        userMessages: userMessages,
+        logger: logger,
+        platform: platform,
+        fileSystem: fs,
+        flutterRoot: Cache.flutterRoot ?? '',
+      );
+
+  @override
+  late final Logger logger = _logger ?? BufferLogger.test();
+
+  @override
+  TestCompilerNativeAssetsBuilder? get nativeAssetsBuilder => _nativeAssetsBuilder;
+
+  @override
+  late final OperatingSystemUtils os = _os ?? FakeOperatingSystemUtils();
+
+  @override
+  late final OutputPreferences outputPreferences = _outputPreferences ?? OutputPreferences.test();
+
+  @override
+  late final Platform platform = _platform ?? FakePlatform();
+
+  @override
+  late final PreRunValidator preRunValidator = _preRunValidator ?? const NoOpPreRunValidator();
+
+  @override
+  late final ProcessManager processManager = _processManager ?? FakeProcessManager.any();
+
+  @override
+  late final ProcessUtils processUtils =
+      _processUtils ?? ProcessUtils(processManager: processManager, logger: logger);
+
+  @override
+  late final FlutterProjectFactory projectFactory =
+      _projectFactory ?? FlutterProjectFactory(fileSystem: fs, logger: logger);
+
+  @override
+  late final ShutdownHooks shutdownHooks = _shutdownHooks ?? ShutdownHooks();
+
+  @override
+  late final Signals signals = _signals ?? Signals.test();
+
+  @override
+  late final Stdio stdio = _stdio ?? FakeStdio();
+
+  @override
+  late final SystemClock systemClock = _systemClock ?? const SystemClock();
+
+  @override
+  late final AnsiTerminal terminal = _terminal ?? AnsiTerminal(stdio: stdio, platform: platform);
+
+  @override
+  late final UserMessages userMessages = _userMessages ?? UserMessages();
+
+  @override
+  FileSystemUtils get fileSystemUtils => FileSystemUtils(fileSystem: fs, platform: platform);
+}
+
+/// A [ToolContext] that dynamically delegates to [globals] for use in [testUsingContext].
+class DelegatingToolContext extends Fake implements ToolContext {
+  DelegatingToolContext({
+    Artifacts? artifacts,
+    BotDetector? botDetector,
+    Cache? cache,
+    Config? config,
+    CustomDevicesConfig? customDevicesConfig,
+    FlutterVersion? flutterVersion,
+    FileSystem? fs,
+    Git? git,
+    LocalEngineLocator? localEngineLocator,
+    Logger? logger,
+    OperatingSystemUtils? os,
+    OutputPreferences? outputPreferences,
+    Platform? platform,
+    PreRunValidator? preRunValidator,
+    ProcessManager? processManager,
+    ProcessUtils? processUtils,
+    FlutterProjectFactory? projectFactory,
+    ShutdownHooks? shutdownHooks,
+    Signals? signals,
+    Stdio? stdio,
+    SystemClock? systemClock,
+    AnsiTerminal? terminal,
+    UserMessages? userMessages,
+  }) : _artifacts = artifacts,
+       _botDetector = botDetector,
+       _cache = cache,
+       _config = config,
+       _customDevicesConfig = customDevicesConfig,
+       _flutterVersion = flutterVersion,
+       _fs = fs,
+       _git = git,
+       _localEngineLocator = localEngineLocator,
+       _logger = logger,
+       _os = os,
+       _outputPreferences = outputPreferences,
+       _platform = platform,
+       _preRunValidator = preRunValidator,
+       _processManager = processManager,
+       _processUtils = processUtils,
+       _projectFactory = projectFactory,
+       _shutdownHooks = shutdownHooks,
+       _signals = signals,
+       _stdio = stdio,
+       _systemClock = systemClock,
+       _terminal = terminal,
+       _userMessages = userMessages;
+
+  final Artifacts? _artifacts;
+  final BotDetector? _botDetector;
+  final Cache? _cache;
+  final Config? _config;
+  final CustomDevicesConfig? _customDevicesConfig;
+  final FlutterVersion? _flutterVersion;
+  final FileSystem? _fs;
+  final Git? _git;
+  final LocalEngineLocator? _localEngineLocator;
+  final Logger? _logger;
+  final OperatingSystemUtils? _os;
+  final OutputPreferences? _outputPreferences;
+  final Platform? _platform;
+  final PreRunValidator? _preRunValidator;
+  final ProcessManager? _processManager;
+  final ProcessUtils? _processUtils;
+  final FlutterProjectFactory? _projectFactory;
+  final ShutdownHooks? _shutdownHooks;
+  final Signals? _signals;
+  final Stdio? _stdio;
+  final SystemClock? _systemClock;
+  final AnsiTerminal? _terminal;
+  final UserMessages? _userMessages;
+
+  @override
+  Artifacts get artifacts => _artifacts ?? globals.artifacts!;
+
+  @override
+  BotDetector get botDetector => _botDetector ?? globals.botDetector;
+
+  @override
+  Cache get cache => _cache ?? globals.cache;
+
+  @override
+  Config get config => _config ?? globals.config;
 
-class FakeArtifacts extends Fake implements Artifacts {}
+  @override
+  CustomDevicesConfig get customDevicesConfig =>
+      _customDevicesConfig ?? globals.customDevicesConfig;
+
+  @override
+  FlutterVersion get flutterVersion => _flutterVersion ?? globals.flutterVersion;
+
+  @override
+  FileSystem get fs => _fs ?? globals.fs;
+
+  @override
+  Git get git => _git ?? globals.git;
 
-class FakeCache extends Fake implements Cache {}
+  @override
+  LocalEngineLocator get localEngineLocator =>
+      _localEngineLocator ??
+      globals.localEngineLocator ??
+      LocalEngineLocator(
+        userMessages: userMessages,
+        logger: logger,
+        platform: platform,
+        fileSystem: fs,
+        flutterRoot: Cache.flutterRoot ?? '',
+      );
+
+  @override
+  Logger get logger => _logger ?? globals.logger;
+
+  @override
+  OperatingSystemUtils get os => _os ?? globals.os;
+
+  @override
+  OutputPreferences get outputPreferences => _outputPreferences ?? globals.outputPreferences;
+
+  @override
+  Platform get platform => _platform ?? globals.platform;
+
+  @override
+  PreRunValidator get preRunValidator => _preRunValidator ?? const NoOpPreRunValidator();
+
+  @override
+  ProcessManager get processManager => _processManager ?? globals.processManager;
+
+  @override
+  ProcessUtils get processUtils => _processUtils ?? globals.processUtils;
+
+  @override
+  FlutterProjectFactory get projectFactory => _projectFactory ?? globals.projectFactory;
+
+  @override
+  ShutdownHooks get shutdownHooks => _shutdownHooks ?? globals.shutdownHooks;
+
+  @override
+  Signals get signals => _signals ?? globals.signals;
+
+  @override
+  Stdio get stdio => _stdio ?? globals.stdio;
+
+  @override
+  SystemClock get systemClock => _systemClock ?? globals.systemClock;
+
+  @override
+  AnsiTerminal get terminal => _terminal ?? globals.terminal;
+
+  @override
+  UserMessages get userMessages => _userMessages ?? globals.userMessages;
+
+  @override
+  FileSystemUtils get fileSystemUtils => FileSystemUtils(fileSystem: fs, platform: platform);
+}
+
+class FakeAndroidContext extends Fake implements AndroidContext {
+  FakeAndroidContext({
+    AndroidSdk? androidSdk,
+    AndroidStudio? androidStudio,
+    GradleUtils? gradleUtils,
+    Java? java,
+  }) : _androidSdk = androidSdk,
+       _androidStudio = androidStudio,
+       _gradleUtils = gradleUtils,
+       _java = java;
+
+  final AndroidSdk? _androidSdk;
+  final AndroidStudio? _androidStudio;
+  final GradleUtils? _gradleUtils;
+  final Java? _java;
+
+  @override
+  AndroidSdk? get androidSdk => _androidSdk;
+
+  @override
+  AndroidStudio? get androidStudio => _androidStudio;
+
+  @override
+  late final GradleUtils gradleUtils = _gradleUtils ?? FakeGradleUtils();
+
+  @override
+  Java? get java => _java;
+}
+
+class FakeAppleContext extends Fake implements AppleContext {
+  FakeAppleContext({
+    CocoaPods? cocoaPods,
+    CocoaPodsValidator? cocoapodsValidator,
+    IOSSimulatorUtils? iosSimulatorUtils,
+    IOSWorkflow? iosWorkflow,
+    PlistParser? plistParser,
+    XCDevice? xcdevice,
+    Xcode? xcode,
+    XcodeProjectInterpreter? xcodeProjectInterpreter,
+  }) : _cocoaPods = cocoaPods,
+       _cocoapodsValidator = cocoapodsValidator,
+       _iosSimulatorUtils = iosSimulatorUtils,
+       _iosWorkflow = iosWorkflow,
+       _plistParser = plistParser,
+       _xcdevice = xcdevice,
+       _xcode = xcode,
+       _xcodeProjectInterpreter = xcodeProjectInterpreter;
+
+  final CocoaPods? _cocoaPods;
+  final CocoaPodsValidator? _cocoapodsValidator;
+  final IOSSimulatorUtils? _iosSimulatorUtils;
+  final IOSWorkflow? _iosWorkflow;
+  final PlistParser? _plistParser;
+  final XCDevice? _xcdevice;
+  final Xcode? _xcode;
+  final XcodeProjectInterpreter? _xcodeProjectInterpreter;
+
+  @override
+  late final CocoaPods cocoaPods = _cocoaPods ?? FakeCocoaPods();
+
+  @override
+  late final CocoaPodsValidator cocoapodsValidator =
+      _cocoapodsValidator ?? FakeCocoaPodsValidator();
+
+  @override
+  late final IOSSimulatorUtils iosSimulatorUtils = _iosSimulatorUtils ?? FakeIOSSimulatorUtils();
+
+  @override
+  late final IOSWorkflow iosWorkflow = _iosWorkflow ?? FakeIOSWorkflow();
+
+  @override
+  late final PlistParser plistParser = _plistParser ?? FakePlistParser();
+
+  @override
+  late final XCDevice xcdevice = _xcdevice ?? FakeXCDevice();
+
+  @override
+  late final Xcode xcode = _xcode ?? FakeXcode();
+
+  @override
+  late final XcodeProjectInterpreter xcodeProjectInterpreter =
+      _xcodeProjectInterpreter ?? FakeXcodeProjectInterpreter();
+}
diff --git a/packages/flutter_tools/test/web.shard/chrome_test.dart b/packages/flutter_tools/test/web.shard/chrome_test.dart
index fc748046b859b..0bb89ff5a7edf 100644
--- a/packages/flutter_tools/test/web.shard/chrome_test.dart
+++ b/packages/flutter_tools/test/web.shard/chrome_test.dart
@@ -23,6 +23,11 @@ import '../src/fakes.dart' hide FakeProcess;
 const kChromeArgs = <String>[
   '--disable-background-timer-throttling',
   '--disable-renderer-backgrounding',
+  '--disable-background-networking',
+  '--disable-sync',
+  '--disable-client-side-phishing-detection',
+  '--disable-notifications',
+  ...kGcmDisabledFlags,
   '--disable-extensions',
   '--disable-popup-blocking',
   '--bwsi',
@@ -104,6 +109,46 @@ void main() {
     );
   });
 
+  testWithoutContext('filters out Chromium D-Bus error lines from stderr logs', () async {
+    final logger = BufferLogger.test();
+    final chromiumLauncher = ChromiumLauncher(
+      fileSystem: fileSystem,
+      platform: platform,
+      processManager: processManager,
+      operatingSystemUtils: operatingSystemUtils,
+      browserFinder: findChromeExecutable,
+      logger: logger,
+    );
+
+    const dbusStderr = '''
+[27076:27076:0805/172123.895258:ERROR:dbus/bus.cc(408)] Failed to connect to the bus: Could not parse server address e.g. ''
+[27076:27076:0805/172123.895258:ERROR:dbus/object_proxy.cc(588)] Failed to call method: org.freedesktop.DBus.Properties.Get: object_path= /org/freedesktop/UPower
+[27076:27076:0805/172123.895258:ERROR:some_other_file.cc(100)] Non-dbus error line
+DevTools listening on ws://127.0.0.1:12345/devtools/browser/
+''';
+
+    processManager.addCommand(
+      const FakeCommand(
+        command: <String>[
+          'example_chrome',
+          '--user-data-dir=/.tmp_rand0/flutter_tools_chrome_device.rand0',
+          '--remote-debugging-port=12345',
+          ...kChromeArgs,
+          'example_url',
+        ],
+        stderr: dbusStderr,
+      ),
+    );
+
+    await expectReturnsNormallyLater(chromiumLauncher.launch('example_url', skipCheck: true));
+
+    expect(logger.traceText, contains('Non-dbus error line'));
+    expect(logger.traceText, isNot(contains('ERROR:dbus/bus.cc')));
+    expect(logger.traceText, isNot(contains('ERROR:dbus/object_proxy.cc')));
+    expect(logger.traceText, isNot(contains('Failed to connect to the bus')));
+    expect(logger.traceText, isNot(contains('org.freedesktop.DBus')));
+  });
+
   testWithoutContext('can launch chrome in verbose mode', () async {
     chromeLauncher = ChromiumLauncher(
       fileSystem: fileSystem,
@@ -440,11 +485,6 @@ void main() {
             '--no-sandbox',
             '--headless',
             '--window-size=1024,1024',
-            '--disable-background-networking',
-            '--disable-sync',
-            '--disable-client-side-phishing-detection',
-            '--disable-notifications',
-            '--disable-features=GCM',
             'example_url',
           ],
           stderr: kDevtoolsStderr,
@@ -579,11 +619,6 @@ void main() {
           '--no-sandbox',
           '--headless',
           '--window-size=1024,1024',
-          '--disable-background-networking',
-          '--disable-sync',
-          '--disable-client-side-phishing-detection',
-          '--disable-notifications',
-          '--disable-features=GCM',
           'example_url',
         ],
         stderr: kDevtoolsStderr,
@@ -680,11 +715,6 @@ void main() {
       '--no-sandbox',
       '--headless',
       '--window-size=1024,1024',
-      '--disable-background-networking',
-      '--disable-sync',
-      '--disable-client-side-phishing-detection',
-      '--disable-notifications',
-      '--disable-features=GCM',
       '--use-gl=angle',
       '--use-angle=swiftshader',
       '--enable-unsafe-swiftshader',
@@ -722,11 +752,6 @@ void main() {
       '--no-sandbox',
       '--headless',
       '--window-size=1024,1024',
-      '--disable-background-networking',
-      '--disable-sync',
-      '--disable-client-side-phishing-detection',
-      '--disable-notifications',
-      '--disable-features=GCM',
       'example_url',
     ];
 
@@ -764,11 +789,6 @@ void main() {
             '--no-sandbox',
             '--headless',
             '--window-size=1024,1024',
-            '--disable-background-networking',
-            '--disable-sync',
-            '--disable-client-side-phishing-detection',
-            '--disable-notifications',
-            '--disable-features=GCM',
             'example_url',
           ],
           stderr: 'nothing in the std error indicating glibc error',
diff --git a/packages/flutter_tools/test/web.shard/web_define_run_test.dart b/packages/flutter_tools/test/web.shard/web_define_run_test.dart
new file mode 100644
index 0000000000000..96c3af6b229a2
--- /dev/null
+++ b/packages/flutter_tools/test/web.shard/web_define_run_test.dart
@@ -0,0 +1,117 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@Tags(<String>['flutter-test-driver'])
+library;
+
+import 'dart:convert';
+import 'dart:io' as io;
+
+import 'package:file/file.dart';
+
+import '../integration.shard/test_data/web_define_project.dart';
+import '../integration.shard/test_driver.dart';
+import '../integration.shard/test_utils.dart';
+import '../src/common.dart';
+
+import 'test_data/web_server_test_common.dart';
+
+/// Fetches the body served at [url]; the bare app URL serves index.html.
+Future<String> _fetch(String url) async {
+  final client = io.HttpClient();
+  try {
+    final io.HttpClientRequest request = await client.getUrl(Uri.parse(url));
+    final io.HttpClientResponse response = await request.close();
+    final String body = await response.transform(utf8.decoder).join();
+    if (response.statusCode != io.HttpStatus.ok) {
+      throw Exception('GET $url returned HTTP ${response.statusCode}, body:\n$body');
+    }
+    return body;
+  } finally {
+    client.close(force: true);
+  }
+}
+
+/// Asserts --web-define placeholders were substituted and none remain.
+void _expectSubstituted(String body) {
+  expect(body, contains(WebDefineProject.kVersion));
+  expect(body, contains(WebDefineProject.kApiUrl));
+  expect(body, isNot(contains('{{MY_VERSION}}')));
+  expect(body, isNot(contains('{{API_URL}}')));
+}
+
+void main() {
+  late Directory tempDir;
+  final project = WebDefineProject();
+  late FlutterRunTestDriver flutter;
+
+  setUp(() async {
+    tempDir = createResolvedTempDirectorySync('web_define_run_test.');
+    await project.setUpIn(tempDir);
+    flutter = FlutterRunTestDriver(tempDir);
+  });
+
+  tearDown(() async {
+    await flutter.stop();
+    tryToDelete(tempDir);
+  });
+
+  const webDefineArgs = <String>[
+    '--no-web-resources-cdn',
+    '--web-define=MY_VERSION=${WebDefineProject.kVersion}',
+    '--web-define=API_URL=${WebDefineProject.kApiUrl}',
+  ];
+
+  testWithoutContext('flutter run (debug) substitutes --web-define in served index.html '
+      'and keeps it substituted across hot reload and hot restart', () async {
+    final testRunner = WebServerDeviceTestRunner(flutter);
+    try {
+      final String appUrl = await testRunner.runWebServerDevice(
+        additionalCommandArgs: webDefineArgs,
+      );
+      _expectSubstituted(await _fetch(appUrl));
+
+      await testRunner.hotReload();
+      _expectSubstituted(await _fetch(appUrl));
+
+      await testRunner.hotRestart();
+      _expectSubstituted(await _fetch(appUrl));
+    } finally {
+      await testRunner.cleanup();
+    }
+  });
+
+  testWithoutContext('flutter run --profile substitutes --web-define in served index.html '
+      'and keeps it substituted across hot restart', () async {
+    final testRunner = WebServerDeviceTestRunner(flutter);
+    try {
+      final String appUrl = await testRunner.runWebServerDevice(
+        additionalCommandArgs: <String>[...webDefineArgs, '--profile'],
+      );
+      _expectSubstituted(await _fetch(appUrl));
+
+      // Hot reload is debug-only.
+      await testRunner.hotRestart();
+      _expectSubstituted(await _fetch(appUrl));
+    } finally {
+      await testRunner.cleanup();
+    }
+  });
+
+  testWithoutContext('flutter run --release substitutes --web-define in served index.html '
+      'and keeps it substituted across hot restart', () async {
+    final testRunner = WebServerDeviceTestRunner(flutter);
+    try {
+      final String appUrl = await testRunner.runWebServerDevice(
+        additionalCommandArgs: <String>[...webDefineArgs, '--release'],
+      );
+      _expectSubstituted(await _fetch(appUrl));
+
+      await testRunner.hotRestart();
+      _expectSubstituted(await _fetch(appUrl));
+    } finally {
+      await testRunner.cleanup();
+    }
+  });
+}
diff --git a/packages/integration_test/analysis_options.yaml b/packages/integration_test/analysis_options.yaml
index 2509a6ee60810..8461e419f4fa3 100644
--- a/packages/integration_test/analysis_options.yaml
+++ b/packages/integration_test/analysis_options.yaml
@@ -1,5 +1,9 @@
 include: ../analysis_options.yaml
 
+plugins:
+  flutter_analyzer_plugin:
+    path: ../../dev/flutter_analyzer_plugin
+
 analyzer:
   exclude:
     - "test_fixes/**"
diff --git a/pubspec.lock b/pubspec.lock
index 1345c3610b65d..216238260a0dd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -25,6 +25,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.7"
+  analysis_server_plugin:
+    dependency: transitive
+    description:
+      name: analysis_server_plugin
+      sha256: "63a41a9c0e12574c39f0207a193f8bdb65c78aa1d791c98f0aee6a91c4387df4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.9"
   analyzer:
     dependency: "direct main"
     description:
@@ -33,6 +41,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.1.0"
+  analyzer_plugin:
+    dependency: transitive
+    description:
+      name: analyzer_plugin
+      sha256: "383e9d91be2ae8ab4a423656f1b39152d2ac5aaa88051d4bc178f89d071a90e0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.3"
+  analyzer_testing:
+    dependency: transitive
+    description:
+      name: analyzer_testing
+      sha256: "2cdc399ca5110d9059b0ef3c73a25d8d5357318d9057bf68e5358a013b5e9c4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   animations:
     dependency: "direct main"
     description:
@@ -102,10 +126,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56"
+      sha256: "31b24be6615ec7fcf70b3aa5a7469fe35826485e639a16dd7eb83ba30e4cc6a8"
       url: "https://pub.dev"
     source: hosted
-    version: "8.12.6"
+    version: "8.12.7"
   characters:
     dependency: "direct main"
     description:
@@ -234,6 +258,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  dap_adapters:
+    dependency: transitive
+    description:
+      name: dap_adapters
+      sha256: "26f1ae0945bd0e0d015d2c0cb0fa8d1ed84262d7e5db3bf2642fb4c199fa7844"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   dart_service_protocol_shared:
     dependency: transitive
     description:
@@ -410,6 +442,27 @@ packages:
       relative: true
     source: path
     version: "0.0.0"
+  flutter_tools_core:
+    dependency: transitive
+    description:
+      path: "packages/flutter_tools/packages/flutter_tools_core"
+      relative: true
+    source: path
+    version: "0.0.0"
+  flutter_tools_extension:
+    dependency: transitive
+    description:
+      path: "packages/flutter_tools/packages/flutter_tools_extension"
+      relative: true
+    source: path
+    version: "0.0.0"
+  flutter_tools_extension_linux_prototype:
+    dependency: transitive
+    description:
+      path: "packages/flutter_tools/packages/flutter_tools_extension_linux_prototype"
+      relative: true
+    source: path
+    version: "0.0.0"
   frontend_server_client:
     dependency: "direct main"
     description:
@@ -910,10 +963,10 @@ packages:
     dependency: "direct main"
     description:
       name: record_use
-      sha256: af37186ff9ede46fa32f152526c48f46c5b3ad7d3d5a566140cb5df3dc4ed737
+      sha256: "3b4ab682aff40175afca6ff090cc5aa7ce9dafe8dfbae1537a6c678e6678baee"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   retry:
     dependency: "direct main"
     description:
@@ -1095,6 +1148,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.18"
+  test_reflective_loader:
+    dependency: transitive
+    description:
+      name: test_reflective_loader
+      sha256: d828d5ca15179aaac2aaf8f510cf0a52ec28e0031681b044ec5e581a4b8002e7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   typed_data:
     dependency: "direct main"
     description:
@@ -1195,10 +1256,10 @@ packages:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: "20ef311160e2ced020a62f38e4cc399a1bf289e722fc5fe37c9d7b18e44c9e8d"
+      sha256: "8c837b570dccb9ae6ff73d2e0b03c7e708bfefd3bd1194faa7f3e7f200dfc399"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.0"
+    version: "2.14.0"
   video_player_android:
     dependency: "direct main"
     description:
@@ -1315,10 +1376,10 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter_android
-      sha256: a97db7a44f8e71af2f3971c45550a08cce1fb60059c1b8e534251e6cfb753490
+      sha256: b98656fa4461f8cc05c48a778b4d4883e60ec63e1778348f363f9bb9a477745d
       url: "https://pub.dev"
     source: hosted
-    version: "4.13.0"
+    version: "4.14.0"
   webview_flutter_platform_interface:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3af22515f270b..b2863416faf5b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,6 +5,7 @@ environment:
 
 workspace:
   - dev/a11y_assessments
+  - dev/flutter_analyzer_plugin
   - dev/automated_tests
   - dev/benchmarks/complex_layout
   - dev/benchmarks/imitation_game_flutter
@@ -29,6 +30,7 @@ workspace:
   - dev/integration_tests/data_asset_package
   - dev/integration_tests/deferred_components_test
   - dev/integration_tests/display_cutout_rotation
+  - dev/integration_tests/engine_integration_golden_test
   - dev/integration_tests/external_textures
   - dev/integration_tests/flavors
   - dev/integration_tests/flutter_gallery
@@ -61,7 +63,6 @@ workspace:
   - dev/tools/gen_keycodes
   - dev/tools/vitool
   - dev/tracing_tests
-  - examples/api
   - examples/flutter_view
   - examples/hello_world
   - examples/image_list
@@ -77,6 +78,7 @@ workspace:
   - packages/flutter_localizations
   - packages/flutter_test
   - packages/flutter_web_plugins
+  - packages/flutter/examples/api
   - packages/flutter/test_private
   - packages/flutter/test_private/test
   - packages/fuchsia_remote_debug_protocol
@@ -122,7 +124,7 @@ dependencies:
   googleapis_auth: 2.3.3
   hooks: 2.1.0
   data_assets: 0.20.0
-  record_use: 1.0.0
+  record_use: 1.1.0
   html: 0.15.6
   http: 1.6.0
   http_multi_server: 3.2.2
@@ -191,7 +193,7 @@ dependencies:
   url_launcher_web: 2.4.3
   url_launcher_windows: 3.1.5
   vector_math: ^2.4.2
-  video_player: 2.13.0
+  video_player: 2.14.0
   video_player_android: 2.12.0
   video_player_avfoundation: 2.11.0
   video_player_platform_interface: 6.9.0
@@ -205,7 +207,7 @@ dependencies:
   webdriver: 3.1.0
   webkit_inspection_protocol: 1.2.1
   webview_flutter: 4.14.1
-  webview_flutter_android: 4.13.0
+  webview_flutter_android: 4.14.0
   webview_flutter_platform_interface: 2.15.1
   webview_flutter_wkwebview: 3.26.0
   xdg_directories: 1.1.0
@@ -222,4 +224,4 @@ dependencies:
 dev_dependencies:
   ffigen: 20.1.1
 
-# PUBSPEC CHECKSUM: db69ps
+# PUBSPEC CHECKSUM: eqa987