aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2017-07-17 11:13:23 -0700
committerGravatar Muxi Yan <mxyan@google.com>2017-07-17 11:14:57 -0700
commitd07b88457440d0e5ba5b4e714a13637dff85ee0d (patch)
treea0ca33959d29350a2413d60c37fb72107391539f
parente89c83a21bf2975e6c686e5dc11fc5d17a22d590 (diff)
parent1e9bdb5d1a9f9293052d8eb53500cc3b3900f2f3 (diff)
Merge changes in #11189
-rw-r--r--BUILD2
-rw-r--r--tools/ubsan_suppressions.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/BUILD b/BUILD
index fa42326787..c9cc6dbd3c 100644
--- a/BUILD
+++ b/BUILD
@@ -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",
diff --git a/tools/ubsan_suppressions.txt b/tools/ubsan_suppressions.txt
index 83dcfc3d05..2dcfeea9af 100644
--- 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