diff options
author | Craig Tiller <ctiller@google.com> | 2017-01-26 08:51:30 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-01-26 08:51:30 -0800 |
commit | c63aaf1650858cb99346a324e1a9235685a717c7 (patch) | |
tree | ddfce7d41038ee325c8fd2625cec53e0356d768f /build.yaml | |
parent | 0f2e2e4a426f5fd8fd46b08679dcbfccc151ca98 (diff) | |
parent | e49959dc98cf88eebbdc0cadcbc13394eff53faf (diff) |
Merge branch 'cp' into rollfwd
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build.yaml b/build.yaml index 7b3e64e9bb..5b9dcbbd26 100644 --- a/build.yaml +++ b/build.yaml @@ -397,11 +397,14 @@ filegroups: - src/core/ext/client_channel/client_channel_factory.h - src/core/ext/client_channel/connector.h - src/core/ext/client_channel/http_connect_handshaker.h + - src/core/ext/client_channel/http_proxy.h - src/core/ext/client_channel/initial_connect_string.h - src/core/ext/client_channel/lb_policy.h - src/core/ext/client_channel/lb_policy_factory.h - src/core/ext/client_channel/lb_policy_registry.h - src/core/ext/client_channel/parse_address.h + - src/core/ext/client_channel/proxy_mapper.h + - src/core/ext/client_channel/proxy_mapper_registry.h - src/core/ext/client_channel/resolver.h - src/core/ext/client_channel/resolver_factory.h - src/core/ext/client_channel/resolver_registry.h @@ -416,11 +419,14 @@ filegroups: - src/core/ext/client_channel/connector.c - src/core/ext/client_channel/default_initial_connect_string.c - src/core/ext/client_channel/http_connect_handshaker.c + - src/core/ext/client_channel/http_proxy.c - src/core/ext/client_channel/initial_connect_string.c - src/core/ext/client_channel/lb_policy.c - src/core/ext/client_channel/lb_policy_factory.c - src/core/ext/client_channel/lb_policy_registry.c - src/core/ext/client_channel/parse_address.c + - src/core/ext/client_channel/proxy_mapper.c + - src/core/ext/client_channel/proxy_mapper_registry.c - src/core/ext/client_channel/resolver.c - src/core/ext/client_channel/resolver_factory.c - src/core/ext/client_channel/resolver_registry.c @@ -3244,12 +3250,12 @@ targets: - src/proto/grpc/lb/v1/load_balancer.proto - test/cpp/grpclb/grpclb_test.cc deps: - - gpr - - gpr_test_util - - grpc - - grpc++ - grpc++_test_util - grpc_test_util + - grpc++ + - grpc + - gpr_test_util + - gpr - name: http2_client build: test run: false |