aboutsummaryrefslogtreecommitdiffhomepage
path: root/WORKSPACE
diff options
context:
space:
mode:
authorGravatar Jakob Buchgraber <buchgr@google.com>2017-04-14 21:16:19 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-04-14 21:16:19 +0200
commit8ff0d0d436b4fd9fd4199d313f708377c7a668af (patch)
tree1d0060d271adb3d6bac605c2a10768be80e09203 /WORKSPACE
parent5235d06159ba6fee412bee261ea7867d061252b0 (diff)
Revert "protobuf: Update protobuf to @laszlocsomor's master at commit 421d909."
This reverts commit 5235d06159ba6fee412bee261ea7867d061252b0. Unfortunately, we noticed several build errors / test failures internally due this change.
Diffstat (limited to 'WORKSPACE')
-rw-r--r--WORKSPACE15
1 files changed, 5 insertions, 10 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 7eb0a9dcc8..0f215c8a30 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -27,12 +27,6 @@ bind(
actual = "//third_party:guava",
)
-# Used by //third_party/protobuf:protobuf_python
-bind(
- name = "six",
- actual = "//third_party/py/six",
-)
-
# For tools/cpp/test/...
load("//tools/cpp/test:docker_repository.bzl", "docker_repository")
docker_repository()
@@ -56,15 +50,16 @@ docker_repository()
# This allows rules written in skylark to locate apple build tools.
bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper")
-local_repository(
+new_local_repository(
name = "com_google_protobuf",
- path = "./third_party/protobuf/",
+ path = "./third_party/protobuf/3.0.0/",
+ build_file = "./third_party/protobuf/3.0.0/BUILD",
)
new_local_repository(
name = "com_google_protobuf_java",
- path = "./third_party/protobuf/",
- build_file = "./third_party/protobuf/com_google_protobuf_java.BUILD",
+ path = "./third_party/protobuf/3.0.0/",
+ build_file = "./third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD",
)
# OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK.