Adopt proto_lang_toolchain for java_grpc_library()

.bazelrc

@@ -1,3 +1,3 @@
 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
 
-common:skip_android --deleted_packages=android,binder
+common:skip_android --deleted_packages=android,binder

compiler/BUILD.bazel

@@ -42,10 +42,14 @@ java_library(
     ],
 )
 
-java_rpc_toolchain(
+load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain")
+
+proto_lang_toolchain(
     name = "java_grpc_library_toolchain",
+    command_line = "--rpc-plugin_out=%s",
     plugin = "//compiler:grpc_java_plugin",
-    runtime = [":java_grpc_library_deps__do_not_reference"],
+    plugin_format_flag = "--plugin=protoc-gen-rpc-plugin=%s",
+    runtime = ":java_grpc_library_deps__do_not_reference",
     visibility = ["//visibility:public"],
 )
 

java_grpc_library.bzl

@@ -1,7 +1,7 @@
-"""Build rule for java_grpc_library."""
-
 load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@com_google_protobuf//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
 load("@rules_java//java:defs.bzl", "JavaInfo", "JavaPluginInfo", "java_common")
+load("@rules_proto//proto:defs.bzl", "proto_common")
 
 _JavaRpcToolchainInfo = provider(
     fields = [
@@ -122,6 +122,41 @@ def _java_rpc_library_impl(ctx):
 
     return [java_info]
 
+def _java_grpc_library_impl(ctx):
+    if len(ctx.attr.srcs) != 1:
+        fail("Exactly one src value supported", "srcs")
+    if ctx.attr.srcs[0].label.package != ctx.label.package:
+        print(("in srcs attribute of {0}: Proto source with label {1} should be in " +
+               "same package as consuming rule").format(ctx.label, ctx.attr.srcs[0].label))
+
+    toolchain = ctx.attr._toolchain[ProtoLangToolchainInfo]
+    srcs = ctx.attr.srcs[0][ProtoInfo]
+
+    srcjar = ctx.actions.declare_file("%s-proto-gensrc.jar" % ctx.label.name)
+
+    proto_common.compile(
+        actions = ctx.actions,
+        proto_info = srcs,
+        proto_lang_toolchain_info = toolchain,
+        generated_files = [srcjar],
+        plugin_output = srcjar.path,
+    )
+
+    deps_java_info = java_common.merge([dep[JavaInfo] for dep in ctx.attr.deps])
+
+    java_info = java_common.compile(
+        ctx,
+        java_toolchain = ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"].java,
+        source_jars = [srcjar],
+        output = ctx.outputs.jar,
+        output_source_jar = ctx.outputs.srcjar,
+        deps = [
+            java_common.make_non_strict(deps_java_info),
+        ] + ([toolchain.runtime[JavaInfo]] if toolchain.runtime else []),
+    )
+
+    return [java_info]
+
 _java_grpc_library = rule(
     attrs = {
         "srcs": attr.label_list(
@@ -136,6 +171,7 @@ _java_grpc_library = rule(
         ),
         "_toolchain": attr.label(
             default = Label("//compiler:java_grpc_library_toolchain"),
+            providers = [ProtoLangToolchainInfo],
         ),
     },
     toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
@@ -145,7 +181,7 @@ _java_grpc_library = rule(
         "srcjar": "lib%{name}-src.jar",
     },
     provides = [JavaInfo],
-    implementation = _java_rpc_library_impl,
+    implementation = _java_grpc_library_impl,
 )
 
 # A copy of _java_grpc_library, except with a neverlink=1 _toolchain
@@ -163,6 +199,7 @@ INTERNAL_java_grpc_library_for_xds = rule(
         ),
         "_toolchain": attr.label(
             default = Label("//xds:java_grpc_library_toolchain"),
+            providers = [ProtoLangToolchainInfo],
         ),
     },
     toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
@@ -172,7 +209,7 @@ INTERNAL_java_grpc_library_for_xds = rule(
         "srcjar": "lib%{name}-src.jar",
     },
     provides = [JavaInfo],
-    implementation = _java_rpc_library_impl,
+    implementation = _java_grpc_library_impl,
 )
 
 _java_lite_grpc_library = rule(

xds/BUILD.bazel

@@ -319,10 +319,14 @@ java_grpc_library(
     deps = [":xds_orca_java_proto"],
 )
 
-java_rpc_toolchain(
+load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain")
+
+proto_lang_toolchain(
     name = "java_grpc_library_toolchain",
+    command_line = "--rpc-plugin_out=%s",
     plugin = "//compiler:grpc_java_plugin",
-    runtime = [":java_grpc_library_deps"],
+    plugin_format_flag = "--plugin=protoc-gen-rpc-plugin=%s",
+    runtime = ":java_grpc_library_deps",
 )
 
 java_library(