diff options
author | 2017-04-01 07:42:20 -0700 | |
---|---|---|
committer | 2017-04-01 07:42:20 -0700 | |
commit | 5f95f1a4caff51459b77b0d6890e396e16617b9e (patch) | |
tree | 282c7e47f5a5f1a62964a47473c51472f7df995c /build.yaml | |
parent | d35bb9ec62992cb01f44316a7267d39f1918149d (diff) | |
parent | bd210c0bff6c8e52f49caa1cbc129359c24e2fbf (diff) |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/build.yaml b/build.yaml index c74faa8fe0..a3795689b7 100644 --- a/build.yaml +++ b/build.yaml @@ -156,7 +156,6 @@ filegroups: - include/grpc/impl/codegen/gpr_slice.h - include/grpc/impl/codegen/gpr_types.h - include/grpc/impl/codegen/port_platform.h - - include/grpc/impl/codegen/slice.h - include/grpc/impl/codegen/sync.h - include/grpc/impl/codegen/sync_generic.h - include/grpc/impl/codegen/sync_posix.h @@ -186,6 +185,7 @@ filegroups: - src/core/lib/channel/handshaker_registry.h - src/core/lib/channel/http_client_filter.h - src/core/lib/channel/http_server_filter.h + - src/core/lib/channel/max_age_filter.h - src/core/lib/channel/message_size_filter.h - src/core/lib/compression/algorithm_metadata.h - src/core/lib/compression/message_compress.h @@ -252,6 +252,7 @@ filegroups: - src/core/lib/json/json_common.h - src/core/lib/json/json_reader.h - src/core/lib/json/json_writer.h + - src/core/lib/slice/b64.h - src/core/lib/slice/percent_encoding.h - src/core/lib/slice/slice_hash_table.h - src/core/lib/slice/slice_internal.h @@ -295,6 +296,7 @@ filegroups: - src/core/lib/channel/handshaker_registry.c - src/core/lib/channel/http_client_filter.c - src/core/lib/channel/http_server_filter.c + - src/core/lib/channel/max_age_filter.c - src/core/lib/channel/message_size_filter.c - src/core/lib/compression/compression.c - src/core/lib/compression/message_compress.c @@ -369,7 +371,7 @@ filegroups: - src/core/lib/json/json_reader.c - src/core/lib/json/json_string.c - src/core/lib/json/json_writer.c - - src/core/lib/security/util/b64.c + - src/core/lib/slice/b64.c - src/core/lib/slice/percent_encoding.c - src/core/lib/slice/slice.c - src/core/lib/slice/slice_buffer.c @@ -464,6 +466,7 @@ filegroups: - include/grpc/impl/codegen/exec_ctx_fwd.h - include/grpc/impl/codegen/grpc_types.h - include/grpc/impl/codegen/propagation_bits.h + - include/grpc/impl/codegen/slice.h - include/grpc/impl/codegen/status.h uses: - gpr_codegen @@ -497,6 +500,7 @@ filegroups: plugin: grpc_lb_policy_grpclb uses: - grpc_base + - grpc_secure - grpc_client_channel - nanopb - name: grpc_lb_policy_pick_first @@ -571,7 +575,6 @@ filegroups: - src/core/lib/security/transport/security_connector.h - src/core/lib/security/transport/security_handshaker.h - src/core/lib/security/transport/tsi_error.h - - src/core/lib/security/util/b64.h - src/core/lib/security/util/json_util.h src: - src/core/lib/http/httpcli_security_connector.c @@ -596,7 +599,6 @@ filegroups: - src/core/lib/security/transport/security_handshaker.c - src/core/lib/security/transport/server_auth_filter.c - src/core/lib/security/transport/tsi_error.c - - src/core/lib/security/util/b64.c - src/core/lib/security/util/json_util.c - src/core/lib/surface/init_secure.c secure: true @@ -701,6 +703,7 @@ filegroups: uses: - grpc_transport_chttp2 - grpc_base + - grpc_client_channel - name: grpc_transport_chttp2_client_insecure src: - src/core/ext/transport/chttp2/client/insecure/channel_create.c @@ -874,6 +877,8 @@ filegroups: - src/cpp/util/time_cc.cc uses: - grpc++_codegen_base + - grpc_base + - nanopb - name: grpc++_codegen_base language: c++ public_headers: @@ -2037,7 +2042,7 @@ targets: build: test language: c src: - - test/core/security/b64_test.c + - test/core/slice/b64_test.c deps: - grpc_test_util - grpc |