Merge pull request #9532 from muxi/revert-cronet-header-dir-change

Move bidirectional_stream_c.h back to third_party/objective_c/Cronet
pull/9485/head^2
Muxi Yan 8 years ago committed by GitHub
commit 459e10d80e
  1. 2
      BUILD
  2. 2
      build.yaml
  3. 2
      src/core/ext/transport/cronet/transport/cronet_api_dummy.c
  4. 2
      src/core/ext/transport/cronet/transport/cronet_transport.c
  5. 0
      third_party/objective_c/Cronet/bidirectional_stream_c.h
  6. 2
      tools/run_tests/generated/sources_and_headers.json

@ -1038,7 +1038,7 @@ grpc_cc_library(
"src/core/ext/transport/cronet/transport/cronet_transport.c",
],
hdrs = [
"third_party/Cronet/bidirectional_stream_c.h",
"third_party/objective_c/Cronet/bidirectional_stream_c.h",
],
language = "c",
public_hdrs = [

@ -695,7 +695,7 @@ filegroups:
- include/grpc/grpc_security.h
- include/grpc/grpc_security_constants.h
headers:
- third_party/Cronet/bidirectional_stream_c.h
- third_party/objective_c/Cronet/bidirectional_stream_c.h
src:
- src/core/ext/transport/cronet/client/secure/cronet_channel_create.c
- src/core/ext/transport/cronet/transport/cronet_api_dummy.c

@ -38,7 +38,7 @@ library, so we can build it in all environments */
#include <grpc/support/log.h>
#include "third_party/Cronet/bidirectional_stream_c.h"
#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
#ifdef GRPC_COMPILE_WITH_CRONET
/* link with the real CRONET library in the build system */

@ -51,7 +51,7 @@
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/static_metadata.h"
#include "src/core/lib/transport/transport_impl.h"
#include "third_party/Cronet/bidirectional_stream_c.h"
#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
#define GRPC_HEADER_SIZE_IN_BYTES 5

@ -7907,7 +7907,7 @@
"include/grpc/grpc_cronet.h",
"include/grpc/grpc_security.h",
"include/grpc/grpc_security_constants.h",
"third_party/Cronet/bidirectional_stream_c.h"
"third_party/objective_c/Cronet/bidirectional_stream_c.h"
],
"is_filegroup": true,
"language": "c",

Loading…
Cancel
Save