From 6e12e656722b32b25a4278e8211b8f0b2b01c0fd Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Tue, 2 May 2017 11:53:15 +0200
Subject: [PATCH] Update protobuf dependency to 3.2.0

Change-Id: I32f6b16955ecefc242af8d9261418452d698c9ff
PiperOrigin-RevId: 154812955
---
 WORKSPACE               | 14 ++++++++++----
 compile.sh              |  2 ++
 src/main/protobuf/BUILD |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 0f215c8a308a2d..31518dab60dac0 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()
@@ -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 a8819be330046f..e93d7538dddf99 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 50af577aadc07c..55925685b9aac0 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",