From b2d64efa3ac20dca7e029427a7ef40303aca4af9 Mon Sep 17 00:00:00 2001 From: Cheng-Yu Chung Date: Wed, 21 Sep 2022 18:16:34 -0400 Subject: [PATCH] Remove `grpc_codegen` (#30960) * Remove `grpc_codegen` * Update --- BUILD | 136 +++++++++++++++------------------------- test/core/end2end/BUILD | 9 --- 2 files changed, 51 insertions(+), 94 deletions(-) diff --git a/BUILD b/BUILD index 2aec343c1e7..13411f8af02 100644 --- a/BUILD +++ b/BUILD @@ -600,7 +600,6 @@ grpc_cc_library( "grpc_authorization_base", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_common", "grpc_credentials_util", "grpc_external_account_credentials", @@ -612,6 +611,7 @@ grpc_cc_library( "grpc_jwt_credentials", "grpc_local_credentials", "grpc_oauth2_credentials", + "grpc_public_hdrs", "grpc_security_base", "grpc_ssl_credentials", "grpc_tls_credentials", @@ -797,7 +797,7 @@ grpc_cc_library( "grpc++_base", "grpc_base", "grpc_client_channel", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "iomgr_port", "orphanable", @@ -819,7 +819,6 @@ grpc_cc_library( external_deps = ["absl/strings"], language = "c++", deps = [ - "exec_ctx", "gpr", "grpc", "grpc++_base", @@ -868,8 +867,8 @@ grpc_cc_library( "grpc++_codegen_base", "grpc++_codegen_base_src", "grpc++_codegen_proto", - "grpc_codegen", "grpc_insecure_credentials", + "grpc_public_hdrs", "grpc_unsecure", ], ) @@ -931,7 +930,7 @@ grpc_cc_library( deps = [ "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", ], ) @@ -1250,7 +1249,6 @@ grpc_cc_library( visibility = ["@grpc:trace"], deps = [ "gpr", - "grpc_codegen", "grpc_public_hdrs", ], ) @@ -1848,7 +1846,7 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "iomgr_timer", "ref_counted", @@ -2106,7 +2104,7 @@ grpc_cc_library( deps = [ "cpp_impl_of", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "memory_quota", "ref_counted", "ref_counted_ptr", @@ -2129,7 +2127,7 @@ grpc_cc_library( ], deps = [ "gpr", - "grpc_codegen", + "grpc_public_hdrs", ], ) @@ -2149,7 +2147,7 @@ grpc_cc_library( deps = [ "gpr", "gpr_murmur_hash", - "grpc_codegen", + "grpc_public_hdrs", "slice_refcount", ], ) @@ -2185,7 +2183,7 @@ grpc_cc_library( deps = [ "gpr", "gpr_spinlock", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "slice", "slice_refcount", @@ -2250,7 +2248,7 @@ grpc_cc_library( "gpr_atm", "gpr_spinlock", "gpr_tls", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "time", "useful", @@ -2813,7 +2811,7 @@ grpc_cc_library( deps = [ "event_engine_base_hdrs", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_port", "ref_counted_ptr", "resource_quota", @@ -3001,7 +2999,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", ], ) @@ -3058,7 +3056,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "useful", ], ) @@ -3666,7 +3664,7 @@ grpc_cc_library( "debug_location", "dual_ref_counted", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "match", "ref_counted", "ref_counted_ptr", @@ -3704,7 +3702,7 @@ grpc_cc_library( "exec_ctx", "gpr_platform", "grpc_backend_metric_data", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "iomgr_fwd", "orphanable", @@ -3760,7 +3758,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "ref_counted", "ref_counted_ptr", @@ -3878,7 +3876,6 @@ grpc_cc_library( "gpr_atm", "grpc_backend_metric_data", "grpc_base", - "grpc_codegen", "grpc_deadline_filter", "grpc_health_upb", "grpc_public_hdrs", @@ -3940,7 +3937,7 @@ grpc_cc_library( "dual_ref_counted", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_service_config", "ref_counted", "ref_counted_ptr", @@ -4029,7 +4026,7 @@ grpc_cc_library( "exec_ctx_wakeup_scheduler", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "http2_errors", "idle_filter_state", @@ -4071,7 +4068,6 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "iomgr_timer", "time", @@ -4103,7 +4099,7 @@ grpc_cc_library( "config", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "slice", ], ) @@ -4136,7 +4132,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_service_config", "json", @@ -4263,7 +4258,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_message_size_filter", "grpc_public_hdrs", "grpc_trace", @@ -4277,23 +4271,6 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "grpc_codegen", - language = "c++", - public_hdrs = [ - "include/grpc/impl/codegen/byte_buffer.h", - "include/grpc/impl/codegen/byte_buffer_reader.h", - "include/grpc/impl/codegen/compression_types.h", - "include/grpc/impl/codegen/connectivity_state.h", - "include/grpc/impl/codegen/grpc_types.h", - "include/grpc/impl/codegen/propagation_bits.h", - "include/grpc/impl/codegen/status.h", - "include/grpc/impl/codegen/slice.h", - ], - visibility = ["@grpc:public"], - deps = ["gpr"], -) - grpc_cc_library( name = "grpc_grpclb_balancer_addresses", srcs = [ @@ -4307,7 +4284,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "server_address", "useful", ], @@ -4352,7 +4329,6 @@ grpc_cc_library( "gpr_atm", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_grpclb_balancer_addresses", "grpc_lb_upb", "grpc_public_hdrs", @@ -4423,7 +4399,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_fake_credentials", "grpc_public_hdrs", "grpc_resolver", @@ -4673,13 +4648,13 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_credentials_util", "grpc_fake_credentials", "grpc_fault_injection_filter", "grpc_lb_xds_channel_args", "grpc_matchers", "grpc_outlier_detection_header", + "grpc_public_hdrs", "grpc_rbac_filter", "grpc_security_base", "grpc_sockaddr", @@ -4744,7 +4719,7 @@ grpc_cc_library( "config", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "ref_counted", "ref_counted_ptr", "useful", @@ -4774,7 +4749,6 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_security_base", "grpc_server_config_selector", @@ -4859,9 +4833,9 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_matchers", "grpc_outlier_detection_header", + "grpc_public_hdrs", "grpc_security_base", "grpc_tls_credentials", "grpc_trace", @@ -4927,12 +4901,12 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_address_filtering", "grpc_lb_policy_ring_hash", "grpc_lb_xds_channel_args", "grpc_lb_xds_common", "grpc_outlier_detection_header", + "grpc_public_hdrs", "grpc_resolver", "grpc_resolver_fake", "grpc_trace", @@ -4976,9 +4950,9 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_xds_channel_args", "grpc_lb_xds_common", + "grpc_public_hdrs", "grpc_trace", "grpc_xds_client", "json", @@ -5018,7 +4992,7 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver_xds_header", "grpc_trace", "iomgr_timer", @@ -5076,7 +5050,7 @@ grpc_cc_library( "gpr", "gpr_manual_constructor", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "lb_policy", "ref_counted_ptr", @@ -5104,8 +5078,8 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "lb_policy", @@ -5145,8 +5119,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "json_args", @@ -5183,8 +5157,8 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "lb_policy", @@ -5237,8 +5211,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_outlier_detection_header", + "grpc_public_hdrs", "grpc_trace", "iomgr_fwd", "iomgr_timer", @@ -5279,8 +5253,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_address_filtering", + "grpc_public_hdrs", "grpc_trace", "iomgr_timer", "json", @@ -5322,8 +5296,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_address_filtering", + "grpc_public_hdrs", "grpc_trace", "json", "json_args", @@ -5375,7 +5349,6 @@ grpc_cc_library( "gpr", "gpr_platform", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_security_base", "grpc_sockaddr", @@ -5439,7 +5412,7 @@ grpc_cc_library( "grpc", "grpc++", "grpc++_codegen_base", - "grpc_codegen", + "grpc_public_hdrs", "lb_server_load_reporting_filter", "lb_server_load_reporting_service_server_builder_plugin", ], @@ -5573,7 +5546,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_resolver_dns_selection", "grpc_trace", @@ -5621,8 +5594,8 @@ grpc_cc_library( "event_engine_common", "gpr", "grpc_base", - "grpc_codegen", "grpc_grpclb_balancer_addresses", + "grpc_public_hdrs", "grpc_resolver", "grpc_resolver_dns_selection", "grpc_service_config", @@ -5714,7 +5687,7 @@ grpc_cc_library( "config", "debug_location", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_service_config", "orphanable", @@ -5767,7 +5740,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_policy_ring_hash", "grpc_public_hdrs", "grpc_resolver", @@ -5810,7 +5782,7 @@ grpc_cc_library( "env", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_security_base", "grpc_xds_client", @@ -5854,7 +5826,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "handshaker", @@ -5900,8 +5872,8 @@ grpc_cc_library( "dual_ref_counted", "gpr", "grpc_base", - "grpc_codegen", "grpc_credentials_util", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "promise", @@ -5957,7 +5929,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6081,7 +6053,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6117,7 +6089,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "handshaker", @@ -6155,11 +6127,11 @@ grpc_cc_library( "gpr", "grpc_alts_credentials", "grpc_base", - "grpc_codegen", "grpc_external_account_credentials", "grpc_jwt_credentials", "grpc_lb_xds_channel_args", "grpc_oauth2_credentials", + "grpc_public_hdrs", "grpc_security_base", "grpc_ssl_credentials", "grpc_trace", @@ -6211,7 +6183,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_credentials_util", "grpc_public_hdrs", "grpc_security_base", @@ -6415,7 +6386,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6492,7 +6463,6 @@ grpc_cc_library( "gpr", "gpr_atm", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "handshaker", @@ -6625,7 +6595,7 @@ grpc_cc_library( deps = [ "cpp_impl_of", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "ref_counted", "slice", ], @@ -6657,8 +6627,8 @@ grpc_cc_library( deps = [ "gpr", "grpc_base", - "grpc_codegen", "grpc_credentials_util", + "grpc_public_hdrs", "grpc_security_base", "grpc_transport_chttp2_alpn", "ref_counted", @@ -6773,7 +6743,6 @@ grpc_cc_library( "gpr", "grpc_authorization_base", "grpc_base", - "grpc_codegen", "grpc_matchers", "grpc_public_hdrs", "grpc_rbac_engine", @@ -6985,7 +6954,6 @@ grpc_cc_library( "gpr", "gpr_atm", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "hpack_constants", @@ -7051,7 +7019,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_insecure_credentials", "grpc_public_hdrs", "grpc_resolver", @@ -7095,8 +7062,8 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_insecure_credentials", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "grpc_transport_chttp2", @@ -7143,7 +7110,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "iomgr_fwd", @@ -7275,9 +7241,9 @@ grpc_cc_library( "grpc++_codegen_base_src", "grpc++_codegen_proto", "grpc_base", - "grpc_codegen", "grpc_credentials_util", "grpc_health_upb", + "grpc_public_hdrs", "grpc_security_base", "grpc_service_config", "grpc_service_config_impl", @@ -7330,9 +7296,9 @@ grpc_cc_library( "grpc++_codegen_base", "grpc++_codegen_base_src", "grpc_base", - "grpc_codegen", "grpc_health_upb", "grpc_insecure_credentials", + "grpc_public_hdrs", "grpc_service_config", "grpc_service_config_impl", "grpc_trace", @@ -7433,7 +7399,7 @@ grpc_cc_library( visibility = ["@grpc:public"], deps = [ "grpc++_public_hdrs", - "grpc_codegen", + "grpc_public_hdrs", ], ) diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 74b1465ccde..99b034b04e3 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -86,7 +86,6 @@ grpc_cc_library( deps = [ "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], @@ -116,7 +115,6 @@ grpc_cc_test( "//:gpr", "//:gpr_atm", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:iomgr_fwd", "//test/core/util:grpc_test_util", @@ -131,7 +129,6 @@ grpc_cc_test( "cq_verifier", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], @@ -151,7 +148,6 @@ grpc_cc_test( "cq_verifier", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:iomgr_port", "//:resolved_address", @@ -176,7 +172,6 @@ grpc_cc_test( "//:default_event_engine", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:grpc_resolver_dns_ares", "//:grpc_sockaddr", @@ -198,7 +193,6 @@ grpc_cc_test( "local_util", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:grpc_transport_inproc", "//test/core/util:grpc_test_util", @@ -215,7 +209,6 @@ grpc_cc_test( "//:gpr", "//:gpr_platform", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], @@ -241,7 +234,6 @@ grpc_cc_test( "//:exec_ctx", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:grpc_resolver_fake", "//:ref_counted_ptr", @@ -267,7 +259,6 @@ grpc_cc_test( "cq_verifier", "//:gpr", "//:grpc", - "//:grpc_codegen", "//:grpc_public_hdrs", "//:tsi_ssl_credentials", "//:useful",