From 6073f1d41a102b70007356d1445c57b7f7533d78 Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Tue, 6 Jun 2017 11:58:26 -0400
Subject: protobuf: Use bazel's native java_proto_library rules.

Additional changes:
  - Introduce a Skylark macro java_library_srcs that provides the source jars of a java_*_library rule.
  - Remove bazel's own java_proto_library implementation.

Change-Id: I18f2259bc75ca0fb32dcd8a6a857c609bd2c7773
PiperOrigin-RevId: 158146210
---
 src/main/java/com/google/devtools/build/lib/BUILD         |  1 +
 .../devtools/build/lib/buildeventstream/proto/BUILD       | 15 ++++++++++-----
 src/main/java/com/google/devtools/build/lib/remote/BUILD  |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 8bf2d1af7b..610486e186 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -1159,6 +1159,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_java_proto",
+        "//src/main/protobuf:command_server_java_grpc",
         "//src/main/protobuf:command_server_java_proto",
         "//src/main/protobuf:invocation_policy_java_proto",
         "//src/main/protobuf:test_status_java_proto",
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
index 09c10cb3c0..efff5df2bf 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
@@ -1,18 +1,23 @@
 package(default_visibility = ["//src:__subpackages__"])
 
-load("//tools/build_rules:genproto.bzl", "java_proto_library")
+load("//tools/build_rules:utilities.bzl", "java_library_srcs")
 
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
 )
 
+java_library_srcs(
+    name = "dist_jars",
+    deps = [":build_event_stream_java_proto"],
+)
+
 java_proto_library(
     name = "build_event_stream_java_proto",
-    src = "build_event_stream.proto",
+    deps = ["build_event_stream_proto"],
 )
 
-filegroup(
-    name = "dist_jars",
-    srcs = ["build_event_stream_java_proto_srcjar"],
+proto_library(
+    name = "build_event_stream_proto",
+    srcs = ["build_event_stream.proto"],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/remote/BUILD b/src/main/java/com/google/devtools/build/lib/remote/BUILD
index bfc9c39269..3a3c304d1e 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -23,6 +23,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/common/options",
+        "//src/main/protobuf:remote_protocol_java_grpc",
         "//src/main/protobuf:remote_protocol_java_proto",
         "//third_party:apache_httpclient",
         "//third_party:apache_httpcore",
-- 
cgit v1.2.3