diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-25 14:32:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 14:32:51 -0700 |
| commit | b5fa72c89e07c3a4a6730d3adf108ce9cfc33d78 (patch) | |
| tree | ea1866ce9257dbaaddf365a2c9a7a813c4fa0a2c /tools | |
| parent | de2d9fc07bf7f01184c6bfebb7ed12da8eade525 (diff) | |
| parent | 26100cb1fecc20df4ac0afced747665e48bcc91d (diff) | |
Merge pull request #7451 from y-zeng/seperate_generated_files
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/sanity/check_sources_and_headers.py | 3 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 41 |
2 files changed, 35 insertions, 9 deletions
diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py index c028499ca6..28c1dc46d7 100755 --- a/tools/run_tests/sanity/check_sources_and_headers.py +++ b/tools/run_tests/sanity/check_sources_and_headers.py @@ -55,7 +55,8 @@ def target_has_header(target, name): for dep in target['deps']: if target_has_header(get_target(dep), name): return True - if name == 'src/core/lib/profiling/stap_probes.h': + if name in ['src/core/lib/profiling/stap_probes.h', + 'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h']: return True return False diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 65959da203..e85dd2c820 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4361,25 +4361,19 @@ { "deps": [ "grpc++", - "grpc++_codegen_proto" + "grpc++_reflection_proto" ], "headers": [ "include/grpc++/ext/proto_server_reflection_plugin.h", - "include/grpc++/ext/reflection.grpc.pb.h", - "include/grpc++/ext/reflection.pb.h", "src/cpp/ext/proto_server_reflection.h" ], "language": "c++", "name": "grpc++_reflection", "src": [ "include/grpc++/ext/proto_server_reflection_plugin.h", - "include/grpc++/ext/reflection.grpc.pb.h", - "include/grpc++/ext/reflection.pb.h", "src/cpp/ext/proto_server_reflection.cc", "src/cpp/ext/proto_server_reflection.h", - "src/cpp/ext/proto_server_reflection_plugin.cc", - "src/cpp/ext/reflection.grpc.pb.cc", - "src/cpp/ext/reflection.pb.cc" + "src/cpp/ext/proto_server_reflection_plugin.cc" ], "third_party": false, "type": "lib" @@ -4387,6 +4381,18 @@ { "deps": [], "headers": [ + "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h", + "src/proto/grpc/reflection/v1alpha/reflection.pb.h" + ], + "language": "c++", + "name": "grpc++_reflection_codegen", + "src": [], + "third_party": false, + "type": "lib" + }, + { + "deps": [], + "headers": [ "test/cpp/util/test_config.h" ], "language": "c++", @@ -6759,5 +6765,24 @@ ], "third_party": false, "type": "filegroup" + }, + { + "deps": [ + "grpc++_codegen_proto" + ], + "headers": [ + "include/grpc++/ext/reflection.grpc.pb.h", + "include/grpc++/ext/reflection.pb.h" + ], + "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" + ], + "third_party": false, + "type": "filegroup" } ] |