From d35f93d1b3c648abc6b16c24fe584d23287e35f8 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sat, 27 Jun 2015 00:57:29 +0200
Subject: [PATCH] Merges broke the build - regenerating.
---
BUILD | 6 ++++++
tools/run_tests/sources_and_headers.json | 16 ++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/BUILD b/BUILD
index 2110d02abe..7273b17d73 100644
--- a/BUILD
+++ b/BUILD
@@ -978,11 +978,15 @@ objc_library(
"src/core/transport/chttp2/hpack_parser.c",
"src/core/transport/chttp2/hpack_table.c",
"src/core/transport/chttp2/huffsyms.c",
+ "src/core/transport/chttp2/incoming_metadata.c",
+ "src/core/transport/chttp2/parsing.c",
"src/core/transport/chttp2/status_conversion.c",
"src/core/transport/chttp2/stream_encoder.c",
+ "src/core/transport/chttp2/stream_lists.c",
"src/core/transport/chttp2/stream_map.c",
"src/core/transport/chttp2/timeout_encoding.c",
"src/core/transport/chttp2/varint.c",
+ "src/core/transport/chttp2/writing.c",
"src/core/transport/chttp2_transport.c",
"src/core/transport/metadata.c",
"src/core/transport/stream_op.c",
@@ -1071,6 +1075,8 @@ objc_library(
"src/core/transport/chttp2/hpack_table.h",
"src/core/transport/chttp2/http2_errors.h",
"src/core/transport/chttp2/huffsyms.h",
+ "src/core/transport/chttp2/incoming_metadata.h",
+ "src/core/transport/chttp2/internal.h",
"src/core/transport/chttp2/status_conversion.h",
"src/core/transport/chttp2/stream_encoder.h",
"src/core/transport/chttp2/stream_map.h",
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 5c74bf1eea..eb2514fa46 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -8717,6 +8717,8 @@
"src/core/transport/chttp2/hpack_table.h",
"src/core/transport/chttp2/http2_errors.h",
"src/core/transport/chttp2/huffsyms.h",
+ "src/core/transport/chttp2/incoming_metadata.h",
+ "src/core/transport/chttp2/internal.h",
"src/core/transport/chttp2/status_conversion.h",
"src/core/transport/chttp2/stream_encoder.h",
"src/core/transport/chttp2/stream_map.h",
@@ -8933,16 +8935,22 @@
"src/core/transport/chttp2/http2_errors.h",
"src/core/transport/chttp2/huffsyms.c",
"src/core/transport/chttp2/huffsyms.h",
+ "src/core/transport/chttp2/incoming_metadata.c",
+ "src/core/transport/chttp2/incoming_metadata.h",
+ "src/core/transport/chttp2/internal.h",
+ "src/core/transport/chttp2/parsing.c",
"src/core/transport/chttp2/status_conversion.c",
"src/core/transport/chttp2/status_conversion.h",
"src/core/transport/chttp2/stream_encoder.c",
"src/core/transport/chttp2/stream_encoder.h",
+ "src/core/transport/chttp2/stream_lists.c",
"src/core/transport/chttp2/stream_map.c",
"src/core/transport/chttp2/stream_map.h",
"src/core/transport/chttp2/timeout_encoding.c",
"src/core/transport/chttp2/timeout_encoding.h",
"src/core/transport/chttp2/varint.c",
"src/core/transport/chttp2/varint.h",
+ "src/core/transport/chttp2/writing.c",
"src/core/transport/chttp2_transport.c",
"src/core/transport/chttp2_transport.h",
"src/core/transport/metadata.c",
@@ -9116,6 +9124,8 @@
"src/core/transport/chttp2/hpack_table.h",
"src/core/transport/chttp2/http2_errors.h",
"src/core/transport/chttp2/huffsyms.h",
+ "src/core/transport/chttp2/incoming_metadata.h",
+ "src/core/transport/chttp2/internal.h",
"src/core/transport/chttp2/status_conversion.h",
"src/core/transport/chttp2/stream_encoder.h",
"src/core/transport/chttp2/stream_map.h",
@@ -9296,16 +9306,22 @@
"src/core/transport/chttp2/http2_errors.h",
"src/core/transport/chttp2/huffsyms.c",
"src/core/transport/chttp2/huffsyms.h",
+ "src/core/transport/chttp2/incoming_metadata.c",
+ "src/core/transport/chttp2/incoming_metadata.h",
+ "src/core/transport/chttp2/internal.h",
+ "src/core/transport/chttp2/parsing.c",
"src/core/transport/chttp2/status_conversion.c",
"src/core/transport/chttp2/status_conversion.h",
"src/core/transport/chttp2/stream_encoder.c",
"src/core/transport/chttp2/stream_encoder.h",
+ "src/core/transport/chttp2/stream_lists.c",
"src/core/transport/chttp2/stream_map.c",
"src/core/transport/chttp2/stream_map.h",
"src/core/transport/chttp2/timeout_encoding.c",
"src/core/transport/chttp2/timeout_encoding.h",
"src/core/transport/chttp2/varint.c",
"src/core/transport/chttp2/varint.h",
+ "src/core/transport/chttp2/writing.c",
"src/core/transport/chttp2_transport.c",
"src/core/transport/chttp2_transport.h",
"src/core/transport/metadata.c",
--
GitLab