From a2697e4592e2d771eaf40658f7ca84ec75754367 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@users.noreply.github.com>
Date: Thu, 4 Mar 2021 15:07:24 +0100
Subject: [PATCH] simplify build.yaml: get rid of the "secure" field (#25547)

* get rid of useless "secure" field from build.yaml

* remove nonsensical "liblibssl.a" dependency from makefile

* regenerate projects
---
 BUILD.gn                                      |   3 +-
 CMakeLists.txt                                | 299 ++++++++++++++++-
 Makefile                                      |   6 +-
 build_autogenerated.yaml                      | 313 +++++++++++++++++-
 templates/BUILD.gn.template                   |   6 +-
 templates/CMakeLists.txt.template             |   4 +-
 templates/Makefile.template                   |  18 +-
 templates/README.md                           |  11 -
 templates/grpc.gyp.template                   |   2 +
 .../extract_metadata_from_bazel_xml.py        |  19 +-
 10 files changed, 617 insertions(+), 64 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 89ab85273fd..1d78f751882 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1231,11 +1231,11 @@ config("grpc_config") {
         "src/core/tsi/transport_security_interface.h",
     ]
     deps = [
-        "//third_party/boringssl",
         "//third_party/zlib",
         ":gpr",
         ":address_sorting",
         ":upb",
+        "//third_party/boringssl",
         ":absl/types:optional",
         ":absl/strings:strings",
         ":absl/status:statusor",
@@ -1513,6 +1513,7 @@ config("grpc_config") {
         ":gpr",
         ":address_sorting",
         ":upb",
+        "//third_party/boringssl",
         ":absl/synchronization:synchronization",
     ]
     
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f64c475146..af447a0c861 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1159,6 +1159,7 @@ target_link_libraries(end2end_nosec_tests
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -1287,13 +1288,13 @@ target_include_directories(end2end_tests
     ${_gRPC_ZLIB_INCLUDE_DIR}
 )
 target_link_libraries(end2end_tests
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   grpc_test_util
   grpc
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -2019,7 +2020,6 @@ target_include_directories(grpc
 )
 target_link_libraries(grpc
   ${_gRPC_BASELIB_LIBRARIES}
-  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_ZLIB_LIBRARIES}
   ${_gRPC_CARES_LIBRARIES}
   ${_gRPC_ADDRESS_SORTING_LIBRARIES}
@@ -2029,6 +2029,7 @@ target_link_libraries(grpc
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::optional
   absl::strings
   absl::statusor
@@ -2114,6 +2115,7 @@ target_link_libraries(grpc_csharp_ext
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -2180,6 +2182,7 @@ target_link_libraries(grpc_test_util
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::symbolize
   absl::stacktrace
   absl::failure_signal_handler
@@ -2784,6 +2787,7 @@ target_link_libraries(grpc++
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::synchronization
 )
 
@@ -3033,6 +3037,7 @@ target_link_libraries(grpc++_alts
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 foreach(_hdr
@@ -3097,6 +3102,7 @@ target_link_libraries(grpc++_error_details
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 foreach(_hdr
@@ -3167,6 +3173,7 @@ target_link_libraries(grpc++_reflection
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 foreach(_hdr
@@ -3239,6 +3246,7 @@ target_link_libraries(grpc++_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 foreach(_hdr
@@ -3361,6 +3369,7 @@ target_link_libraries(grpc++_test_util
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -3767,6 +3776,7 @@ target_link_libraries(grpcpp_channelz
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 foreach(_hdr
@@ -3979,6 +3989,7 @@ target_link_libraries(algorithm_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4009,6 +4020,7 @@ target_link_libraries(alloc_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4039,6 +4051,7 @@ target_link_libraries(alpn_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4070,6 +4083,7 @@ target_link_libraries(alts_counter_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4101,6 +4115,7 @@ target_link_libraries(alts_crypt_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4132,6 +4147,7 @@ target_link_libraries(alts_crypter_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4164,6 +4180,7 @@ target_link_libraries(alts_frame_protector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4195,6 +4212,7 @@ target_link_libraries(alts_grpc_record_protocol_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4226,6 +4244,7 @@ target_link_libraries(alts_handshaker_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4257,6 +4276,7 @@ target_link_libraries(alts_iovec_record_protocol_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4287,6 +4307,7 @@ target_link_libraries(alts_security_connector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4318,6 +4339,7 @@ target_link_libraries(alts_tsi_handshaker_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4349,6 +4371,7 @@ target_link_libraries(alts_tsi_utils_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4380,6 +4403,7 @@ target_link_libraries(alts_zero_copy_grpc_protector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4410,6 +4434,7 @@ target_link_libraries(arena_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4440,6 +4465,7 @@ target_link_libraries(auth_context_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4470,6 +4496,7 @@ target_link_libraries(avl_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4500,6 +4527,7 @@ target_link_libraries(b64_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4531,6 +4559,7 @@ target_link_libraries(bad_server_response_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4563,6 +4592,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -4596,6 +4626,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -4627,6 +4658,7 @@ target_link_libraries(bin_decoder_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4657,6 +4689,7 @@ target_link_libraries(bin_encoder_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4687,6 +4720,7 @@ target_link_libraries(buffer_list_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4717,6 +4751,7 @@ target_link_libraries(channel_args_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4747,6 +4782,7 @@ target_link_libraries(channel_create_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4777,6 +4813,7 @@ target_link_libraries(channel_stack_builder_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4807,6 +4844,7 @@ target_link_libraries(channel_stack_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4837,6 +4875,7 @@ target_link_libraries(check_gcp_environment_linux_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4867,6 +4906,7 @@ target_link_libraries(check_gcp_environment_windows_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4898,6 +4938,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -4929,6 +4970,7 @@ target_link_libraries(cmdline_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -4960,6 +5002,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -4991,6 +5034,7 @@ target_link_libraries(completion_queue_threading_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5021,6 +5065,7 @@ target_link_libraries(compression_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5051,6 +5096,7 @@ target_link_libraries(concurrent_connectivity_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5082,6 +5128,7 @@ target_link_libraries(connection_refused_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5112,6 +5159,7 @@ target_link_libraries(cpu_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5142,6 +5190,7 @@ target_link_libraries(dns_resolver_connectivity_using_ares_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5172,6 +5221,7 @@ target_link_libraries(dns_resolver_connectivity_using_native_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5202,6 +5252,7 @@ target_link_libraries(dns_resolver_cooldown_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5232,6 +5283,7 @@ target_link_libraries(dns_resolver_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5264,6 +5316,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5296,6 +5349,7 @@ target_link_libraries(endpoint_pair_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5326,6 +5380,7 @@ target_link_libraries(env_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5357,6 +5412,7 @@ target_link_libraries(error_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5388,6 +5444,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5419,6 +5476,7 @@ target_link_libraries(fake_resolver_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5450,6 +5508,7 @@ target_link_libraries(fake_transport_security_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5481,6 +5540,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5513,6 +5573,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5549,6 +5610,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5585,6 +5647,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5617,6 +5680,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5652,6 +5716,7 @@ target_link_libraries(format_request_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5683,6 +5748,7 @@ target_link_libraries(frame_handler_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5714,6 +5780,7 @@ target_link_libraries(goaway_server_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5744,6 +5811,7 @@ target_link_libraries(grpc_alts_credentials_options_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5774,6 +5842,7 @@ target_link_libraries(grpc_byte_buffer_reader_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5804,6 +5873,7 @@ target_link_libraries(grpc_completion_queue_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5834,6 +5904,7 @@ target_link_libraries(grpc_ipv6_loopback_available_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5866,6 +5937,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5898,6 +5970,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -5929,6 +6002,7 @@ target_link_libraries(histogram_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5959,6 +6033,7 @@ target_link_libraries(host_port_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -5989,6 +6064,7 @@ target_link_libraries(hpack_encoder_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6019,6 +6095,7 @@ target_link_libraries(hpack_parser_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6049,6 +6126,7 @@ target_link_libraries(hpack_table_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6084,6 +6162,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6120,6 +6199,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6152,6 +6232,7 @@ target_link_libraries(inproc_callback_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6183,6 +6264,7 @@ target_link_libraries(invalid_call_argument_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6213,6 +6295,7 @@ target_link_libraries(json_token_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6243,6 +6326,7 @@ target_link_libraries(jwt_verifier_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6274,6 +6358,7 @@ target_link_libraries(lame_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6304,6 +6389,7 @@ target_link_libraries(load_file_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6334,6 +6420,7 @@ target_link_libraries(manual_constructor_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6364,6 +6451,7 @@ target_link_libraries(message_compress_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6394,6 +6482,7 @@ target_link_libraries(metadata_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6424,6 +6513,7 @@ target_link_libraries(minimal_stack_is_minimal_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6454,6 +6544,7 @@ target_link_libraries(mpmcqueue_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6485,6 +6576,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6517,6 +6609,7 @@ target_link_libraries(multiple_server_queues_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6547,6 +6640,7 @@ target_link_libraries(murmur_hash_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6578,6 +6672,7 @@ target_link_libraries(no_server_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6608,6 +6703,7 @@ target_link_libraries(num_external_connectivity_watchers_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6638,6 +6734,7 @@ target_link_libraries(parse_address_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6669,6 +6766,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6704,6 +6802,7 @@ target_link_libraries(parser_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6734,6 +6833,7 @@ target_link_libraries(percent_encoding_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6764,6 +6864,7 @@ target_link_libraries(public_headers_must_be_c89
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6795,6 +6896,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6826,6 +6928,7 @@ target_link_libraries(resolve_address_using_ares_resolver_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6857,6 +6960,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -6888,6 +6992,7 @@ target_link_libraries(resolve_address_using_native_resolver_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6918,6 +7023,7 @@ target_link_libraries(resource_quota_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6948,6 +7054,7 @@ target_link_libraries(secure_channel_create_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -6979,6 +7086,7 @@ target_link_libraries(secure_endpoint_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7009,6 +7117,7 @@ target_link_libraries(security_connector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7039,6 +7148,7 @@ target_link_libraries(sequential_connectivity_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7071,6 +7181,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7102,6 +7213,7 @@ target_link_libraries(server_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7132,6 +7244,7 @@ target_link_libraries(slice_buffer_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7162,6 +7275,7 @@ target_link_libraries(slice_string_helpers_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7192,6 +7306,7 @@ target_link_libraries(sockaddr_resolver_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7222,6 +7337,7 @@ target_link_libraries(sockaddr_utils_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7253,6 +7369,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7284,6 +7401,7 @@ target_link_libraries(spinlock_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7314,6 +7432,7 @@ target_link_libraries(ssl_credentials_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7346,6 +7465,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7377,6 +7497,7 @@ target_link_libraries(status_conversion_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7407,6 +7528,7 @@ target_link_libraries(stream_compression_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7437,6 +7559,7 @@ target_link_libraries(stream_map_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7467,6 +7590,7 @@ target_link_libraries(stream_owned_slice_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7497,6 +7621,7 @@ target_link_libraries(string_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7527,6 +7652,7 @@ target_link_libraries(sync_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7558,6 +7684,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7591,6 +7718,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7623,6 +7751,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -7654,6 +7783,7 @@ target_link_libraries(test_core_gpr_time_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7684,6 +7814,7 @@ target_link_libraries(test_core_security_credentials_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7714,6 +7845,7 @@ target_link_libraries(test_core_slice_slice_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7744,6 +7876,7 @@ target_link_libraries(thd_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7774,6 +7907,7 @@ target_link_libraries(threadpool_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7804,6 +7938,7 @@ target_link_libraries(time_averaged_stats_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7834,6 +7969,7 @@ target_link_libraries(timeout_encoding_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7864,6 +8000,7 @@ target_link_libraries(timer_heap_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7894,6 +8031,7 @@ target_link_libraries(timer_list_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7924,6 +8062,7 @@ target_link_libraries(tls_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7954,6 +8093,7 @@ target_link_libraries(transport_security_common_api_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -7984,6 +8124,7 @@ target_link_libraries(transport_security_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8015,6 +8156,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -8046,6 +8188,7 @@ target_link_libraries(useful_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8076,6 +8219,7 @@ target_link_libraries(varint_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8118,6 +8262,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -8255,6 +8400,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -8297,6 +8443,7 @@ target_link_libraries(alts_util_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8357,6 +8504,7 @@ target_link_libraries(async_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8397,6 +8545,7 @@ target_link_libraries(auth_property_iterator_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8435,6 +8584,7 @@ target_link_libraries(authorization_engine_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8473,6 +8623,7 @@ target_link_libraries(aws_request_signer_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8511,6 +8662,7 @@ target_link_libraries(backoff_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8551,6 +8703,7 @@ target_link_libraries(bad_streaming_id_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8591,6 +8744,7 @@ target_link_libraries(badreq_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -8630,6 +8784,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -9604,6 +9759,7 @@ target_link_libraries(byte_buffer_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9642,6 +9798,7 @@ target_link_libraries(byte_stream_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9685,6 +9842,7 @@ target_link_libraries(cancel_ares_query_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9723,6 +9881,7 @@ target_link_libraries(certificate_provider_registry_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9761,6 +9920,7 @@ target_link_libraries(certificate_provider_store_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9814,6 +9974,7 @@ target_link_libraries(cfstream_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9853,6 +10014,7 @@ target_link_libraries(channel_arguments_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9892,6 +10054,7 @@ target_link_libraries(channel_filter_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9936,6 +10099,7 @@ target_link_libraries(channel_trace_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -9975,6 +10139,7 @@ target_link_libraries(channelz_registry_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10029,6 +10194,7 @@ target_link_libraries(channelz_service_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10073,6 +10239,7 @@ target_link_libraries(channelz_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10135,6 +10302,7 @@ target_link_libraries(cli_call_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -10190,6 +10358,7 @@ target_link_libraries(client_callback_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10252,6 +10421,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -10307,6 +10477,7 @@ target_link_libraries(client_interceptors_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10370,6 +10541,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -10410,6 +10582,7 @@ target_link_libraries(codegen_test_full
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10449,6 +10622,7 @@ target_link_libraries(codegen_test_minimal
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10489,6 +10663,7 @@ target_link_libraries(connection_prefix_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10527,6 +10702,7 @@ target_link_libraries(connectivity_state_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10580,6 +10756,7 @@ target_link_libraries(context_allocator_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10618,6 +10795,7 @@ target_link_libraries(context_list_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10671,6 +10849,7 @@ target_link_libraries(delegating_channel_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10711,6 +10890,7 @@ target_link_libraries(destroy_grpclb_channel_with_active_connect_stress_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10749,6 +10929,7 @@ target_link_libraries(dual_ref_counted_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10789,6 +10970,7 @@ target_link_libraries(duplicate_header_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10848,6 +11030,7 @@ target_link_libraries(end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10896,6 +11079,7 @@ target_link_libraries(error_details_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10934,6 +11118,7 @@ target_link_libraries(evaluate_args_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -10972,6 +11157,7 @@ target_link_libraries(eventmanager_libuv_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11011,6 +11197,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
     absl::symbolize
     absl::stacktrace
   )
@@ -11066,6 +11253,7 @@ target_link_libraries(exception_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11104,6 +11292,7 @@ target_link_libraries(file_watcher_certificate_provider_factory_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11160,6 +11349,7 @@ target_link_libraries(filter_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11213,6 +11403,7 @@ target_link_libraries(flaky_network_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11269,6 +11460,7 @@ target_link_libraries(generic_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11308,6 +11500,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -11347,6 +11540,7 @@ target_link_libraries(global_config_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11386,6 +11580,7 @@ target_link_libraries(google_mesh_ca_certificate_provider_factory_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11435,6 +11630,7 @@ target_link_libraries(grpc_cli
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -11740,6 +11936,7 @@ target_link_libraries(grpc_tls_certificate_distributor_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11778,6 +11975,7 @@ target_link_libraries(grpc_tls_certificate_provider_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11816,6 +12014,7 @@ target_link_libraries(grpc_tls_credentials_options_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11876,6 +12075,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
     absl::flags
   )
 
@@ -11922,6 +12122,7 @@ target_link_libraries(grpclb_api_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -11984,6 +12185,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -12024,6 +12226,7 @@ target_link_libraries(h2_ssl_session_reuse_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12064,6 +12267,7 @@ target_link_libraries(head_of_line_blocking_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12104,6 +12308,7 @@ target_link_libraries(headers_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12166,6 +12371,7 @@ target_link_libraries(health_service_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12219,6 +12425,7 @@ target_link_libraries(http2_client
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -12277,6 +12484,7 @@ target_link_libraries(hybrid_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12315,6 +12523,7 @@ target_link_libraries(init_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12355,6 +12564,7 @@ target_link_libraries(initial_settings_frame_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12393,6 +12603,7 @@ target_link_libraries(insecure_security_connector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12449,6 +12660,7 @@ target_link_libraries(interop_client
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -12505,6 +12717,7 @@ target_link_libraries(interop_server
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -12548,6 +12761,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
     absl::flags
   )
 
@@ -12588,6 +12802,7 @@ target_link_libraries(json_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12628,6 +12843,7 @@ target_link_libraries(large_metadata_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12671,6 +12887,7 @@ target_link_libraries(lb_get_cpu_stats_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12711,6 +12928,7 @@ target_link_libraries(lb_load_data_store_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12749,6 +12967,7 @@ target_link_libraries(linux_system_roots_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12787,6 +13006,7 @@ target_link_libraries(log_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12825,6 +13045,7 @@ target_link_libraries(matchers_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12878,6 +13099,7 @@ target_link_libraries(message_allocator_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12935,6 +13157,7 @@ target_link_libraries(mock_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -12987,6 +13210,7 @@ target_link_libraries(nonblocking_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13025,6 +13249,7 @@ target_link_libraries(noop-benchmark
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   ${_gRPC_BENCHMARK_LIBRARIES}
 )
 
@@ -13064,6 +13289,7 @@ target_link_libraries(orphanable_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13104,6 +13330,7 @@ target_link_libraries(out_of_bounds_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13142,6 +13369,7 @@ target_link_libraries(pid_controller_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13195,6 +13423,7 @@ target_link_libraries(port_sharing_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13254,6 +13483,7 @@ target_link_libraries(proto_server_reflection_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13293,6 +13523,7 @@ target_link_libraries(proto_utils_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13380,6 +13611,7 @@ target_link_libraries(qps_json_driver
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -13460,6 +13692,7 @@ target_link_libraries(qps_worker
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -13518,6 +13751,7 @@ target_link_libraries(raw_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13556,6 +13790,7 @@ target_link_libraries(ref_counted_ptr_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13594,6 +13829,7 @@ target_link_libraries(ref_counted_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13633,6 +13869,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -13672,6 +13909,7 @@ target_link_libraries(retry_throttle_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13712,6 +13950,7 @@ target_link_libraries(secure_auth_context_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13769,6 +14008,7 @@ target_link_libraries(server_builder_plugin_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13913,6 +14153,7 @@ target_link_libraries(server_chttp2_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -13954,6 +14195,7 @@ target_link_libraries(server_context_test_spouse_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14006,6 +14248,7 @@ target_link_libraries(server_early_return_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14060,6 +14303,7 @@ target_link_libraries(server_interceptors_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14100,6 +14344,7 @@ target_link_libraries(server_registered_method_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14210,6 +14455,7 @@ target_link_libraries(service_config_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14248,6 +14494,7 @@ target_link_libraries(service_config_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14286,6 +14533,7 @@ target_link_libraries(settings_timeout_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14342,6 +14590,7 @@ target_link_libraries(shutdown_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14382,6 +14631,7 @@ target_link_libraries(simple_request_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14421,6 +14671,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
     absl::symbolize
   )
 
@@ -14461,6 +14712,7 @@ target_link_libraries(stat_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14499,6 +14751,7 @@ target_link_libraries(static_metadata_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14537,6 +14790,7 @@ target_link_libraries(stats_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14575,6 +14829,7 @@ target_link_libraries(status_metadata_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14613,6 +14868,7 @@ target_link_libraries(status_util_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14653,6 +14909,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -14711,6 +14968,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -14751,6 +15009,7 @@ target_link_libraries(string_ref_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14790,6 +15049,7 @@ target_link_libraries(test_cpp_client_credentials_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14829,6 +15089,7 @@ target_link_libraries(test_cpp_server_credentials_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14869,6 +15130,7 @@ target_link_libraries(test_cpp_util_slice_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14909,6 +15171,7 @@ target_link_libraries(test_cpp_util_time_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -14950,6 +15213,7 @@ target_link_libraries(thread_manager_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15007,6 +15271,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -15048,6 +15313,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -15087,6 +15353,7 @@ target_link_libraries(time_util_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15126,6 +15393,7 @@ target_link_libraries(timer_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15164,6 +15432,7 @@ target_link_libraries(tls_security_connector_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15206,6 +15475,7 @@ target_link_libraries(too_many_pings_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15246,6 +15516,7 @@ target_link_libraries(unknown_frame_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15284,6 +15555,7 @@ target_link_libraries(uri_parser_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15324,6 +15596,7 @@ target_link_libraries(window_overflow_bad_client_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15363,6 +15636,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -15437,6 +15711,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
     absl::symbolize
     absl::stacktrace
     absl::failure_signal_handler
@@ -15479,6 +15754,7 @@ target_link_libraries(xds_bootstrap_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15517,6 +15793,7 @@ target_link_libraries(xds_certificate_provider_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15570,6 +15847,7 @@ target_link_libraries(xds_credentials_end2end_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15608,6 +15886,7 @@ target_link_libraries(xds_credentials_test
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
 )
 
 
@@ -15766,6 +16045,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     gpr
     address_sorting
     upb
+    ${_gRPC_SSL_LIBRARIES}
   )
 
 
@@ -15819,6 +16099,7 @@ target_link_libraries(xds_interop_client
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -15872,6 +16153,7 @@ target_link_libraries(xds_interop_server
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -15913,6 +16195,7 @@ target_link_libraries(alts_credentials_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -15954,6 +16237,7 @@ target_link_libraries(client_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -15995,6 +16279,7 @@ target_link_libraries(hpack_parser_fuzzer_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16036,6 +16321,7 @@ target_link_libraries(http_request_fuzzer_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16077,6 +16363,7 @@ target_link_libraries(http_response_fuzzer_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16118,6 +16405,7 @@ target_link_libraries(json_fuzzer_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16159,6 +16447,7 @@ target_link_libraries(nanopb_fuzzer_response_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16200,6 +16489,7 @@ target_link_libraries(nanopb_fuzzer_serverlist_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16241,6 +16531,7 @@ target_link_libraries(percent_decode_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16282,6 +16573,7 @@ target_link_libraries(percent_encode_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16323,6 +16615,7 @@ target_link_libraries(server_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16364,6 +16657,7 @@ target_link_libraries(ssl_server_fuzzer_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
@@ -16405,6 +16699,7 @@ target_link_libraries(uri_fuzzer_test_one_entry
   gpr
   address_sorting
   upb
+  ${_gRPC_SSL_LIBRARIES}
   absl::flags
 )
 
diff --git a/Makefile b/Makefile
index cb4e68971d1..9b1a2983d70 100644
--- a/Makefile
+++ b/Makefile
@@ -1670,15 +1670,15 @@ ifeq ($(SYSTEM),MINGW32)
 $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CSHARP_EXT_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
 else
 $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CSHARP_EXT_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.15 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.15 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).so.15
 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).so
 endif
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 2e7c4fa7d48..0ed6e981ef3 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -12,7 +12,6 @@ libs:
   - third_party/address_sorting/address_sorting_posix.c
   - third_party/address_sorting/address_sorting_windows.c
   deps: []
-  secure: false
 - name: end2end_nosec_tests
   build: private
   language: c
@@ -121,7 +120,7 @@ libs:
   - gpr
   - address_sorting
   - upb
-  secure: false
+  - libssl
 - name: end2end_tests
   build: private
   language: c
@@ -231,7 +230,7 @@ libs:
   - gpr
   - address_sorting
   - upb
-  secure: true
+  - libssl
 - name: gpr
   build: all
   language: c
@@ -365,7 +364,6 @@ libs:
   - absl/status:status
   - absl/memory:memory
   - absl/base:base
-  secure: false
 - name: grpc
   build: all
   language: c
@@ -1410,6 +1408,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/types:optional
   - absl/strings:strings
   - absl/status:statusor
@@ -1420,7 +1419,6 @@ libs:
   - absl/container:flat_hash_map
   baselib: true
   generate_plugin_registry: true
-  secure: true
 - name: grpc_csharp_ext
   build: all
   language: c
@@ -1433,6 +1431,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_test_util
   build: private
   language: c
@@ -1488,6 +1487,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/debugging:symbolize
   - absl/debugging:stacktrace
   - absl/debugging:failure_signal_handler
@@ -1547,7 +1547,6 @@ libs:
   - absl/debugging:symbolize
   - absl/debugging:stacktrace
   - absl/debugging:failure_signal_handler
-  secure: false
 - name: grpc_unsecure
   build: all
   language: c
@@ -2097,7 +2096,6 @@ libs:
   - absl/container:flat_hash_map
   baselib: true
   generate_plugin_registry: true
-  secure: false
 - name: benchmark_helpers
   build: test
   language: c++
@@ -2377,6 +2375,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/synchronization:synchronization
   baselib: true
 - name: grpc++_alts
@@ -2395,6 +2394,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
   baselib: true
 - name: grpc++_error_details
   build: all
@@ -2411,6 +2411,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc++_reflection
   build: all
   language: c++
@@ -2429,6 +2430,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc++_test
   build: private
   language: c++
@@ -2448,6 +2450,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc++_test_config
   build: private
   language: c++
@@ -2487,6 +2490,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: grpc++_unsecure
   build: all
@@ -2731,7 +2735,6 @@ libs:
   - upb
   - absl/synchronization:synchronization
   baselib: true
-  secure: false
 - name: grpc_plugin_support
   build: protoc
   language: c++
@@ -2771,7 +2774,6 @@ libs:
   - src/compiler/python_generator.cc
   - src/compiler/ruby_generator.cc
   deps: []
-  secure: false
 - name: grpcpp_channelz
   build: all
   language: c++
@@ -2789,6 +2791,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - libssl
 targets:
 - name: algorithm_test
   build: test
@@ -2802,6 +2805,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: alloc_test
   build: test
@@ -2815,6 +2819,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: alpn_test
   build: test
@@ -2828,6 +2833,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_counter_test
   build: test
   language: c
@@ -2842,6 +2848,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_crypt_test
   build: test
   language: c
@@ -2856,6 +2863,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_crypter_test
   build: test
   language: c
@@ -2870,6 +2878,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_frame_protector_test
   build: test
   language: c
@@ -2886,6 +2895,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_grpc_record_protocol_test
   build: test
   language: c
@@ -2900,6 +2910,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_handshaker_client_test
   build: test
   language: c
@@ -2914,6 +2925,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_iovec_record_protocol_test
   build: test
   language: c
@@ -2928,6 +2940,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_security_connector_test
   build: test
   language: c
@@ -2940,6 +2953,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_tsi_handshaker_test
   build: test
   language: c
@@ -2954,6 +2968,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_tsi_utils_test
   build: test
   language: c
@@ -2968,6 +2983,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: alts_zero_copy_grpc_protector_test
   build: test
   language: c
@@ -2982,6 +2998,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: arena_test
   build: test
   language: c
@@ -2994,6 +3011,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: auth_context_test
   build: test
@@ -3007,6 +3025,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: avl_test
   build: test
@@ -3020,6 +3039,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: b64_test
   build: test
@@ -3033,6 +3053,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: bad_server_response_test
   build: test
@@ -3048,6 +3069,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: bad_ssl_alpn_test
   build: test
   language: c
@@ -3062,6 +3084,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3080,6 +3103,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3096,6 +3120,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: bin_encoder_test
   build: test
@@ -3109,6 +3134,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: buffer_list_test
   build: test
@@ -3122,6 +3148,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channel_args_test
   build: test
   language: c
@@ -3134,6 +3161,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: channel_create_test
   build: test
@@ -3147,6 +3175,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channel_stack_builder_test
   build: test
   language: c
@@ -3159,6 +3188,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channel_stack_test
   build: test
   language: c
@@ -3171,6 +3201,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: check_gcp_environment_linux_test
   build: test
@@ -3184,6 +3215,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: check_gcp_environment_windows_test
   build: test
   language: c
@@ -3196,6 +3228,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: client_ssl_test
   build: test
   language: c
@@ -3208,6 +3241,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3224,6 +3258,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: combiner_test
   build: test
@@ -3237,6 +3272,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3254,6 +3290,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: compression_test
   build: test
   language: c
@@ -3266,6 +3303,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: concurrent_connectivity_test
   build: test
@@ -3279,6 +3317,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: connection_refused_test
   build: test
   language: c
@@ -3293,6 +3332,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: cpu_test
   build: test
   language: c
@@ -3305,6 +3345,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: dns_resolver_connectivity_using_ares_test
   build: test
@@ -3318,6 +3359,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=ares
 - name: dns_resolver_connectivity_using_native_test
@@ -3332,6 +3374,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=native
 - name: dns_resolver_cooldown_test
@@ -3346,6 +3389,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: dns_resolver_test
   build: test
   language: c
@@ -3358,6 +3402,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: dualstack_socket_test
   build: test
   language: c
@@ -3372,6 +3417,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3390,6 +3436,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: env_test
   build: test
   language: c
@@ -3402,6 +3449,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: error_test
   build: test
@@ -3417,6 +3465,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: ev_epollex_linux_test
   build: test
@@ -3430,6 +3479,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3446,6 +3496,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: fake_transport_security_test
   build: test
   language: c
@@ -3460,6 +3511,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: fd_conservation_posix_test
   build: test
   language: c
@@ -3472,6 +3524,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3488,6 +3541,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3509,6 +3563,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3530,6 +3585,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3546,6 +3602,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3568,6 +3625,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: frame_handler_test
   build: test
   language: c
@@ -3582,6 +3640,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: goaway_server_test
   build: test
   language: c
@@ -3596,6 +3655,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_alts_credentials_options_test
   build: test
   language: c
@@ -3608,6 +3668,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_byte_buffer_reader_test
   build: test
   language: c
@@ -3620,6 +3681,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: grpc_completion_queue_test
   build: test
@@ -3633,6 +3695,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_ipv6_loopback_available_test
   build: test
   language: c
@@ -3645,6 +3708,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: handshake_server_with_readahead_handshaker_test
   build: test
   language: c
@@ -3659,6 +3723,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3675,6 +3740,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3691,6 +3757,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: host_port_test
   build: test
@@ -3704,6 +3771,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: hpack_encoder_test
   build: test
@@ -3717,6 +3785,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: hpack_parser_test
   build: test
@@ -3730,6 +3799,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: hpack_table_test
   build: test
@@ -3743,6 +3813,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: httpcli_test
   build: test
@@ -3761,6 +3832,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3782,6 +3854,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3799,6 +3872,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: invalid_call_argument_test
   build: test
@@ -3814,6 +3888,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: json_token_test
   build: test
   language: c
@@ -3826,6 +3901,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: jwt_verifier_test
   build: test
@@ -3839,6 +3915,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: lame_client_test
   build: test
@@ -3854,6 +3931,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: load_file_test
   build: test
   language: c
@@ -3866,6 +3944,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: manual_constructor_test
   build: test
@@ -3879,6 +3958,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: message_compress_test
   build: test
@@ -3892,6 +3972,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: metadata_test
   build: test
@@ -3905,6 +3986,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: minimal_stack_is_minimal_test
   build: test
   language: c
@@ -3917,6 +3999,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: mpmcqueue_test
   build: test
@@ -3930,6 +4013,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: mpscq_test
   build: test
@@ -3943,6 +4027,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -3962,6 +4047,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: murmur_hash_test
   build: test
   language: c
@@ -3974,6 +4060,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: no_server_test
   build: test
@@ -3989,6 +4076,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: num_external_connectivity_watchers_test
   build: test
   language: c
@@ -4001,6 +4089,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: parse_address_test
   build: test
   language: c
@@ -4013,6 +4102,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: parse_address_with_named_scope_id_test
   build: test
   language: c
@@ -4025,6 +4115,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4047,6 +4138,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: percent_encoding_test
   build: test
@@ -4060,6 +4152,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: public_headers_must_be_c89
   build: test
@@ -4073,6 +4166,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: resolve_address_using_ares_resolver_posix_test
   build: test
   language: c
@@ -4085,6 +4179,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=ares
   platforms:
@@ -4103,6 +4198,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=ares
 - name: resolve_address_using_native_resolver_posix_test
@@ -4117,6 +4213,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=native
   platforms:
@@ -4135,6 +4232,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   args:
   - --resolver=native
 - name: resource_quota_test
@@ -4149,6 +4247,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: secure_channel_create_test
   build: test
   language: c
@@ -4161,6 +4260,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: secure_endpoint_test
   build: test
   language: c
@@ -4175,6 +4275,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: security_connector_test
   build: test
   language: c
@@ -4187,6 +4288,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: sequential_connectivity_test
   build: test
   run: false
@@ -4200,6 +4302,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_ssl_test
   build: test
   language: c
@@ -4214,6 +4317,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4230,6 +4334,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: slice_buffer_test
   build: test
   language: c
@@ -4242,6 +4347,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: slice_string_helpers_test
   build: test
@@ -4255,6 +4361,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: sockaddr_resolver_test
   build: test
@@ -4268,6 +4375,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: sockaddr_utils_test
   build: test
   language: c
@@ -4280,6 +4388,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: socket_utils_test
   build: test
   language: c
@@ -4292,6 +4401,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4308,6 +4418,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: ssl_credentials_test
   build: test
@@ -4321,6 +4432,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: ssl_transport_security_test
   build: test
   language: c
@@ -4335,6 +4447,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4351,6 +4464,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: stream_compression_test
   build: test
@@ -4364,6 +4478,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: stream_map_test
   build: test
@@ -4377,6 +4492,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: stream_owned_slice_test
   build: test
   language: c
@@ -4389,6 +4505,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: string_test
   build: test
@@ -4402,6 +4519,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: sync_test
   build: test
@@ -4415,6 +4533,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: tcp_client_posix_test
   build: test
@@ -4428,6 +4547,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4446,6 +4566,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4461,6 +4582,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4477,6 +4599,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: test_core_security_credentials_test
   build: test
@@ -4490,6 +4613,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: test_core_slice_slice_test
   build: test
   language: c
@@ -4502,6 +4626,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: thd_test
   build: test
@@ -4515,6 +4640,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: threadpool_test
   build: test
@@ -4528,6 +4654,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: time_averaged_stats_test
   build: test
@@ -4541,6 +4668,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: timeout_encoding_test
   build: test
@@ -4554,6 +4682,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: timer_heap_test
   build: test
@@ -4567,6 +4696,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: timer_list_test
   build: test
@@ -4580,6 +4710,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: tls_test
   build: test
@@ -4593,6 +4724,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: transport_security_common_api_test
   build: test
@@ -4606,6 +4738,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: transport_security_test
   build: test
   language: c
@@ -4618,6 +4751,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: udp_server_test
   build: test
   language: c
@@ -4630,6 +4764,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4646,6 +4781,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: varint_test
   build: test
@@ -4659,6 +4795,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: address_sorting_test
   gtest: true
@@ -4676,6 +4813,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4743,6 +4881,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -4760,6 +4899,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/security/corpus/alts_credentials_corpus
@@ -4780,6 +4920,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: async_end2end_test
   gtest: true
   build: test
@@ -4800,6 +4941,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: auth_property_iterator_test
   gtest: true
   build: test
@@ -4815,6 +4957,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: authorization_engine_test
   gtest: true
@@ -4829,6 +4972,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: aws_request_signer_test
   gtest: true
   build: test
@@ -4842,6 +4986,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: backoff_test
   gtest: true
   build: test
@@ -4855,6 +5000,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: bad_streaming_id_bad_client_test
   gtest: true
@@ -4873,6 +5019,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: badreq_bad_client_test
   gtest: true
   build: test
@@ -4890,6 +5037,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: bdp_estimator_test
   gtest: true
   build: test
@@ -4903,6 +5051,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -5402,6 +5551,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: byte_stream_test
   gtest: true
@@ -5416,6 +5566,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: cancel_ares_query_test
   gtest: true
@@ -5437,6 +5588,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: certificate_provider_registry_test
   gtest: true
   build: test
@@ -5450,6 +5602,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: certificate_provider_store_test
   gtest: true
   build: test
@@ -5463,6 +5616,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: cfstream_test
   gtest: true
   build: test
@@ -5484,6 +5638,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channel_arguments_test
   gtest: true
   build: test
@@ -5498,6 +5653,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: channel_filter_test
   gtest: true
@@ -5513,6 +5669,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: channel_trace_test
   gtest: true
@@ -5531,6 +5688,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channelz_registry_test
   gtest: true
   build: test
@@ -5545,6 +5703,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: channelz_service_test
   gtest: true
@@ -5567,6 +5726,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: channelz_test
   gtest: true
   build: test
@@ -5584,6 +5744,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: cli_call_test
   gtest: true
   build: test
@@ -5616,6 +5777,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: client_callback_end2end_test
   gtest: true
@@ -5639,6 +5801,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: client_channel_stress_test
   gtest: true
   build: test
@@ -5662,6 +5825,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -5680,6 +5844,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/end2end/fuzzers/client_fuzzer_corpus
@@ -5707,6 +5872,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: client_lb_end2end_test
   gtest: true
   build: test
@@ -5732,6 +5898,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -5750,6 +5917,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: codegen_test_minimal
   gtest: true
@@ -5765,6 +5933,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: connection_prefix_bad_client_test
   gtest: true
@@ -5783,6 +5952,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: connectivity_state_test
   gtest: true
   build: test
@@ -5796,6 +5966,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: context_allocator_end2end_test
   gtest: true
   build: test
@@ -5816,6 +5987,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: context_list_test
   gtest: true
   build: test
@@ -5829,6 +6001,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: delegating_channel_test
   gtest: true
@@ -5850,6 +6023,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: destroy_grpclb_channel_with_active_connect_stress_test
   gtest: true
   build: test
@@ -5865,6 +6039,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: dual_ref_counted_test
   gtest: true
   build: test
@@ -5878,6 +6053,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: duplicate_header_bad_client_test
   gtest: true
   build: test
@@ -5895,6 +6071,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: end2end_test
   gtest: true
   build: test
@@ -5920,6 +6097,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: error_details_test
   gtest: true
   build: test
@@ -5937,6 +6115,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: evaluate_args_test
   gtest: true
   build: test
@@ -5950,6 +6129,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: eventmanager_libuv_test
   gtest: true
   build: test
@@ -5963,6 +6143,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: examine_stack_test
   gtest: true
@@ -5977,6 +6158,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/debugging:symbolize
   - absl/debugging:stacktrace
   platforms:
@@ -6002,6 +6184,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: file_watcher_certificate_provider_factory_test
   gtest: true
   build: test
@@ -6015,6 +6198,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: filter_end2end_test
   gtest: true
   build: test
@@ -6034,6 +6218,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: flaky_network_test
   gtest: true
   build: test
@@ -6055,6 +6240,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: generic_end2end_test
   gtest: true
   build: test
@@ -6074,6 +6260,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: global_config_env_test
   gtest: true
   build: test
@@ -6087,6 +6274,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -6105,6 +6293,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: google_mesh_ca_certificate_provider_factory_test
   gtest: true
@@ -6121,6 +6310,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_cli
   build: test
   run: false
@@ -6149,6 +6339,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: grpc_cpp_plugin
   build: protoc
@@ -6158,7 +6349,6 @@ targets:
   - src/compiler/cpp_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_csharp_plugin
   build: protoc
   language: c++
@@ -6167,7 +6357,6 @@ targets:
   - src/compiler/csharp_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_node_plugin
   build: protoc
   language: c++
@@ -6176,7 +6365,6 @@ targets:
   - src/compiler/node_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_objective_c_plugin
   build: protoc
   language: c++
@@ -6185,7 +6373,6 @@ targets:
   - src/compiler/objective_c_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_php_plugin
   build: protoc
   language: c++
@@ -6194,7 +6381,6 @@ targets:
   - src/compiler/php_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_python_plugin
   build: protoc
   language: c++
@@ -6203,7 +6389,6 @@ targets:
   - src/compiler/python_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_ruby_plugin
   build: protoc
   language: c++
@@ -6212,7 +6397,6 @@ targets:
   - src/compiler/ruby_plugin.cc
   deps:
   - grpc_plugin_support
-  secure: false
 - name: grpc_tls_certificate_distributor_test
   gtest: true
   build: test
@@ -6226,6 +6410,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_tls_certificate_provider_test
   gtest: true
   build: test
@@ -6239,6 +6424,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_tls_credentials_options_test
   gtest: true
   build: test
@@ -6252,6 +6438,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpc_tool_test
   gtest: true
   build: test
@@ -6284,6 +6471,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   platforms:
   - linux
@@ -6305,6 +6493,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: grpclb_end2end_test
   gtest: true
   build: test
@@ -6328,6 +6517,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -6346,6 +6536,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: head_of_line_blocking_bad_client_test
   gtest: true
   build: test
@@ -6363,6 +6554,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: headers_bad_client_test
   gtest: true
   build: test
@@ -6380,6 +6572,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: health_service_end2end_test
   gtest: true
   build: test
@@ -6404,6 +6597,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: hpack_parser_fuzzer_test
   build: fuzzer
   language: c++
@@ -6418,6 +6612,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/transport/chttp2/hpack_parser_corpus
@@ -6442,6 +6637,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: http_request_fuzzer_test
   build: fuzzer
@@ -6457,6 +6653,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/http/request_corpus
@@ -6475,6 +6672,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/http/response_corpus
@@ -6500,6 +6698,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: init_test
   gtest: true
   build: test
@@ -6513,6 +6712,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: initial_settings_frame_bad_client_test
   gtest: true
@@ -6531,6 +6731,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: insecure_security_connector_test
   gtest: true
   build: test
@@ -6544,6 +6745,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: interop_client
   build: test
   run: false
@@ -6569,6 +6771,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: interop_server
   build: test
@@ -6592,6 +6795,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: interop_test
   build: test
@@ -6608,6 +6812,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   platforms:
   - linux
@@ -6627,6 +6832,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/json/corpus
@@ -6644,6 +6850,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: large_metadata_bad_client_test
   gtest: true
@@ -6662,6 +6869,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: lb_get_cpu_stats_test
   gtest: true
   build: test
@@ -6681,6 +6889,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: lb_load_data_store_test
   gtest: true
   build: test
@@ -6698,6 +6907,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: linux_system_roots_test
   gtest: true
   build: test
@@ -6711,6 +6921,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: log_test
   gtest: true
   build: test
@@ -6724,6 +6935,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: matchers_test
   gtest: true
@@ -6738,6 +6950,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: message_allocator_end2end_test
   gtest: true
   build: test
@@ -6758,6 +6971,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: mock_test
   gtest: true
   build: test
@@ -6778,6 +6992,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: nanopb_fuzzer_response_test
   build: fuzzer
   language: c++
@@ -6792,6 +7007,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/nanopb/corpus_response
@@ -6810,6 +7026,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/nanopb/corpus_serverlist
@@ -6832,6 +7049,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: noop-benchmark
   build: test
   language: c++
@@ -6844,6 +7062,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - benchmark
   benchmark: true
   defaults: benchmark
@@ -6860,6 +7079,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: out_of_bounds_bad_client_test
   gtest: true
   build: test
@@ -6877,6 +7097,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: percent_decode_fuzzer
   build: fuzzer
   language: c++
@@ -6891,6 +7112,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/slice/percent_decode_corpus
@@ -6909,6 +7131,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/slice/percent_encode_corpus
@@ -6926,6 +7149,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: port_sharing_end2end_test
   gtest: true
   build: test
@@ -6946,6 +7170,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: proto_server_reflection_test
   gtest: true
   build: test
@@ -6970,6 +7195,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: proto_utils_test
   gtest: true
   build: test
@@ -6984,6 +7210,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: qps_json_driver
   build: test
@@ -7036,6 +7263,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: qps_worker
   build: test
@@ -7079,6 +7307,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: raw_end2end_test
   gtest: true
@@ -7101,6 +7330,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: ref_counted_ptr_test
   gtest: true
   build: test
@@ -7114,6 +7344,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: ref_counted_test
   gtest: true
   build: test
@@ -7127,6 +7358,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: remove_stream_from_stalled_lists_test
   gtest: true
   build: test
@@ -7140,6 +7372,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7157,6 +7390,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: secure_auth_context_test
   gtest: true
@@ -7173,6 +7407,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_builder_plugin_test
   gtest: true
   build: test
@@ -7194,6 +7429,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_builder_test
   gtest: true
   build: test
@@ -7249,6 +7485,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_context_test_spouse_test
   gtest: true
   build: test
@@ -7265,6 +7502,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_early_return_test
   gtest: true
   build: test
@@ -7283,6 +7521,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_fuzzer
   build: fuzzer
   language: c++
@@ -7297,6 +7536,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/end2end/fuzzers/server_fuzzer_corpus
@@ -7324,6 +7564,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_registered_method_bad_client_test
   gtest: true
   build: test
@@ -7341,6 +7582,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: server_request_call_test
   gtest: true
   build: test
@@ -7383,6 +7625,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: service_config_test
   gtest: true
   build: test
@@ -7396,6 +7639,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: settings_timeout_test
   gtest: true
   build: test
@@ -7410,6 +7654,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: shutdown_test
   gtest: true
   build: test
@@ -7429,6 +7674,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: simple_request_bad_client_test
   gtest: true
   build: test
@@ -7446,6 +7692,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: ssl_server_fuzzer
   build: fuzzer
   language: c++
@@ -7460,6 +7707,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/security/corpus/ssl_server_corpus
@@ -7477,6 +7725,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/debugging:symbolize
   platforms:
   - linux
@@ -7496,6 +7745,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: static_metadata_test
   gtest: true
@@ -7510,6 +7760,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: stats_test
   gtest: true
   build: test
@@ -7523,6 +7774,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: status_metadata_test
   gtest: true
@@ -7537,6 +7789,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: status_util_test
   gtest: true
@@ -7551,6 +7804,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: stranded_event_test
   gtest: true
@@ -7567,6 +7821,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7590,6 +7845,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7608,6 +7864,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: test_cpp_client_credentials_test
   gtest: true
@@ -7623,6 +7880,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: test_cpp_server_credentials_test
   gtest: true
   build: test
@@ -7637,6 +7895,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: test_cpp_util_slice_test
   gtest: true
   build: test
@@ -7652,6 +7911,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: test_cpp_util_time_test
   gtest: true
@@ -7668,6 +7928,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: thread_manager_test
   gtest: true
@@ -7685,6 +7946,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: thread_stress_test
   gtest: true
   build: test
@@ -7704,6 +7966,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7723,6 +7986,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7740,6 +8004,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   uses_polling: false
 - name: timer_test
   gtest: true
@@ -7755,6 +8020,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: tls_security_connector_test
   gtest: true
   build: test
@@ -7768,6 +8034,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: too_many_pings_test
   gtest: true
   build: test
@@ -7786,6 +8053,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: unknown_frame_bad_client_test
   gtest: true
   build: test
@@ -7803,6 +8071,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: uri_fuzzer_test
   build: fuzzer
   language: c++
@@ -7817,6 +8086,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
   corpus_dirs:
   - test/core/uri/uri_corpus
@@ -7834,6 +8104,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: window_overflow_bad_client_test
   gtest: true
   build: test
@@ -7851,6 +8122,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: work_serializer_test
   gtest: true
   build: test
@@ -7864,6 +8136,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -7926,6 +8199,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/debugging:symbolize
   - absl/debugging:stacktrace
   - absl/debugging:failure_signal_handler
@@ -7946,6 +8220,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: xds_certificate_provider_test
   gtest: true
   build: test
@@ -7959,6 +8234,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: xds_credentials_end2end_test
   gtest: true
   build: test
@@ -7979,6 +8255,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: xds_credentials_test
   gtest: true
   build: test
@@ -7992,6 +8269,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
 - name: xds_end2end_test
   gtest: true
   build: test
@@ -8039,6 +8317,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   platforms:
   - linux
   - posix
@@ -8061,6 +8340,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 - name: xds_interop_server
   build: test
@@ -8080,5 +8360,6 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - libssl
   - absl/flags:flag
 tests: []
diff --git a/templates/BUILD.gn.template b/templates/BUILD.gn.template
index 660bf53d641..e92f1199d22 100644
--- a/templates/BUILD.gn.template
+++ b/templates/BUILD.gn.template
@@ -35,8 +35,6 @@
   <%!
   def get_deps(target_dict):
     deps = []
-    if target_dict.get("secure", False):
-      deps = ["//third_party/boringssl"]
     if target_dict.get("build", None) == "protoc":
       deps.append("//third_party/protobuf:protoc_lib")
     name = target_dict.get("name", None)
@@ -45,7 +43,9 @@
     elif name in ("grpc", "grpc_unsecure"):
       deps.append("//third_party/zlib")
     for d in target_dict.get("deps", []):
-      if d.startswith(("//", ":")):
+      if d == "libssl":
+        deps.append("//third_party/boringssl")
+      elif d.startswith(("//", ":")):
         deps.append(d)
       else:
         deps.append(":%s" % d)
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 7fe97eeb1a5..732af0e63f2 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -60,8 +60,6 @@
       deps.append("${_gRPC_BASELIB_LIBRARIES}")
     if target_dict.get('build', None) in ['protoc']:
       deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}")
-    if target_dict.get('secure', False):
-      deps.append("${_gRPC_SSL_LIBRARIES}")
     if target_dict.language == 'c++':
       deps.append("${_gRPC_PROTOBUF_LIBRARIES}")
     if target_dict['name'] in ['grpc', 'grpc_cronet', 'grpc_unsecure']:
@@ -74,6 +72,8 @@
     for d in target_dict.get('deps', []):
       if d == 'benchmark':
         deps.append("${_gRPC_BENCHMARK_LIBRARIES}")
+      elif d == 'libssl':
+        deps.append("${_gRPC_SSL_LIBRARIES}")
       elif is_absl_lib(d):
         deps.append(get_absl_dep(d))
       else:
diff --git a/templates/Makefile.template b/templates/Makefile.template
index b91ec449f37..5afb36ce6a4 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -860,7 +860,6 @@
       "defaults": "abseil",
       "src": sorted(used_abseil_srcs),
       "hdr": sorted(used_abseil_hdrs),
-      "secure": False,
     })
   %>
   ${makelib(grpc_abseil_lib)}
@@ -897,7 +896,7 @@
   % endif
 
   ## If the library requires OpenSSL, let's add some restrictions.
-  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  % if 'libssl' in lib.get('deps', []):
   ifeq ($(NO_SECURE),true)
 
   # You can't build secure libraries if you don't have OpenSSL.
@@ -932,7 +931,7 @@
    $(ADDRESS_SORTING_MERGE_OBJS) \
    $(RE2_MERGE_OBJS) \
    $(UPB_MERGE_OBJS) \
-  % if lib.get('secure', 'check') == True:
+  % if 'libssl' in lib.get('deps', []):
    $(OPENSSL_MERGE_OBJS) \
   % endif
   % endif
@@ -949,7 +948,7 @@
    $(ADDRESS_SORTING_MERGE_OBJS) \
    $(RE2_MERGE_OBJS) \
    $(UPB_MERGE_OBJS) \
-  % if lib.get('secure', 'check') == True:
+  % if 'libssl' in lib.get('deps', []):
    $(OPENSSL_MERGE_OBJS) \
   % endif
   % endif
@@ -972,12 +971,13 @@
     mingw_lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)'
     for dep in lib.get('deps', []):
       if is_absl_lib(dep): continue
+      if 'libssl' == dep: continue
       lib_archive = '$(LIBDIR)/$(CONFIG)/lib' + dep + '.a'
       common = common + ' ' + lib_archive
       lib_deps = lib_deps + ' ' + lib_archive
       mingw_lib_deps = mingw_lib_deps + ' ' + lib_archive
 
-    security = lib.get('secure', 'check')
+    security = 'libssl' in lib.get('deps', [])
     if security == True:
       common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)'
     common = common + ' $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS)'
@@ -989,7 +989,7 @@
       for src in lib.src:
         sources_that_don_t_need_openssl.add(src)
 
-    if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+    if 'libssl' in lib.get('deps', []):
       lib_deps = lib_deps + ' $(OPENSSL_DEP)'
       mingw_lib_deps = mingw_lib_deps + ' $(OPENSSL_DEP)'
 
@@ -1019,20 +1019,20 @@
   endif
   endif
   % endif
-  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  % if 'libssl' in lib.get('deps', []):
   ## If the lib was secure, we have to close the Makefile's if that tested
   ## the presence of OpenSSL.
 
   endif
   % endif
 
-  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  % if 'libssl' in lib.get('deps', []):
   ifneq ($(NO_SECURE),true)
   % endif
   ifneq ($(NO_DEPS),true)
   -include $(LIB${lib.name.upper()}_OBJS:.o=.dep)
   endif
-  % if lib.get('secure', 'check') == True or lib.get('secure', 'check') == 'check':
+  % if 'libssl' in lib.get('deps', []):
   endif
   % endif
   # end of build recipe for library "${lib.name}"
diff --git a/templates/README.md b/templates/README.md
index 936ba4108d7..9c4626f5eb5 100644
--- a/templates/README.md
+++ b/templates/README.md
@@ -76,7 +76,6 @@ language: "...",          # the language tag; "c" or "c++"
 public_headers:           # list of public headers to install
 headers:                  # list of headers used by that target
 src:                      # list of files to compile
-secure: boolean,          # see below
 baselib: boolean,         # this is a low level library that has system
                           # dependencies
 filegroups:               # list of filegroups to merge to that project
@@ -99,16 +98,6 @@ All of the targets should always be present in the generated project file, if
 possible and applicable. But the build tag is what should group the targets
 together in a single build command.
 
-
-## The `"secure"` tag
-
-This means this target requires OpenSSL one way or another. The values can be
-`"yes"`, `"no"` and `"check"`. The default value is `"check"`. It means that
-the target requires OpenSSL, but that since the target depends on another one
-that is supposed to also import OpenSSL, the import should then be implicitely
-transitive. `"check"` should then only disable that target if OpenSSL hasn't
-been found or is unavailable.
-
 ## The `"baselib"` boolean
 
 This means this is a library that will provide most of the features for gRPC.
diff --git a/templates/grpc.gyp.template b/templates/grpc.gyp.template
index 49ce883ef8f..3437c178c3b 100644
--- a/templates/grpc.gyp.template
+++ b/templates/grpc.gyp.template
@@ -145,7 +145,9 @@
         'type': 'static_library',
         'dependencies': [
           % for dep in getattr(lib, 'deps', []):
+          %  if dep != 'libssl':
           '${dep}',
+          %  endif
           % endfor
         ],
         'sources': [
diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py
index e39d45da864..3523871f23f 100755
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@@ -238,6 +238,8 @@ def _external_dep_name_from_bazel_dependency(bazel_dep):
         return 'upb'
     elif bazel_dep == '//external:benchmark':
         return 'benchmark'
+    elif bazel_dep == '//external:libssl':
+        return 'libssl'
     else:
         # all the other external deps such as protobuf, cares, zlib
         # don't need to be listed explicitly, they are handled automatically
@@ -627,24 +629,20 @@ def _detect_and_print_issues(build_yaml_like):
 # there are mostly extra properties that we weren't able to obtain from the bazel build
 # _TYPE: whether this is library, target or test
 # _RENAME: whether this target should be renamed to a different name (to match expectations of make and cmake builds)
-# NOTE: secure is 'check' by default, so setting secure = False below does matter
 _BUILD_EXTRA_METADATA = {
     'third_party/address_sorting:address_sorting': {
         'language': 'c',
         'build': 'all',
-        'secure': False,
         '_RENAME': 'address_sorting'
     },
     'gpr': {
         'language': 'c',
         'build': 'all',
-        'secure': False
     },
     'grpc': {
         'language': 'c',
         'build': 'all',
         'baselib': True,
-        'secure': True,
         'generate_plugin_registry': True
     },
     'grpc++': {
@@ -669,7 +667,6 @@ _BUILD_EXTRA_METADATA = {
         'language': 'c++',
         'build': 'all',
         'baselib': True,
-        'secure': False,
     },
     # TODO(jtattermusch): do we need to set grpc_csharp_ext's LDFLAGS for wrapping memcpy in the same way as in build.yaml?
     'grpc_csharp_ext': {
@@ -680,7 +677,6 @@ _BUILD_EXTRA_METADATA = {
         'language': 'c',
         'build': 'all',
         'baselib': True,
-        'secure': False,
         'generate_plugin_registry': True
     },
     'grpcpp_channelz': {
@@ -694,55 +690,47 @@ _BUILD_EXTRA_METADATA = {
     'src/compiler:grpc_plugin_support': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_RENAME': 'grpc_plugin_support'
     },
     'src/compiler:grpc_cpp_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_cpp_plugin'
     },
     'src/compiler:grpc_csharp_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_csharp_plugin'
     },
     'src/compiler:grpc_node_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_node_plugin'
     },
     'src/compiler:grpc_objective_c_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_objective_c_plugin'
     },
     'src/compiler:grpc_php_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_php_plugin'
     },
     'src/compiler:grpc_python_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_python_plugin'
     },
     'src/compiler:grpc_ruby_plugin': {
         'language': 'c++',
         'build': 'protoc',
-        'secure': False,
         '_TYPE': 'target',
         '_RENAME': 'grpc_ruby_plugin'
     },
@@ -758,7 +746,6 @@ _BUILD_EXTRA_METADATA = {
     'test/core/util:grpc_test_util_unsecure': {
         'language': 'c',
         'build': 'private',
-        'secure': False,
         '_RENAME': 'grpc_test_util_unsecure'
     },
     # TODO(jtattermusch): consider adding grpc++_test_util_unsecure - it doesn't seem to be used by bazel build (don't forget to set secure: False)
@@ -777,13 +764,11 @@ _BUILD_EXTRA_METADATA = {
     'test/core/end2end:end2end_tests': {
         'language': 'c',
         'build': 'private',
-        'secure': True,
         '_RENAME': 'end2end_tests'
     },
     'test/core/end2end:end2end_nosec_tests': {
         'language': 'c',
         'build': 'private',
-        'secure': False,
         '_RENAME': 'end2end_nosec_tests'
     },