Merge changes in #11189

7 years ago · d07b884574
parent e89c83a21b 1e9bdb5d1a
commit d07b884574
2 changed files with 3 additions and 0 deletions
--- a/2
+++ b/2
@ -447,6 +447,7 @@ grpc_cc_library(
        "src/core/lib/channel/handshaker_registry.c",
        "src/core/lib/compression/compression.c",
        "src/core/lib/compression/message_compress.c",
+        "src/core/lib/compression/stream_compression.c",
        "src/core/lib/http/format_request.c",
        "src/core/lib/http/httpcli.c",
        "src/core/lib/http/parser.c",
@ -573,6 +574,7 @@ grpc_cc_library(
        "src/core/lib/channel/handshaker_registry.h",
        "src/core/lib/compression/algorithm_metadata.h",
        "src/core/lib/compression/message_compress.h",
+        "src/core/lib/compression/stream_compression.h",
        "src/core/lib/http/format_request.h",
        "src/core/lib/http/httpcli.h",
        "src/core/lib/http/parser.h",
--- a/tools/ubsan_suppressions.txt
+++ b/tools/ubsan_suppressions.txt
@ -7,3 +7,4 @@ alignment:CRYPTO_cbc128_encrypt
 alignment:CRYPTO_gcm128_encrypt
 nonnull-attribute:google::protobuf::*
 alignment:google::protobuf::*
+nonnull-attribute:_tr_stored_block