From ce62feb37059eca26b607deb0b9974bce148cc64 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 21 Jan 2016 14:22:46 -0800
Subject: [PATCH] Fix sanity

---
 .../sources_and_headers.json.template         |  2 +-
 tools/run_tests/sources_and_headers.json      | 46 -------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template
index ba1c5a5ef85..04802772af5 100644
--- a/templates/tools/run_tests/sources_and_headers.json.template
+++ b/templates/tools/run_tests/sources_and_headers.json.template
@@ -32,5 +32,5 @@
                      proto_headers(tgt.src)),
                  "deps": sorted(tgt.get('deps', []))}
                 for tgt in (targets + libs)
-                if not tgt.boringssl],
+                if not tgt.boringssl and not tgt.zlib],
                sort_keys=True, indent=2)}
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index bdb917d93c5..8d3785b5860 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -4335,52 +4335,6 @@
       "src/csharp/ext/grpc_csharp_ext.c"
     ]
   }, 
-  {
-    "deps": [], 
-    "headers": [
-      "third_party/zlib/crc32.h", 
-      "third_party/zlib/deflate.h", 
-      "third_party/zlib/gzguts.h", 
-      "third_party/zlib/inffast.h", 
-      "third_party/zlib/inffixed.h", 
-      "third_party/zlib/inflate.h", 
-      "third_party/zlib/inftrees.h", 
-      "third_party/zlib/trees.h", 
-      "third_party/zlib/zconf.h", 
-      "third_party/zlib/zlib.h", 
-      "third_party/zlib/zutil.h"
-    ], 
-    "language": "c", 
-    "name": "z", 
-    "src": [
-      "third_party/zlib/adler32.c", 
-      "third_party/zlib/compress.c", 
-      "third_party/zlib/crc32.c", 
-      "third_party/zlib/crc32.h", 
-      "third_party/zlib/deflate.c", 
-      "third_party/zlib/deflate.h", 
-      "third_party/zlib/gzclose.c", 
-      "third_party/zlib/gzguts.h", 
-      "third_party/zlib/gzlib.c", 
-      "third_party/zlib/gzread.c", 
-      "third_party/zlib/gzwrite.c", 
-      "third_party/zlib/infback.c", 
-      "third_party/zlib/inffast.c", 
-      "third_party/zlib/inffast.h", 
-      "third_party/zlib/inffixed.h", 
-      "third_party/zlib/inflate.c", 
-      "third_party/zlib/inflate.h", 
-      "third_party/zlib/inftrees.c", 
-      "third_party/zlib/inftrees.h", 
-      "third_party/zlib/trees.c", 
-      "third_party/zlib/trees.h", 
-      "third_party/zlib/uncompr.c", 
-      "third_party/zlib/zconf.h", 
-      "third_party/zlib/zlib.h", 
-      "third_party/zlib/zutil.c", 
-      "third_party/zlib/zutil.h"
-    ]
-  }, 
   {
     "deps": [
       "gpr",