diff options
| author |  Carmi Grushko <carmi@google.com> | 2017-02-10 12:28:22 -0500 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-21 10:14:59 -0500 |
| commit | f19aa2150d419b0ab605025bcb3d033b59ddbd24 (patch) | |
| tree | 78939de7cd00051b1bb768c6d8169d04f5648032 /third_party/protobuf | |
| parent | c9a75d27d6299389d10b148cc65151875ae7079c (diff) | |
Remove no-longer used protobuf BUILD aliases
Also, rename rules in third_party/protobuf/3.0.0/BUILD to match upstream protobuf.
Change-Id: I343982e752722ebb2461fb08e722558cea2f06b9
Diffstat (limited to 'third_party/protobuf')
| -rw-r--r-- | third_party/protobuf/3.0.0/BUILD | 9 | ||||
| -rw-r--r-- | third_party/protobuf/BUILD | 14 |
2 files changed, 5 insertions, 18 deletions
diff --git a/third_party/protobuf/3.0.0/BUILD b/third_party/protobuf/3.0.0/BUILD index ce5caaa6fb..46a34ebf0d 100644 --- a/third_party/protobuf/3.0.0/BUILD +++ b/third_party/protobuf/3.0.0/BUILD @@ -18,7 +18,7 @@ filegroup( ) java_import( - name = "protobuf-util", + name = "protobuf_java_util", jars = ["protobuf-java-util-3.0.0.jar"], exports = [ "//third_party:gson", @@ -142,11 +142,8 @@ cc_library( visibility = ["//visibility:public"], ) -# This is named just "protobuf" in protobuf's BUILD file, but it is renamed here -# to "protobuf_clib" to avoid conflicting with the java_import named "protobuf" -# above. cc_library( - name = "protobuf_clib", + name = "protobuf", srcs = [ # AUTOGEN(protobuf_srcs) "src/google/protobuf/any.cc", @@ -311,7 +308,7 @@ cc_library( includes = ["src/"], linkopts = LINK_OPTS, visibility = ["//visibility:public"], - deps = [":protobuf_clib"], + deps = [":protobuf"], ) proto_lang_toolchain( diff --git a/third_party/protobuf/BUILD b/third_party/protobuf/BUILD index 6dae212e45..60845b08a6 100644 --- a/third_party/protobuf/BUILD +++ b/third_party/protobuf/BUILD @@ -20,21 +20,11 @@ proto_alias("protobuf_java", PROTOBUF_VERSION) proto_alias("protobuf-jars", PROTOBUF_VERSION) -proto_alias("protobuf-util", PROTOBUF_VERSION) - -alias( - name = "protobuf_java_util", - actual = "//third_party/protobuf/3.0.0:protobuf-util" -) +proto_alias("protobuf_java_util", PROTOBUF_VERSION) proto_alias("protobuf_python", PROTOBUF_VERSION) -proto_alias("protobuf_clib", PROTOBUF_VERSION) - -alias( - name = "protobuf", - actual = "//third_party/protobuf/3.0.0:protobuf_clib" -) +proto_alias("protobuf", PROTOBUF_VERSION) proto_alias("protoc_lib", PROTOBUF_VERSION) |