Simplify genproto.bzl.

Generate a srcjar artifact, and use native.java_library to emit the
actual jar file.

Post-review modifications:
  - Formatted genproto.bzl
  - Use //external:jar instead of relying on PATH
  - Make proto library a java_import instead of a filegroup in
    test setup.

--
Change-Id: I005f801f09439bbca43e483ad4a47da4588fea94
Reviewed-on: https://bazel-review.googlesource.com/1362
MOS_MIGRATED_REVID=94914935

4 files changed, 20 insertions, 8 deletions

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 717d9bf4fc..c319e34d92 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -1,11 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/genproto", "genproto")
+load("/tools/build_rules/genproto", "proto_java_library")
 
-[genproto(
-    name = "proto_" + proto_file,
-    src = proto_file + ".proto",
-) for proto_file in [
+FILES = [
     "build",
     "deps",
     "crosstool_config",
@@ -13,7 +10,12 @@ load("/tools/build_rules/genproto", "genproto")
     "test_status",
     "bundlemerge",
     "xcodegen",
-]]
+]
+
+[proto_java_library(
+    name = "proto_" + s,
+    src = s + ".proto",
+) for s in FILES]
 
 filegroup(
     name = "srcs",
diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index c3c7fd558e..9d0979f254 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -20,6 +20,11 @@ filegroup(
     srcs = ["bin/java"],
 )
 
+filegroup(
+    name = "jar",
+    srcs = ["bin/jar"],
+)
+
 BOOTCLASS_JARS = [
     "rt.jar",
     "resources.jar",
diff --git a/src/main/tools/jdk.WORKSPACE b/src/main/tools/jdk.WORKSPACE
index d8fb5e5154..c26eaa3133 100644
--- a/src/main/tools/jdk.WORKSPACE
+++ b/src/main/tools/jdk.WORKSPACE
@@ -43,6 +43,11 @@ bind(
 )
 
 bind(
+    name = "jar",
+    actual = "@local-jdk//:jar",
+)
+
+bind(
     name = "jdk-default",
     actual = "@local-jdk//:jdk-default",
 )
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index a0fe04aa00..ae134866cc 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -53,9 +53,9 @@ function setup_protoc_support() {
 cat <<EOF > third_party/BUILD
 package(default_visibility = ["//visibility:public"])
 exports_files(["protoc"])
-filegroup(
+java_import(
   name = "protobuf",
-  srcs = [ "protobuf-java.jar"])
+  jars = ["protobuf-java.jar"])
 
 EOF
 }