Skip to content

Unify add-to-app module wiring on the variant API and drop host-project cross-wiring - #8

Open
reidbaker-agent wants to merge 1 commit into
agp-apk-copy-versioncodefrom
agp-add-to-app
Open

Unify add-to-app module wiring on the variant API and drop host-project cross-wiring#8
reidbaker-agent wants to merge 1 commit into
agp-apk-copy-versioncodefrom
agp-add-to-app

Conversation

@reidbaker-agent

@reidbaker-agent reidbaker-agent commented Jul 22, 2026

Copy link
Copy Markdown
Owner

Phase 8 of 11 of the AGP public-API migration; stacked on #7.

Phase P7 of the AGP public-API migration (flutter#180137,
flutter#166550), the last Kotlin consumer of the legacy variant
API:

  • Add-to-app module (library) projects now use the same consolidated
    onVariants block as application projects: the Flutter compile task
    and CopyFlutterAssetsTask are registered lazily per library variant,
    and flutter_assets are wired through
    variant.sources.assets.addGeneratedSourceDirectory. The host
    application consumes them through AGP's normal library packaging and
    variant matching, with build modes resolved from the public
    Component.debuggable flag (so a custom debuggable host build type
    such as 'staging' still maps to the debug engine artifacts via the
    module's matched variant). Module variants skip the CLI task-name
    gating: which module variant a host build consumes is AGP's variant
    matching decision, and a module has at most three variants to
    configure lazily.
  • The host-project lookup, the appProject.afterEvaluate
    libraryVariants.all x applicationVariants.all cross-product, the
    explicit merge<HostVariant>Assets.dependsOn edge, and the
    addFlutterDepsForModule legacy fork from P5 are deleted.
  • flutter.hostAppProjectName is now a no-op: it only fed the host
    lookup. A warning explains that it has no effect and will be removed
    in a future Flutter release.
  • The legacy com.android.builder.model.BuildType buildModeFor overload
    lost its last caller and is deleted along with its duplicate tests
    (the P2 name/debuggable and DSL overload tests cover the semantics).
    FlutterPlugin.kt and FlutterPluginUtils.kt no longer import any
    legacy (non com.android.build.api) AGP types.

Verification (CI): build_android_host_app_with_module_source,
module_host_with_custom_build, module_custom_host_app_name scenarios;
module-root flutter build apk; add-to-app newDsl=true test; gradle unit
tests on both AGP axes.

Revert-safe until P10 lands (mutually tolerant with P6).

CI must run the FGP unit tests (the Kotlin suite in packages/flutter_tools/gradle could not run in the delivery sandbox: dl.google.com returns 403, so AGP artifacts do not resolve).

@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from c051ed0 to 1d44353 Compare July 22, 2026 15:54
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from 1d44353 to f3d2a31 Compare July 28, 2026 13:36
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from f3d2a31 to 91f0814 Compare July 28, 2026 13:37
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from 91f0814 to 45e5dea Compare July 29, 2026 20:21
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from 45e5dea to 9ce1623 Compare July 29, 2026 20:43
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from 9ce1623 to e34a92a Compare July 30, 2026 21:59
@reidbaker-agent
reidbaker-agent force-pushed the agp-apk-copy-versioncode branch from e34a92a to b7a23f7 Compare July 31, 2026 16:16
…ct cross-wiring

Phase P7 of the AGP public-API migration (flutter#180137,
flutter#166550), the last Kotlin consumer of the legacy variant
API:

- Add-to-app module (library) projects now use the same consolidated
  onVariants block as application projects: the Flutter compile task
  and CopyFlutterAssetsTask are registered lazily per library variant,
  and flutter_assets are wired through
  variant.sources.assets.addGeneratedSourceDirectory. The host
  application consumes them through AGP's normal library packaging and
  variant matching, with build modes resolved from the public
  Component.debuggable flag (so a custom debuggable host build type
  such as 'staging' still maps to the debug engine artifacts via the
  module's matched variant). Module variants skip the CLI task-name
  gating: which module variant a host build consumes is AGP's variant
  matching decision, and a module has at most three variants to
  configure lazily.
- The host-project lookup, the appProject.afterEvaluate
  libraryVariants.all x applicationVariants.all cross-product, the
  explicit merge<HostVariant>Assets.dependsOn edge, and the
  addFlutterDepsForModule legacy fork from P5 are deleted.
- flutter.hostAppProjectName is now a no-op: it only fed the host
  lookup. A warning explains that it has no effect and will be removed
  in a future Flutter release.
- The legacy com.android.builder.model.BuildType buildModeFor overload
  lost its last caller and is deleted along with its duplicate tests
  (the P2 name/debuggable and DSL overload tests cover the semantics).
  FlutterPlugin.kt and FlutterPluginUtils.kt no longer import any
  legacy (non com.android.build.api) AGP types.

Verification (CI): build_android_host_app_with_module_source,
module_host_with_custom_build, module_custom_host_app_name scenarios;
module-root flutter build apk; add-to-app newDsl=true test; gradle unit
tests on both AGP axes.

Revert-safe until P10 lands (mutually tolerant with P6).
@reidbaker
reidbaker force-pushed the agp-apk-copy-versioncode branch from b7a23f7 to 53bcc7f Compare July 31, 2026 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants