diff options
| author | ZHANG Dapeng <zdapeng@google.com> | 2017-07-05 16:15:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 16:15:33 -0700 |
| commit | c2791496ca8880cb05668d263bc8a72ed2702367 (patch) | |
| tree | d4b4a47e95ab3e1351aa023445c9fc0dc37b53d4 | |
| parent | 69e278aa8eccf8df9627489e8a9809a18b4eed0c (diff) | |
| download | grpc-grpc-java-c2791496ca8880cb05668d263bc8a72ed2702367.tar.gz | |
fix misuse of bazel repo @com_google_protobuf
resolves #3175
| -rw-r--r-- | examples/BUILD.bazel | 4 | ||||
| -rw-r--r-- | protobuf-lite/BUILD.bazel | 2 | ||||
| -rw-r--r-- | protobuf/BUILD.bazel | 4 | ||||
| -rw-r--r-- | repositories.bzl | 5 |
4 files changed, 10 insertions, 5 deletions
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index fe6bbdd66..9255676a8 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -49,10 +49,10 @@ java_library( "@com_google_api_grpc_google_common_protos//jar", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava//jar", - "@com_google_protobuf//:protobuf_java_util", "@com_google_protobuf_java//:protobuf_java", - "@grpc_java//protobuf", + "@com_google_protobuf_java//:protobuf_java_util", "@grpc_java//core", + "@grpc_java//protobuf", "@grpc_java//stub", ], ) diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel index 9b018608c..74939c2fe 100644 --- a/protobuf-lite/BUILD.bazel +++ b/protobuf-lite/BUILD.bazel @@ -10,6 +10,6 @@ java_library( "//core:internal", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava//jar", - "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf_java//:protobuf_java", ], ) diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel index 41288a28b..29fc11c6e 100644 --- a/protobuf/BUILD.bazel +++ b/protobuf/BUILD.bazel @@ -10,7 +10,7 @@ java_library( "@com_google_api_grpc_google_common_protos//jar", "@com_google_code_findbugs_jsr305//jar", "@com_google_guava//jar", - "@com_google_protobuf//:protobuf_java", - "@com_google_protobuf//:protobuf_java_util", + "@com_google_protobuf_java//:protobuf_java", + "@com_google_protobuf_java//:protobuf_java_util", ], ) diff --git a/repositories.bzl b/repositories.bzl index a15e95f89..8f840c8a0 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -120,6 +120,9 @@ def com_google_instrumentation_api(): ) def com_google_protobuf(): + # proto_library rules implicitly depend on @com_google_protobuf//:protoc, + # which is the proto-compiler. + # This statement defines the @com_google_protobuf repo. native.http_archive( name = "com_google_protobuf", sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75", @@ -128,6 +131,8 @@ def com_google_protobuf(): ) def com_google_protobuf_java(): + # java_proto_library rules implicitly depend on @com_google_protobuf_java//:java_toolchain, + # which is the Java proto runtime (base classes and common utilities). native.http_archive( name = "com_google_protobuf_java", sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75", |