Merge github.com:grpc/grpc into naming-crisis

1 files changed, 17 insertions, 10 deletions

diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template
index cf424edd0b..18b9bc2654 100644
--- a/templates/tools/run_tests/sources_and_headers.json.template
+++ b/templates/tools/run_tests/sources_and_headers.json.template
@@ -12,18 +12,25 @@
         out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h'])
     return out
 
-  def no_protos(src):
-    out = []
-    for f in src:
-      if os.path.splitext(f)[1] != '.proto':
-        out.append(f)
-    return out
-
   def all_targets(targets, libs):
     for tgt in targets:
       yield ('target', tgt)
     for tgt in libs:
       yield ('lib', tgt)
+
+  def no_protos_filter(src):
+  	return os.path.splitext(src)[1] != '.proto'
+
+  def no_third_party_filter(src):
+  	return not src.startswith('third_party/')
+
+  def filter_srcs(srcs, filters):
+  	out = []
+  	for s in srcs:
+  		filter_passes = (f(s) for f in filters)
+  		if all(filter_passes):
+  			out.append(s)
+  	return out
   %>
 
   ${json.dumps([{"name": tgt.name,
@@ -31,9 +38,9 @@
                  "language": tgt.language,
                  "third_party": tgt.boringssl or tgt.zlib,
                  "src": sorted(
-                     no_protos(tgt.src) +
-                     tgt.get('public_headers', []) +
-                     tgt.get('headers', [])),
+                     filter_srcs(tgt.src, (no_protos_filter, no_third_party_filter)) +
+                     filter_srcs(tgt.get('public_headers', []), (no_protos_filter, no_third_party_filter)) +
+                     filter_srcs(tgt.get('headers', []), (no_third_party_filter,))),
                  "headers": sorted(
                      tgt.get('public_headers', []) +
                      tgt.get('headers', []) +