Merge remote-tracking branch 'upstream/master' into remove_fake_resolver

1 files changed, 33 insertions, 40 deletions

diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index ac6738d472..3c332586bb 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -2497,7 +2497,7 @@
       "gpr", 
       "grpc", 
       "grpc++", 
-      "grpc++_reflection", 
+      "grpc++_proto_reflection_desc_db", 
       "grpc++_test_config", 
       "grpc_cli_libs"
     ], 
@@ -2616,8 +2616,9 @@
       "grpc", 
       "grpc++", 
       "grpc++_codegen_proto", 
-      "grpc++_config_proto", 
+      "grpc++_proto_reflection_desc_db", 
       "grpc++_reflection", 
+      "grpc++_test_util", 
       "grpc_cli_libs", 
       "grpc_test_util"
     ], 
@@ -2625,16 +2626,13 @@
       "src/proto/grpc/testing/echo.grpc.pb.h", 
       "src/proto/grpc/testing/echo.pb.h", 
       "src/proto/grpc/testing/echo_messages.grpc.pb.h", 
-      "src/proto/grpc/testing/echo_messages.pb.h", 
-      "test/cpp/util/string_ref_helper.h"
+      "src/proto/grpc/testing/echo_messages.pb.h"
     ], 
     "is_filegroup": false, 
     "language": "c++", 
     "name": "grpc_tool_test", 
     "src": [
-      "test/cpp/util/grpc_tool_test.cc", 
-      "test/cpp/util/string_ref_helper.cc", 
-      "test/cpp/util/string_ref_helper.h"
+      "test/cpp/util/grpc_tool_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -2826,20 +2824,17 @@
       "gpr_test_util", 
       "grpc", 
       "grpc++", 
+      "grpc++_proto_reflection_desc_db", 
       "grpc++_reflection", 
       "grpc++_test_util", 
       "grpc_test_util"
     ], 
-    "headers": [
-      "test/cpp/util/proto_reflection_descriptor_database.h"
-    ], 
+    "headers": [], 
     "is_filegroup": false, 
     "language": "c++", 
     "name": "proto_server_reflection_test", 
     "src": [
-      "test/cpp/end2end/proto_server_reflection_test.cc", 
-      "test/cpp/util/proto_reflection_descriptor_database.cc", 
-      "test/cpp/util/proto_reflection_descriptor_database.h"
+      "test/cpp/end2end/proto_server_reflection_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -5043,34 +5038,40 @@
   {
     "deps": [
       "grpc++", 
+      "grpc++_config_proto", 
       "grpc++_reflection_proto"
     ], 
     "headers": [
-      "include/grpc++/ext/proto_server_reflection_plugin.h", 
-      "src/cpp/ext/proto_server_reflection.h"
+      "test/cpp/util/proto_reflection_descriptor_database.h"
     ], 
     "is_filegroup": false, 
     "language": "c++", 
-    "name": "grpc++_reflection", 
+    "name": "grpc++_proto_reflection_desc_db", 
     "src": [
-      "include/grpc++/ext/proto_server_reflection_plugin.h", 
-      "src/cpp/ext/proto_server_reflection.cc", 
-      "src/cpp/ext/proto_server_reflection.h", 
-      "src/cpp/ext/proto_server_reflection_plugin.cc"
+      "test/cpp/util/proto_reflection_descriptor_database.cc", 
+      "test/cpp/util/proto_reflection_descriptor_database.h"
     ], 
     "third_party": false, 
     "type": "lib"
   }, 
   {
-    "deps": [], 
+    "deps": [
+      "grpc++", 
+      "grpc++_reflection_proto"
+    ], 
     "headers": [
-      "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h", 
-      "src/proto/grpc/reflection/v1alpha/reflection.pb.h"
+      "include/grpc++/ext/proto_server_reflection_plugin.h", 
+      "src/cpp/ext/proto_server_reflection.h"
     ], 
     "is_filegroup": false, 
     "language": "c++", 
-    "name": "grpc++_reflection_codegen", 
-    "src": [], 
+    "name": "grpc++_reflection", 
+    "src": [
+      "include/grpc++/ext/proto_server_reflection_plugin.h", 
+      "src/cpp/ext/proto_server_reflection.cc", 
+      "src/cpp/ext/proto_server_reflection.h", 
+      "src/cpp/ext/proto_server_reflection_plugin.cc"
+    ], 
     "third_party": false, 
     "type": "lib"
   }, 
@@ -5173,7 +5174,9 @@
   {
     "deps": [
       "grpc++", 
-      "grpc++_reflection"
+      "grpc++_config_proto", 
+      "grpc++_proto_reflection_desc_db", 
+      "grpc++_reflection_proto"
     ], 
     "headers": [
       "test/cpp/util/cli_call.h", 
@@ -5181,7 +5184,6 @@
       "test/cpp/util/config_grpc_cli.h", 
       "test/cpp/util/grpc_tool.h", 
       "test/cpp/util/proto_file_parser.h", 
-      "test/cpp/util/proto_reflection_descriptor_database.h", 
       "test/cpp/util/service_describer.h"
     ], 
     "is_filegroup": false, 
@@ -5197,8 +5199,6 @@
       "test/cpp/util/grpc_tool.h", 
       "test/cpp/util/proto_file_parser.cc", 
       "test/cpp/util/proto_file_parser.h", 
-      "test/cpp/util/proto_reflection_descriptor_database.cc", 
-      "test/cpp/util/proto_reflection_descriptor_database.h", 
       "test/cpp/util/service_describer.cc", 
       "test/cpp/util/service_describer.h"
     ], 
@@ -7664,22 +7664,15 @@
     "type": "filegroup"
   }, 
   {
-    "deps": [
-      "grpc++_codegen_proto"
-    ], 
+    "deps": [], 
     "headers": [
-      "include/grpc++/ext/reflection.grpc.pb.h", 
-      "include/grpc++/ext/reflection.pb.h"
+      "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h", 
+      "src/proto/grpc/reflection/v1alpha/reflection.pb.h"
     ], 
     "is_filegroup": true, 
     "language": "c++", 
     "name": "grpc++_reflection_proto", 
-    "src": [
-      "include/grpc++/ext/reflection.grpc.pb.h", 
-      "include/grpc++/ext/reflection.pb.h", 
-      "src/cpp/ext/reflection.grpc.pb.cc", 
-      "src/cpp/ext/reflection.pb.cc"
-    ], 
+    "src": [], 
     "third_party": false, 
     "type": "filegroup"
   },