Remove unused SDK toolchain type value.

The correct value is already present in utils.bzl. PiperOrigin-RevId: 625328630 Change-Id: Ic9d13cfae25572a4045f6029ca3436eb02bad5fe
bazelbuild · Apr 16, 2024 · af0b40d · af0b40d
1 parent 9dc5242
commit af0b40d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/rules/BUILD b/rules/BUILD
@@ -36,15 +36,14 @@ bzl_library(
         "bundletool.bzl",
         "busybox.bzl",
         "common.bzl",
-        "desugar.bzl",
         "data_binding.bzl",
+        "desugar.bzl",
         "idl.bzl",
         "instrumented_app_info_aspect.bzl",
         "intellij.bzl",
         "java.bzl",
         "migration_tag_DONOTUSE.bzl",
         "native_deps.bzl",
-        "native_toolchain_attrs.bzl",
         "path.bzl",
         "processing_pipeline.bzl",
         "proguard.bzl",
@@ -115,12 +114,12 @@ bzl_library(
         ":common_bzl",
         ":min_sdk_version_bzl",
         "//rules/aar_import:bzl",
+        "//rules/android_application:bzl",
         "//rules/android_library:bzl",
+        "//rules/android_local_test:bzl",
         "//rules/android_sandboxed_sdk:bzl",
         "//rules/android_sdk_repository:bzl",
         "//rules/flags:bzl",
-        "//rules/android_application:bzl",
-        "//rules/android_local_test:bzl",
         "@bazel_skylib//lib:collections",
         "@rules_java//java/common",
     ],
@@ -147,8 +146,8 @@ bzl_library(
 
 stardoc(
     name = "stardoc",
-    input = "doc_rules.bzl",
     out = "stardoc.md",
+    input = "doc_rules.bzl",
     deps = [":doc_rules"],
 )
 

diff --git a/rules/attrs.bzl b/rules/attrs.bzl
@@ -16,8 +16,7 @@
 
 load("//rules:android_split_transition.bzl", "android_transition")
 load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
-load(":native_toolchain_attrs.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE_DEFAULT")
-load(":utils.bzl", "log")
+load(":utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE", "log")
 
 def _add(attrs, *others):
     new = {}
@@ -346,7 +345,7 @@ ANDROID_SDK_ATTRS = dict(
 _ANDROID_TOOLCHAIN_ATTRS = dict(
     _android_sdk_toolchain_type = attr.label(
         allow_rules = ["toolchain_type"],
-        default = ANDROID_SDK_TOOLCHAIN_TYPE_DEFAULT,
+        default = ANDROID_SDK_TOOLCHAIN_TYPE,
     ),
 )
 

diff --git a/rules/native_toolchain_attrs.bzl b/rules/native_toolchain_attrs.bzl