From d90737372d370d920e390aff6138dbc2aec2f3b1 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Thu, 13 Apr 2017 15:08:11 +0200 Subject: Revert "protobuf: Update protobuf to @laszlocsomor's master at commit 421d909." This reverts commit ea82aa115794b019472b44d4f94ed902c1217f30. --- WORKSPACE | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'WORKSPACE') 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. -- cgit v1.2.3