From f3ba6a0133f654109f2484a081f5e8a97f16e3a4 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 5 Apr 2017 12:29:06 -0700
Subject: [PATCH] Fix sanity
---
build.yaml | 2 ++
include/grpc/impl/codegen/grpc_types.h | 2 ++
src/core/ext/filters/http/client/http_client_filter.h | 3 ---
src/core/lib/security/credentials/credentials.c | 1 -
src/core/lib/security/credentials/ssl/ssl_credentials.c | 1 -
tools/run_tests/generated/sources_and_headers.json | 5 ++++-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/build.yaml b/build.yaml
index 383090fa6f..1df62654a4 100644
--- a/build.yaml
+++ b/build.yaml
@@ -480,6 +480,8 @@ filegroups:
- src/core/ext/filters/http/http_filters_plugin.c
- src/core/ext/filters/http/server/http_server_filter.c
plugin: grpc_http_filters
+ uses:
+ - grpc_base
- name: grpc_lb_policy_grpclb
headers:
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index 37f5a49ece..e0276f6e43 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -205,6 +205,8 @@ typedef struct {
/** Minimum time (in milliseconds) between successive ping frames being sent */
#define GRPC_ARG_HTTP2_MIN_TIME_BETWEEN_PINGS_MS \
"grpc.http2.min_time_between_pings_ms"
+/* Channel arg to override the http2 :scheme header */
+#define GRPC_ARG_HTTP2_SCHEME "grpc.http2_scheme"
/** How many pings can we send before needing to send a data frame or header
frame?
(0 indicates that an infinite number of pings can be sent without sending
diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h
index 109702f667..6e1eb3937b 100644
--- a/src/core/ext/filters/http/client/http_client_filter.h
+++ b/src/core/ext/filters/http/client/http_client_filter.h
@@ -38,9 +38,6 @@
/* Processes metadata on the client side for HTTP2 transports */
extern const grpc_channel_filter grpc_http_client_filter;
-/* Channel arg to override the http2 :scheme header */
-#define GRPC_ARG_HTTP2_SCHEME "grpc.http2_scheme"
-
/* Channel arg to determine maximum size of payload eligable for GET request */
#define GRPC_ARG_MAX_PAYLOAD_SIZE_FOR_GET "grpc.max_payload_size_for_get"
diff --git a/src/core/lib/security/credentials/credentials.c b/src/core/lib/security/credentials/credentials.c
index 700aae1bc5..d89da47fc1 100644
--- a/src/core/lib/security/credentials/credentials.c
+++ b/src/core/lib/security/credentials/credentials.c
@@ -36,7 +36,6 @@
#include <stdio.h>
#include <string.h>
-#include "src/core/ext/filters/http/client/http_client_filter.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/http/httpcli.h"
#include "src/core/lib/http/parser.h"
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.c b/src/core/lib/security/credentials/ssl/ssl_credentials.c
index 9dccbb1e5d..b63bb6b6e9 100644
--- a/src/core/lib/security/credentials/ssl/ssl_credentials.c
+++ b/src/core/lib/security/credentials/ssl/ssl_credentials.c
@@ -35,7 +35,6 @@
#include <string.h>
-#include "src/core/ext/filters/http/client/http_client_filter.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/surface/api_trace.h"
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index afa52f391f..6cf4494b12 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8007,7 +8007,10 @@
"type": "filegroup"
},
{
- "deps": [],
+ "deps": [
+ "gpr",
+ "grpc_base"
+ ],
"headers": [
"src/core/ext/filters/http/client/http_client_filter.h",
"src/core/ext/filters/http/compress/compress_filter.h",
--
GitLab