From 409f5588717557b916dce10855369d377e753fe8 Mon Sep 17 00:00:00 2001 From: Cheng-Yu Chung Date: Tue, 27 Sep 2022 11:24:35 -0400 Subject: [PATCH] Revert "Revert "Remove `grpc_codegen` (#30960)" (#31099)" (#31100) This reverts commit eada386921b7f1a3e22073bba60d770d300be671. --- BUILD | 136 +++++++++++++++------------------------- test/core/end2end/BUILD | 9 --- 2 files changed, 51 insertions(+), 94 deletions(-) diff --git a/BUILD b/BUILD index ee73d392136..53f0c32c660 100644 --- a/BUILD +++ b/BUILD @@ -601,7 +601,6 @@ grpc_cc_library( "grpc_authorization_base", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_common", "grpc_credentials_util", "grpc_external_account_credentials", @@ -613,6 +612,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", @@ -798,7 +798,7 @@ grpc_cc_library( "grpc++_base", "grpc_base", "grpc_client_channel", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "iomgr_port", "orphanable", @@ -821,7 +821,6 @@ grpc_cc_library( external_deps = ["absl/strings"], language = "c++", deps = [ - "exec_ctx", "gpr", "grpc", "grpc++_base", @@ -870,8 +869,8 @@ grpc_cc_library( "grpc++_codegen_base", "grpc++_codegen_base_src", "grpc++_codegen_proto", - "grpc_codegen", "grpc_insecure_credentials", + "grpc_public_hdrs", "grpc_unsecure", ], ) @@ -933,7 +932,7 @@ grpc_cc_library( deps = [ "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", ], ) @@ -1245,7 +1244,6 @@ grpc_cc_library( visibility = ["@grpc:trace"], deps = [ "gpr", - "grpc_codegen", "grpc_public_hdrs", ], ) @@ -1842,7 +1840,7 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "iomgr_timer", "ref_counted", @@ -2097,7 +2095,7 @@ grpc_cc_library( deps = [ "cpp_impl_of", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "memory_quota", "ref_counted", "ref_counted_ptr", @@ -2120,7 +2118,7 @@ grpc_cc_library( ], deps = [ "gpr", - "grpc_codegen", + "grpc_public_hdrs", ], ) @@ -2140,7 +2138,7 @@ grpc_cc_library( deps = [ "gpr", "gpr_murmur_hash", - "grpc_codegen", + "grpc_public_hdrs", "slice_refcount", ], ) @@ -2176,7 +2174,7 @@ grpc_cc_library( deps = [ "gpr", "gpr_spinlock", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "slice", "slice_refcount", @@ -2239,7 +2237,7 @@ grpc_cc_library( "gpr", "gpr_atm", "gpr_spinlock", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "time", "useful", @@ -2821,7 +2819,7 @@ grpc_cc_library( deps = [ "event_engine_base_hdrs", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_port", "ref_counted_ptr", "resource_quota", @@ -3010,7 +3008,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", ], ) @@ -3067,7 +3065,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "useful", ], ) @@ -3704,7 +3702,7 @@ grpc_cc_library( "debug_location", "dual_ref_counted", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "match", "ref_counted", "ref_counted_ptr", @@ -3742,7 +3740,7 @@ grpc_cc_library( "exec_ctx", "gpr_platform", "grpc_backend_metric_data", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "iomgr_fwd", "orphanable", @@ -3798,7 +3796,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "ref_counted", "ref_counted_ptr", @@ -3916,7 +3914,6 @@ grpc_cc_library( "gpr_atm", "grpc_backend_metric_data", "grpc_base", - "grpc_codegen", "grpc_deadline_filter", "grpc_health_upb", "grpc_public_hdrs", @@ -3978,7 +3975,7 @@ grpc_cc_library( "dual_ref_counted", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_service_config", "ref_counted", "ref_counted_ptr", @@ -4067,7 +4064,7 @@ grpc_cc_library( "exec_ctx_wakeup_scheduler", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "http2_errors", "idle_filter_state", @@ -4109,7 +4106,6 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "iomgr_timer", "time", @@ -4141,7 +4137,7 @@ grpc_cc_library( "config", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "slice", ], ) @@ -4174,7 +4170,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_service_config", "json", @@ -4301,7 +4296,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_message_size_filter", "grpc_public_hdrs", "grpc_trace", @@ -4315,23 +4309,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 = [ @@ -4345,7 +4322,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", - "grpc_codegen", + "grpc_public_hdrs", "server_address", "useful", ], @@ -4390,7 +4367,6 @@ grpc_cc_library( "gpr_atm", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_grpclb_balancer_addresses", "grpc_lb_upb", "grpc_public_hdrs", @@ -4461,7 +4437,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_fake_credentials", "grpc_public_hdrs", "grpc_resolver", @@ -4712,13 +4687,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", @@ -4784,7 +4759,7 @@ grpc_cc_library( "config", "gpr_platform", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "ref_counted", "ref_counted_ptr", "useful", @@ -4814,7 +4789,6 @@ grpc_cc_library( "exec_ctx", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_security_base", "grpc_server_config_selector", @@ -4899,9 +4873,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", @@ -4967,12 +4941,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", @@ -5016,9 +4990,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", @@ -5058,7 +5032,7 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver_xds_header", "grpc_trace", "iomgr_timer", @@ -5116,7 +5090,7 @@ grpc_cc_library( "gpr", "gpr_manual_constructor", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "iomgr_fwd", "lb_policy", "ref_counted_ptr", @@ -5144,8 +5118,8 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "lb_policy", @@ -5185,8 +5159,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "json_args", @@ -5223,8 +5197,8 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_lb_subchannel_list", + "grpc_public_hdrs", "grpc_trace", "json", "lb_policy", @@ -5277,8 +5251,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", @@ -5319,8 +5293,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_address_filtering", + "grpc_public_hdrs", "grpc_trace", "iomgr_timer", "json", @@ -5362,8 +5336,8 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_address_filtering", + "grpc_public_hdrs", "grpc_trace", "json", "json_args", @@ -5415,7 +5389,6 @@ grpc_cc_library( "gpr", "gpr_platform", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_security_base", "grpc_sockaddr", @@ -5479,7 +5452,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", ], @@ -5613,7 +5586,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_resolver_dns_selection", "grpc_trace", @@ -5661,8 +5634,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", @@ -5754,7 +5727,7 @@ grpc_cc_library( "config", "debug_location", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_service_config", "orphanable", @@ -5807,7 +5780,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_lb_policy_ring_hash", "grpc_public_hdrs", "grpc_resolver", @@ -5850,7 +5822,7 @@ grpc_cc_library( "env", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_resolver", "grpc_security_base", "grpc_xds_client", @@ -5894,7 +5866,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "handshaker", @@ -5940,8 +5912,8 @@ grpc_cc_library( "dual_ref_counted", "gpr", "grpc_base", - "grpc_codegen", "grpc_credentials_util", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "promise", @@ -5997,7 +5969,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6121,7 +6093,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6157,7 +6129,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "grpc_trace", "handshaker", @@ -6195,11 +6167,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", @@ -6251,7 +6223,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_credentials_util", "grpc_public_hdrs", "grpc_security_base", @@ -6455,7 +6426,7 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", + "grpc_public_hdrs", "grpc_security_base", "handshaker", "iomgr_fwd", @@ -6532,7 +6503,6 @@ grpc_cc_library( "gpr", "gpr_atm", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "handshaker", @@ -6665,7 +6635,7 @@ grpc_cc_library( deps = [ "cpp_impl_of", "gpr", - "grpc_codegen", + "grpc_public_hdrs", "ref_counted", "slice", ], @@ -6697,8 +6667,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", @@ -6813,7 +6783,6 @@ grpc_cc_library( "gpr", "grpc_authorization_base", "grpc_base", - "grpc_codegen", "grpc_matchers", "grpc_public_hdrs", "grpc_rbac_engine", @@ -7025,7 +6994,6 @@ grpc_cc_library( "gpr", "gpr_atm", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "hpack_constants", @@ -7091,7 +7059,6 @@ grpc_cc_library( "gpr", "grpc_base", "grpc_client_channel", - "grpc_codegen", "grpc_insecure_credentials", "grpc_public_hdrs", "grpc_resolver", @@ -7134,8 +7101,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", @@ -7181,7 +7148,6 @@ grpc_cc_library( "debug_location", "gpr", "grpc_base", - "grpc_codegen", "grpc_public_hdrs", "grpc_trace", "iomgr_fwd", @@ -7313,9 +7279,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", @@ -7368,9 +7334,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", @@ -7471,7 +7437,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",