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