Drop support for setting manifest_merger via the --android_manifest_m…

…erger flag. The current behavior is that we set the manifest_merger default value to "auto" which takes the value from the flag. The flag's default value is "android". So, instead, we set the attribute's default value to "android" and stop checking the flag. PiperOrigin-RevId: 713718420 Change-Id: I95def179508de0db4ec0f88bdbe894925424494d
bazelbuild · Jan 9, 2025 · eb08200 · eb08200
1 parent 96bbb71
commit eb08200
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/rules/android_binary/attrs.bzl b/rules/android_binary/attrs.bzl
@@ -71,7 +71,7 @@ ATTRS = _attrs.replace(
             instruments = attr.label(),
             manifest_values = attr.string_dict(),
             manifest_merger = attr.string(
-                default = "auto",
+                default = "android",
                 values = ["auto", "legacy", "android", "force_android"],
             ),
             native_target = attr.label(

diff --git a/rules/android_binary/impl.bzl b/rules/android_binary/impl.bzl
@@ -565,15 +565,7 @@ def use_legacy_manifest_merger(ctx):
     Returns:
       Boolean indicating whether legacy manifest merging is enabled.
     """
-    manifest_merger = ctx.attr.manifest_merger
-    android_manifest_merger = ctx.fragments.android.manifest_merger
-
-    if android_manifest_merger == "force_android":
-        return False
-    if manifest_merger == "auto":
-        manifest_merger = android_manifest_merger
-
-    return manifest_merger == "legacy"
+    return ctx.attr.manifest_merger == "legacy"
 
 def finalize(
         ctx,