diff options
| author |  Carmi Grushko <carmi@google.com> | 2017-02-08 16:44:36 -0500 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-09 16:53:32 -0500 |
| commit | bc3c57df6a561de7fd021e388705c88c82ebee34 (patch) | |
| tree | b55d222191d88424a71d225e50de1566cf66a4d2 /third_party/protobuf | |
| parent | 50e7e7f89a985de944e8b966ee0f827b39c91666 (diff) | |
Rearrange third_party/protobuf/BUILD to look like the upstream protobuf repo
1. Removed "protobuf" which used to point at the Java proto runtime.
2. Added "protobuf" that points at the C++ proto runtime (protobuf_clib also currently points there)
3. Added "protobuf_java_util" which points at Java proto utils (protobuf-util also currently points there)
4. Removed some aliases which aren't used in Bazel.
Change-Id: If23a9797af8d87fd6df89bf9bad361288f2e0565
Diffstat (limited to 'third_party/protobuf')
| -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) |