Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: src/core/plugin_registry/grpc_unsecure_plugin_registry.c

Issue 2440763002: Fix Android build issues and gRPC LB policy (Closed)
Patch Set: Synced to latest Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/core/plugin_registry/grpc_unsecure_plugin_registry.c
diff --git a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c
index fe238b791de684e95fce1bbde7d2876105c08662..beeaefb11ef8d332091b00d13fdf6f61c875ec5a 100644
--- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c
+++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c
@@ -43,14 +43,10 @@ extern void grpc_resolver_sockaddr_init(void);
extern void grpc_resolver_sockaddr_shutdown(void);
extern void grpc_load_reporting_plugin_init(void);
extern void grpc_load_reporting_plugin_shutdown(void);
-extern void grpc_lb_policy_grpclb_init(void);
-extern void grpc_lb_policy_grpclb_shutdown(void);
extern void grpc_lb_policy_pick_first_init(void);
extern void grpc_lb_policy_pick_first_shutdown(void);
extern void grpc_lb_policy_round_robin_init(void);
extern void grpc_lb_policy_round_robin_shutdown(void);
-extern void census_grpc_plugin_init(void);
-extern void census_grpc_plugin_shutdown(void);
void grpc_register_built_in_plugins(void) {
grpc_register_plugin(grpc_chttp2_plugin_init,
@@ -63,16 +59,8 @@ void grpc_register_built_in_plugins(void) {
grpc_resolver_sockaddr_shutdown);
grpc_register_plugin(grpc_load_reporting_plugin_init,
grpc_load_reporting_plugin_shutdown);
- // The following lines are commented out in Chromium so that we don't
- // introduce dependency on nanopb.
- // grpc_register_plugin(grpc_lb_policy_grpclb_init,
xyzzyz 2016/10/21 20:14:38 Did these lines disappear from the upstream gRPC,
perumaal 2016/10/21 20:25:38 So this is by changing build.yaml and running too
- // grpc_lb_policy_grpclb_shutdown);
grpc_register_plugin(grpc_lb_policy_pick_first_init,
grpc_lb_policy_pick_first_shutdown);
grpc_register_plugin(grpc_lb_policy_round_robin_init,
grpc_lb_policy_round_robin_shutdown);
- // The following lines are commented out in Chromium so that we don't
- // introduce dependency on nanopb.
- // grpc_register_plugin(census_grpc_plugin_init,
- // census_grpc_plugin_shutdown);
}

Powered by Google App Engine
This is Rietveld 408576698