diff options
| -rw-r--r-- | WORKSPACE | 14 | ||||
| -rwxr-xr-x | compile.sh | 2 | ||||
| -rw-r--r-- | src/main/protobuf/BUILD | 2 |
3 files changed, 13 insertions, 5 deletions
@@ -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() @@ -52,14 +58,14 @@ bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper") new_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/3.2.0/", + build_file = "./third_party/protobuf/3.2.0/BUILD" ) 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/3.2.0/", + build_file = "./third_party/protobuf/3.2.0/com_google_protobuf_java.BUILD", ) # OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK. diff --git a/compile.sh b/compile.sh index a8819be330..e93d7538dd 100755 --- a/compile.sh +++ b/compile.sh @@ -183,6 +183,8 @@ if [ $DO_SRCS_TEST ]; then | grep -v '^derived' \ | grep -Ev "${SRCS_EXCLUDES}" \ | grep -v '^tools/defaults/BUILD' \ + #TODO(buchgr): Remove once protobuf update complete. + | grep -v 'third_party/protobuf/3.0.0/' \ | sort -u >"${OUTPUT_DIR}/srcs-find" log "Diffing" diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD index 50af577aad..55925685b9 100644 --- a/src/main/protobuf/BUILD +++ b/src/main/protobuf/BUILD @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("//tools/build_rules:genproto.bzl", "java_proto_library", "cc_grpc_library") -load("//third_party/protobuf/3.0.0:protobuf.bzl", "cc_proto_library", "py_proto_library") +load("//third_party/protobuf/3.2.0:protobuf.bzl", "cc_proto_library", "py_proto_library") FILES = [ "build", |