@@ -65,7 +65,7 @@ jobs:
             ### Checklist
             - [ ] Check for the latest `goldctl` git revision (e.g. from [CIPD](https://chrome-infra-packages.appspot.com/p/skia/tools/goldctl) or the [Skia Gold repository](https://skia.googlesource.com/buildbot/+/refs/heads/main/gold-client)).
             - [ ] Update `goldctl` in `flutter/flutter`:
-              - [ ] Update `git_revision` for `goldctl` instances in `.ci.yaml`.
+              - [ ] Update `git_revision` for `goldctl` instances in `.ci.yaml` and `engine/src/flutter/.ci.yaml`.
               - [ ] Validate `.ci.yaml` changes and ensure tests pass.
               - [ ] Open PR in `flutter/flutter` to close this issue.
             - [ ] Update `goldctl` in `flutter/packages`:
 
@@ -15,7 +15,7 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
   'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
-  'skia_revision': '17f6986c226c46eb03b4f034ac736ddb1781409c',
+  'skia_revision': '79a00d7c489848260028fbb787417da3e8d8deaa',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -55,22 +55,22 @@ 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': '5933cb486b4aef2f8cf6b9f89a5651c0d5b0955e',
+  'dart_revision': 'b8ffa923309640799d8a3b50a77c2157a7796e09',
 
   # 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': '1c0c9f3836e858e01c4f94ac2e5a936d16a6ba1d',
   'dart_boringssl_rev': '5e1bfb45c353b2bb36bdf26b006ea8f5566c82d5',
   'dart_core_rev': '4d80610a878cdb3f9f10e6a16a2af6631251a3c6',
   'dart_devtools_rev': '85f945ac99379d64d4df6f67d9b011e4cc418e7e',
-  'dart_ecosystem_rev': '16dca7ae5d3ff896a4db47e1ed6cd50f7ebbf115',
-  'dart_http_rev': '585d433ba315702b63904fddba4459db5fec2d87',
+  'dart_ecosystem_rev': '622ef61a7edd5de7df38661e163e55c57606c96a',
+  'dart_http_rev': '23f8574cdfce93c3bb0c6d83d92167d92b9824d5',
   'dart_i18n_rev': '1f5ea2fb2381bdf7bab054a43c0d69771f104561',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_rev': 'a73edc98c98fb25152aa3f12c1b9db91594c1369',
   'dart_pub_rev': 'eca8f8ada939be70f0be3189db31e421dd0be7fd',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': 'a66d517d18c24faba0ae1b3ae160d47672beb1bb',
+  'dart_tools_rev': '2b54c71af39b1ec937237b842068fdef5a7c2523',
   'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
   'dart_web_rev': '63e6662dc7022a54439d4da6016685c49a0d6018',
   'dart_webdriver_rev': '8e5c611ea242efdc9f597a8a37c38a9c586120ee',
@@ -333,10 +333,10 @@ deps = {
    Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@5a9534fad9ff2faba89596a70323d2b1f1bcf163',
+   Var('dart_git') + '/dart_style.git@76978d23bfb3d225c81ce3f119ab7055a2a57136',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@5eb0f2c74eb0e9b8dba3169899aec020a2ad8cb2',
+   Var('dart_git') + '/dartdoc.git@e1859cfc70702d65476b087b0d577db18c67abfa',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
    Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -351,7 +351,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@a2a617910fe3b2433eaa94bfb491bb3475a71870',
+   Var('dart_git') + '/native.git@cc7e4b076efadf9705de472bcbed05bf32a87d6a',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -369,7 +369,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@d749b104edf2cb1428b08782830fc6bd2883e3dc',
+   Var('dart_git') + '/test.git@30acb69eb30369a1b9ad2adc4a86224393c197ef',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
@@ -10,7 +10,7 @@
 
 ## Linux Android DeviceLab tests
 /dev/devicelab/bin/tasks/analyzer_benchmark.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/android_choreographer_do_frame_test.dart @reidbaker @flutter/engine
+/dev/devicelab/bin/tasks/android_choreographer_do_frame_test.dart @jesswrd @flutter/engine
 /dev/devicelab/bin/tasks/android_defines_test.dart @jesswrd @flutter/android
 /dev/devicelab/bin/tasks/android_engine_flags_debug_test.dart @camsim99 @flutter/android
 /dev/devicelab/bin/tasks/android_engine_flags_release_test.dart @camsim99 @flutter/android
@@ -19,7 +19,7 @@
 /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_lifecycles_test.dart @gmackall @flutter/engine
 /dev/devicelab/bin/tasks/android_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine
 /dev/devicelab/bin/tasks/android_stack_size_test.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/android_verified_input_test.dart @gmackall @flutter/android
@@ -242,7 +242,7 @@
 /dev/devicelab/bin/tasks/very_long_picture_scrolling_perf_ios__e2e_summary.dart @flar @flutter/engine
 
 ## Host only DeviceLab tests
-/dev/devicelab/bin/tasks/android_display_cutout.dart @reidbaker @flutter/android
+/dev/devicelab/bin/tasks/android_display_cutout.dart @mboetger @flutter/android
 /dev/devicelab/bin/tasks/android_release_builds_exclude_dev_dependencies_test.dart @camsim99 @flutter/android
 /dev/devicelab/bin/tasks/animated_complex_opacity_perf_macos__e2e_summary.dart @loic-sharma @flutter/desktop
 /dev/devicelab/bin/tasks/basic_material_app_macos__compile.dart @loic-sharma @flutter/desktop
@@ -362,15 +362,15 @@
 /dev/integration_tests/deferred_components_test @mboetger @flutter/android
 
 ## Firebase tests
-/dev/integration_tests/release_smoke_test @reidbaker @flutter/android
+/dev/integration_tests/release_smoke_test @jesswrd @flutter/android
 
 ## Shards tests
 # TODO(keyonghan): add files/paths for below framework host only testss.
 # https://github.com/flutter/flutter/issues/82068
 #
 # analyze @justinmc @flutter/framework
-# android_engine_opengles_tests @reidbaker @flutter/android
-# android_engine_vulkan_tests @reidbaker @flutter/android
+# android_engine_opengles_tests @gmackall @flutter/android
+# android_engine_vulkan_tests @mboetger @flutter/android
 # android_engine_hcpp_tests @gmackall @flutter/android
 # android_hardware_smoke_opengles_tests @andywolff @flutter/engine
 # android_hardware_smoke_vulkan_tests @andywolff @flutter/engine
 
@@ -1 +1 @@
-d8d9e97d2d02bf785084e7dc9409a79a49e75967
+a1ed23c8f76035baa4edb2003d50349d07e7d6e0
@@ -271,6 +271,57 @@ Future<void> main() async {
         'lib/armeabi-v7a/libflutter.so',
       ], await getFilesInApk(demoProdApk));
 
+      await clean();
+
+      section('Run app:assembleDemoQa with android.newDsl=true');
+
+      // The fixture's gradle.properties sets android.newDsl=false. With
+      // android.newDsl=true, AGP has no `libraryVariants` or `applicationVariants`.
+      final String demoQaOutput = await inDirectory(hostAppDir, () async {
+        return eval(
+          gradlewExecutable,
+          <String>[
+            'app:assembleDemoQa',
+            '-Pandroid.newDsl=true',
+            '-Pflutter.hostAppProjectName=app',
+          ],
+          environment: <String, String>{'JAVA_HOME': javaHome},
+        );
+      });
+
+      if (!demoQaOutput.contains(
+        "The Gradle property 'flutter.hostAppProjectName' has no effect.",
+      )) {
+        return TaskResult.failure(
+          'Expected a warning that flutter.hostAppProjectName has no effect',
+        );
+      }
+
+      final String demoQaApk = path.join(
+        hostAppDir.path,
+        'app',
+        'build',
+        'outputs',
+        'apk',
+        'demo',
+        'qa',
+        'app-demo-qa.apk',
+      );
+
+      if (!exists(File(demoQaApk))) {
+        return TaskResult.failure('Failed to build app-demo-qa.apk');
+      }
+
+      section('Verify AOT ELF in app-demo-qa.apk');
+
+      final Iterable<String> demoQaFiles = await getFilesInApk(demoQaApk);
+      checkCollectionContains<String>(<String>[
+        ...flutterAssets,
+        'lib/arm64-v8a/libapp.so',
+        'lib/armeabi-v7a/libapp.so',
+      ], demoQaFiles);
+      checkCollectionDoesNotContain<String>(debugAssets, demoQaFiles);
+
       return TaskResult.success(null);
     } on TaskResult catch (taskResult) {
       return taskResult;
 
@@ -34,6 +34,12 @@ android {
             initWith release
             matchingFallbacks += 'release'
         }
+        // Debuggable, but consumes the module's release variant, so it gets release Flutter
+        // artifacts.
+        qa {
+            initWith debug
+            matchingFallbacks += 'release'
+        }
     }
     // Test flavors.
     flavorDimensions += "version"
 
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-flutter.hostAppProjectName=SampleApp
 android.newDsl=false
@@ -99,9 +99,10 @@ projects. That opt-out dies with AGP 10.
 5. **`buildModeFor` semantics.** Every variant-scope call uses the
    `(name, debuggable)` overload with the public `Component.debuggable`.
    Name-based inference is confined to the one DSL-scope case with no public
-   signal (the library-plugin build-type copy in `PluginHandler`). This
-   preserves add-to-app custom-debuggable matching (a host `staging`
-   debuggable build type maps to debug engine artifacts).
+   signal (the library-plugin build-type copy in `PluginHandler`). In an
+   add-to-app module the call reads the module's own variant, so the build mode
+   follows the module variant that the host's `matchingFallbacks` select (see
+   "Features that must break" item 6).
 6. **P3 pre-spike / PR 4 (afterEvaluate DSL mutation under newDsl).** The planned scratch-app
    spike (AGP 9.1 + `newDsl=true` + custom build type, verifying that build-type
    creation from `pluginProject.afterEvaluate` still works) could not run in the
@@ -237,12 +238,23 @@ else serializes through `FlutterPlugin.kt` / `FlutterPluginUtils.kt`.
    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. 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.
+6. **Add-to-app**: the module registers its Flutter tasks in its own `onVariants` and
+   adds the staged assets and native libraries as generated source directories of each
+   library variant. The host consumes them like any Android library's, so the
+   host-project lookup, the `libraryVariants` × host `applicationVariants` loop and the
+   `:app:merge<V>Assets.dependsOn` edge are removed.
+   - `flutter.hostAppProjectName` has no effect; setting it logs a warning that names no
+     removal milestone.
+   - Every module variant is configured whatever the command line names, because the
+     host's `matchingFallbacks`, not the task name, decide which module variant a host
+     task consumes. Registration is lazy, so only that variant runs. Cost: a host build
+     of only `assemble<Variant>AndroidTest` runs the module's `flutter assemble`.
+   - The build mode comes from the consumed module variant, not the host build type. A
+     debuggable host build type that falls back to the module's `release` gets release
+     artifacts. Built as the only task, the deleted code ran the module's debug Flutter
+     build for it, and the APK had no `flutter_assets` and no `libapp.so`.
+   - Module assets are a generated source directory (item 5), and `copyFlutterAssets<V>`
+     is a `CopyFlutterAssetsTask` (item 7).
 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.
 
@@ -194,28 +194,27 @@ aliases:
 
 ### Add-to-app (Flutter module in a host app)
 
-- Flutter no longer looks up or configures the host `:app` project from the
-  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 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
-  prints a deprecation warning naming the removal milestone. It was only used
-  for the host-project lookup, which no longer exists.
-- Flutter maps host build types to Flutter build modes using the public
-  "debuggable" flag: `profile` stays `profile`, debuggable build types map to
-  `debug`, everything else maps to `release`. If your host has no `profile`
-  build type, add `matchingFallbacks`:
+- The Flutter module adds its assets and native libraries to its own variants
+  through the Variant API. Your host app consumes them like the assets of any
+  Android library. Flutter does not look up or configure the host `:app`
+  project, and adds no `merge<Variant>Assets.dependsOn(...)` edge to it.
+- `flutter.hostAppProjectName` in `gradle.properties` has no effect. If it is
+  set, Flutter prints a warning that says so. You can remove it.
+- The Flutter module's `copyFlutterAssets<Variant>` tasks are of type
+  `CopyFlutterAssetsTask`, not `org.gradle.api.tasks.Copy`. Build scripts that
+  look them up with the `Copy` type fail.
+- The Flutter build mode comes from the module variant your host build
+  consumes: the module's `debug` variant builds debug Flutter artifacts,
+  `profile` builds profile, and `release` builds release. Host `debug`,
+  `profile` and `release` build types consume the module variant of the same
+  name. For a custom host build type, AGP picks the module variant through the
+  build type's `matchingFallbacks`, so list the module build type you want
+  first:
 
   ```kotlin
   create("staging") {
       initWith(getByName("debug"))
-      isDebuggable = true            // staging gets debug Flutter artifacts
-      matchingFallbacks += listOf("debug", "release")
+      matchingFallbacks += listOf("debug", "release") // staging gets debug Flutter artifacts
   }
   ```
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d8d9e97d2d02bf785084e7dc9409a79a49e75967`
	`1`	`+a1ed23c8f76035baa4edb2003d50349d07e7d6e0`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@ android {`
`34`	`34`	`initWith release`
`35`	`35`	`matchingFallbacks += 'release'`
`36`	`36`	`}`
	`37`	`+ // Debuggable, but consumes the module's release variant, so it gets release Flutter`
	`38`	`+ // artifacts.`
	`39`	`+ qa {`
	`40`	`+ initWith debug`
	`41`	`+ matchingFallbacks += 'release'`
	`42`	`+ }`
`37`	`43`	`}`
`38`	`44`	`// Test flavors.`
`39`	`45`	`flavorDimensions += "version"`