Get the Android SDK from the toolchain, not the deprecated late-bound attribute.

PiperOrigin-RevId: 676886675
Change-Id: I5a5b88d24eb86177ed169d23144e4954381adb7b

Author: katre

launcher/environment.bzl

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Configures the UTP test environment."""
 
-load("//tools/build_defs/android/public_api:android_sdk_info.bzl", "AndroidSdkInfo")
 load(
     ":primitives.bzl",
     "absolute_path_struct",
@@ -26,38 +25,37 @@ visibility([
     "//test/launcher/...",
 ])
 
-def _android_sdk_to_message(target, dexdump, custom_adb):
+def _android_sdk_to_message(android_sdk, dexdump, custom_adb):
     """Generates a google.testing.platform.proto.api.config.AndroidSdk message.
 
     Args:
-        target: (Target) AndroidSdkInfo provider.
+        android_sdk: (Provider) AndroidSdkInfo provider.
         dexdump: (File) dexdump, since it's not available in the AndroidSdkInfo.
         custom_adb: (File) overrides the adb specified in the Android SDK. Can be None
 
     Returns:
         (struct) An AndroidSdk message suitable for proto.encode_text().
     """
-    info = target[AndroidSdkInfo]
     if custom_adb:
         adb = custom_adb
     else:
-        adb = info.adb.executable
+        adb = android_sdk.adb.executable
     return struct(
         sdk_path = struct(
             path = "/".join(
                 [environment_variable("PWD")] +
-                info.aapt.executable.dirname.split("/")[:-1],
+                android_sdk.aapt.executable.dirname.split("/")[:-1],
             ),
         ),
-        aapt_path = absolute_path_struct(info.aapt2.executable),
+        aapt_path = absolute_path_struct(android_sdk.aapt2.executable),
         adb_path = absolute_path_struct(adb),
         dexdump_path = absolute_path_struct(dexdump),
     )
 
 AndroidEnvironmentInfo = provider(
     doc = "Android-specific environment configuration",
     fields = {
-        "sdk": "(Target) Android SDK configuration",
+        "android_sdk": "(Provider) Android SDK configuration",
         "custom_adb": "(File) Custom ADB, overriding the one in sdk. Can be None.",
         "dexdump": "(File) File for the dexdump binary",
         "test_log_dir": "(str) Relative path to output directory for Android instrumentation logs",
@@ -78,7 +76,7 @@ def android_environment_to_message(target):
     """
     info = target[AndroidEnvironmentInfo]
     message = dict(
-        android_sdk = _android_sdk_to_message(info.sdk, info.dexdump, info.custom_adb),
+        android_sdk = _android_sdk_to_message(info.android_sdk, info.dexdump, info.custom_adb),
         test_log_dir = struct(path = info.test_log_dir),
         test_run_log = struct(path = info.test_run_log),
     )
@@ -96,9 +94,10 @@ def _android_environment_impl(ctx):
     optional_deps = []
     if ctx.attr.custom_adb:
         optional_deps.append(ctx.file.custom_adb)
+    android_sdk = ctx.toolchains["//third_party/bazel_rules/rules_android/toolchains/android_sdk:toolchain_type"].android_sdk_info
     return [
         AndroidEnvironmentInfo(
-            sdk = ctx.attr._android_sdk,
+            android_sdk = android_sdk,
             custom_adb = ctx.file.custom_adb,
             dexdump = ctx.file._dexdump,
             test_log_dir = ctx.attr.test_log_dir,
@@ -107,23 +106,15 @@ def _android_environment_impl(ctx):
             logcat_options = ctx.attr.logcat_options,
         ),
         DefaultInfo(files = depset([
-            ctx.attr._android_sdk[AndroidSdkInfo].aapt2.executable,
-            ctx.attr._android_sdk[AndroidSdkInfo].adb.executable,
+            android_sdk.aapt2.executable,
+            android_sdk.adb.executable,
             ctx.file._dexdump,
         ] + optional_deps)),
     ]
 
 android_environment = rule(
     implementation = _android_environment_impl,
     attrs = dict(
-        _android_sdk = attr.label(
-            allow_rules = ["android_sdk"],
-            default = configuration_field(
-                fragment = "android",
-                name = "android_sdk_label",
-            ),
-            providers = [[AndroidSdkInfo]],
-        ),
         _dexdump = attr.label(
             default = "//tools/android:dexdump",
             allow_single_file = True,
@@ -143,6 +134,9 @@ android_environment = rule(
             doc = "Command line options to pass to logcat when streaming logs, e.g. to the AndroidLogcatPlugin.",
         ),
     ),
+    toolchains = [
+        "//third_party/bazel_rules/rules_android/toolchains/android_sdk:toolchain_type",
+    ],
 )
 
 EnvironmentInfo = provider(