diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-12 14:28:36 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-12 14:28:36 -0700 |
| commit | 6d0b4d20c0dbb9326724343a0c04b52d390e25a4 (patch) | |
| tree | c815c2d33c28f0d10112d8239fcf6fe5d6b250ef /tools/run_tests | |
| parent | d9c58961f91d877e760008e2916527b0d56b8826 (diff) | |
| parent | a709afe241d8b264a1c326315f757b4a8d330207 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into merge
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index e05786072b..70332b6f2e 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4208,7 +4208,8 @@ "grpc_transport_chttp2_client_insecure", "grpc_transport_chttp2_client_secure", "grpc_transport_chttp2_server_insecure", - "grpc_transport_chttp2_server_secure" + "grpc_transport_chttp2_server_secure", + "grpc_transport_cronet_client_secure" ], "headers": [], "language": "c", @@ -6085,6 +6086,7 @@ "tsi" ], "headers": [ + "include/grpc/grpc_cronet.h", "include/grpc/grpc_security.h", "include/grpc/grpc_security_constants.h", "src/core/lib/security/context/security_context.h", @@ -6110,6 +6112,7 @@ "language": "c", "name": "grpc_secure", "src": [ + "include/grpc/grpc_cronet.h", "include/grpc/grpc_security.h", "include/grpc/grpc_security_constants.h", "src/core/lib/http/httpcli_security_connector.c", @@ -6365,6 +6368,24 @@ "type": "filegroup" }, { + "deps": [ + "grpc_base", + "grpc_transport_chttp2" + ], + "headers": [ + "third_party/objective_c/Cronet/cronet_c_for_grpc.h" + ], + "language": "c", + "name": "grpc_transport_cronet_client_secure", + "src": [ + "src/core/ext/transport/cronet/client/secure/cronet_channel_create.c", + "src/core/ext/transport/cronet/transport/cronet_api_dummy.c", + "src/core/ext/transport/cronet/transport/cronet_transport.c" + ], + "third_party": false, + "type": "filegroup" + }, + { "deps": [], "headers": [ "third_party/nanopb/pb.h", |