Merge #406 by ted-xie: Migrate away from @bazel_tools//tools/jdk

Closes #406

COPYBARA_INTEGRATE_REVIEW=#406 from ted-xie:no_bazel_tools_jdk 1677235
PiperOrigin-RevId: 794723027
Change-Id: I12b0f1b975ed2d9f351e557d8883b93b3b58f5f8

Author: ted-xie

mobile_install/dependency_map.bzl

@@ -33,7 +33,7 @@ versioned_deps = struct(
         head = "//tools/android:gen_fail",
     ),
     jar_tool = struct(
-        head = "@bazel_tools//tools/jdk:JavaBuilder_deploy.jar",
+        head = "@remote_java_tools//:JavaBuilder",
     ),
     res_v3_dummy_manifest = struct(
         head = "//rules:res_v3_dummy_AndroidManifest.xml",

rules/android_sdk_repository/helper.bzl

@@ -224,7 +224,7 @@ def create_android_sdk_rules(
             main_dex_list_creator = ":main_dex_list_creator",
             proguard = select({
                 ":disallow_proguard": ":fail",
-                "//conditions:default": "@bazel_tools//tools/jdk:proguard",
+                "//conditions:default": "@remote_java_tools//:proguard",
             }),
             # See https://github.com/bazelbuild/bazel/issues/8757
             tags = ["__ANDROID_RULES_MIGRATION__"],

src/java/com/example/sampleapp/BUILD

@@ -29,24 +29,28 @@ android_library(
 # JNI target.
 genrule(
     name = "jni_h",
-    srcs = ["@bazel_tools//tools/jdk:jni_header"],
+    srcs = ["@rules_java//toolchains:jni_header"],
     outs = [":jni.h"],
     cmd = "cp $< $@",
 )
 
 genrule(
     name = "jni_md_h",
     srcs = select({
-        "//conditions:default":["@bazel_tools//tools/jdk:jni_md_header-linux"],
-        "@platforms//os:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
-        "@platforms//os:macos": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+        "//conditions:default": ["@rules_java//toolchains:jni_md_header-linux"],
+        "@platforms//os:windows": ["@rules_java//toolchains:jni_md_header-windows"],
+        "@platforms//os:macos": ["@rules_java//toolchains:jni_md_header-darwin"],
     }),
     outs = [":jni_md.h"],
     cmd = "cp $< $@",
 )
 
 cc_library(
     name = "native",
-    srcs = ["native.c", ":jni.h", ":jni_md.h"],
+    srcs = [
+        "native.c",
+        ":jni.h",
+        ":jni_md.h",
+    ],
     includes = ["."],
 )

src/tools/javatests/com/google/devtools/build/android/dexer/BUILD

@@ -39,11 +39,11 @@ java_library(
         ":dexbuilder_import",
         "//src/tools/java/com/google/devtools/build/android/dexer:DexFileSplitter_lib",
         "//src/tools/java/com/google/devtools/build/android/r8:dexbuilder_deploy.jar",
-        "@bazel_tools//tools/java/runfiles",
         "@rules_android_maven//:com_google_guava_guava",
         "@rules_android_maven//:com_google_truth_truth",
         "@rules_android_maven//:junit_junit",
         "@rules_android_maven//:org_mockito_mockito_core",
+        "@rules_java//java/runfiles",
     ],
 )
 

src/tools/javatests/com/google/devtools/build/android/r8/BUILD

@@ -30,12 +30,12 @@ java_library(
     }),
     deps = [
         "//src/tools/java/com/google/devtools/build/android/r8",
-        "@bazel_tools//tools/java/runfiles",
         "@rules_android_maven//:com_android_tools_r8",
         "@rules_android_maven//:com_beust_jcommander",
         "@rules_android_maven//:com_google_guava_guava",
         "@rules_android_maven//:com_google_truth_truth",
         "@rules_android_maven//:junit_junit",
+        "@rules_java//java/runfiles",
     ],
 )
 

toolchains/android/toolchain.bzl

@@ -256,7 +256,7 @@ _ATTRS = dict(
         executable = True,
     ),
     testsupport = attr.label(
-        default = "@bazel_tools//tools/jdk:TestRunner",
+        default = Label("//tools/jdk:TestRunner"),
     ),
     unzip_tool = attr.label(
         cfg = "exec",

tools/jdk/BUILD

@@ -1,3 +1,4 @@
+load("@rules_java//java:java_import.bzl", "java_import")
 load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
@@ -119,14 +120,14 @@ alias(
 )
 
 alias(
-    name = "jdk",
-    actual = "@bazel_tools//tools/jdk:jdk",
+    name = "current_host_java_runtime",
+    actual = "@rules_java//toolchains:current_host_java_runtime",
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "current_host_java_runtime",
-    actual = "@rules_java//toolchains:current_host_java_runtime",
+java_import(
+    name = "TestRunner",
+    jars = ["@remote_java_tools//:Runner"],
     visibility = ["//visibility:public"],
 )