Merge pull request #5211 from grpc/revert-4038-grpclb_api

Revert "Proto API for LB request/responses"

1 files changed, 7 insertions, 14 deletions

diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template
index 78363ff1fa..04802772af 100644
--- a/templates/tools/run_tests/sources_and_headers.json.template
+++ b/templates/tools/run_tests/sources_and_headers.json.template
@@ -12,27 +12,20 @@
   			out.extend(fmt % name for fmt in ['%s.grpc.pb.h', '%s.pb.h'])
   	return out
   
-  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):
+  def no_protos(src):
   	out = []
-  	for s in srcs:
-  		filter_passes = (f(s) for f in filters)
-  		if all(filter_passes):
-  			out.append(s)
+  	for f in src:
+  		if os.path.splitext(f)[1] != '.proto':
+  			out.append(f)
   	return out
   %>
   
   ${json.dumps([{"name": tgt.name,
                  "language": tgt.language,
                  "src": sorted(
-                     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,))),
+                     no_protos(tgt.src) + 
+                     tgt.get('public_headers', []) + 
+                     tgt.get('headers', [])),
                  "headers": sorted(
                      tgt.get('public_headers', []) + 
                      tgt.get('headers', []) +