From 022f30a15d3678027f916f84ac3192c7113fcae2 Mon Sep 17 00:00:00 2001
From: Eric Gribkoff <ericgribkoff@google.com>
Date: Mon, 1 May 2017 12:11:35 -0700
Subject: [PATCH 1/2] build,protobuf: update google_api_protos dependency

---
 build.gradle          | 2 +-
 protobuf/build.gradle | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 65c63efeb64..93ac118169b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,7 +177,7 @@ subprojects {
                 hpack: 'com.twitter:hpack:0.10.1',
                 jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
                 oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.4.0',
-                google_api_protos: 'com.google.api.grpc:grpc-google-common-protos:0.1.6',
+                google_api_protos: 'com.google.api.grpc:proto-google-common-protos:0.1.9',
                 google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.4.0',
                 okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
                 okio: 'com.squareup.okio:okio:1.6.0',
diff --git a/protobuf/build.gradle b/protobuf/build.gradle
index e18cecedc7c..1ba3aeacd73 100644
--- a/protobuf/build.gradle
+++ b/protobuf/build.gradle
@@ -16,7 +16,6 @@ dependencies {
             libraries.protobuf_util
 
     compile (libraries.google_api_protos) {
-        exclude group: 'io.grpc'
         // 'com.google.api' transitively depends on 'com.google.auto.value:auto-value:1.1', which
         // breaks our annotations.
         exclude group: 'com.google.api'

From 38aa015b281f6d8b9e3f5b8855f15cec922ce9c4 Mon Sep 17 00:00:00 2001
From: Eric Gribkoff <ericgribkoff@google.com>
Date: Mon, 1 May 2017 13:01:05 -0700
Subject: [PATCH 2/2] include api-common module name in exclusion

---
 protobuf/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/protobuf/build.gradle b/protobuf/build.gradle
index 1ba3aeacd73..06dd944f4f5 100644
--- a/protobuf/build.gradle
+++ b/protobuf/build.gradle
@@ -16,9 +16,9 @@ dependencies {
             libraries.protobuf_util
 
     compile (libraries.google_api_protos) {
-        // 'com.google.api' transitively depends on 'com.google.auto.value:auto-value:1.1', which
-        // breaks our annotations.
-        exclude group: 'com.google.api'
+        // 'com.google.api:api-common' transitively depends on auto-value, which breaks our
+        // annotations.
+        exclude group: 'com.google.api', module: 'api-common'
     }
 
     compile (project(':grpc-protobuf-lite')) {