Use the bootclasspath JAR from the Java toolchain instead of the Android SDK JAR in optimizer actions.

The booclasspath JAR for Android includes the classes from the Android SDK JAR and other classes found on the Android bootclasspath.

PiperOrigin-RevId: 686682749
Change-Id: I8408adc3a650aecfd0a2132c30bdf76e9bc62375

Author: ajsinclair

rules/android_binary/impl.bzl

@@ -391,7 +391,7 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
 
         java8_legacy_dex, java8_legacy_dex_map = _dex.get_java8_legacy_dex_and_map(
             ctx,
-            android_jar = get_android_sdk(ctx).android_jar,
+            bootclasspath_jar = utils.only(common.get_java_toolchain(ctx)[java_common.JavaToolchainInfo].bootclasspath.to_list()),
             binary_jar = binary_jar,
             build_customized_files = is_binary_optimized,
             min_sdk_version = _min_sdk_version.clamp(ctx.attr.min_sdk_version),

rules/dex.bzl

@@ -544,7 +544,7 @@ def _get_effective_incremental_dexing(
     # use_incremental_dexing config flag will take effect if incremental_dexing attr is not set
     return use_incremental_dexing
 
-def _get_java8_legacy_dex_and_map(ctx, build_customized_files = False, binary_jar = None, android_jar = None, min_sdk_version = 0):
+def _get_java8_legacy_dex_and_map(ctx, build_customized_files = False, binary_jar = None, bootclasspath_jar = None, min_sdk_version = 0):
     if not build_customized_files:
         # TODO(b/329432231): Can we build this for each Android binary or generate one per minSdkVersion at least?
         return utils.only(get_android_toolchain(ctx).java8_legacy_dex.files.to_list()), None
@@ -556,15 +556,15 @@ def _get_java8_legacy_dex_and_map(ctx, build_customized_files = False, binary_ja
         args = ctx.actions.args()
         args.add("--rules", java8_legacy_dex_rules)
         args.add("--binary", binary_jar)
-        args.add("--android_jar", android_jar)
+        args.add("--android_jar", bootclasspath_jar)
         args.add("--output", java8_legacy_dex)
         args.add("--output_map", java8_legacy_dex_map)
         if min_sdk_version:
             args.add("--min-api", min_sdk_version)
 
         ctx.actions.run(
             executable = get_android_toolchain(ctx).build_java8_legacy_dex.files_to_run,
-            inputs = [binary_jar, android_jar],
+            inputs = [binary_jar, bootclasspath_jar],
             outputs = [java8_legacy_dex_rules, java8_legacy_dex_map, java8_legacy_dex],
             arguments = [args],
             mnemonic = "BuildLegacyDex",

rules/proguard.bzl

@@ -19,7 +19,7 @@ load(":android_neverlink_aspect.bzl", "StarlarkAndroidNeverlinkInfo")
 load(":baseline_profiles.bzl", _baseline_profiles = "baseline_profiles")
 load(":common.bzl", "common")
 load(":java.bzl", "java")
-load(":utils.bzl", "ANDROID_TOOLCHAIN_TYPE", "get_android_sdk", "utils")
+load(":utils.bzl", "ANDROID_TOOLCHAIN_TYPE", "utils")
 
 visibility(PROJECT_VISIBILITY)
 
@@ -440,7 +440,7 @@ def _apply_proguard(
             proguard_usage,
         )
 
-    library_jar_list = [get_android_sdk(ctx).android_jar]
+    library_jar_list = [utils.only(common.get_java_toolchain(ctx)[java_common.JavaToolchainInfo].bootclasspath.to_list())]
     if ctx.fragments.android.desugar_java8:
         library_jar_list.append(ctx.file._desugared_java8_legacy_apis)
     neverlink_infos = utils.collect_providers(StarlarkAndroidNeverlinkInfo, ctx.attr.deps)