Refactor build to have lb policies as extensions

BUILD

@@ -157,6 +157,10 @@ cc_library(
 cc_library(
  name = "grpc",
  srcs = [
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -196,9 +200,6 @@ cc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/pick_first/pick_first.h",
- "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -258,7 +259,6 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",
@@ -298,6 +298,10 @@ cc_library(
  "third_party/nanopb/pb_common.h",
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -345,9 +349,6 @@ cc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/pick_first/pick_first.c",
- "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -413,7 +414,6 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -532,6 +532,10 @@ cc_library(
 cc_library(
  name = "grpc_unsecure",
  srcs = [
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -571,9 +575,6 @@ cc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/pick_first/pick_first.h",
- "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -633,7 +634,6 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/statistics/census_interface.h",
  "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
@@ -659,6 +659,10 @@ cc_library(
  "third_party/nanopb/pb_common.h",
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
  "src/core/ext/transport/chttp2/transport/alpn.c",
@@ -704,9 +708,6 @@ cc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/pick_first/pick_first.c",
- "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -771,7 +772,6 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/surface/alarm.c",
  "src/core/lib/surface/api_trace.c",
  "src/core/lib/surface/byte_buffer.c",
@@ -1360,6 +1360,10 @@ objc_library(
 objc_library(
  name = "grpc_objc",
  srcs = [
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -1407,9 +1411,6 @@ objc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/pick_first/pick_first.c",
- "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -1475,7 +1476,6 @@ objc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -1539,6 +1539,10 @@ objc_library(
  "include/grpc/impl/codegen/propagation_bits.h",
  "include/grpc/impl/codegen/status.h",
  "include/grpc/status.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -1578,9 +1582,6 @@ objc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/pick_first/pick_first.h",
- "src/core/ext/lb_policy/round_robin/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -1640,7 +1641,6 @@ objc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",

Makefile

@@ -2420,6 +2420,10 @@ endif
 
 
 LIBGRPC_SRC = \
+ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+ src/core/ext/lb_policy/pick_first/pick_first.c \
+ src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@@ -2467,9 +2471,6 @@ LIBGRPC_SRC = \
  src/core/lib/client_config/connector.c \
  src/core/lib/client_config/default_initial_connect_string.c \
  src/core/lib/client_config/initial_connect_string.c \
- src/core/ext/lb_policy/grpclb/load_balancer_api.c \
- src/core/ext/lb_policy/pick_first/pick_first.c \
- src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/lib/client_config/lb_policy.c \
  src/core/lib/client_config/lb_policy_factory.c \
  src/core/lib/client_config/lb_policy_registry.c \
@@ -2535,7 +2536,6 @@ LIBGRPC_SRC = \
  src/core/lib/json/json_reader.c \
  src/core/lib/json/json_string.c \
  src/core/lib/json/json_writer.c \
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/lib/security/b64.c \
  src/core/lib/security/client_auth_filter.c \
  src/core/lib/security/credentials.c \
@@ -2781,6 +2781,10 @@ endif
 
 
 LIBGRPC_UNSECURE_SRC = \
+ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+ src/core/ext/lb_policy/pick_first/pick_first.c \
+ src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
  src/core/ext/transport/chttp2/transport/alpn.c \
@@ -2826,9 +2830,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/lib/client_config/connector.c \
  src/core/lib/client_config/default_initial_connect_string.c \
  src/core/lib/client_config/initial_connect_string.c \
- src/core/ext/lb_policy/grpclb/load_balancer_api.c \
- src/core/ext/lb_policy/pick_first/pick_first.c \
- src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/lib/client_config/lb_policy.c \
  src/core/lib/client_config/lb_policy_factory.c \
  src/core/lib/client_config/lb_policy_registry.c \
@@ -2893,7 +2894,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/lib/json/json_reader.c \
  src/core/lib/json/json_string.c \
  src/core/lib/json/json_writer.c \
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/lib/surface/alarm.c \
  src/core/lib/surface/api_trace.c \
  src/core/lib/surface/byte_buffer.c \

binding.gyp

@@ -558,6 +558,10 @@
  'gpr',
  ],
  'sources': [
+ 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+ 'src/core/ext/lb_policy/pick_first/pick_first.c',
+ 'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
  'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@@ -605,9 +609,6 @@
  'src/core/lib/client_config/connector.c',
  'src/core/lib/client_config/default_initial_connect_string.c',
  'src/core/lib/client_config/initial_connect_string.c',
- 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
- 'src/core/ext/lb_policy/pick_first/pick_first.c',
- 'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/lib/client_config/lb_policy.c',
  'src/core/lib/client_config/lb_policy_factory.c',
  'src/core/lib/client_config/lb_policy_registry.c',
@@ -673,7 +674,6 @@
  'src/core/lib/json/json_reader.c',
  'src/core/lib/json/json_string.c',
  'src/core/lib/json/json_writer.c',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/lib/security/b64.c',
  'src/core/lib/security/client_auth_filter.c',
  'src/core/lib/security/credentials.c',

build.yaml

@@ -247,6 +247,7 @@ filegroups:
  - include/grpc/grpc.h
  - include/grpc/status.h
  headers:
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
  - src/core/lib/census/grpc_filter.h
  - src/core/lib/census/grpc_plugin.h
  - src/core/lib/channel/channel_args.h
@@ -262,9 +263,6 @@ filegroups:
  - src/core/lib/client_config/client_config.h
  - src/core/lib/client_config/connector.h
  - src/core/lib/client_config/initial_connect_string.h
- - src/core/ext/lb_policy/grpclb/load_balancer_api.h
- - src/core/ext/lb_policy/pick_first/pick_first.h
- - src/core/ext/lb_policy/round_robin/round_robin.h
  - src/core/lib/client_config/lb_policy.h
  - src/core/lib/client_config/lb_policy_factory.h
  - src/core/lib/client_config/lb_policy_registry.h
@@ -324,7 +322,6 @@ filegroups:
  - src/core/lib/json/json_common.h
  - src/core/lib/json/json_reader.h
  - src/core/lib/json/json_writer.h
- - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
  - src/core/lib/statistics/census_interface.h
  - src/core/lib/statistics/census_rpc_stats.h
  - src/core/lib/surface/api_trace.h
@@ -347,6 +344,7 @@ filegroups:
  - src/core/lib/transport/transport.h
  - src/core/lib/transport/transport_impl.h
  src:
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
  - src/core/lib/census/grpc_context.c
  - src/core/lib/census/grpc_filter.c
  - src/core/lib/census/grpc_plugin.c
@@ -363,9 +361,6 @@ filegroups:
  - src/core/lib/client_config/connector.c
  - src/core/lib/client_config/default_initial_connect_string.c
  - src/core/lib/client_config/initial_connect_string.c
- - src/core/ext/lb_policy/grpclb/load_balancer_api.c
- - src/core/ext/lb_policy/pick_first/pick_first.c
- - src/core/ext/lb_policy/round_robin/round_robin.c
  - src/core/lib/client_config/lb_policy.c
  - src/core/lib/client_config/lb_policy_factory.c
  - src/core/lib/client_config/lb_policy_registry.c
@@ -430,7 +425,6 @@ filegroups:
  - src/core/lib/json/json_reader.c
  - src/core/lib/json/json_string.c
  - src/core/lib/json/json_writer.c
- - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
  - src/core/lib/surface/alarm.c
  - src/core/lib/surface/api_trace.c
  - src/core/lib/surface/byte_buffer.c
@@ -466,6 +460,27 @@ filegroups:
  - include/grpc/impl/codegen/grpc_types.h
  - include/grpc/impl/codegen/propagation_bits.h
  - include/grpc/impl/codegen/status.h
+- name: grpc_lb_policy_grpclb
+ headers:
+ - src/core/ext/lb_policy/grpclb/load_balancer_api.h
+ src:
+ - src/core/ext/lb_policy/grpclb/load_balancer_api.c
+ uses:
+ - grpc_base
+- name: grpc_lb_policy_pick_first
+ headers:
+ - src/core/ext/lb_policy/pick_first/pick_first.h
+ src:
+ - src/core/ext/lb_policy/pick_first/pick_first.c
+ uses:
+ - grpc_base
+- name: grpc_lb_policy_round_robin
+ headers:
+ - src/core/ext/lb_policy/round_robin/round_robin.h
+ src:
+ - src/core/ext/lb_policy/round_robin/round_robin.c
+ uses:
+ - grpc_base
 - name: grpc_secure
  headers:
  - src/core/lib/security/auth_filters.h
@@ -639,6 +654,9 @@ libs:
  - grpc_transport_chttp2_client_secure
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+ - grpc_lb_policy_grpclb
+ - grpc_lb_policy_pick_first
+ - grpc_lb_policy_round_robin
  - grpc_secure
  - grpc_codegen
  - census
@@ -722,6 +740,9 @@ libs:
  - grpc_base
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+ - grpc_lb_policy_grpclb
+ - grpc_lb_policy_pick_first
+ - grpc_lb_policy_round_robin
  - grpc_codegen
  - census
  - nanopb