Reposition files to optionalize client_config system

1 files changed, 92 insertions, 92 deletions

diff --git a/BUILD b/BUILD
index c0738e2091..6a99360540 100644
--- a/BUILD
+++ b/BUILD
@@ -166,6 +166,20 @@ cc_library(
     "src/core/ext/census/grpc_plugin.h",
     "src/core/ext/census/mlog.h",
     "src/core/ext/census/rpc_metric_id.h",
+    "src/core/ext/client_config/client_channel.h",
+    "src/core/ext/client_config/client_config.h",
+    "src/core/ext/client_config/connector.h",
+    "src/core/ext/client_config/initial_connect_string.h",
+    "src/core/ext/client_config/lb_policy.h",
+    "src/core/ext/client_config/lb_policy_factory.h",
+    "src/core/ext/client_config/lb_policy_registry.h",
+    "src/core/ext/client_config/resolver.h",
+    "src/core/ext/client_config/resolver_factory.h",
+    "src/core/ext/client_config/resolver_registry.h",
+    "src/core/ext/client_config/subchannel.h",
+    "src/core/ext/client_config/subchannel_factory.h",
+    "src/core/ext/client_config/subchannel_index.h",
+    "src/core/ext/client_config/uri_parser.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/transport/chttp2/transport/alpn.h",
@@ -192,26 +206,12 @@ cc_library(
     "src/core/lib/channel/channel_args.h",
     "src/core/lib/channel/channel_stack.h",
     "src/core/lib/channel/channel_stack_builder.h",
-    "src/core/lib/channel/client_channel.h",
     "src/core/lib/channel/compress_filter.h",
     "src/core/lib/channel/connected_channel.h",
     "src/core/lib/channel/context.h",
     "src/core/lib/channel/http_client_filter.h",
     "src/core/lib/channel/http_server_filter.h",
     "src/core/lib/channel/subchannel_call_holder.h",
-    "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/lib/client_config/lb_policy.h",
-    "src/core/lib/client_config/lb_policy_factory.h",
-    "src/core/lib/client_config/lb_policy_registry.h",
-    "src/core/lib/client_config/resolver.h",
-    "src/core/lib/client_config/resolver_factory.h",
-    "src/core/lib/client_config/resolver_registry.h",
-    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
-    "src/core/lib/client_config/subchannel_index.h",
-    "src/core/lib/client_config/uri_parser.h",
     "src/core/lib/compression/algorithm_metadata.h",
     "src/core/lib/compression/message_compress.h",
     "src/core/lib/debug/trace.h",
@@ -301,6 +301,22 @@ cc_library(
     "src/core/ext/census/operation.c",
     "src/core/ext/census/placeholders.c",
     "src/core/ext/census/tracing.c",
+    "src/core/ext/client_config/channel_connectivity.c",
+    "src/core/ext/client_config/client_channel.c",
+    "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/connector.c",
+    "src/core/ext/client_config/default_initial_connect_string.c",
+    "src/core/ext/client_config/initial_connect_string.c",
+    "src/core/ext/client_config/lb_policy.c",
+    "src/core/ext/client_config/lb_policy_factory.c",
+    "src/core/ext/client_config/lb_policy_registry.c",
+    "src/core/ext/client_config/resolver.c",
+    "src/core/ext/client_config/resolver_factory.c",
+    "src/core/ext/client_config/resolver_registry.c",
+    "src/core/ext/client_config/subchannel.c",
+    "src/core/ext/client_config/subchannel_factory.c",
+    "src/core/ext/client_config/subchannel_index.c",
+    "src/core/ext/client_config/uri_parser.c",
     "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",
@@ -335,26 +351,11 @@ cc_library(
     "src/core/lib/channel/channel_args.c",
     "src/core/lib/channel/channel_stack.c",
     "src/core/lib/channel/channel_stack_builder.c",
-    "src/core/lib/channel/client_channel.c",
     "src/core/lib/channel/compress_filter.c",
     "src/core/lib/channel/connected_channel.c",
     "src/core/lib/channel/http_client_filter.c",
     "src/core/lib/channel/http_server_filter.c",
     "src/core/lib/channel/subchannel_call_holder.c",
-    "src/core/lib/client_config/client_config.c",
-    "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/lib/client_config/lb_policy.c",
-    "src/core/lib/client_config/lb_policy_factory.c",
-    "src/core/lib/client_config/lb_policy_registry.c",
-    "src/core/lib/client_config/resolver.c",
-    "src/core/lib/client_config/resolver_factory.c",
-    "src/core/lib/client_config/resolver_registry.c",
-    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
-    "src/core/lib/client_config/subchannel_index.c",
-    "src/core/lib/client_config/uri_parser.c",
     "src/core/lib/compression/compression_algorithm.c",
     "src/core/lib/compression/message_compress.c",
     "src/core/lib/debug/trace.c",
@@ -430,7 +431,6 @@ cc_library(
     "src/core/lib/surface/call_details.c",
     "src/core/lib/surface/call_log_batch.c",
     "src/core/lib/surface/channel.c",
-    "src/core/lib/surface/channel_connectivity.c",
     "src/core/lib/surface/channel_init.c",
     "src/core/lib/surface/channel_ping.c",
     "src/core/lib/surface/channel_stack_type.c",
@@ -534,6 +534,20 @@ cc_library(
     "src/core/ext/census/grpc_plugin.h",
     "src/core/ext/census/mlog.h",
     "src/core/ext/census/rpc_metric_id.h",
+    "src/core/ext/client_config/client_channel.h",
+    "src/core/ext/client_config/client_config.h",
+    "src/core/ext/client_config/connector.h",
+    "src/core/ext/client_config/initial_connect_string.h",
+    "src/core/ext/client_config/lb_policy.h",
+    "src/core/ext/client_config/lb_policy_factory.h",
+    "src/core/ext/client_config/lb_policy_registry.h",
+    "src/core/ext/client_config/resolver.h",
+    "src/core/ext/client_config/resolver_factory.h",
+    "src/core/ext/client_config/resolver_registry.h",
+    "src/core/ext/client_config/subchannel.h",
+    "src/core/ext/client_config/subchannel_factory.h",
+    "src/core/ext/client_config/subchannel_index.h",
+    "src/core/ext/client_config/uri_parser.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/transport/chttp2/transport/alpn.h",
@@ -560,26 +574,12 @@ cc_library(
     "src/core/lib/channel/channel_args.h",
     "src/core/lib/channel/channel_stack.h",
     "src/core/lib/channel/channel_stack_builder.h",
-    "src/core/lib/channel/client_channel.h",
     "src/core/lib/channel/compress_filter.h",
     "src/core/lib/channel/connected_channel.h",
     "src/core/lib/channel/context.h",
     "src/core/lib/channel/http_client_filter.h",
     "src/core/lib/channel/http_server_filter.h",
     "src/core/lib/channel/subchannel_call_holder.h",
-    "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/lib/client_config/lb_policy.h",
-    "src/core/lib/client_config/lb_policy_factory.h",
-    "src/core/lib/client_config/lb_policy_registry.h",
-    "src/core/lib/client_config/resolver.h",
-    "src/core/lib/client_config/resolver_factory.h",
-    "src/core/lib/client_config/resolver_registry.h",
-    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
-    "src/core/lib/client_config/subchannel_index.h",
-    "src/core/lib/client_config/uri_parser.h",
     "src/core/lib/compression/algorithm_metadata.h",
     "src/core/lib/compression/message_compress.h",
     "src/core/lib/debug/trace.h",
@@ -655,6 +655,22 @@ cc_library(
     "src/core/ext/census/operation.c",
     "src/core/ext/census/placeholders.c",
     "src/core/ext/census/tracing.c",
+    "src/core/ext/client_config/channel_connectivity.c",
+    "src/core/ext/client_config/client_channel.c",
+    "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/connector.c",
+    "src/core/ext/client_config/default_initial_connect_string.c",
+    "src/core/ext/client_config/initial_connect_string.c",
+    "src/core/ext/client_config/lb_policy.c",
+    "src/core/ext/client_config/lb_policy_factory.c",
+    "src/core/ext/client_config/lb_policy_registry.c",
+    "src/core/ext/client_config/resolver.c",
+    "src/core/ext/client_config/resolver_factory.c",
+    "src/core/ext/client_config/resolver_registry.c",
+    "src/core/ext/client_config/subchannel.c",
+    "src/core/ext/client_config/subchannel_factory.c",
+    "src/core/ext/client_config/subchannel_index.c",
+    "src/core/ext/client_config/uri_parser.c",
     "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",
@@ -687,26 +703,11 @@ cc_library(
     "src/core/lib/channel/channel_args.c",
     "src/core/lib/channel/channel_stack.c",
     "src/core/lib/channel/channel_stack_builder.c",
-    "src/core/lib/channel/client_channel.c",
     "src/core/lib/channel/compress_filter.c",
     "src/core/lib/channel/connected_channel.c",
     "src/core/lib/channel/http_client_filter.c",
     "src/core/lib/channel/http_server_filter.c",
     "src/core/lib/channel/subchannel_call_holder.c",
-    "src/core/lib/client_config/client_config.c",
-    "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/lib/client_config/lb_policy.c",
-    "src/core/lib/client_config/lb_policy_factory.c",
-    "src/core/lib/client_config/lb_policy_registry.c",
-    "src/core/lib/client_config/resolver.c",
-    "src/core/lib/client_config/resolver_factory.c",
-    "src/core/lib/client_config/resolver_registry.c",
-    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
-    "src/core/lib/client_config/subchannel_index.c",
-    "src/core/lib/client_config/uri_parser.c",
     "src/core/lib/compression/compression_algorithm.c",
     "src/core/lib/compression/message_compress.c",
     "src/core/lib/debug/trace.c",
@@ -767,7 +768,6 @@ cc_library(
     "src/core/lib/surface/call_details.c",
     "src/core/lib/surface/call_log_batch.c",
     "src/core/lib/surface/channel.c",
-    "src/core/lib/surface/channel_connectivity.c",
     "src/core/lib/surface/channel_init.c",
     "src/core/lib/surface/channel_ping.c",
     "src/core/lib/surface/channel_stack_type.c",
@@ -821,8 +821,8 @@ cc_library(
 cc_library(
   name = "grpc_zookeeper",
   srcs = [
-    "src/core/lib/client_config/resolvers/zookeeper_resolver.h",
-    "src/core/lib/client_config/resolvers/zookeeper_resolver.c",
+    "src/core/ext/client_config/resolvers/zookeeper_resolver.h",
+    "src/core/ext/client_config/resolvers/zookeeper_resolver.c",
   ],
   hdrs = [
     "include/grpc/grpc_zookeeper.h",
@@ -1364,6 +1364,22 @@ objc_library(
     "src/core/ext/census/operation.c",
     "src/core/ext/census/placeholders.c",
     "src/core/ext/census/tracing.c",
+    "src/core/ext/client_config/channel_connectivity.c",
+    "src/core/ext/client_config/client_channel.c",
+    "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/connector.c",
+    "src/core/ext/client_config/default_initial_connect_string.c",
+    "src/core/ext/client_config/initial_connect_string.c",
+    "src/core/ext/client_config/lb_policy.c",
+    "src/core/ext/client_config/lb_policy_factory.c",
+    "src/core/ext/client_config/lb_policy_registry.c",
+    "src/core/ext/client_config/resolver.c",
+    "src/core/ext/client_config/resolver_factory.c",
+    "src/core/ext/client_config/resolver_registry.c",
+    "src/core/ext/client_config/subchannel.c",
+    "src/core/ext/client_config/subchannel_factory.c",
+    "src/core/ext/client_config/subchannel_index.c",
+    "src/core/ext/client_config/uri_parser.c",
     "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",
@@ -1398,26 +1414,11 @@ objc_library(
     "src/core/lib/channel/channel_args.c",
     "src/core/lib/channel/channel_stack.c",
     "src/core/lib/channel/channel_stack_builder.c",
-    "src/core/lib/channel/client_channel.c",
     "src/core/lib/channel/compress_filter.c",
     "src/core/lib/channel/connected_channel.c",
     "src/core/lib/channel/http_client_filter.c",
     "src/core/lib/channel/http_server_filter.c",
     "src/core/lib/channel/subchannel_call_holder.c",
-    "src/core/lib/client_config/client_config.c",
-    "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/lib/client_config/lb_policy.c",
-    "src/core/lib/client_config/lb_policy_factory.c",
-    "src/core/lib/client_config/lb_policy_registry.c",
-    "src/core/lib/client_config/resolver.c",
-    "src/core/lib/client_config/resolver_factory.c",
-    "src/core/lib/client_config/resolver_registry.c",
-    "src/core/lib/client_config/subchannel.c",
-    "src/core/lib/client_config/subchannel_factory.c",
-    "src/core/lib/client_config/subchannel_index.c",
-    "src/core/lib/client_config/uri_parser.c",
     "src/core/lib/compression/compression_algorithm.c",
     "src/core/lib/compression/message_compress.c",
     "src/core/lib/debug/trace.c",
@@ -1493,7 +1494,6 @@ objc_library(
     "src/core/lib/surface/call_details.c",
     "src/core/lib/surface/call_log_batch.c",
     "src/core/lib/surface/channel.c",
-    "src/core/lib/surface/channel_connectivity.c",
     "src/core/lib/surface/channel_init.c",
     "src/core/lib/surface/channel_ping.c",
     "src/core/lib/surface/channel_stack_type.c",
@@ -1539,6 +1539,20 @@ objc_library(
     "src/core/ext/census/grpc_plugin.h",
     "src/core/ext/census/mlog.h",
     "src/core/ext/census/rpc_metric_id.h",
+    "src/core/ext/client_config/client_channel.h",
+    "src/core/ext/client_config/client_config.h",
+    "src/core/ext/client_config/connector.h",
+    "src/core/ext/client_config/initial_connect_string.h",
+    "src/core/ext/client_config/lb_policy.h",
+    "src/core/ext/client_config/lb_policy_factory.h",
+    "src/core/ext/client_config/lb_policy_registry.h",
+    "src/core/ext/client_config/resolver.h",
+    "src/core/ext/client_config/resolver_factory.h",
+    "src/core/ext/client_config/resolver_registry.h",
+    "src/core/ext/client_config/subchannel.h",
+    "src/core/ext/client_config/subchannel_factory.h",
+    "src/core/ext/client_config/subchannel_index.h",
+    "src/core/ext/client_config/uri_parser.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/transport/chttp2/transport/alpn.h",
@@ -1565,26 +1579,12 @@ objc_library(
     "src/core/lib/channel/channel_args.h",
     "src/core/lib/channel/channel_stack.h",
     "src/core/lib/channel/channel_stack_builder.h",
-    "src/core/lib/channel/client_channel.h",
     "src/core/lib/channel/compress_filter.h",
     "src/core/lib/channel/connected_channel.h",
     "src/core/lib/channel/context.h",
     "src/core/lib/channel/http_client_filter.h",
     "src/core/lib/channel/http_server_filter.h",
     "src/core/lib/channel/subchannel_call_holder.h",
-    "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/lib/client_config/lb_policy.h",
-    "src/core/lib/client_config/lb_policy_factory.h",
-    "src/core/lib/client_config/lb_policy_registry.h",
-    "src/core/lib/client_config/resolver.h",
-    "src/core/lib/client_config/resolver_factory.h",
-    "src/core/lib/client_config/resolver_registry.h",
-    "src/core/lib/client_config/subchannel.h",
-    "src/core/lib/client_config/subchannel_factory.h",
-    "src/core/lib/client_config/subchannel_index.h",
-    "src/core/lib/client_config/uri_parser.h",
     "src/core/lib/compression/algorithm_metadata.h",
     "src/core/lib/compression/message_compress.h",
     "src/core/lib/debug/trace.h",