aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/java_tools/buildjar
diff options
context:
space:
mode:
authorGravatar Jakob Buchgraber <buchgr@google.com>2017-06-06 11:58:26 -0400
committerGravatar John Cater <jcater@google.com>2017-06-06 12:37:03 -0400
commit6073f1d41a102b70007356d1445c57b7f7533d78 (patch)
tree9ce021a4d4c91ca032946e1dc440159a055a3f1c /src/java_tools/buildjar
parentd9223e00c18466bd286a5e400007acb78ddeb9de (diff)
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
Diffstat (limited to 'src/java_tools/buildjar')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
index ec99b7aece..173e827dc7 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
@@ -128,19 +128,16 @@ load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bo
bootstrap_java_library(
name = "skylark-deps",
+ srcs = ["//:bootstrap-derived-java-srcs"],
jars = [
"//third_party:auto_value-jars",
"//third_party:bootstrap_guava_and_error_prone-jars",
"//third_party:jsr305-jars",
"//third_party/protobuf:protobuf-jars",
"//third_party/java/jacoco:core-jars",
+ "//third_party/grpc:bootstrap-grpc-jars",
],
neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar"],
- srcjars = [
- "//src/main/protobuf:deps_java_proto_srcjar",
- "//src/main/protobuf:worker_protocol_java_proto_srcjar",
- "//src/main/protobuf:java_compilation_java_proto_srcjar",
- ],
)
bootstrap_java_library(