[build] Auto-deps for a grab bag more targets (#30184)

* progress * progress * progress * progress * Automated change: Fix sanity tests * progress * progress * progress * progress * fixes * fix * progress * progress * progress * progress * Automated change: Fix sanity tests * fix Co-authored-by: ctiller <ctiller@users.noreply.github.com>
3 years ago · 7b8e3d89c4
parent 0f272f836d
commit 7b8e3d89c4
9 changed files with 134 additions and 109 deletions
--- a/205
+++ b/205
@ -424,6 +424,7 @@ grpc_cc_library(
        "grpc_base",
        "grpc_codegen",
        "grpc_common",
+        "grpc_http_filters",
        "grpc_security_base",
        "grpc_trace",
        "http_connect_handshaker",
@ -483,6 +484,7 @@ grpc_cc_library(
        "grpc_base",
        "grpc_codegen",
        "grpc_common",
+        "grpc_http_filters",
        "grpc_secure",
        "grpc_security_base",
        "grpc_trace",
@ -1015,11 +1017,13 @@ grpc_cc_library(
 grpc_cc_library(
    name = "unique_type_name",
    hdrs = ["src/core/lib/gprpp/unique_type_name.h"],
-    external_deps = [
-        "absl/strings",
-    ],
+    external_deps = ["absl/strings"],
    language = "c++",
-    deps = ["useful"],
+    tags = ["grpc-autodeps"],
+    deps = [
+        "gpr_platform",
+        "useful",
+    ],
 )

 grpc_cc_library(
@ -1102,6 +1106,7 @@ grpc_cc_library(
    public_hdrs = [
        "src/core/lib/config/core_configuration.h",
    ],
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:client_channel"],
    deps = [
        "channel_args_preconditioning",
@ -1867,10 +1872,11 @@ grpc_cc_library(
        "include/grpc/event_engine/memory_allocator.h",
        "include/grpc/event_engine/memory_request.h",
    ],
+    external_deps = ["absl/strings"],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "gpr_platform",
-        "ref_counted",
        "slice",
        "slice_refcount",
    ],
@ -3180,25 +3186,24 @@ grpc_cc_library(
        "absl/base:core_headers",
        "absl/container:inlined_vector",
        "absl/memory",
+        "absl/status",
+        "absl/status:statusor",
        "absl/strings",
        "absl/strings:cord",
        "absl/strings:str_format",
-        "absl/time",
        "absl/types:optional",
        "absl/types:variant",
-        "absl/status",
-        "absl/status:statusor",
        "absl/utility",
        "upb_lib",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:client_channel"],
    deps = [
        "arena",
        "channel_fwd",
        "channel_init",
        "channel_stack_type",
-        "chunked_vector",
        "config",
        "construct_destruct",
        "debug_location",
@ -3209,26 +3214,25 @@ grpc_cc_library(
        "gpr_codegen",
        "grpc_backend_metric_data",
        "grpc_base",
-        "grpc_client_authority_filter",
        "grpc_codegen",
        "grpc_deadline_filter",
        "grpc_health_upb",
+        "grpc_public_hdrs",
        "grpc_resolver",
        "grpc_service_config",
        "grpc_service_config_impl",
        "grpc_trace",
-        "handshaker_factory",
-        "handshaker_registry",
        "http_connect_handshaker",
-        "httpcli",
        "iomgr_fwd",
        "iomgr_timer",
        "json",
        "json_util",
+        "memory_quota",
        "orphanable",
        "protobuf_duration_upb",
        "ref_counted",
        "ref_counted_ptr",
+        "resolved_address",
        "resource_quota",
        "server_address",
        "service_config_parser",
@ -3237,6 +3241,7 @@ grpc_cc_library(
        "slice_refcount",
        "sockaddr_utils",
        "time",
+        "transport_fwd",
        "unique_type_name",
        "uri_parser",
        "useful",
@ -3488,20 +3493,27 @@ grpc_cc_library(
    external_deps = [
        "absl/memory",
        "absl/status",
+        "absl/status:statusor",
        "absl/strings",
        "absl/types:optional",
        "absl/utility",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
+        "arena_promise",
+        "channel_fwd",
        "config",
        "context",
        "gpr_base",
        "grpc_base",
+        "grpc_public_hdrs",
        "grpc_service_config",
        "grpc_trace",
+        "json",
        "json_util",
        "poll",
+        "service_config_parser",
        "sleep",
        "time",
        "try_seq",
@ -3570,15 +3582,18 @@ grpc_cc_library(
        "absl/base:core_headers",
        "absl/meta:type_traits",
        "absl/status",
-        "absl/strings:str_format",
+        "absl/status:statusor",
        "absl/strings",
+        "absl/strings:str_format",
        "absl/types:optional",
        "absl/utility",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:http"],
    deps = [
        "arena",
+        "arena_promise",
        "basic_seq",
        "call_push_pull",
        "channel_fwd",
@ -3591,9 +3606,9 @@ grpc_cc_library(
        "grpc_base",
        "grpc_codegen",
        "grpc_message_size_filter",
+        "grpc_public_hdrs",
        "grpc_trace",
        "latch",
-        "orphanable",
        "percent_encoding",
        "poll",
        "promise",
@ -3660,19 +3675,21 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
    ],
    external_deps = [
+        "absl/base:core_headers",
        "absl/container:inlined_vector",
        "absl/memory",
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
        "absl/strings:str_format",
-        "absl/time",
        "absl/types:optional",
        "absl/types:variant",
        "upb_lib",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
+        "channel_fwd",
        "channel_init",
        "channel_stack_type",
        "config",
@ -3686,12 +3703,12 @@ grpc_cc_library(
        "grpc_codegen",
        "grpc_grpclb_balancer_addresses",
        "grpc_lb_upb",
+        "grpc_public_hdrs",
        "grpc_resolver",
        "grpc_resolver_fake",
        "grpc_security_base",
        "grpc_sockaddr",
        "grpc_trace",
-        "grpc_transport_chttp2_client_connector",
        "iomgr_timer",
        "json",
        "orphanable",
@ -3729,7 +3746,6 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/base:core_headers",
-        "absl/container:inlined_vector",
        "absl/hash",
        "absl/memory",
        "absl/status",
@ -3740,16 +3756,17 @@ grpc_cc_library(
        "upb_lib",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "debug_location",
        "dual_ref_counted",
        "gpr_base",
-        "gpr_codegen",
        "grpc_base",
        "grpc_client_channel",
        "grpc_codegen",
        "grpc_fake_credentials",
+        "grpc_public_hdrs",
        "grpc_resolver",
        "grpc_security_base",
        "grpc_service_config_impl",
@ -3758,7 +3775,6 @@ grpc_cc_library(
        "json",
        "json_util",
        "orphanable",
-        "ref_counted",
        "ref_counted_ptr",
        "rls_upb",
        "server_address",
@ -4065,6 +4081,7 @@ grpc_cc_library(
        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "debug_location",
        "gpr_base",
@ -4523,6 +4540,7 @@ grpc_cc_library(
        "absl/container:inlined_vector",
        "absl/meta:type_traits",
        "absl/status",
+        "absl/status:statusor",
        "absl/strings",
        "absl/strings:str_format",
        "absl/types:optional",
@ -4530,18 +4548,19 @@ grpc_cc_library(
        "opencensus-tags",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
+        "arena_promise",
        "channel_fwd",
        "channel_init",
        "channel_stack_type",
        "config",
        "context",
-        "error",
-        "gpr",
-        "grpc++_base",
+        "gpr_base",
+        "gpr_platform",
        "grpc_base",
        "grpc_codegen",
-        "grpc_lb_policy_grpclb",
+        "grpc_public_hdrs",
        "grpc_security_base",
        "grpc_sockaddr",
        "poll",
@ -4645,9 +4664,10 @@ grpc_cc_library(
        "src/cpp/server/load_reporter/get_cpu_stats.h",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "gpr_base",
-        "grpc++",
+        "gpr_platform",
    ],
 )

@ -4687,16 +4707,21 @@ grpc_cc_library(
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
+        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "debug_location",
        "gpr_base",
        "grpc_base",
        "grpc_resolver",
+        "grpc_trace",
+        "iomgr_fwd",
        "iomgr_timer",
        "orphanable",
        "ref_counted_ptr",
+        "time",
        "uri_parser",
        "work_serializer",
    ],
@ -4711,10 +4736,8 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h",
    ],
    language = "c++",
-    deps = [
-        "gpr_base",
-        "grpc_base",
-    ],
+    tags = ["grpc-autodeps"],
+    deps = ["gpr_base"],
 )

 grpc_cc_library(
@ -4723,26 +4746,24 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc",
    ],
    external_deps = [
-        "absl/container:inlined_vector",
+        "absl/functional:bind_front",
        "absl/memory",
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
-        "absl/functional:bind_front",
        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "debug_location",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
        "grpc_codegen",
        "grpc_resolver",
        "grpc_resolver_dns_selection",
        "grpc_trace",
-        "iomgr_timer",
        "orphanable",
        "polling_resolver",
        "ref_counted_ptr",
@ -4770,18 +4791,17 @@ grpc_cc_library(
    external_deps = [
        "absl/base:core_headers",
        "absl/container:flat_hash_set",
-        "absl/container:inlined_vector",
        "absl/memory",
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
        "absl/strings:str_format",
        "absl/types:optional",
-        "absl/time",
        "address_sorting",
        "cares",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "debug_location",
@ -4789,7 +4809,6 @@ grpc_cc_library(
        "event_engine_common",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
        "grpc_codegen",
        "grpc_grpclb_balancer_addresses",
        "grpc_resolver",
@ -4824,18 +4843,16 @@ grpc_cc_library(
        "absl/strings",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
-        "grpc_codegen",
        "grpc_resolver",
        "iomgr_port",
        "orphanable",
        "resolved_address",
        "server_address",
-        "slice",
        "uri_parser",
    ],
 )
@ -4847,23 +4864,20 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/memory",
-        "absl/status",
        "absl/status:statusor",
        "absl/strings",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
-        "grpc_codegen",
        "grpc_resolver",
        "iomgr_port",
        "orphanable",
        "resolved_address",
        "server_address",
-        "slice",
        "uri_parser",
    ],
 )
@ -4873,12 +4887,14 @@ grpc_cc_library(
    srcs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc"],
    hdrs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"],
    external_deps = [
+        "absl/base:core_headers",
        "absl/memory",
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = [
        "//test:__subpackages__",
        "@grpc:grpc_resolver_fake",
@ -4888,12 +4904,13 @@ grpc_cc_library(
        "debug_location",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
+        "grpc_codegen",
        "grpc_resolver",
        "grpc_service_config",
        "orphanable",
+        "ref_counted",
+        "ref_counted_ptr",
        "server_address",
-        "slice",
        "uri_parser",
        "useful",
        "work_serializer",
@ -4905,10 +4922,12 @@ grpc_cc_library(
    hdrs = [
        "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.h",
    ],
-    external_deps = [
-        "absl/strings",
-    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
+    deps = [
+        "gpr_platform",
+        "unique_type_name",
+    ],
 )

 grpc_cc_library(
@ -4917,9 +4936,6 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc",
    ],
    external_deps = [
-        "xxhash",
-        "re2",
-        "absl/container:inlined_vector",
        "absl/memory",
        "absl/meta:type_traits",
        "absl/random",
@ -4929,8 +4945,11 @@ grpc_cc_library(
        "absl/strings:str_format",
        "absl/types:optional",
        "absl/types:variant",
+        "re2",
+        "xxhash",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "arena",
        "channel_fwd",
@ -4942,12 +4961,12 @@ grpc_cc_library(
        "grpc_client_channel",
        "grpc_codegen",
        "grpc_lb_policy_ring_hash",
+        "grpc_public_hdrs",
        "grpc_resolver",
        "grpc_service_config",
        "grpc_service_config_impl",
        "grpc_trace",
        "grpc_xds_client",
-        "handshaker_factory",
        "iomgr_fwd",
        "orphanable",
        "ref_counted_ptr",
@ -4955,7 +4974,6 @@ grpc_cc_library(
        "time",
        "unique_type_name",
        "uri_parser",
-        "useful",
        "work_serializer",
    ],
 )
@ -4974,13 +4992,13 @@ grpc_cc_library(
        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "alts_util",
        "config",
        "debug_location",
        "gpr_base",
        "grpc_base",
-        "grpc_client_channel",
        "grpc_codegen",
        "grpc_resolver",
        "grpc_security_base",
@ -5097,11 +5115,8 @@ grpc_cc_library(
    hdrs = [
        "src/core/tsi/fake_transport_security.h",
    ],
-    external_deps = [
-        "absl/strings",
-        "absl/strings:str_format",
-    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = [
        "@grpc:public",
    ],
@ -5194,8 +5209,9 @@ grpc_cc_library(
        "src/core/tsi/local_transport_security.h",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
-        "gpr",
+        "gpr_base",
        "grpc_base",
        "tsi_base",
    ],
@ -5853,16 +5869,18 @@ grpc_cc_library(
        "src/core/tsi/ssl/session_cache/ssl_session_cache.h",
    ],
    external_deps = [
-        "absl/strings",
        "absl/memory",
        "libssl",
-        "libcrypto",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:public"],
    deps = [
+        "cpp_impl_of",
        "gpr_base",
        "grpc_base",
+        "grpc_codegen",
+        "ref_counted",
    ],
 )

@ -6033,16 +6051,14 @@ grpc_cc_library(
    hdrs = [
        "include/grpcpp/security/authorization_policy_provider.h",
    ],
-    external_deps = [
-        "absl/synchronization",
-        "protobuf_headers",
-    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "gpr_base",
        "grpc++",
        "grpc++_codegen_base",
        "grpc_authorization_provider",
+        "grpc_public_hdrs",
    ],
 )

@ -6178,7 +6194,6 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/base:core_headers",
-        "absl/memory",
        "absl/status",
        "absl/strings",
        "absl/strings:cord",
@ -6189,29 +6204,25 @@ grpc_cc_library(
        "absl/utility",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:grpclb"],
    deps = [
        "arena",
        "bdp_estimator",
        "bitset",
        "chttp2_flow_control",
-        "chunked_vector",
        "debug_location",
        "gpr_base",
        "grpc_base",
        "grpc_codegen",
-        "grpc_http_filters",
-        "grpc_resolver",
+        "grpc_public_hdrs",
        "grpc_trace",
-        "grpc_transport_chttp2_alpn",
        "hpack_constants",
        "hpack_encoder_table",
        "httpcli",
        "iomgr_fwd",
        "iomgr_timer",
        "memory_quota",
-        "orphanable",
-        "pid_controller",
        "poll",
        "ref_counted",
        "ref_counted_ptr",
@ -6222,7 +6233,7 @@ grpc_cc_library(
        "slice_refcount",
        "status_helper",
        "time",
-        "uri_parser",
+        "transport_fwd",
        "useful",
    ],
 )
@ -6236,6 +6247,7 @@ grpc_cc_library(
        "src/core/ext/transport/chttp2/alpn/alpn.h",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "gpr_base",
        "useful",
@ -6251,13 +6263,13 @@ grpc_cc_library(
        "src/core/ext/transport/chttp2/client/chttp2_connector.h",
    ],
    external_deps = [
-        "absl/container:inlined_vector",
        "absl/status",
-        "absl/strings",
-        "absl/strings:str_format",
        "absl/status:statusor",
+        "absl/strings:str_format",
+        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "channel_args_preconditioning",
        "channel_stack_type",
@ -6268,20 +6280,22 @@ grpc_cc_library(
        "grpc_client_channel",
        "grpc_codegen",
        "grpc_insecure_credentials",
+        "grpc_public_hdrs",
        "grpc_resolver",
        "grpc_security_base",
        "grpc_trace",
        "grpc_transport_chttp2",
        "handshaker",
        "handshaker_registry",
+        "iomgr_timer",
        "orphanable",
+        "ref_counted_ptr",
        "resolved_address",
        "slice",
        "sockaddr_utils",
        "tcp_connect_handshaker",
        "transport_fwd",
        "unique_type_name",
-        "uri_parser",
    ],
 )

@ -6303,15 +6317,14 @@ grpc_cc_library(
        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    deps = [
        "config",
        "debug_location",
        "gpr_base",
        "grpc_base",
        "grpc_codegen",
-        "grpc_http_filters",
        "grpc_insecure_credentials",
-        "grpc_resolver",
        "grpc_security_base",
        "grpc_trace",
        "grpc_transport_chttp2",
@ -6321,7 +6334,6 @@ grpc_cc_library(
        "iomgr_timer",
        "memory_quota",
        "orphanable",
-        "ref_counted",
        "ref_counted_ptr",
        "resolved_address",
        "resource_quota",
@ -6331,7 +6343,6 @@ grpc_cc_library(
        "transport_fwd",
        "unique_type_name",
        "uri_parser",
-        "useful",
    ],
 )

@ -6385,9 +6396,10 @@ grpc_cc_library(
        "src/core/tsi/transport_security_interface.h",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:tsi_interface"],
    deps = [
-        "gpr",
+        "gpr_base",
        "grpc_trace",
    ],
 )
@ -6409,14 +6421,13 @@ grpc_cc_library(
        "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h",
        "src/core/tsi/alts/handshaker/transport_security_common_api.h",
    ],
-    external_deps = [
-        "upb_lib",
-    ],
+    external_deps = ["upb_lib"],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:tsi"],
    deps = [
        "alts_upb",
-        "gpr",
+        "gpr_base",
        "grpc_base",
    ],
 )
@ -6722,23 +6733,17 @@ grpc_cc_library(
        "src/cpp/server/orca/orca_interceptor.h",
    ],
    external_deps = [
-        "upb_lib",
        "absl/memory",
        "absl/strings",
        "absl/types:optional",
    ],
    language = "c++",
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:public"],
    deps = [
        "grpc++",
-        "grpc++_codegen_base",
        "grpc_base",
        "grpcpp_call_metric_recorder",
-        "protobuf_duration_upb",
-        "ref_counted",
-        "time",
-        "xds_orca_service_upb",
-        "xds_orca_upb",
    ],
 )

@ -6749,26 +6754,24 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/base:core_headers",
-        "absl/status",
        "absl/time",
        "absl/types:optional",
        "upb_lib",
-        "absl/memory",
    ],
    language = "c++",
    public_hdrs = [
        "include/grpcpp/ext/orca_service.h",
    ],
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:public"],
    deps = [
        "debug_location",
        "default_event_engine_factory_hdrs",
-        "gpr",
+        "gpr_base",
        "grpc++",
        "grpc++_codegen_base",
        "grpc++_internal_hdrs_only",
        "grpc_base",
-        "iomgr_timer",
        "protobuf_duration_upb",
        "ref_counted",
        "ref_counted_ptr",
@ -6850,6 +6853,7 @@ grpc_cc_library(
        "grpc_no_xds": [],
        "//conditions:default": ["//:grpcpp_csds"],
    }],
+    tags = ["grpc-autodeps"],
    deps = [
        "gpr",
        "grpc++",
@ -6864,9 +6868,7 @@ grpc_cc_library(
    srcs = [
        "src/cpp/client/channel_test_peer.cc",
    ],
-    external_deps = [
-        "gtest",
-    ],
+    external_deps = ["gtest"],
    public_hdrs = [
        "include/grpc++/test/mock_stream.h",
        "include/grpc++/test/server_context_test_spouse.h",
@ -6876,10 +6878,11 @@ grpc_cc_library(
        "include/grpcpp/test/mock_stream.h",
        "include/grpcpp/test/server_context_test_spouse.h",
    ],
+    tags = ["grpc-autodeps"],
    visibility = ["@grpc:grpc++_test"],
    deps = [
-        "gpr_base",
        "grpc++",
+        "grpc++_codegen_base",
        "grpc_base",
    ],
 )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2633,7 +2633,6 @@ add_library(grpc_unsecure
  src/core/ext/filters/http/message_compress/message_decompress_filter.cc
  src/core/ext/filters/http/server/http_server_filter.cc
  src/core/ext/filters/message_size/message_size_filter.cc
-  src/core/ext/transport/chttp2/alpn/alpn.cc
  src/core/ext/transport/chttp2/client/chttp2_connector.cc
  src/core/ext/transport/chttp2/server/chttp2_server.cc
  src/core/ext/transport/chttp2/transport/bin_decoder.cc
@ -12489,7 +12488,6 @@ target_include_directories(lb_get_cpu_stats_test
 target_link_libraries(lb_get_cpu_stats_test
  ${_gRPC_PROTOBUF_LIBRARIES}
  ${_gRPC_ALLTARGETS_LIBRARIES}
-  grpc++
  grpc_test_util
 )

--- a/2
+++ b/2
@ -1851,7 +1851,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/http/message_compress/message_decompress_filter.cc \
    src/core/ext/filters/http/server/http_server_filter.cc \
    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
@ -2853,6 +2852,7 @@ src/core/ext/filters/rbac/rbac_filter.cc: $(OPENSSL_DEP)
 src/core/ext/filters/rbac/rbac_service_config_parser.cc: $(OPENSSL_DEP)
 src/core/ext/filters/server_config_selector/server_config_selector.cc: $(OPENSSL_DEP)
 src/core/ext/filters/server_config_selector/server_config_selector_filter.cc: $(OPENSSL_DEP)
+src/core/ext/transport/chttp2/alpn/alpn.cc: $(OPENSSL_DEP)
 src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c: $(OPENSSL_DEP)
 src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c: $(OPENSSL_DEP)
 src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c: $(OPENSSL_DEP)
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -1894,7 +1894,6 @@ libs:
  - src/core/ext/filters/http/message_compress/message_decompress_filter.h
  - src/core/ext/filters/http/server/http_server_filter.h
  - src/core/ext/filters/message_size/message_size_filter.h
-  - src/core/ext/transport/chttp2/alpn/alpn.h
  - src/core/ext/transport/chttp2/client/chttp2_connector.h
  - src/core/ext/transport/chttp2/server/chttp2_server.h
  - src/core/ext/transport/chttp2/transport/bin_decoder.h
@ -2225,7 +2224,6 @@ libs:
  - src/core/ext/filters/http/message_compress/message_decompress_filter.cc
  - src/core/ext/filters/http/server/http_server_filter.cc
  - src/core/ext/filters/message_size/message_size_filter.cc
-  - src/core/ext/transport/chttp2/alpn/alpn.cc
  - src/core/ext/transport/chttp2/client/chttp2_connector.cc
  - src/core/ext/transport/chttp2/server/chttp2_server.cc
  - src/core/ext/transport/chttp2/transport/bin_decoder.cc
@ -6532,7 +6530,6 @@ targets:
  - src/cpp/server/load_reporter/get_cpu_stats_windows.cc
  - test/cpp/server/load_reporter/get_cpu_stats_test.cc
  deps:
-  - grpc++
  - grpc_test_util
 - name: lb_load_data_store_test
  gtest: true
--- a/grpc.gyp
+++ b/grpc.gyp
@ -1195,7 +1195,6 @@
        'src/core/ext/filters/http/message_compress/message_decompress_filter.cc',
        'src/core/ext/filters/http/server/http_server_filter.cc',
        'src/core/ext/filters/message_size/message_size_filter.cc',
-        'src/core/ext/transport/chttp2/alpn/alpn.cc',
        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
        'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
--- a/test/core/bad_client/generate_tests.bzl
+++ b/test/core/bad_client/generate_tests.bzl
@ -44,7 +44,13 @@ def grpc_bad_client_tests():
        srcs = ["bad_client.cc"],
        hdrs = ["bad_client.h"],
        language = "C++",
-        deps = ["//test/core/util:grpc_test_util", "//:grpc", "//:gpr", "//test/core/end2end:cq_verifier"],
+        deps = [
+            "//test/core/util:grpc_test_util",
+            "//:grpc",
+            "//:gpr",
+            "//test/core/end2end:cq_verifier",
+            "//:grpc_http_filters",
+        ],
    )
    for t, topt in BAD_CLIENT_TESTS.items():
        grpc_cc_test(
--- a/test/core/end2end/BUILD
+++ b/test/core/end2end/BUILD
@ -80,6 +80,7 @@ grpc_cc_library(
    deps = [
        "//:gpr",
        "//:grpc",
+        "//:grpc_http_filters",
        "//test/core/util:grpc_test_util",
    ],
 )
--- a/test/core/end2end/generate_tests.bzl
+++ b/test/core/end2end/generate_tests.bzl
@ -427,6 +427,7 @@ def grpc_end2end_tests():
            "//test/core/util:test_lb_policies",
            "//:grpc_authorization_provider",
            "//test/core/compression:args_utils",
+            "//:grpc_http_filters",
        ],
    )
    for f, fopt in END2END_FIXTURES.items():
@ -447,6 +448,7 @@ def grpc_end2end_tests():
                "//:grpc",
                "//:gpr",
                "//test/core/compression:args_utils",
+                "//:grpc_http_filters",
            ],
            tags = _platform_support_tags(fopt) + fopt.tags,
        )
--- a/tools/distrib/fix_build_deps.py
+++ b/tools/distrib/fix_build_deps.py
@ -244,6 +244,10 @@ class FakeSelects:
        pass


+num_cc_libraries = 0
+num_opted_out_cc_libraries = 0
+
+
 def grpc_cc_library(name,
                    hdrs=[],
                    public_hdrs=[],
@ -253,7 +257,14 @@ def grpc_cc_library(name,
                    deps=[],
                    external_deps=[],
                    **kwargs):
+    global args
+    global num_cc_libraries
+    global num_opted_out_cc_libraries
+    num_cc_libraries += 1
    if select_deps or 'nofixdeps' in tags or 'grpc-autodeps' not in tags:
+        if args.whats_left and not select_deps and 'nofixdeps' not in tags:
+            num_opted_out_cc_libraries += 1
+            print("Not opted in: {}".format(name))
        no_update.add(name)
    scores[name] = len(public_hdrs + hdrs)
    # avoid_dep is the internal way of saying prefer something else
@ -343,6 +354,10 @@ parser.add_argument('--score',
                    default='edit_distance',
                    help='scoring function to use: one of ' +
                    ', '.join(SCORERS.keys()))
+parser.add_argument('--whats_left',
+                    action='store_true',
+                    default=False,
+                    help='show what is left to opt in')
 args = parser.parse_args()

 exec(
@ -362,6 +377,10 @@ exec(
        'filegroup': lambda name, **kwargs: None,
    }, {})

+if args.whats_left:
+    print("{}/{} libraries are opted in".format(
+        num_cc_libraries - num_opted_out_cc_libraries, num_cc_libraries))
+

 # Keeps track of all possible sets of dependencies that could satify the
 # problem. (models the list monad in Haskell!)