From 40b815058f1209e66086f4426c407875f47fe400 Mon Sep 17 00:00:00 2001
From: cindyxue <32377977+cindyxue@users.noreply.github.com>
Date: Fri, 12 Jun 2020 17:10:13 -0700
Subject: [PATCH] xds: fix build.gradle for shadowing googleapis (#7121)

---
 xds/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xds/build.gradle b/xds/build.gradle
index 7e0726d25d..5ef147e00b 100644
--- a/xds/build.gradle
+++ b/xds/build.gradle
@@ -89,7 +89,7 @@ shadowJar {
     dependencies {
         include(project(':grpc-xds'))
     }
-    relocate 'com.github.googleapis', 'io.grpc.xds.shaded.com.github.googleapis'
+    relocate 'com.google.api.expr', 'io.grpc.xds.shaded.com.google.api.expr'
     relocate 'com.github.udpa', 'io.grpc.xds.shaded.com.github.udpa'
     relocate 'io.envoyproxy', 'io.grpc.xds.shaded.io.envoyproxy'
     relocate 'io.grpc.netty', 'io.grpc.netty.shaded.io.grpc.netty'
@@ -101,6 +101,7 @@ jacocoTestReport {
     classDirectories.from = sourceSets.main.output.collect {
         fileTree(dir: it,
         exclude: [
+                '**/com/google/api/**',
                 '**/com/github/**',
                 '**/envoy/annotations/**',
                 '**/io/envoyproxy/**',