From 5235d06159ba6fee412bee261ea7867d061252b0 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Wed, 12 Apr 2017 14:30:38 +0200 Subject: protobuf: Update protobuf to @laszlocsomor's master at commit 421d909. Update protobuf to @laszlocsomor's fork of protobuf. This is essentially the development version of protobuf 3.2.0 and windows specific fixes from laszlo. Those fixes will be merged into protobuf soon: https://github.com/google/protobuf/pull/2969). For instructions on how to update protobuf for bazel see README.bazel.md. Change-Id: Ic1daafe30270cb6bcc6231e6c94fb670af0475e7 --- WORKSPACE | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'WORKSPACE') diff --git a/WORKSPACE b/WORKSPACE index 0f215c8a30..7eb0a9dcc8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,6 +27,12 @@ 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() @@ -50,16 +56,15 @@ docker_repository() # This allows rules written in skylark to locate apple build tools. bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper") -new_local_repository( +local_repository( name = "com_google_protobuf", - path = "./third_party/protobuf/3.0.0/", - build_file = "./third_party/protobuf/3.0.0/BUILD", + path = "./third_party/protobuf/", ) new_local_repository( name = "com_google_protobuf_java", - path = "./third_party/protobuf/3.0.0/", - build_file = "./third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD", + path = "./third_party/protobuf/", + build_file = "./third_party/protobuf/com_google_protobuf_java.BUILD", ) # OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK. -- cgit v1.2.3