aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carmi Grushko <carmi@google.com>2017-02-08 21:31:57 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-02-09 15:10:12 +0000
commit159b1c111d01cb5f169cbd4995c5173a432a09cc (patch)
tree631181fafca0ee4e2173dd54bbb396668125ed9b
parent05b9fe1386d85ec8d5e1cbcae5324c3c32ff74da (diff)
Use //third_party/protobuf:protobuf_java instead of //third_party/protobuf:protobuf to refer to the Java proto runtime.
This is the name in the upstream protobuf repo. -- PiperOrigin-RevId: 146949832 MOS_MIGRATED_REVID=146949832
-rw-r--r--src/main/java/com/google/devtools/build/lib/BUILD26
-rw-r--r--src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD2
-rw-r--r--src/main/java/com/google/devtools/build/lib/remote/BUILD2
-rw-r--r--src/test/java/com/google/devtools/build/lib/BUILD16
-rw-r--r--src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD2
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/repository/BUILD2
6 files changed, 25 insertions, 25 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 72ba58063e..de72cb7f85 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -116,7 +116,7 @@ java_library(
"//src/main/protobuf:invocation_policy_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -268,7 +268,7 @@ java_library(
"//src/main/java/com/google/devtools/common/options",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -307,7 +307,7 @@ java_library(
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -425,7 +425,7 @@ java_library(
"//src/main/protobuf:build_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -450,7 +450,7 @@ java_library(
"//src/main/protobuf:build_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -525,7 +525,7 @@ java_library(
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -717,7 +717,7 @@ java_library(
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -739,7 +739,7 @@ java_library(
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -805,7 +805,7 @@ java_library(
"//third_party:guava",
"//third_party:joda_time",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -921,7 +921,7 @@ java_library(
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -945,7 +945,7 @@ java_library(
"//src/main/protobuf:extra_actions_base_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -969,7 +969,7 @@ java_library(
"//src/main/protobuf:intellij_ide_info_java_proto",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -1032,7 +1032,7 @@ java_library(
"//third_party:joda_time",
"//third_party:jsr305",
"//third_party/grpc:grpc-jar",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
index 14674f56b9..661d416524 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
@@ -14,6 +14,6 @@ java_library(
"//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
"//src/main/java/com/google/devtools/common/options",
"//third_party:guava",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
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 937642c07a..d8f157c27d 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -27,7 +27,7 @@ java_library(
"//third_party:hazelcast",
"//third_party:jsr305",
"//third_party/grpc:grpc-jar",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 9a9c64f61a..7f26b3e773 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -586,7 +586,7 @@ java_library(
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -623,7 +623,7 @@ java_test(
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -682,7 +682,7 @@ java_test(
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -750,7 +750,7 @@ java_test(
"//third_party:mockito",
"//third_party:truth",
"//third_party/grpc:grpc-jar",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -949,7 +949,7 @@ java_test(
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -996,7 +996,7 @@ java_test(
"//src/main/java/com/google/devtools/build/lib:build-base",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -1087,7 +1087,7 @@ java_test(
"//third_party:mockito",
"//third_party:truth",
"//third_party/grpc:grpc-jar",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -1174,7 +1174,7 @@ java_test(
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
index 896cb5a9b2..597dec1d01 100644
--- a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD
@@ -20,6 +20,6 @@ java_test(
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index 530fd558ba..b24f8d10aa 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -35,7 +35,7 @@ java_test(
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)