diff options
| -rw-r--r-- | third_party/protobuf/3.0.0/BUILD | 2 | ||||
| -rw-r--r-- | third_party/protobuf/BUILD | 23 |
2 files changed, 11 insertions, 14 deletions
diff --git a/third_party/protobuf/3.0.0/BUILD b/third_party/protobuf/3.0.0/BUILD index 35c3084b41..ce5caaa6fb 100644 --- a/third_party/protobuf/3.0.0/BUILD +++ b/third_party/protobuf/3.0.0/BUILD @@ -26,7 +26,7 @@ java_import( ) java_import( - name = "protobuf", + name = "protobuf_java", jars = ["protobuf-java-3.0.0.jar"], ) diff --git a/third_party/protobuf/BUILD b/third_party/protobuf/BUILD index 9fa483deb1..6dae212e45 100644 --- a/third_party/protobuf/BUILD +++ b/third_party/protobuf/BUILD @@ -16,29 +16,26 @@ filegroup( proto_alias("protoc", PROTOBUF_VERSION) -proto_alias("protobuf", PROTOBUF_VERSION) - -# "protobuf" above refers to the Java proto runtime, but upstream, -# "protobuf" refers to the C++ proto runtime. This alias allows us -# to switch all Bazel refernces to "protobuf" to the correct "protobuf_java". -# This alias should be temporary while this transition is done. -alias( - name = "protobuf_java", - actual = "//third_party/protobuf/3.0.0:protobuf" -) +proto_alias("protobuf_java", PROTOBUF_VERSION) proto_alias("protobuf-jars", PROTOBUF_VERSION) proto_alias("protobuf-util", PROTOBUF_VERSION) -proto_alias("protobuf_python_srcs", PROTOBUF_VERSION) +alias( + name = "protobuf_java_util", + actual = "//third_party/protobuf/3.0.0:protobuf-util" +) proto_alias("protobuf_python", PROTOBUF_VERSION) -proto_alias("protobuf_lite", PROTOBUF_VERSION) - proto_alias("protobuf_clib", PROTOBUF_VERSION) +alias( + name = "protobuf", + actual = "//third_party/protobuf/3.0.0:protobuf_clib" +) + proto_alias("protoc_lib", PROTOBUF_VERSION) proto_alias("java_toolchain", PROTOBUF_VERSION) |