canonical · mattkae · Sep 30, 2025 · Sep 30, 2025 · Sep 30, 2025 · Sep 30, 2025
diff --git a/.autoroller-preupload.sh b/.autoroller-preupload.sh
@@ -21,6 +21,11 @@ WORKING_DIR="$REPO_PATH/engine/src/flutter"
 LICENSES_PATH="$REPO_PATH/engine/src/flutter/sky/packages/sky_engine/LICENSE"
 DATA_PATH="$REPO_PATH/engine/src/flutter/tools/licenses_cpp/data"
 
+cd "$REPO_PATH/engine/src"
+./tools/dart/create_updated_flutter_deps.py
+cd "$REPO_PATH"
+gclient sync -D
+
 # This calls `gn gen`.
 "$GN" --runtime-mode profile --no-goma --no-rbe --enable-minimal-linux
 ninja -C "$PROFILE_PATH" licenses_cpp

diff --git a/.ci.yaml b/.ci.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,11 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
 
 ## Flutter 3.35 Changes
 
+### [3.35.6](https://github.com/flutter/flutter/releases/tag/3.35.6)
+
+- [flutter/175669](https://github.com/flutter/flutter/issues/175669) `flutter analyze --suggestions` supports versions up to Java 25, Gradle 9 and AGP 9, Kotlin 2.2.20.
+- [flutter/172624](https://github.com/flutter/flutter/issues/172624) Fixes an issue that could result in a corrupt pipeline cache when using the Impeller Vulkan back end.
+
 ### [3.35.5](https://github.com/flutter/flutter/releases/tag/3.35.5)
 
  - [flutter/172105](https://github.com/flutter/flutter/issues/172105) Flutter view no longer hangs after multiple transitions on iOS add-to-app.

diff --git a/DEPS b/DEPS
@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'bb3b6bd4be0dd757165a5723e1794f7ad2211d49',
+  'skia_revision': 'c501c727a00796f7b8a269680e41304155bc0b16',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,30 +56,30 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'af31d2637b6bced76edd4bcead0d941fe9ad871a',
+  'dart_revision': '2d8e0359a767fcf8dde79d04b6a40115ea1c67f4',
 
   # 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_ai_rev': '901e2cea44bde868061cae58269cf8cc583a8a78',
+  'dart_ai_rev': '59db320ee39a1ae5f6e2830be851e52bb7263ce1',
   'dart_binaryen_rev': '1d2e23d5e55788091a51420ba3a9889d4efe7509',
-  'dart_boringssl_rev': '40e035a9e5d721b3b7c15c46259d782ffe7d9e96',
+  'dart_boringssl_rev': 'eae76e0715de794f4fe0a189fe8c8146cbc9990c',
   'dart_core_rev': '5c3e2c38df268be2347f3aad30ced0147dd012bb',
-  'dart_devtools_rev': '5e1792245005088a0a0dfe28f207bd22045ba783',
-  'dart_ecosystem_rev': '36e514d52c5d056227e4cea98b784ade50b5b4f1',
-  'dart_http_rev': 'e0dadd16e01bb4611036f4946ed480dac2d59dca',
-  'dart_i18n_rev': '09627d28f97e05858e1ba5c6e45ff45d56b1e786',
+  'dart_devtools_rev': '0327830448901920f739259364c3f2f624df5a03',
+  'dart_ecosystem_rev': '96ee86147a5f4c70aed64262e1521b745936cdb1',
+  'dart_http_rev': '2c53fa3c558ec5d1dd9fce4360d435113dba11e5',
+  'dart_i18n_rev': '34d1832b7e65d9aef1f7f6a82c22f6e53476191c',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': '07eed6e8cc0535189112ae8373aa8f16f4a5c3ca',
-  'dart_pub_rev': '469eb6193c0a49495ea2ce7432cf749f077ad596',
+  'dart_protobuf_rev': '14bbd0bd7ff9b7e322ff4e85bd243f6905170b92',
+  'dart_pub_rev': 'f7f1891e2de3d795532f45ec214f88ac912ffcd6',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': 'ecd7dd523c8a5761f337eedce8878b092996a75c',
-  'dart_vector_math_rev': '3939545edc38ed657381381d33acde02c49ff827',
-  'dart_web_rev': '0baaea4de4dfd60db85dd112d8cc7480d0dd8bd8',
-  'dart_webdev_rev': '23aefebea46c1f94c27703743b2c8db1f651bf29',
+  'dart_tools_rev': '6866f9b19553625cc8af099d67aecbfb02067dcb',
+  'dart_vector_math_rev': 'a7b7e9ccb931348dbfa669e0f8fea1bf97705b16',
+  'dart_web_rev': '816abcc1bf186f61c7e66e7f4c56d1554a61ab27',
+  'dart_webdev_rev': '29ba1b12c83b5d0e34bc61181801120c36b95c54',
   'dart_webdriver_rev': '09104f459ed834d48b132f6b7734923b1fbcf2e9',
-  'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
+  'dart_webkit_inspection_protocol_rev': '0f7685804d77ec02c6564d7ac1a6c8a2341c5bdf',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -253,7 +253,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
 
   'engine/src/flutter/third_party/vulkan-deps':
-   Var('chromium_git') + '/vulkan-deps' + '@' + '938de304bdcb33049ec39ce45f16223eb6a960b6',
+   Var('chromium_git') + '/vulkan-deps' + '@' + 'a9e2ca3b57aba86a22a2df1b84bf12f8cc98806e',
 
   'engine/src/flutter/third_party/flatbuffers':
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
@@ -282,7 +282,7 @@ deps = {
   'engine/src/flutter/third_party/boringssl/src':
   'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
-  'engine/src/flutter/third_party/perfetto':
+  'engine/src/flutter/third_party/dart/third_party/perfetto/src':
    Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'),
 
   'engine/src/flutter/third_party/protobuf':
@@ -302,7 +302,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@1d2e23d5e55788091a51420ba3a9889d4efe7509',
 
   'engine/src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:5e1792245005088a0a0dfe28f207bd22045ba783'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:0327830448901920f739259364c3f2f624df5a03'}]},
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ai':
    Var('dart_git') + '/ai.git' + '@' + Var('dart_ai_rev'),
@@ -314,7 +314,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@ca019b0498692ad78f5f0f0f6208a1258e17fc90',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@669b15f7da5da04a38e95e8ac0ff6471697a549f',
+   Var('dart_git') + '/dartdoc.git@ec2a4feee51961e9fbdd2bd94060cc8fc994c47e',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
    Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -329,7 +329,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@400c7001de7a3cddca341e728163bd64029ab288',
+   Var('dart_git') + '/native.git@3ec573500f743d4a1393f7802143aef50fec0a47',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -338,7 +338,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@de91a5b8c1de05f622c0c6f1eab38d5f31e0113f',
+   Var('dart_git') + '/shelf.git@f30d65034a868530a9aa9ada7c3067d22fa01185',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
    Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -347,7 +347,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@b99d556ec6096965eb177111299c0783678200f6',
+   Var('dart_git') + '/test.git@8083c8f24ffbca58cc0385add03c296b70636e7a',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -368,7 +368,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:0bf5d0bb49d7872a1a01e55dbea63ad7455d754e'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:782552bdddc112c62db28ec7e9b2763f4457a3ea'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -519,10 +519,10 @@ deps = {
    Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '03c67afd452cdff45b41bfe65e19a2fb5b80a0e8',
 
   'engine/src/flutter/third_party/swiftshader':
-  Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'd040a5bab638bf7c226235c95787ba6288bb6416',
+  Var('swiftshader_git') + '/SwiftShader.git' + '@' + '794b0cfce1d828d187637e6d932bae484fbe0976',
 
   'engine/src/flutter/third_party/angle':
-  Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
+  Var('flutter_git') + '/third_party/angle' + '@' + '6950c6c99fa1a2d653922871ede6679d74840289',
 
   'engine/src/flutter/third_party/vulkan_memory_allocator':
   Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + 'c788c52156f3ef7bc7ab769cb03c110a53ac8fcb',
@@ -807,7 +807,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'rcOl0yxJb4znJ903YZ0BtnELs13r0WQ7TACeefPZ3bgC'
+        'version': '_dd0Jv50H0oUI2Ad8Prwtr8uyaJVPRRdXCVA2omL4XgC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

diff --git a/TESTOWNERS b/TESTOWNERS
@@ -305,6 +305,7 @@
 /dev/devicelab/bin/tasks/windows_desktop_impeller.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/windows_home_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/windows_startup_test.dart @loic-sharma @flutter/desktop
+/dev/devicelab/bin/tasks/windowing_test_linux.dart @robert-ancell @flutter/desktop
 /dev/devicelab/bin/tasks/windowing_test_windows.dart @mattkae @flutter/desktop
 /dev/devicelab/bin/tasks/mac_desktop_impeller.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/linux_desktop_impeller.dart @jonahwilliams @flutter/engine

diff --git a/bin/internal/content_aware_hash.ps1 b/bin/internal/content_aware_hash.ps1
@@ -44,7 +44,7 @@ if (($currentBranch -ne "main") -and
     ($currentBranch -ne "master") -and
     ($currentBranch -ne "stable") -and
     ($currentBranch -ne "beta") -and
-    (-not (($currentBranch -eq "HEAD") -and (-not [string]::IsNullOrEmpty($env:LUCI_CI)))) -and
+    (-not (($currentBranch -eq "HEAD") -and (-not [string]::IsNullOrEmpty($env:LUCI_CONTEXT)))) -and
     (-not $currentBranch.StartsWith("gh-readonly-queue/master/pr-")) -and
     (-not ($currentBranch -like "flutter-*-candidate.*")) -and
     (-not $isShallow)) {
@@ -79,6 +79,6 @@ if (($currentBranch -ne "main") -and
 # 3. Out-File -NoNewline -Encoding ascii outputs 8bit ascii
 # 4. git hash-object with stdin from a pipeline consumes UTF-16, so consume
 #.   the contents of hash.txt
-(git -C "$flutterRoot" ls-tree --format "%(objectname) %(path)" "$baseRef" -- $trackedFiles | Out-String) -replace "`r`n", "`n"  | Out-File -NoNewline -Encoding ascii hash.txt
+(git -C "$flutterRoot" ls-tree "$baseRef" -- $trackedFiles | Out-String) -replace "`r`n", "`n"  | Out-File -NoNewline -Encoding ascii hash.txt
 git hash-object hash.txt
 Remove-Item hash.txt
diff --git a/bin/internal/content_aware_hash.sh b/bin/internal/content_aware_hash.sh
@@ -44,7 +44,7 @@ if [[ "$CURRENT_BRANCH" != "main" && \
       "$CURRENT_BRANCH" != "beta" && \
       "$CURRENT_BRANCH" != "gh-readonly-queue/master/pr-"* && \
       "$CURRENT_BRANCH" != "flutter-"*"-candidate."* && \
-      ! ( "$CURRENT_BRANCH" == "HEAD" && -n "$LUCI_CI" ) && \
+      ! ( "$CURRENT_BRANCH" == "HEAD" && -n "$LUCI_CONTEXT" ) && \
       ! -f "$FLUTTER_ROOT/.git/shallow" ]]; then
 
   # This is a development branch. Find the merge-base.
@@ -68,4 +68,4 @@ if [[ "$CURRENT_BRANCH" != "main" && \
   fi
 fi
 
-git -C "$FLUTTER_ROOT" ls-tree --format "%(objectname) %(path)" "$BASEREF" -- "${TRACKEDFILES[@]}" | git hash-object --stdin
+git -C "$FLUTTER_ROOT" ls-tree "$BASEREF" -- "${TRACKEDFILES[@]}" | git hash-object --stdin
diff --git a/bin/internal/flutter_packages.version b/bin/internal/flutter_packages.version
@@ -1 +1 @@
-287739d0accebbcd6459dfa86f559916db793318
+d062181ac46598cec62ffb9cc62bae1dc48ca06d
diff --git a/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart b/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart
@@ -119,5 +119,12 @@ Future<void> main() async {
   }
 
   print('\n\n╡ ••• Done ••• ╞\n\n');
+
+  // Ensure stdout buffers are flushed so the collecting process gets Done
+  await stdout.flush();
+
+  // Now we're just being paranoid here and letting the process churn through
+  // log lines before handling the exit code.
+  await Future<void>.delayed(const Duration(seconds: 5));
   exit(0);
 }
diff --git a/dev/customer_testing/tests.version b/dev/customer_testing/tests.version
@@ -1 +1 @@
-20af51f6c62f7134c0c387d0ec2e13db33b1b9e4
+986c4326b4e4bb4e37bc963c2cc2aaa10b943859
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		287739d0accebbcd6459dfa86f559916db793318
		d062181ac46598cec62ffb9cc62bae1dc48ca06d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		20af51f6c62f7134c0c387d0ec2e13db33b1b9e4
		986c4326b4e4bb4e37bc963c2cc2aaa10b943859