diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-16 13:42:07 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-16 13:42:07 -0700 |
commit | 321b7d8fb0dbe40f27685f733a3098bd4fd9c77b (patch) | |
tree | 3386f15aa6d894f972048bd08ab25e0cce489441 /build.yaml | |
parent | 8996208bc3af635160964a784ea643e28c6bd9e0 (diff) | |
parent | bcb65f0bd533ff0c7babf3b06a424d2bd5f1d37d (diff) |
Merge github.com:grpc/grpc into thread_pool
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/build.yaml b/build.yaml index c0e7c771aa..84beeabb7e 100644 --- a/build.yaml +++ b/build.yaml @@ -176,6 +176,7 @@ filegroups: - include/grpc/slice.h - include/grpc/slice_buffer.h - include/grpc/status.h + - include/grpc/support/workaround_list.h headers: - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_stack.h @@ -653,6 +654,13 @@ filegroups: - grpc_base - grpc_transport_chttp2_alpn - tsi +- name: grpc_server_backward_compatibility + headers: + - src/core/ext/filters/workarounds/workaround_utils.h + src: + - src/core/ext/filters/workarounds/workaround_utils.c + uses: + - grpc_base - name: grpc_test_util_base build: test headers: @@ -819,6 +827,15 @@ filegroups: - grpc_base - grpc_transport_chttp2 - grpc_http_filters +- name: grpc_workaround_cronet_compression_filter + headers: + - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h + src: + - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.c + plugin: grpc_workaround_cronet_compression_filter + uses: + - grpc_base + - grpc_server_backward_compatibility - name: nanopb headers: - third_party/nanopb/pb.h @@ -1048,6 +1065,8 @@ libs: - grpc_max_age_filter - grpc_message_size_filter - grpc_deadline_filter + - grpc_workaround_cronet_compression_filter + - grpc_server_backward_compatibility generate_plugin_registry: true secure: true vs_packages: @@ -1147,6 +1166,8 @@ libs: - grpc_max_age_filter - grpc_message_size_filter - grpc_deadline_filter + - grpc_workaround_cronet_compression_filter + - grpc_server_backward_compatibility generate_plugin_registry: true secure: false vs_project_guid: '{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}' @@ -3338,7 +3359,7 @@ targets: - gpr_test_util - gpr args: - - --benchmark_min_time=0 + - --benchmark_min_time=4 defaults: benchmark platforms: - mac |