diff options
| author |  jiangtaoli2016 <jiangtao@google.com> | 2017-04-24 15:33:41 -0700 |
|---|---|---|
| committer | jiangtaoli2016 <jiangtao@google.com> | 2017-04-24 15:33:41 -0700 |
| commit | 812860850ca3481ab231295e261c797967fcd361 (patch) | |
| tree | 66740e28faf3e3694767dd6f8145ae72d1530d4f /BUILD | |
| parent | f2263e14ca778e0a42d896ad5228c671fbb97aed (diff) | |
| parent | 731adcc0b4b06de05444bfbd65a3a1d9aaa3ecaf (diff) | |
Merge branch 'master' into new_tsi
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 55 |
1 files changed, 21 insertions, 34 deletions
@@ -54,33 +54,46 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "grpc", +grpc_cc_libraries( + name_list = ["grpc", "grpc_unsecure",], srcs = [ "src/core/lib/surface/init.c", - "src/core/plugin_registry/grpc_plugin_registry.c", + ], + additional_src_list = [ + [ + "src/core/plugin_registry/grpc_plugin_registry.c", + ], + [ + "src/core/lib/surface/init_unsecure.c", + "src/core/plugin_registry/grpc_unsecure_plugin_registry.c", + ], ], language = "c", standalone = True, deps = [ "census", "grpc_base", - "grpc_lb_policy_grpclb_secure", "grpc_lb_policy_pick_first", "grpc_lb_policy_round_robin", "grpc_load_reporting", "grpc_max_age_filter", - "grpc_resolver_dns_ares", "grpc_resolver_dns_native", "grpc_resolver_sockaddr", - "grpc_secure", "grpc_transport_chttp2_client_insecure", - "grpc_transport_chttp2_client_secure", "grpc_transport_chttp2_server_insecure", - "grpc_transport_chttp2_server_secure", "grpc_message_size_filter", "grpc_deadline_filter", ], + additional_dep_list = [ + [ + "grpc_secure", + "grpc_resolver_dns_ares", + "grpc_lb_policy_grpclb_secure", + "grpc_transport_chttp2_client_secure", + "grpc_transport_chttp2_server_secure", + ], + [], + ], ) grpc_cc_library( @@ -99,32 +112,6 @@ grpc_cc_library( ) grpc_cc_library( - name = "grpc_unsecure", - srcs = [ - "src/core/lib/surface/init.c", - "src/core/lib/surface/init_unsecure.c", - "src/core/plugin_registry/grpc_unsecure_plugin_registry.c", - ], - language = "c", - standalone = True, - deps = [ - "census", - "grpc_base", - "grpc_lb_policy_grpclb", - "grpc_lb_policy_pick_first", - "grpc_lb_policy_round_robin", - "grpc_load_reporting", - "grpc_max_age_filter", - "grpc_resolver_dns_native", - "grpc_resolver_sockaddr", - "grpc_transport_chttp2_client_insecure", - "grpc_transport_chttp2_server_insecure", - "grpc_message_size_filter", - "grpc_deadline_filter", - ], -) - -grpc_cc_library( name = "grpc++", srcs = [ "src/cpp/client/insecure_credentials.cc", |