diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-06 12:44:12 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-06 12:44:12 -0700 |
commit | 87ec3b77b54c392a68dfeb7e6a73e44ab26059b2 (patch) | |
tree | 43515198ba22e880e892c8b2d974a3cae22b6505 /tools/run_tests | |
parent | 7a952ad8e46b93c38862bdfd7bb6f2ee4f08c772 (diff) | |
parent | 19061093eb480adfeae59f71228fb66296621eb9 (diff) |
Merge pull request #6750 from makdharma/cronet
cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code.
Diffstat (limited to 'tools/run_tests')
-rw-r--r-- | tools/run_tests/sources_and_headers.json | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index b30ff4bbc6..a023bb7fdf 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4093,8 +4093,7 @@ "grpc_transport_chttp2_client_insecure", "grpc_transport_chttp2_client_secure", "grpc_transport_chttp2_server_insecure", - "grpc_transport_chttp2_server_secure", - "grpc_transport_cronet_client_secure" + "grpc_transport_chttp2_server_secure" ], "headers": [], "language": "c", @@ -4108,6 +4107,22 @@ { "deps": [ "gpr", + "grpc_base", + "grpc_transport_chttp2_client_secure", + "grpc_transport_cronet_client_secure" + ], + "headers": [], + "language": "c", + "name": "grpc_cronet", + "src": [ + "src/core/lib/surface/init.c" + ], + "third_party": false, + "type": "lib" + }, + { + "deps": [ + "gpr", "grpc" ], "headers": [], @@ -6008,7 +6023,6 @@ "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", @@ -6033,7 +6047,6 @@ "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", @@ -6292,11 +6305,17 @@ "grpc_transport_chttp2" ], "headers": [ + "include/grpc/grpc_cronet.h", + "include/grpc/grpc_security.h", + "include/grpc/grpc_security_constants.h", "third_party/objective_c/Cronet/cronet_c_for_grpc.h" ], "language": "c", "name": "grpc_transport_cronet_client_secure", "src": [ + "include/grpc/grpc_cronet.h", + "include/grpc/grpc_security.h", + "include/grpc/grpc_security_constants.h", "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" |