Remove unused branch in generate_main_dex_list.

The legacy_main_dex_list_generator is always provided.

PiperOrigin-RevId: 705205900
Change-Id: Idb9ea45736892220de0336ce026cb676b5d23d5e

Author: ajsinclair

rules/android_binary/impl.bzl

@@ -301,7 +301,6 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
             main_dex_list_opts = ctx.attr.main_dex_list_opts,
             main_dex_proguard_spec = packaged_resources_ctx.main_dex_proguard_config,
             proguard_specs = list(ctx.files.main_dex_proguard_specs),
-            shrinked_android_jar = get_android_sdk(ctx).shrinked_android_jar,
             main_dex_list_creator = get_android_sdk(ctx).main_dex_list_creator,
             legacy_main_dex_list_generator =
                 ctx.attr._legacy_main_dex_list_generator.files_to_run if ctx.attr._legacy_main_dex_list_generator else get_android_sdk(ctx).legacy_main_dex_list_generator,

rules/android_sdk.bzl

@@ -27,7 +27,7 @@ def _impl(ctx):
         aidl_lib = None,
         android_jar = ctx.file.android_jar,
         source_properties = ctx.file.source_properties,
-        shrinked_android_jar = ctx.file.shrinked_android_jar,
+        shrinked_android_jar = None,
         main_dex_classes = ctx.file.main_dex_classes,
         adb = ctx.attr.adb.files_to_run,
         dx = ctx.attr.dx.files_to_run,

rules/android_sdk_repository/helper.bzl

@@ -226,7 +226,6 @@ def create_android_sdk_rules(
                 ":disallow_proguard": ":fail",
                 "//conditions:default": "@bazel_tools//tools/jdk:proguard",
             }),
-            shrinked_android_jar = "platforms/android-%d/android.jar" % api_level,
             # See https://github.com/bazelbuild/bazel/issues/8757
             tags = ["__ANDROID_RULES_MIGRATION__"],
             zipalign = select({
@@ -583,7 +582,6 @@ def create_dummy_sdk_toolchain():
         main_dex_classes = "dummy.jar",
         main_dex_list_creator = ":empty-binary",
         proguard = ":empty-binary",
-        shrinked_android_jar = "dummy.jar",
         tags = ["__ANDROID_RULES_MIGRATION__"],
         zipalign = ":empty-binary",
     )

rules/attrs.bzl

@@ -303,10 +303,6 @@ ANDROID_SDK_ATTRS = dict(
         executable = True,
         mandatory = True,
     ),
-    shrinked_android_jar = attr.label(
-        allow_single_file = True,
-        cfg = "exec",
-    ),
     source_properties = attr.label(
         allow_single_file = True,
         cfg = "exec",

rules/dex.bzl

@@ -726,7 +726,6 @@ def _generate_main_dex_list(
         main_dex_proguard_spec = None,
         proguard_specs = [],
         legacy_apis = [],
-        shrinked_android_jar = None,
         toolchain_type = None,
         main_dex_list_creator = None,
         legacy_main_dex_list_generator = None,
@@ -737,70 +736,25 @@ def _generate_main_dex_list(
     if main_dex_proguard_spec:
         proguard_specs.append(main_dex_proguard_spec)
 
-    #  If legacy_main_dex_list_generator is not set by either the SDK or the flag, use ProGuard and
-    #  the main dext list creator specified by the android_sdk rule. If
-    #  legacy_main_dex_list_generator is provided, use that tool instead.
-    #  TODO(b/147692286): Remove the old main-dex list generation that relied on ProGuard.
-    if not legacy_main_dex_list_generator:
-        if not shrinked_android_jar:
-            fail("In \"legacy\" multidex mode, either legacy_main_dex_list_generator or " +
-                 "shrinked_android_jar must be set in the android_sdk.")
-
-        # Process the input jar through Proguard into an intermediate, streamlined jar.
-        stripped_jar = _get_dx_artifact(ctx, "main_dex_intermediate.jar")
-        args = ctx.actions.args()
-        args.add("-forceprocessing")
-        args.add("-injars", jar)
-        args.add("-libraryjars", shrinked_android_jar)
-        args.add("-outjars", stripped_jar)
-        args.add("-dontwarn")
-        args.add("-dontnote")
-        args.add("-dontoptimize")
-        args.add("-dontobfuscate")
-        ctx.actions.run(
-            outputs = [stripped_jar],
-            executable = proguard_tool,
-            args = [args],
-            inputs = [jar, shrinked_android_jar],
-            mnemonic = "MainDexClassesIntermediate",
-            progress_message = "Generating streamlined input jar for main dex classes list",
-            use_default_shell_dev = True,
-            toolchain = toolchain_type,
-        )
-
-        args = ctx.actions.args()
-        args.add_all([main_dex_list, stripped_jar, jar])
-        args.add_all(main_dex_list_opts)
-
-        ctx.actions.run(
-            outputs = [main_dex_list],
-            executable = main_dex_list_creator,
-            arguments = [args],
-            inputs = [jar, stripped_jar],
-            mnemonic = "MainDexClasses",
-            progress_message = "Generating main dex classes list",
-            toolchain = toolchain_type,
-        )
-    else:
-        inputs = [jar, android_jar] + proguard_specs
+    inputs = [jar, android_jar] + proguard_specs
 
-        args = ctx.actions.args()
-        args.add("--main-dex-list-output", main_dex_list)
-        args.add("--lib", android_jar)
-        if desugar_java8_libs:
-            args.add_all(legacy_apis, before_each = "--lib")
-            inputs += legacy_apis
-        args.add_all(proguard_specs, before_each = "--main-dex-rules")
-        args.add(jar)
-        ctx.actions.run(
-            executable = legacy_main_dex_list_generator,
-            arguments = [args],
-            outputs = [main_dex_list],
-            inputs = inputs,
-            mnemonic = "MainDexClasses",
-            progress_message = "Generating main dex classes list",
-            toolchain = toolchain_type,
-        )
+    args = ctx.actions.args()
+    args.add("--main-dex-list-output", main_dex_list)
+    args.add("--lib", android_jar)
+    if desugar_java8_libs:
+        args.add_all(legacy_apis, before_each = "--lib")
+        inputs += legacy_apis
+    args.add_all(proguard_specs, before_each = "--main-dex-rules")
+    args.add(jar)
+    ctx.actions.run(
+        executable = legacy_main_dex_list_generator,
+        arguments = [args],
+        outputs = [main_dex_list],
+        inputs = inputs,
+        mnemonic = "MainDexClasses",
+        progress_message = "Generating main dex classes list",
+        toolchain = toolchain_type,
+    )
     return main_dex_list
 
 def _transform_dex_list_through_proguard_map(