From bb2e8af0b003cc0e583fc7978dba3a55c125cc13 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 31 Jan 2017 15:58:06 -0800
Subject: [PATCH] Move bidirectional_stream_c.h back to
third_party/objective_c/Cronet
---
BUILD | 2 +-
build.yaml | 2 +-
src/core/ext/transport/cronet/transport/cronet_api_dummy.c | 2 +-
src/core/ext/transport/cronet/transport/cronet_transport.c | 2 +-
third_party/{ => objective_c}/Cronet/bidirectional_stream_c.h | 0
tools/run_tests/generated/sources_and_headers.json | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename third_party/{ => objective_c}/Cronet/bidirectional_stream_c.h (100%)
diff --git a/BUILD b/BUILD
index 0200b14bca..92847a7b4e 100644
--- a/BUILD
+++ b/BUILD
@@ -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 = [
diff --git a/build.yaml b/build.yaml
index 59678324c2..cbb193db0a 100644
--- a/build.yaml
+++ b/build.yaml
@@ -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
diff --git a/src/core/ext/transport/cronet/transport/cronet_api_dummy.c b/src/core/ext/transport/cronet/transport/cronet_api_dummy.c
index 74327a4214..da6c0b4fbc 100644
--- a/src/core/ext/transport/cronet/transport/cronet_api_dummy.c
+++ b/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 */
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.c b/src/core/ext/transport/cronet/transport/cronet_transport.c
index 419bfb7b7d..d755b1f147 100644
--- a/src/core/ext/transport/cronet/transport/cronet_transport.c
+++ b/src/core/ext/transport/cronet/transport/cronet_transport.c
@@ -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
diff --git a/third_party/Cronet/bidirectional_stream_c.h b/third_party/objective_c/Cronet/bidirectional_stream_c.h
similarity index 100%
rename from third_party/Cronet/bidirectional_stream_c.h
rename to third_party/objective_c/Cronet/bidirectional_stream_c.h
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 9716598606..900f9a6fe7 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -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",
--
GitLab