aboutsummaryrefslogtreecommitdiffhomepage
path: root/build.yaml
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-01-29 10:58:59 -0800
committerGravatar ncteisen <ncteisen@gmail.com>2018-01-29 10:58:59 -0800
commitbdb746ec00fcea16981f26c90bce514baaec494c (patch)
treea0b5b861517c7b3fc190f9d43eeaeec6ed2c34e6 /build.yaml
parent804507d638f3bd0b2bcec1fcb2fd1cdbc361a90b (diff)
parent123547c9625c56fdf5cb4ddd1df55ae0c785fa60 (diff)
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'build.yaml')
-rw-r--r--build.yaml15
1 files changed, 10 insertions, 5 deletions
diff --git a/build.yaml b/build.yaml
index 3532adc475..ec34bbb3d1 100644
--- a/build.yaml
+++ b/build.yaml
@@ -161,6 +161,8 @@ filegroups:
- src/core/lib/channel/handshaker_registry.cc
- src/core/lib/channel/object_registry.cc
- src/core/lib/compression/compression.cc
+ - src/core/lib/compression/compression_internal.cc
+ - src/core/lib/compression/compression_ruby.cc
- src/core/lib/compression/message_compress.cc
- src/core/lib/compression/stream_compression.cc
- src/core/lib/compression/stream_compression_gzip.cc
@@ -297,6 +299,7 @@ filegroups:
- include/grpc/byte_buffer.h
- include/grpc/byte_buffer_reader.h
- include/grpc/compression.h
+ - include/grpc/compression_ruby.h
- include/grpc/fork.h
- include/grpc/grpc.h
- include/grpc/grpc_posix.h
@@ -319,6 +322,7 @@ filegroups:
- src/core/lib/channel/handshaker_registry.h
- src/core/lib/channel/object_registry.h
- src/core/lib/compression/algorithm_metadata.h
+ - src/core/lib/compression/compression_internal.h
- src/core/lib/compression/message_compress.h
- src/core/lib/compression/stream_compression.h
- src/core/lib/compression/stream_compression_gzip.h
@@ -937,19 +941,19 @@ filegroups:
- grpc
- name: tsi
headers:
+ - src/core/tsi/alts_transport_security.h
- src/core/tsi/fake_transport_security.h
- - src/core/tsi/gts_transport_security.h
- src/core/tsi/ssl_transport_security.h
- src/core/tsi/ssl_types.h
- src/core/tsi/transport_security_grpc.h
src:
+ - src/core/tsi/alts_transport_security.cc
- src/core/tsi/fake_transport_security.cc
- - src/core/tsi/gts_transport_security.cc
- src/core/tsi/ssl_transport_security.cc
- src/core/tsi/transport_security_grpc.cc
deps:
- gpr
- plugin: grpc_tsi_gts
+ plugin: grpc_tsi_alts
secure: true
uses:
- tsi_interface
@@ -5072,7 +5076,8 @@ defaults:
CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
boringssl:
CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas
- -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
+ -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough
+ $(NO_W_EXTRA_SEMI)
CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
-D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
global:
@@ -5082,7 +5087,7 @@ defaults:
LDFLAGS: -g
zlib:
CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
- $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
+ -Wno-implicit-fallthrough $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
openssl_fallback:
base_uri: https://openssl.org/source/old/1.0.2/
extraction_dir: openssl-1.0.2f