Merge pull request #2584 from cgrushko/patch-2

Add a proto_lang_toolchain for Java

BUILD

@@ -771,7 +771,14 @@ internal_protobuf_py_tests(
 
 proto_lang_toolchain(
   name = "cc_toolchain",
-  runtime = ":protobuf",
   command_line = "--cpp_out=$(OUT)",
+  runtime = ":protobuf",
   visibility = ["//visibility:public"],
 )
+
+proto_lang_toolchain(
+    name = "java_toolchain",
+    command_line = "--java_out=$(OUT)",
+    runtime = ":protobuf_java",
+    visibility = ["//visibility:public"],
+)