diff options
| author |  jiangtaoli2016 <jiangtao@google.com> | 2017-07-31 14:16:26 -0700 |
|---|---|---|
| committer | jiangtaoli2016 <jiangtao@google.com> | 2017-07-31 14:16:26 -0700 |
| commit | 79d9a8a7e05f132f12fa9b3202ce7f20591bc444 (patch) | |
| tree | dc04aaf4dcbc1fd7a5047d7be33355d2c68e2669 /BUILD | |
| parent | 7001bc279b520b556eb7e8e14fd8c9f87dfe3785 (diff) | |
| parent | dc1cfe9e21d0b3ea19911300d15a65ef6201bb92 (diff) | |
Merge branch 'master' into tsi_grpc
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -206,6 +206,7 @@ grpc_cc_library( standalone = True, deps = [ "grpc_common", + "grpc_lb_policy_grpclb", ], ) @@ -221,7 +222,6 @@ grpc_cc_library( deps = [ "grpc_common", "grpc_lb_policy_grpclb_secure", - "grpc_resolver_dns_ares", "grpc_secure", "grpc_transport_chttp2_client_secure", "grpc_transport_chttp2_server_secure", @@ -287,6 +287,7 @@ grpc_cc_library( "grpc++_base_unsecure", "grpc++_codegen_base", "grpc++_codegen_base_src", + "grpc++_codegen_proto", "grpc_unsecure", ], ) @@ -725,6 +726,7 @@ grpc_cc_library( "src/core/lib/iomgr/is_epollexclusive_available.h", "src/core/lib/iomgr/load_file.h", "src/core/lib/iomgr/lockfree_event.h", + "src/core/lib/iomgr/nameser.h", "src/core/lib/iomgr/network_status_tracker.h", "src/core/lib/iomgr/polling_entity.h", "src/core/lib/iomgr/pollset.h", @@ -836,6 +838,8 @@ grpc_cc_library( "grpc_load_reporting", "grpc_max_age_filter", "grpc_message_size_filter", + "grpc_resolver_dns_ares", + "grpc_resolver_fake", "grpc_resolver_dns_native", "grpc_resolver_sockaddr", "grpc_transport_chttp2_client_insecure", |