harryterkelsen
diff --git a/‎.ci.yaml‎
Lines changed: 0 additions & 1 deletion b/‎.ci.yaml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎DEPS‎
Lines changed: 6 additions & 6 deletions b/‎DEPS‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎bin/internal/flutter_packages.version‎
Lines changed: 1 addition & 1 deletion b/‎bin/internal/flutter_packages.version‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dev/integration_tests/android_verified_input/pubspec.yaml‎
Lines changed: 2 additions & 2 deletions b/‎dev/integration_tests/android_verified_input/pubspec.yaml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎docs/platforms/android/Update-Android-MinSdk-Version.md‎
Lines changed: 58 additions & 0 deletions b/‎docs/platforms/android/Update-Android-MinSdk-Version.md‎
Lines changed: 58 additions & 0 deletions
diff --git a/‎engine/src/build/vs_toolchain.py‎
Lines changed: 16 additions & 3 deletions b/‎engine/src/build/vs_toolchain.py‎
Lines changed: 16 additions & 3 deletions
diff --git a/‎engine/src/flutter/.ci.yaml‎
Lines changed: 1 addition & 0 deletions b/‎engine/src/flutter/.ci.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎engine/src/flutter/.clang-tidy‎
Lines changed: 1 addition & 1 deletion b/‎engine/src/flutter/.clang-tidy‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎engine/src/flutter/fml/string_conversion.cc‎
Lines changed: 5 additions & 0 deletions b/‎engine/src/flutter/fml/string_conversion.cc‎
Lines changed: 5 additions & 0 deletions
@@ -3579,7 +3579,6 @@ targets:
   - name: Mac_ios draw_arcs_all_stroke_styles_perf_ios__timeline_summary
     recipe: devicelab/devicelab_drone
     presubmit: false
-    bringup: true
     timeout: 60
     properties:
       tags: >
 
@@ -32,6 +32,10 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
 
 ## Flutter 3.38 Changes
 
+### [3.38.5](https://github.com/flutter/flutter/releases/tag/3.38.5)
+
+- [flutter/179700](https://github.com/flutter/flutter/issues/179700) Update dart to 3.10.4.
+
 ### [3.38.4](https://github.com/flutter/flutter/releases/tag/3.38.4)
 
 - [flutter/178547](https://github.com/flutter/flutter/issues/178547) Rendering issues in the Linux desktop embedder when using Skia.
 
@@ -15,7 +15,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'f9e32c28c5c5ee1ca4ab4dec6ef327b4e91754b6',
+  'skia_revision': 'edf52cb27f29d20534a0a84db1689d3fc3256758',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -59,14 +59,14 @@ 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': '019cb923bf62e68b0b5b5ea98e4a74472a8a0bcb',
+  'dart_revision': 'f105c21685743fe5758661a2cb69d3ff3636edb6',
 
   # 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': '4eb2446144a8af374e08da8d3c743dcce129f87f',
   'dart_binaryen_rev': '6ec7b5f9c615d3b224c67ae221d6812c8f8e1a96',
-  'dart_boringssl_rev': '098d5baf008ffa6321e2c4a358f5475fcf1fe938',
-  'dart_core_rev': '5c3e2c38df268be2347f3aad30ced0147dd012bb',
+  'dart_boringssl_rev': '29e2ef6cc121e6d30a38bdb3fce3ddd489e6e2eb',
+  'dart_core_rev': '58b0a108b4d1310465e8482d6629357891df1cb1',
   'dart_devtools_rev': 'bac6843cce3c98d8794a7cce796faaa8860cc00f',
   'dart_ecosystem_rev': 'eac66d93142907b39f2271647c111f36ff3365b9',
   'dart_http_rev': 'a22386e9c390290c916d1c53a3d3c1447ec120ce',
@@ -77,7 +77,7 @@ vars = {
   'dart_protobuf_rev': '9e30258e0aa6a6430ee36c84b75308a9702fde42',
   'dart_pub_rev': 'b297f1f5e42f2569f15a98548f44b4b9a48487c1',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': 'd03c394b24829f662098e590a2c812a076b01199',
+  'dart_tools_rev': '97014f33a2aad59385df73f25baf9c304ca5c866',
   'dart_vector_math_rev': '70a9a2cb610d040b247f3ca2cd70a94c1c6f6f23',
   'dart_web_rev': '35fc98dd8f9da175ed0a2dcf246299e922e1e1e2',
   'dart_webdev_rev': '234e44c2ba0aa6cee5a36026538ca89457bf0d55',
@@ -810,7 +810,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '_pSztGZvEA3-Ry-GWNEj4jMKX5mX1NoFMYXMEm0f9-8C'
+        'version': 'fppT9ZrwbFx7iYrIhYwdk2rAWE_LBcSvyxu_cZkULTkC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
 
@@ -1 +1 @@
-338ecd3864b89c367e58a2bfd69c3767531ecbe4
+0ac7a032dbcd4a6b05e52b54183ffa2c98c44dfa
@@ -19,7 +19,7 @@ dependencies:
 
   async: ^2.13.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  characters: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  characters: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.19.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 7.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.18 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -80,4 +80,4 @@ dev_dependencies:
   webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: 2kn18j
+# PUBSPEC CHECKSUM: fj70b8
@@ -0,0 +1,58 @@
+# Removing support for an Android API level in Flutter (go/flutter-android-remove-api-level)
+
+## Objective
+
+Provides a list of areas to consider and examples of former work for how to update Flutter to no longer support an old version of the Android API.
+
+### Overview
+After Flutter has decided to bump the minimum supported Android SDK, ideally through a justification document like http://goto.google.com/rfc-flutter-android-m-deprecation, this document covers what to update and suggests an order.
+
+#### Google3
+Googlers should start by following the Google3 migration steps defined in go/flutter-android-g3-minsdk-version.
+Google apps can be migrated to a higher minimum API level before Flutter drops support.
+
+#### Bump templates used in `flutter create`
+Templates take the least justification or configuration to bump.
+Example PR: https://github.com/flutter/flutter/pull/170882
+
+#### Add auto migration for apps targeting deprecated APIs.
+
+Example PR: https://github.com/flutter/flutter/pull/170882 `android_project_migration_test.dart`
+
+#### Modify tooling to enforce a new minimum version.
+
+Example PR: https://github.com/flutter/flutter/pull/170882 see `DependencyVersionChecker.kt` and `gradle_utils.dart`
+
+#### Update the engine minSdk and tests
+[Upgrading-Engine's-Android-API-version.md](Upgrading-Engine's-Android-API-version.md)
+
+#### Breaking change notice
+Create a breaking change notice for the next stable release.
+
+See "Minimum Android SDK has changed" in [Flutter 3.35 Technical Blog Post](https://blog.flutter.dev/whats-new-in-flutter-3-35-c58ef72e3766).
+
+#### Update documentation
+
+Update documentation page to indicate the old API is not tested: https://docs.flutter.dev/reference/supported-platforms.
+
+Example PR: https://github.com/flutter/website/pull/12230
+
+##### Issue hygiene
+Close all GitHub issues against the deprecated platform.
+
+#### Packages
+After a stable build is published with the new minimum Android API level.
+
+1. Update all existing Flutter maintained plugins to use the new stable Flutter version.
+2. Audit native Android code in any plugins that have no longer used codepaths and delete those codepaths.
+
+Example PRs:
+* https://github.com/flutter/packages/pull/9851
+* https://github.com/flutter/packages/pull/9987
+* https://github.com/flutter/packages/pull/10470
+
+
+#### Related documents
+
+Example tracking bug for `minSdk` 24 https://github.com/flutter/flutter/issues/170807
+Google3 documentation go/flutter-android-g3-minsdk-version
@@ -18,7 +18,7 @@
 import glob
 import json
 import os
-import pipes
+import shlex
 import platform
 import re
 import shutil
@@ -39,12 +39,14 @@
   ('2019', '16.0'),
   ('2017', '15.0'),
   ('2022', '17.0'),
+  ('2026', '18'),
 ])
 
 VC_VERSIONS = {
   '2017': 'VC141',
   '2019': 'VC142',
   '2022': 'VC143',
+  '2026': 'VC145',
 }
 
 
@@ -168,6 +170,12 @@ def GetVisualStudioVersion():
       for k,v in list(MSVS_VERSIONS.items()))
   available_versions = []
   for version in supported_versions:
+    # Also look for the numeric version folder (e.g. "18")
+    search_versions = [version]
+    if version in MSVS_VERSIONS:
+        search_versions.append(MSVS_VERSIONS[version])
+
+  for version in search_versions:
     for path in (
         os.environ.get('vs%s_install' % version),
         os.path.expandvars('%ProgramFiles(x86)%' +
@@ -192,15 +200,20 @@ def DetectVisualStudioPath():
   # build/toolchain/win/setup_toolchain.py as well.
   version_as_year = GetVisualStudioVersion()
 
+  path_versions = [version_as_year]
+  if version_as_year in MSVS_VERSIONS:
+      path_versions.append(MSVS_VERSIONS[version_as_year])
+
   # The VC++ >=2017 install location needs to be located using COM instead of
   # the registry. For details see:
   # https://blogs.msdn.microsoft.com/heaths/2016/09/15/changes-to-visual-studio-15-setup/
   # For now we use a hardcoded default with an environment variable override.
   possible_install_paths = (
       os.path.expandvars('%s/Microsoft Visual Studio/%s/%s' %
-                         (program_path_var, version_as_year, product))
+                         (program_path_var, v_check, product))
       for program_path_var in ('%ProgramFiles%', '%ProgramFiles(x86)%')
-      for product in ('Enterprise', 'Professional', 'Community', 'Preview'))
+      for product in ('Enterprise', 'Professional', 'Community', 'Preview')
+      for v_check in path_versions)
   for path in (
       os.environ.get('vs%s_install' % version_as_year), *possible_install_paths):
     if path and os.path.exists(path):
 
@@ -162,6 +162,7 @@ targets:
 
   - name: Linux linux_fuchsia_tests
     recipe: engine_v2/engine_v2
+    bringup: true
     timeout: 90
     enabled_branches:
       # Don't run this on release branches
 
@@ -60,4 +60,4 @@ CheckOptions:
 # updated.
 #
 # tl;dr: I'm sorry.
-HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|txt|vulkan|wasm|web_sdk)\/.*"
+HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|skwasm|sky|testing|tools|txt|vulkan|wasm|web_sdk)\/.*"
@@ -44,4 +44,9 @@ std::u16string Utf8ToUtf16(const std::string_view string) {
   return converter.from_bytes(string.data());
 }
 
+std::string PathToUtf8(const std::filesystem::path& path) {
+  const std::u8string path_u8 = path.u8string();
+  return std::string(path_u8.begin(), path_u8.end());
+}
+
 }  // namespace fml
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-338ecd3864b89c367e58a2bfd69c3767531ecbe4`
	`1`	`+0ac7a032dbcd4a6b05e52b54183ffa2c98c44dfa`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ CheckOptions:`
`60`	`60`	`# updated.`
`61`	`61`	`#`
`62`	`62`	`# tl;dr: I'm sorry.`
`63`		`-HeaderFilterRegex: "[..\/]+\/flutter\/(assets\|benchmarking\|bin\|build\|ci\|common\|display_list\|docs\|examples\|flow\|flutter_frontend_server\|flutter_vma\|fml\|impeller\|lib\|runtime\|shell\|skia\|sky\|testing\|tools\|txt\|vulkan\|wasm\|web_sdk)\/.*"`
	`63`	`+HeaderFilterRegex: "[..\/]+\/flutter\/(assets\|benchmarking\|bin\|build\|ci\|common\|display_list\|docs\|examples\|flow\|flutter_frontend_server\|flutter_vma\|fml\|impeller\|lib\|runtime\|shell\|skia\|skwasm\|sky\|testing\|tools\|txt\|vulkan\|wasm\|web_sdk)\/.*"`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,9 @@ std::u16string Utf8ToUtf16(const std::string_view string) {`
`44`	`44`	`return converter.from_bytes(string.data());`
`45`	`45`	`}`
`46`	`46`
	`47`	`+std::string PathToUtf8(const std::filesystem::path& path) {`
	`48`	`+ const std::u8string path_u8 = path.u8string();`
	`49`	`+ return std::string(path_u8.begin(), path_u8.end());`
	`50`	`+}`
	`51`	`+`
`47`	`52`	`} // namespace fml`