Reduce duplicate Android configurations

Author: Sameri11

tools/flutter/android.bzl

@@ -25,6 +25,7 @@ load(
     "ArtProfileInfo",
     "DataBindingV2Info",
 )
+load("@rules_android//rules:android_split_transition.bzl", "android_split_transition")
 load(
     "@rules_android//rules:rules.bzl",
     "ApkInfo",
@@ -435,8 +436,16 @@ def _flutter_bundle_check_impl(ctx):
     mode = ctx.attr._mode[BuildSettingInfo].value
     expected = _contributions_for(mode)
 
+    contribution_splits = ctx.split_attr.contributions
+    if len(contribution_splits) != 1:
+        fail(
+            "flutter_bundle_check requires exactly one rules_android platform, got {}.".format(
+                sorted(contribution_splits),
+            ),
+        )
+
     by_kind = {}
-    for dep in ctx.attr.contributions:
+    for dep in contribution_splits.values()[0] + [ctx.attr.assets_contribution]:
         info = dep[FlutterBundleContributionInfo]
         if info.kind in by_kind:
             fail("Two contributions declare kind '{}'.".format(info.kind))
@@ -535,8 +544,26 @@ def _flutter_bundle_check_impl(ctx):
 
     return [DefaultInfo(files = depset([marker]))]
 
+# Pin release builds to `opt`; preserve explicitly non-fastbuild modes.
+def _pin_release_compilation_mode_impl(settings, _attr):
+    mode = settings["//tools/flutter:mode"]
+    compilation_mode = str(settings["//command_line_option:compilation_mode"])
+    if mode == "release" and compilation_mode == "fastbuild":
+        compilation_mode = "opt"
+    return {"//command_line_option:compilation_mode": compilation_mode}
+
+_pin_release_compilation_mode = transition(
+    implementation = _pin_release_compilation_mode_impl,
+    inputs = [
+        "//tools/flutter:mode",
+        "//command_line_option:compilation_mode",
+    ],
+    outputs = ["//command_line_option:compilation_mode"],
+)
+
 flutter_bundle_check = rule(
     implementation = _flutter_bundle_check_impl,
+    cfg = _pin_release_compilation_mode,
     doc = """Fails the build if the bundle is missing a piece for any ABI it declares.
 
 Instantiated by flutter_android_libs, not written by hand. Three checks, in
@@ -553,7 +580,16 @@ and ships an empty ABI.""",
             mandatory = True,
             doc = "The ABIs the bundle claims to support. Every native contribution must cover each.",
         ),
+        # android_binary reaches its Java/native closure through this transition.
+        # Matching it makes the check inspect the same configured inputs instead
+        # of building a third target-configuration copy.
         "contributions": attr.label_list(
+            cfg = android_split_transition,
+            providers = [FlutterBundleContributionInfo],
+            mandatory = True,
+        ),
+        # android_binary's assets attribute stays in its own target configuration.
+        "assets_contribution": attr.label(
             providers = [FlutterBundleContributionInfo],
             mandatory = True,
         ),
@@ -715,7 +751,8 @@ def flutter_android_libs(
       Under `mode=debug` the `aot_library` contribution and its `_libapp`
         export are dropped: debug ships no AOT snapshot, so nothing supplies
         one and android_binary must not expect it.
-      **kwargs: visibility, tags.
+      **kwargs: visibility and tags for the caller-facing join and check.
+        Macro-internal helper and contribution targets append `manual`.
     """
     no_plugin_graph = plugins == None
     if native_libs == None:
@@ -728,6 +765,11 @@ def flutter_android_libs(
         embedding_deps = flutter_embedding_deps(maven_repo)
 
     check_abis(abis, "flutter_android_libs " + name)
+    internal_kwargs = dict(kwargs)
+    internal_tags = list(internal_kwargs.get("tags", []))
+    if "manual" not in internal_tags:
+        internal_tags.append("manual")
+    internal_kwargs["tags"] = internal_tags
 
     # A non-empty dict has to cover the declared ABI set exactly. `{}` is the
     # deliberate declaration that this app has no recipe or plugin-native
@@ -800,7 +842,7 @@ def flutter_android_libs(
             name = libapp_jars[abi],
             src = "{}_{}".format(aot, abi),
             abi = abi,
-            **kwargs
+            **internal_kwargs
         )
 
         engine_stripped[abi] = "{}_engine_{}_stripped".format(name, abi)
@@ -811,7 +853,7 @@ def flutter_android_libs(
                 _MODE_RELEASE: engine_jar_label(abi, "release"),
             })),
             abi = abi,
-            **kwargs
+            **internal_kwargs
         )
 
     # One java_import per contribution, not per ABI: android_binary collects
@@ -820,12 +862,12 @@ def flutter_android_libs(
     java_import(
         name = name + "_libapp",
         jars = [libapp_jars[abi] for abi in abis],
-        **kwargs
+        **internal_kwargs
     )
     java_import(
         name = name + "_engine",
         jars = [engine_stripped[abi] for abi in abis],
-        **kwargs
+        **internal_kwargs
     )
 
     # Which contributions vary by ABI is the location's property, not a second
@@ -857,6 +899,7 @@ def flutter_android_libs(
         "registrant",
     ]
     contributions = []
+    asset_contribution = None
     aot_contribution = None
     for kind, location in _ANDROID_CONTRIBUTIONS:
         contribution = "{}_{}_contribution".format(name, kind)
@@ -872,17 +915,21 @@ def flutter_android_libs(
             # emptiness is still explicit at this boundary; the two structural
             # runtime contributions and the asset/AOT/engine never are.
             empty = kind in empty_kinds and not srcs and not libraries,
-            **kwargs
+            **internal_kwargs
         )
         if kind == "aot_library":
             # Declare AOT for all modes; debug excludes it before inputs are needed.
             aot_contribution = contribution
+        elif kind == "assets":
+            # android_binary's assets edge does not take its deps split.
+            asset_contribution = contribution
         else:
             contributions.append(contribution)
 
     flutter_bundle_check(
         name = name + "_check",
         abis = abis,
+        assets_contribution = asset_contribution,
         contributions = contributions + select({
             _MODE_DEBUG: [],
             _MODE_RELEASE: [aot_contribution],
@@ -958,23 +1005,6 @@ _MANIFEST_VALUES = {
     "targetSdkVersion": "36",
 }
 
-# Pin release builds to `opt`; preserve explicitly non-fastbuild modes.
-def _pin_release_compilation_mode_impl(settings, _attr):
-    mode = settings["//tools/flutter:mode"]
-    compilation_mode = str(settings["//command_line_option:compilation_mode"])
-    if mode == "release" and compilation_mode == "fastbuild":
-        compilation_mode = "opt"
-    return {"//command_line_option:compilation_mode": compilation_mode}
-
-_pin_release_compilation_mode = transition(
-    implementation = _pin_release_compilation_mode_impl,
-    inputs = [
-        "//tools/flutter:mode",
-        "//command_line_option:compilation_mode",
-    ],
-    outputs = ["//command_line_option:compilation_mode"],
-)
-
 def _flutter_apk_impl(ctx):
     apk = ctx.attr.apk
     info = apk[ApkInfo]
@@ -1201,6 +1231,9 @@ def flutter_android_binary(
         `<name>_check_test` takes only visibility and tags.
     """
     check_abis(abis, "flutter_android_binary " + name)
+    internal_tags = list(kwargs.get("tags", []))
+    if "manual" not in internal_tags:
+        internal_tags.append("manual")
 
     if kwargs.get("proguard_specs"):
         fail(
@@ -1270,6 +1303,7 @@ def flutter_android_binary(
         name = versioned_manifest,
         manifest = manifest,
         pubspec = pubspec,
+        tags = internal_tags,
     )
 
     if resource_files == None:
@@ -1359,10 +1393,12 @@ def flutter_android_binary(
             plugins = plugins,
             registrant = registrant,
             maven_repo = maven_repo,
+            tags = internal_tags,
         )
 
         packaging_kwargs = dict(kwargs)
         wrapper_visibility = packaging_kwargs.pop("visibility", None)
+        packaging_kwargs.pop("tags", None)
 
         packaged = target + "_apk"
         android_binary(
@@ -1374,6 +1410,7 @@ def flutter_android_binary(
             resource_files = resource_files,
             deps = deps + [":" + join] + debug_manifest_deps,
             visibility = ["//visibility:private"],
+            tags = internal_tags,
             **packaging_kwargs
         )