Migrate the flutter-apk copy and per-ABI versionCode to the variant API

.ci.yaml

@@ -780,6 +780,7 @@ targets:
       # it is available in Firebase Test Lab.
       physical_devices: >-
         [
+          "--device", "model=cubs,version=37",
           "--device", "model=shiba,version=34",
           "--device", "model=redfin,version=30",
           "--device", "model=griffin,version=24"
@@ -1148,6 +1149,32 @@ targets:
       - engine/**
       - DEPS
 
+  # Gradle 8.4 cannot run on Java 25, so the pre-AGP 8.3 module test is pinned
+  # to Java 17 instead of the default JDK.
+  - name: Linux android_java17_build_android_host_app_with_module_aar
+    recipe: devicelab/devicelab_drone
+    timeout: 60
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:37v2"},
+          {"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": "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"]
+      task_name: android_java17_build_android_host_app_with_module_aar
+    runIf:
+      - dev/**
+      - packages/flutter_tools/**
+      - bin/**
+      - .ci.yaml
+      - engine/**
+      - DEPS
+
   - name: Linux build_android_host_app_with_module_source
     recipe: devicelab/devicelab_drone
     timeout: 60
@@ -7740,6 +7767,7 @@ targets:
     bringup: true
     timeout: 60
     properties:
+      xvfb: "1"
       dependencies: >-
         [
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},

.github/workflows/quarterly-scheduled-tasks.yml

@@ -91,7 +91,7 @@ jobs:
           BODY: |
             ### Quarterly Dart SDK Constraint Bump
 
-            **Context**: Ahead of the upcoming stable release, the minimum Dart SDK version constraint across `flutter/flutter` should be bumped to align with the current stable release.
+            **Context**: Ahead of the upcoming stable release, the minimum Dart SDK version constraint across `flutter/flutter` should be bumped to align with the current stable release. If and when bumping Dart in the repo requires a large scale change (LSC)—for example, to re-format the repo—the release team should be included in the process. The LSC will need to follow branch alignment so as to not disrupt the release process.
 
             See [Bumping the Dart SDK version constraint](https://github.com/flutter/flutter/blob/main/docs/infra/Bumping-the-Dart-SDK-version.md) for full instructions and policies.
 
@@ -110,6 +110,7 @@ jobs:
               ```bash
               dart --enable-asserts dev/bots/analyze.dart
               ```
+            - [ ] **Check for Large Scale Changes (LSC)**: If the bump requires a large scale change (e.g., to re-format the repo), include the release team in the process and ensure the LSC follows branch alignment so as to not disrupt the release process.
             - [ ] Open PR in `flutter/flutter` to close this issue.
 
             *This issue was automatically generated by GitHub Actions workflow.*

.github/workflows/roll-dart-dependencies.yml

@@ -95,8 +95,8 @@ jobs:
         env:
           DART_HASH: ${{ inputs.dart_hash }}
         run: |
-          # Check if the root DEPS file has changed
-          if git diff --exit-code DEPS; then
+          # Check if the root DEPS file or supports_dart2wasm.js has changed
+          if git diff --exit-code DEPS engine/src/flutter/lib/web_ui/flutter_js/src/supports_dart2wasm.js; then
             echo "changed=false" >> "$GITHUB_OUTPUT"
             echo "## ✅ Dart version already up to date" >> "$GITHUB_STEP_SUMMARY"
             echo "The DEPS file is already up to date with Dart hash \`$DART_HASH\`." >> "$GITHUB_STEP_SUMMARY"
@@ -108,7 +108,7 @@ jobs:
         if: steps.git-check.outputs.changed == 'true'
         run: |
           gh auth setup-git
-          git add DEPS
+          git add DEPS engine/src/flutter/lib/web_ui/flutter_js/src/supports_dart2wasm.js
           git commit -m "Update flutter DEPS to dart $DART_HASH"
           git push origin "$BRANCH_NAME" --force
 

CHANGELOG.md

@@ -32,6 +32,9 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
 
 ## Flutter 3.47 Changes
 
+### [3.47.6](https://github.com/flutter/flutter/releases/tag/3.47.6)
+- [flutter/192513](https://github.com/flutter/flutter/issues/192513) Fixed an issue that caused Windows production apps to hang.
+
 ### [3.47.5](https://github.com/flutter/flutter/releases/tag/3.47.5)
 - [flutter/190307](https://github.com/flutter/flutter/issues/190307) When debugging on physical iOS 27 devices, app occasionally crashes.
 - [flutter/191242](https://github.com/flutter/flutter/issues/191242) When re-expanding a preview group in the Widget Previewer, previews crash due to a type error in scroll restoration.

DEPS

@@ -15,7 +15,7 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
   'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
-  'skia_revision': 'f441ca223b2b17b83542ae41d492d0fc76ec1dcb',
+  'skia_revision': '7b7326917e77789bd77275b26d005c2fbdf9abfe',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -87,9 +87,6 @@ vars = {
   # Checkout Android dependencies only on platforms where we build for Android targets.
   'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
 
-  # Checkout Java dependencies only on platforms that do not have java installed on path.
-  'download_jdk': True,
-
   # Checkout Windows dependencies only if we are building on Windows.
   'download_windows_deps' : 'host_os == "win"',
 
@@ -199,7 +196,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': 'whZAV1mfT-Rdc0rQ81s_IEef2L7kbGPFtiQPitjf_akC',
+  'fuchsia_test_scripts_version': 'fCNknap4ZI0AMcvIffJlVX1lR2ZSIA0HrLIpBMmzMuYC',
 
   # 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.
@@ -292,7 +289,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
 
   'engine/src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '6ebb40c594776cc2c21ea14df85a2a89a328b364',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '5aa526207171ecadf31597f0980a7b7ad8872f33',
 
    'engine/src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',

TESTOWNERS

@@ -16,6 +16,7 @@
 /dev/devicelab/bin/tasks/android_engine_flags_release_test.dart @camsim99 @flutter/android
 /dev/devicelab/bin/tasks/android_intent_security_test.dart @camsim99 @flutter/android
 /dev/devicelab/bin/tasks/android_java11_dependency_smoke_tests.dart @jesswrd @flutter/android
+/dev/devicelab/bin/tasks/android_java17_build_android_host_app_with_module_aar.dart @jesswrd @flutter/android
 /dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart @jesswrd @flutter/android
 /dev/devicelab/bin/tasks/android_lifecycles_test.dart @reidbaker @flutter/engine
 /dev/devicelab/bin/tasks/android_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine

bin/internal/flutter_packages.version

@@ -1 +1 @@
-ba0364a650af47374ffb1412595e3bf789ae5c99
+d5ec6dbaf1c69b22d01ed22f177d9b0f47daadf9