Fetch dexbuilder and desugar from the toolchain in dex_desugar_aspect

PiperOrigin-RevId: 990554413
Change-Id: I4f1e2544e56fde6dc0183018a9ded52c700295d8

rules/dex_desugar_aspect.bzl

diff --git a/rules/dex_desugar_aspect.bzl b/rules/dex_desugar_aspect.bzl
index f5e78df..c6754c3 100644
--- a/rules/dex_desugar_aspect.bzl
+++ b/rules/dex_desugar_aspect.bzl
@@ -24,7 +24,7 @@
 load(":dex.bzl", _dex = "dex")
 load(":dex_toolchains.bzl", "dex_toolchains")
 load(":min_sdk_version.bzl", _min_sdk_version = "min_sdk_version")
-load(":utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE", _utils = "utils")
+load(":utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE", "ANDROID_TOOLCHAIN_TYPE", "get_android_toolchain", _utils = "utils")
 
 visibility(PROJECT_VISIBILITY)
 
@@ -146,8 +146,9 @@
                     bootclasspath = bootclasspath,
                     classpath = desugar_classpath,
                     min_sdk_version = min_sdk_version,
-                    desugar_exec = ctx.executable._desugar_java8,
+                    desugar_exec = get_android_toolchain(ctx).desugar.files_to_run,
                     desugared_lib_config = ctx.file._desugared_lib_config,
+                    toolchain_type = ANDROID_TOOLCHAIN_TYPE,
                 )
             else:
                 desugared_jar = None
@@ -164,7 +165,8 @@
                     output = dex,
                     incremental_dexopts = incremental_dexopts_list,
                     min_sdk_version = min_sdk_version,
-                    dex_exec = ctx.executable._dexbuilder,
+                    dex_exec = get_android_toolchain(ctx).dexbuilder.files_to_run,
+                    toolchain_type = ANDROID_TOOLCHAIN_TYPE,
                 )
 
                 dex_archive = struct(
@@ -265,22 +267,10 @@
                     "//rules/flags:bytecode_transformer",
                 ),
             ),
-            "_desugar_java8": attr.label(
-                default = Label("//tools/android:desugar_java8"),
-                allow_files = True,
-                cfg = "exec",
-                executable = True,
-            ),
             "_desugared_lib_config": attr.label(
                 allow_single_file = True,
                 default = Label("//tools/android:full_desugar_jdk_libs_config_json"),
             ),
-            "_dexbuilder": attr.label(
-                default = Label("//tools/android:dexbuilder"),
-                allow_files = True,
-                cfg = "exec",
-                executable = True,
-            ),
         },
         _attrs.ANDROID_SDK,
         _min_sdk_version.attrs,
@@ -289,6 +279,7 @@
     fragments = ["android"],
     toolchains = [
         ANDROID_SDK_TOOLCHAIN_TYPE,
+        ANDROID_TOOLCHAIN_TYPE,
     ],
     required_aspect_providers = [[JavaInfo]],
     **_opt_kwargs()