grpc 1.32.0 → 1.33.0.pre1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of grpc might be problematic. Click here for more details.

Files changed (214) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +175 -376
  3. data/include/grpc/grpc.h +0 -5
  4. data/include/grpc/grpc_security.h +16 -0
  5. data/include/grpc/impl/codegen/grpc_types.h +0 -5
  6. data/src/core/ext/filters/client_channel/client_channel.cc +204 -170
  7. data/src/core/ext/filters/client_channel/config_selector.cc +0 -4
  8. data/src/core/ext/filters/client_channel/config_selector.h +34 -5
  9. data/src/core/ext/filters/client_channel/lb_policy.h +1 -1
  10. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +48 -35
  11. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +7 -5
  12. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +3 -2
  13. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +106 -106
  14. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +2 -2
  15. data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +3 -3
  16. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +3 -3
  17. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +9 -32
  18. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +3 -3
  19. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +198 -126
  20. data/src/core/ext/filters/client_channel/lb_policy/xds/eds.cc +439 -249
  21. data/src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc +571 -0
  22. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +727 -0
  23. data/src/core/ext/filters/client_channel/lb_policy_registry.cc +8 -1
  24. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +1 -1
  25. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +553 -358
  26. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.h +28 -0
  27. data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +8 -39
  28. data/src/core/ext/filters/client_channel/resolver_result_parsing.h +4 -2
  29. data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +44 -43
  30. data/src/core/ext/filters/client_channel/resolving_lb_policy.h +5 -9
  31. data/src/core/ext/filters/client_channel/server_address.cc +80 -0
  32. data/src/core/ext/filters/client_channel/server_address.h +25 -36
  33. data/src/core/ext/filters/client_channel/service_config.cc +16 -13
  34. data/src/core/ext/filters/client_channel/service_config.h +7 -4
  35. data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +2 -2
  36. data/src/core/ext/filters/client_channel/service_config_parser.cc +8 -6
  37. data/src/core/ext/filters/client_channel/service_config_parser.h +8 -5
  38. data/src/core/ext/filters/client_channel/subchannel_interface.h +44 -0
  39. data/src/core/ext/filters/message_size/message_size_filter.cc +2 -1
  40. data/src/core/ext/filters/message_size/message_size_filter.h +2 -1
  41. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +17 -10
  42. data/src/core/ext/transport/chttp2/transport/flow_control.cc +10 -2
  43. data/src/core/ext/transport/chttp2/transport/flow_control.h +10 -0
  44. data/src/core/ext/transport/chttp2/transport/internal.h +5 -0
  45. data/src/core/ext/transport/chttp2/transport/parsing.cc +16 -2
  46. data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c +29 -9
  47. data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h +66 -0
  48. data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c +123 -45
  49. data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h +310 -53
  50. data/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c +17 -5
  51. data/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h +45 -0
  52. data/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c +1 -0
  53. data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c +16 -9
  54. data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h +38 -15
  55. data/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c +53 -0
  56. data/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h +133 -0
  57. data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c +54 -8
  58. data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h +123 -5
  59. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +40 -16
  60. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +114 -5
  61. data/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c +36 -0
  62. data/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h +85 -0
  63. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c +36 -16
  64. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h +86 -20
  65. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c +23 -6
  66. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h +54 -5
  67. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c +10 -6
  68. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h +28 -11
  69. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +184 -57
  70. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +504 -69
  71. data/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c +6 -5
  72. data/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h +11 -7
  73. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +78 -26
  74. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +236 -25
  75. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c +8 -9
  76. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h +19 -33
  77. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c +7 -3
  78. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +16 -0
  79. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c +65 -23
  80. data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +229 -47
  81. data/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c +20 -10
  82. data/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h +67 -4
  83. data/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c +3 -2
  84. data/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h +6 -0
  85. data/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c +242 -0
  86. data/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h +753 -0
  87. data/src/core/ext/upb-generated/udpa/annotations/security.upb.c +31 -0
  88. data/src/core/ext/upb-generated/udpa/annotations/security.upb.h +57 -0
  89. data/src/core/ext/upb-generated/udpa/core/v1/authority.upb.c +28 -0
  90. data/src/core/ext/upb-generated/udpa/core/v1/authority.upb.h +53 -0
  91. data/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c +52 -0
  92. data/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h +129 -0
  93. data/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c +42 -0
  94. data/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h +77 -0
  95. data/src/core/ext/upb-generated/udpa/core/v1/resource.upb.c +36 -0
  96. data/src/core/ext/upb-generated/udpa/core/v1/resource.upb.h +85 -0
  97. data/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c +54 -0
  98. data/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h +160 -0
  99. data/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c +36 -0
  100. data/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h +84 -0
  101. data/src/core/ext/xds/certificate_provider_factory.h +59 -0
  102. data/src/core/ext/xds/certificate_provider_registry.cc +103 -0
  103. data/src/core/ext/xds/certificate_provider_registry.h +57 -0
  104. data/src/core/ext/xds/certificate_provider_store.h +50 -0
  105. data/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc +377 -0
  106. data/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h +102 -0
  107. data/src/core/ext/xds/xds_api.cc +301 -93
  108. data/src/core/ext/xds/xds_api.h +129 -92
  109. data/src/core/ext/xds/xds_channel_args.h +6 -3
  110. data/src/core/ext/xds/xds_client.cc +498 -410
  111. data/src/core/ext/xds/xds_client.h +105 -51
  112. data/src/core/ext/xds/xds_client_stats.cc +18 -12
  113. data/src/core/ext/xds/xds_client_stats.h +33 -5
  114. data/src/core/lib/channel/channel_args.h +0 -1
  115. data/src/core/lib/channel/channelz.cc +10 -45
  116. data/src/core/lib/channel/channelz.h +11 -19
  117. data/src/core/lib/channel/channelz_registry.cc +12 -11
  118. data/src/core/lib/channel/channelz_registry.h +3 -0
  119. data/src/core/lib/gpr/time_precise.cc +2 -0
  120. data/src/core/lib/gpr/time_precise.h +6 -2
  121. data/src/core/lib/gprpp/dual_ref_counted.h +336 -0
  122. data/src/core/lib/gprpp/ref_counted.h +51 -22
  123. data/src/core/lib/gprpp/ref_counted_ptr.h +153 -0
  124. data/src/core/lib/iomgr/endpoint_cfstream.cc +9 -5
  125. data/src/core/lib/iomgr/exec_ctx.h +10 -8
  126. data/src/core/lib/json/json_util.cc +58 -0
  127. data/src/core/lib/json/json_util.h +37 -0
  128. data/src/core/lib/security/certificate_provider.h +60 -0
  129. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +321 -0
  130. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +214 -0
  131. data/src/core/lib/security/credentials/xds/xds_credentials.cc +45 -0
  132. data/src/core/lib/security/credentials/xds/xds_credentials.h +51 -0
  133. data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +6 -10
  134. data/src/core/lib/security/security_connector/ssl_utils.h +5 -0
  135. data/src/core/lib/surface/channel.cc +9 -31
  136. data/src/core/lib/surface/channel.h +6 -1
  137. data/src/core/lib/surface/init.cc +26 -9
  138. data/src/core/lib/surface/version.cc +2 -2
  139. data/src/core/lib/transport/bdp_estimator.h +2 -1
  140. data/src/core/lib/transport/connectivity_state.h +2 -2
  141. data/src/core/lib/transport/metadata.cc +11 -1
  142. data/src/core/plugin_registry/grpc_plugin_registry.cc +35 -20
  143. data/src/core/tsi/ssl_transport_security.cc +2 -2
  144. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +2 -2
  145. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +3 -3
  146. data/src/ruby/lib/grpc/version.rb +1 -1
  147. data/third_party/boringssl-with-bazel/err_data.c +465 -463
  148. data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_lib.c +0 -6
  149. data/third_party/boringssl-with-bazel/src/crypto/dsa/dsa.c +9 -43
  150. data/third_party/boringssl-with-bazel/src/crypto/dsa/dsa_asn1.c +55 -4
  151. data/third_party/boringssl-with-bazel/src/crypto/dsa/internal.h +34 -0
  152. data/third_party/boringssl-with-bazel/src/crypto/evp/evp.c +4 -0
  153. data/third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c +6 -2
  154. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/digest/digest.c +2 -0
  155. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/internal.h +4 -0
  156. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa.c +30 -10
  157. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +10 -15
  158. data/third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c +98 -11
  159. data/third_party/boringssl-with-bazel/src/crypto/hpke/internal.h +51 -6
  160. data/third_party/boringssl-with-bazel/src/crypto/trust_token/internal.h +44 -2
  161. data/third_party/boringssl-with-bazel/src/crypto/trust_token/pmbtoken.c +221 -49
  162. data/third_party/boringssl-with-bazel/src/crypto/trust_token/trust_token.c +64 -20
  163. data/third_party/boringssl-with-bazel/src/crypto/x509/a_strex.c +3 -3
  164. data/third_party/boringssl-with-bazel/src/crypto/x509/algorithm.c +0 -8
  165. data/third_party/boringssl-with-bazel/src/crypto/x509/t_crl.c +3 -3
  166. data/third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c +1 -1
  167. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c +7 -2
  168. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_ext.c +21 -18
  169. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_obj.c +1 -1
  170. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c +24 -3
  171. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c +3 -3
  172. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_txt.c +67 -67
  173. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_v3.c +3 -3
  174. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +29 -35
  175. data/third_party/boringssl-with-bazel/src/crypto/x509/x509cset.c +13 -2
  176. data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c +9 -8
  177. data/third_party/boringssl-with-bazel/src/crypto/x509/x_all.c +10 -10
  178. data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c +2 -2
  179. data/third_party/boringssl-with-bazel/src/crypto/x509/x_name.c +28 -40
  180. data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c +3 -1
  181. data/third_party/boringssl-with-bazel/src/crypto/x509v3/ext_dat.h +1 -4
  182. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c +7 -3
  183. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c +2 -2
  184. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c +1 -1
  185. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c +55 -8
  186. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c +1 -1
  187. data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +0 -1
  188. data/third_party/boringssl-with-bazel/src/include/openssl/base.h +1 -1
  189. data/third_party/boringssl-with-bazel/src/include/openssl/cipher.h +6 -0
  190. data/third_party/boringssl-with-bazel/src/include/openssl/crypto.h +1 -1
  191. data/third_party/boringssl-with-bazel/src/include/openssl/dh.h +12 -0
  192. data/third_party/boringssl-with-bazel/src/include/openssl/digest.h +9 -0
  193. data/third_party/boringssl-with-bazel/src/include/openssl/evp.h +4 -1
  194. data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +9 -2
  195. data/third_party/boringssl-with-bazel/src/include/openssl/trust_token.h +26 -6
  196. data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +188 -78
  197. data/third_party/boringssl-with-bazel/src/include/openssl/x509v3.h +52 -43
  198. data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +18 -18
  199. data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +2 -3
  200. data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +1 -1
  201. data/third_party/boringssl-with-bazel/src/ssl/internal.h +9 -9
  202. data/third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc +8 -9
  203. data/third_party/boringssl-with-bazel/src/ssl/tls13_both.cc +1 -2
  204. data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +4 -8
  205. data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +2 -2
  206. metadata +72 -42
  207. data/src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc +0 -537
  208. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc +0 -1141
  209. data/src/core/ext/upb-generated/gogoproto/gogo.upb.c +0 -17
  210. data/src/core/ext/upb-generated/gogoproto/gogo.upb.h +0 -29
  211. data/src/core/ext/xds/xds_channel.h +0 -46
  212. data/src/core/ext/xds/xds_channel_secure.cc +0 -103
  213. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pku.c +0 -110
  214. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_sxnet.c +0 -274
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 97fec0b54ae4f430ddcea0e6e14b9619c57a3c72c0856b8960b6d2b757f999df
4
- data.tar.gz: 016753e7d93badea7eeb459f6d082b1b7aa39b07375b656f571afa7864c229cd
3
+ metadata.gz: 311101ffd3a6a678d8b4b2f5d3d783962051dce8bcc3bb8a83cd0734349cb665
4
+ data.tar.gz: 8539bc401641954167ff470360460e7c7bc9978c45de28aeaeb83b7a9f91ce6a
5
5
  SHA512:
6
- metadata.gz: 414be065a17d42683a1a38e6a081a57835f718eb28e280813789c18d3c4bd9305d05e562098a3e6ea9735676087f58dc38f79806526f93b0445356fee2aac26a
7
- data.tar.gz: 262ab1ee062092ee0acec66b7bdc6927a3ac6a5fa321eebcad9dfafaf747f31d86fe03a6d610808376047b27b7ce75c702719710bbfe1506010f26e767fbaecd
6
+ metadata.gz: dbea56380d8c6e0b9ec874be10c85b2844dc8f21b0c1420c4cf1995c5fae051bfb72232a30208f4057214f71aa60be5e5a03393267902259c7cfbcbd7c749130
7
+ data.tar.gz: 914cea8b7e45fc29d28826554dd0b1bb9cd2422cc1bbde549b52c286fd5c79ec8f4013fb68b173d01495fe8c797de53900fd3422c2622470007ea5304aebd1c3
data/Makefile CHANGED
@@ -77,7 +77,7 @@ OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
77
77
  LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
78
78
  GENDIR = $(BUILDDIR_ABSOLUTE)/gens
79
79
 
80
- # Configurations
80
+ # Configurations (as defined under "configs" section in build_handwritten.yaml)
81
81
 
82
82
  VALID_CONFIG_opt = 1
83
83
  CC_opt = $(DEFAULT_CC)
@@ -446,8 +446,7 @@ ARFLAGS += $(GRPC_CROSS_AROPTS) # e.g., rc --target=elf32-little
446
446
  USE_BUILT_PROTOC = false
447
447
  endif
448
448
 
449
- GTEST_LIB = -Ithird_party/googletest/googletest/include -Ithird_party/googletest/googletest third_party/googletest/googletest/src/gtest-all.cc -Ithird_party/googletest/googlemock/include -Ithird_party/googletest/googlemock third_party/googletest/googlemock/src/gmock-all.cc
450
- GTEST_LIB += -lgflags -std=c++11
449
+ # V=1 can be used to print commands run by make
451
450
  ifeq ($(V),1)
452
451
  E = @:
453
452
  Q =
@@ -456,9 +455,9 @@ E = @echo
456
455
  Q = @
457
456
  endif
458
457
 
459
- CORE_VERSION = 12.0.0
460
- CPP_VERSION = 1.32.0
461
- CSHARP_VERSION = 2.32.0
458
+ CORE_VERSION = 13.0.0
459
+ CPP_VERSION = 1.33.0-pre1
460
+ CSHARP_VERSION = 2.33.0-pre1
462
461
 
463
462
  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
464
463
  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -488,19 +487,13 @@ HOST_LDLIBS += $(LDLIBS)
488
487
 
489
488
  CACHE_MK =
490
489
 
491
- HAS_PKG_CONFIG ?= $(shell command -v $(PKG_CONFIG) >/dev/null 2>&1 && echo true || echo false)
492
-
493
- ifeq ($(HAS_PKG_CONFIG), true)
494
- CACHE_MK += HAS_PKG_CONFIG = true,
495
- endif
496
-
497
490
  ifeq ($(SYSTEM),MINGW32)
498
491
  EXECUTABLE_SUFFIX = .exe
499
492
  SHARED_EXT_CORE = dll
500
493
  SHARED_EXT_CPP = dll
501
494
  SHARED_EXT_CSHARP = dll
502
495
  SHARED_PREFIX =
503
- SHARED_VERSION_CORE = -12
496
+ SHARED_VERSION_CORE = -13
504
497
  SHARED_VERSION_CPP = -1
505
498
  SHARED_VERSION_CSHARP = -2
506
499
  else ifeq ($(SYSTEM),Darwin)
@@ -529,107 +522,7 @@ else
529
522
  IS_GIT_FOLDER = true
530
523
  endif
531
524
 
532
- ifeq ($(HAS_PKG_CONFIG),true)
533
- OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
534
- ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
535
- PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.12.0 protobuf
536
- CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
537
- else # HAS_PKG_CONFIG
538
-
539
- ifeq ($(SYSTEM),MINGW32)
540
- OPENSSL_LIBS = ssl32 eay32
541
- else
542
- OPENSSL_LIBS = ssl crypto
543
- endif
544
-
545
- OPENSSL_ALPN_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/openssl-alpn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
546
- BORINGSSL_COMPILE_CHECK_CMD = $(CC) $(CPPFLAGS) -Ithird_party/boringssl-with-bazel/src/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(CFLAGS) -g -o $(TMPOUT) test/build/boringssl.c $(LDFLAGS)
547
- ZLIB_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
548
- PROTOBUF_CHECK_CMD = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
549
- CARES_CHECK_CMD = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(TMPOUT) test/build/c-ares.c -lcares $(LDFLAGS)
550
-
551
- endif # HAS_PKG_CONFIG
552
-
553
- PERFTOOLS_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
554
-
555
- PROTOC_CHECK_CMD = which protoc > /dev/null
556
- PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
557
- DTRACE_CHECK_CMD = which dtrace > /dev/null
558
- SYSTEMTAP_HEADERS_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/systemtap.c $(LDFLAGS)
559
-
560
- ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
561
- HAS_SYSTEM_PERFTOOLS ?= $(shell $(PERFTOOLS_CHECK_CMD) 2> /dev/null && echo true || echo false)
562
- ifeq ($(HAS_SYSTEM_PERFTOOLS),true)
563
- DEFINES += GRPC_HAVE_PERFTOOLS
564
- LIBS += profiler
565
- CACHE_MK += HAS_SYSTEM_PERFTOOLS = true,
566
- endif
567
- endif
568
-
569
- HAS_SYSTEM_PROTOBUF_VERIFY = $(shell $(PROTOBUF_CHECK_CMD) 2> /dev/null && echo true || echo false)
570
- ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
571
- HAS_SYSTEM_OPENSSL_ALPN ?= $(shell $(OPENSSL_ALPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
572
- ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
573
- CACHE_MK += HAS_SYSTEM_OPENSSL_ALPN = true,
574
- endif
575
- HAS_SYSTEM_ZLIB ?= $(shell $(ZLIB_CHECK_CMD) 2> /dev/null && echo true || echo false)
576
- ifeq ($(HAS_SYSTEM_ZLIB),true)
577
- CACHE_MK += HAS_SYSTEM_ZLIB = true,
578
- endif
579
- HAS_SYSTEM_PROTOBUF ?= $(HAS_SYSTEM_PROTOBUF_VERIFY)
580
- ifeq ($(HAS_SYSTEM_PROTOBUF),true)
581
- CACHE_MK += HAS_SYSTEM_PROTOBUF = true,
582
- endif
583
- HAS_SYSTEM_CARES ?= $(shell $(CARES_CHECK_CMD) 2> /dev/null && echo true || echo false)
584
- ifeq ($(HAS_SYSTEM_CARES),true)
585
- CACHE_MK += HAS_SYSTEM_CARES = true,
586
- endif
587
- else
588
- # override system libraries if the config requires a custom compiled library
589
- HAS_SYSTEM_OPENSSL_ALPN = false
590
- HAS_SYSTEM_ZLIB = false
591
- HAS_SYSTEM_PROTOBUF = false
592
- HAS_SYSTEM_CARES = false
593
- endif
594
-
595
- HAS_PROTOC ?= $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
596
- ifeq ($(HAS_PROTOC),true)
597
- CACHE_MK += HAS_PROTOC = true,
598
- HAS_VALID_PROTOC ?= $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
599
- ifeq ($(HAS_VALID_PROTOC),true)
600
- CACHE_MK += HAS_VALID_PROTOC = true,
601
- endif
602
- else
603
- HAS_VALID_PROTOC = false
604
- endif
605
-
606
- # Check for Systemtap (https://sourceware.org/systemtap/), first by making sure <sys/sdt.h> is present
607
- # in the system and secondly by checking for the "dtrace" binary (on Linux, this is part of the Systemtap
608
- # distribution. It's part of the base system on BSD/Solaris machines).
609
- ifndef HAS_SYSTEMTAP
610
- HAS_SYSTEMTAP_HEADERS = $(shell $(SYSTEMTAP_HEADERS_CHECK_CMD) 2> /dev/null && echo true || echo false)
611
- HAS_DTRACE = $(shell $(DTRACE_CHECK_CMD) 2> /dev/null && echo true || echo false)
612
- HAS_SYSTEMTAP = false
613
- ifeq ($(HAS_SYSTEMTAP_HEADERS),true)
614
- ifeq ($(HAS_DTRACE),true)
615
- HAS_SYSTEMTAP = true
616
- endif
617
- endif
618
- endif
619
-
620
- ifeq ($(HAS_SYSTEMTAP),true)
621
- CACHE_MK += HAS_SYSTEMTAP = true,
622
- endif
623
-
624
- # Note that for testing purposes, one can do:
625
- # make HAS_EMBEDDED_OPENSSL_ALPN=false
626
- # to emulate the fact we do not have OpenSSL in the third_party folder.
627
- ifeq ($(wildcard third_party/boringssl-with-bazel/src/include/openssl/ssl.h),)
628
- HAS_EMBEDDED_OPENSSL_ALPN = false
629
- else
630
- CAN_COMPILE_EMBEDDED_OPENSSL ?= $(shell $(BORINGSSL_COMPILE_CHECK_CMD) 2> /dev/null && echo true || echo false)
631
- HAS_EMBEDDED_OPENSSL_ALPN = $(CAN_COMPILE_EMBEDDED_OPENSSL)
632
- endif
525
+ # Setup zlib dependency
633
526
 
634
527
  ifeq ($(wildcard third_party/zlib/zlib.h),)
635
528
  HAS_EMBEDDED_ZLIB = false
@@ -637,34 +530,11 @@ else
637
530
  HAS_EMBEDDED_ZLIB = true
638
531
  endif
639
532
 
640
- ifeq ($(wildcard third_party/protobuf/src/google/protobuf/descriptor.pb.h),)
641
- HAS_EMBEDDED_PROTOBUF = false
642
- ifneq ($(HAS_VALID_PROTOC),true)
643
- NO_PROTOC = true
644
- endif
645
- else
646
- HAS_EMBEDDED_PROTOBUF = true
647
- endif
648
-
649
- ifeq ($(wildcard third_party/cares/cares/ares.h),)
650
- HAS_EMBEDDED_CARES = false
651
- else
652
- HAS_EMBEDDED_CARES = true
653
- endif
654
-
655
- PC_REQUIRES_GRPC =
656
- PC_LIBS_GRPC =
657
-
658
- ifeq ($(HAS_SYSTEM_ZLIB),false)
659
- ifeq ($(HAS_EMBEDDED_ZLIB), true)
660
- EMBED_ZLIB ?= true
661
- else
662
- DEP_MISSING += zlib
663
- EMBED_ZLIB ?= broken
664
- endif
665
- else
533
+ # for zlib, we support building both from submodule
534
+ # and from system-installed zlib. In some builds,
535
+ # embedding zlib is not desirable.
536
+ # By default we use the system zlib (to match legacy behavior)
666
537
  EMBED_ZLIB ?= false
667
- endif
668
538
 
669
539
  ifeq ($(EMBED_ZLIB),true)
670
540
  ZLIB_DEP = $(LIBDIR)/$(CONFIG)/libz.a
@@ -672,35 +542,41 @@ ZLIB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libz.a
672
542
  ZLIB_MERGE_OBJS = $(LIBZ_OBJS)
673
543
  CPPFLAGS += -Ithird_party/zlib
674
544
  else
675
- ifeq ($(HAS_PKG_CONFIG),true)
676
- CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
677
- LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L zlib)
678
- LIBS += $(patsubst -l%,%,$(shell $(PKG_CONFIG) --libs-only-l zlib))
679
- PC_REQUIRES_GRPC += zlib
680
- else
681
- PC_LIBS_GRPC += -lz
682
545
  LIBS += z
683
546
  endif
684
- endif
685
547
 
686
- CARES_PKG_CONFIG = false
548
+ # Setup c-ares dependency
549
+
550
+ ifeq ($(wildcard third_party/cares/cares/ares.h),)
551
+ HAS_EMBEDDED_CARES = false
552
+ else
553
+ HAS_EMBEDDED_CARES = true
554
+ endif
687
555
 
688
- ifeq ($(HAS_SYSTEM_CARES),false)
689
- ifeq ($(HAS_EMBEDDED_CARES), true)
556
+ ifeq ($(HAS_EMBEDDED_CARES),true)
690
557
  EMBED_CARES ?= true
691
558
  else
559
+ # only building with c-ares from submodule is supported
692
560
  DEP_MISSING += cares
693
561
  EMBED_CARES ?= broken
694
562
  endif
695
- else
696
- EMBED_CARES ?= false
563
+
564
+ ifeq ($(EMBED_CARES),true)
565
+ CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a
566
+ CARES_MERGE_OBJS = $(LIBARES_OBJS)
567
+ CARES_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libares.a
568
+ CPPFLAGS := -Ithird_party/cares -Ithird_party/cares/cares $(CPPFLAGS)
697
569
  endif
698
570
 
571
+ # Setup address_sorting dependency
572
+
699
573
  ADDRESS_SORTING_DEP = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
700
574
  ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS)
701
575
  ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
702
576
  CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS)
703
577
 
578
+ # Setup abseil dependency
579
+
704
580
  GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
705
581
  GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
706
582
  ifeq ($(HOST_IS_X86_64),true)
@@ -709,144 +585,80 @@ else
709
585
  ABSL_RANDOM_HWAES_FLAGS =
710
586
  endif
711
587
 
588
+ # Setup re2 dependency
589
+
712
590
  RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a
713
591
  RE2_MERGE_OBJS = $(LIBRE2_OBJS)
714
592
  RE2_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libre2.a
715
593
 
594
+ # Setup upb dependency
595
+
716
596
  UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a
717
597
  UPB_MERGE_OBJS = $(LIBUPB_OBJS)
718
598
  UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a
719
599
 
720
- ifeq ($(EMBED_CARES),true)
721
- CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a
722
- CARES_MERGE_OBJS = $(LIBARES_OBJS)
723
- CARES_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libares.a
724
- CPPFLAGS := -Ithird_party/cares -Ithird_party/cares/cares $(CPPFLAGS)
725
- else
726
- ifeq ($(HAS_PKG_CONFIG),true)
727
- PC_REQUIRES_GRPC += libcares
728
- CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libcares)
729
- LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libcares)
730
- LIBS += $(patsubst -l%,%,$(shell $(PKG_CONFIG) --libs-only-l libcares))
600
+ # Setup boringssl dependency
601
+
602
+ ifeq ($(wildcard third_party/boringssl-with-bazel/src/include/openssl/ssl.h),)
603
+ HAS_EMBEDDED_OPENSSL = false
731
604
  else
732
- PC_LIBS_GRPC += -lcares
733
- LIBS += cares
734
- endif
605
+ HAS_EMBEDDED_OPENSSL = true
735
606
  endif
736
607
 
737
- OPENSSL_PKG_CONFIG = false
738
-
739
- PC_REQUIRES_SECURE =
740
- PC_LIBS_SECURE =
741
-
742
- ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
743
- EMBED_OPENSSL ?= false
744
- NO_SECURE ?= false
745
- else # HAS_SYSTEM_OPENSSL_ALPN=false
746
- ifneq ($(HAS_EMBEDDED_OPENSSL_ALPN),false)
747
- EMBED_OPENSSL ?= $(HAS_EMBEDDED_OPENSSL_ALPN)
748
- NO_SECURE ?= false
749
- else # HAS_EMBEDDED_OPENSSL_ALPN=false
750
- NO_SECURE ?= true
751
- endif # HAS_EMBEDDED_OPENSSL_ALPN
752
- endif # HAS_SYSTEM_OPENSSL_ALPN
608
+ ifeq ($(HAS_EMBEDDED_OPENSSL),true)
609
+ EMBED_OPENSSL ?= true
610
+ else
611
+ # only support building boringssl from submodule
612
+ DEP_MISSING += openssl
613
+ EMBED_OPENSSL ?= broken
614
+ endif
753
615
 
754
- OPENSSL_DEP :=
755
- OPENSSL_MERGE_LIBS :=
756
- ifeq ($(NO_SECURE),false)
757
616
  ifeq ($(EMBED_OPENSSL),true)
758
617
  OPENSSL_DEP += $(LIBDIR)/$(CONFIG)/libboringssl.a
759
618
  OPENSSL_MERGE_LIBS += $(LIBDIR)/$(CONFIG)/libboringssl.a
760
619
  OPENSSL_MERGE_OBJS += $(LIBBORINGSSL_OBJS)
761
620
  # need to prefix these to ensure overriding system libraries
762
- CPPFLAGS := -Ithird_party/boringssl-with-bazel/src/include $(CPPFLAGS)
763
- else ifneq ($(EMBED_OPENSSL),false)
764
- OPENSSL_DEP += $(EMBED_OPENSSL)/libssl.a $(EMBED_OPENSSL)/libcrypto.a
765
- OPENSSL_MERGE_LIBS += $(EMBED_OPENSSL)/libssl.a $(EMBED_OPENSSL)/libcrypto.a
766
- OPENSSL_MERGE_OBJS += $(wildcard $(EMBED_OPENSSL)/grpc_obj/*.o)
767
- # need to prefix these to ensure overriding system libraries
768
- CPPFLAGS := -I$(EMBED_OPENSSL)/include $(CPPFLAGS)
769
- else # EMBED_OPENSSL=false
770
- ifeq ($(HAS_PKG_CONFIG),true)
771
- OPENSSL_PKG_CONFIG = true
772
- PC_REQUIRES_SECURE = openssl
773
- CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
774
- LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
775
- ifeq ($(SYSTEM),Linux)
776
- ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
777
- LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
778
- endif # LDFLAGS_OPENSSL_PKG_CONFIG=''
779
- endif # System=Linux
780
- LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
781
- else # HAS_PKG_CONFIG=false
782
- LIBS_SECURE = $(OPENSSL_LIBS)
783
- endif # HAS_PKG_CONFIG
621
+ CPPFLAGS := -Ithird_party/boringssl-with-bazel/src/include $(CPPFLAGS)
784
622
  ifeq ($(DISABLE_ALPN),true)
785
623
  CPPFLAGS += -DTSI_OPENSSL_ALPN_SUPPORT=0
786
624
  LIBS_SECURE = $(OPENSSL_LIBS)
787
625
  endif # DISABLE_ALPN
788
- PC_LIBS_SECURE = $(addprefix -l, $(LIBS_SECURE))
789
626
  endif # EMBED_OPENSSL
790
- endif # NO_SECURE
791
627
 
792
- ifeq ($(OPENSSL_PKG_CONFIG),true)
793
- LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
794
- else
795
628
  LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
796
- endif
797
-
798
- PROTOBUF_PKG_CONFIG = false
799
-
800
- PC_REQUIRES_GRPCXX =
801
- PC_LIBS_GRPCXX =
802
629
 
803
- CPPFLAGS := -Ithird_party/googletest/googletest/include -Ithird_party/googletest/googlemock/include $(CPPFLAGS)
804
-
805
- PROTOC_PLUGINS_ALL = $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(BINDIR)/$(CONFIG)/grpc_node_plugin $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(BINDIR)/$(CONFIG)/grpc_php_plugin $(BINDIR)/$(CONFIG)/grpc_python_plugin $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
806
- PROTOC_PLUGINS_DIR = $(BINDIR)/$(CONFIG)
630
+ # Setup protobuf dependency
807
631
 
808
- ifeq ($(HAS_SYSTEM_PROTOBUF),true)
809
- ifeq ($(HAS_PKG_CONFIG),true)
810
- PROTOBUF_PKG_CONFIG = true
811
- PC_REQUIRES_GRPCXX = protobuf
812
- CPPFLAGS := $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags protobuf)
813
- LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf)
814
- ifeq ($(SYSTEM),Linux)
815
- ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)
816
- LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
817
- endif
632
+ # we only support building protobuf from submodule
633
+ HAS_SYSTEM_PROTOBUF = false
634
+ HAS_PROTOC = false
635
+ HAS_VALID_PROTOC = false
636
+ ifeq ($(wildcard third_party/protobuf/src/google/protobuf/descriptor.pb.h),)
637
+ HAS_EMBEDDED_PROTOBUF = false
638
+ ifneq ($(HAS_VALID_PROTOC),true)
639
+ NO_PROTOC = true
818
640
  endif
819
641
  else
820
- PC_LIBS_GRPCXX = -lprotobuf
642
+ HAS_EMBEDDED_PROTOBUF = true
821
643
  endif
822
- PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL)
823
- else
644
+
645
+ PROTOC_PLUGINS_DIR = $(BINDIR)/$(CONFIG)
646
+
647
+ PROTOC_PLUGINS_ALL = $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(BINDIR)/$(CONFIG)/grpc_node_plugin $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(BINDIR)/$(CONFIG)/grpc_php_plugin $(BINDIR)/$(CONFIG)/grpc_python_plugin $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
824
648
  ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
825
649
  PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
826
650
  CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
827
651
  LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
828
- ifneq ($(USE_BUILT_PROTOC),false)
829
652
  PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
830
653
  PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL)
831
654
  else
832
- PROTOC_PLUGINS =
833
- PROTOC_PLUGINS_DIR = $(prefix)/bin
834
- endif
835
- else
836
655
  NO_PROTOBUF = true
837
656
  endif
838
- endif
839
657
 
840
658
  LIBS_PROTOBUF = protobuf
841
659
  LIBS_PROTOC = protoc protobuf
842
-
843
660
  HOST_LDLIBS_PROTOC += $(addprefix -l, $(LIBS_PROTOC))
844
-
845
- ifeq ($(PROTOBUF_PKG_CONFIG),true)
846
- LDLIBS_PROTOBUF += $(shell $(PKG_CONFIG) --libs-only-l protobuf)
847
- else
848
661
  LDLIBS_PROTOBUF += $(addprefix -l, $(LIBS_PROTOBUF))
849
- endif
850
662
 
851
663
  ifeq ($(MAKECMDGOALS),clean)
852
664
  NO_DEPS = true
@@ -969,12 +781,7 @@ grpc_python_plugin: $(BINDIR)/$(CONFIG)/grpc_python_plugin
969
781
  grpc_ruby_plugin: $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
970
782
 
971
783
  run_dep_checks:
972
- $(OPENSSL_ALPN_CHECK_CMD) || true
973
- $(ZLIB_CHECK_CMD) || true
974
- $(PERFTOOLS_CHECK_CMD) || true
975
- $(PROTOBUF_CHECK_CMD) || true
976
- $(PROTOC_CHECK_VERSION_CMD) || true
977
- $(CARES_CHECK_CMD) || true
784
+ @echo "run_dep_checks target has been deprecated."
978
785
 
979
786
  third_party/protobuf/configure:
980
787
  $(E) "[AUTOGEN] Preparing protobuf"
@@ -1872,8 +1679,8 @@ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
1872
1679
  ifeq ($(SYSTEM),Darwin)
1873
1680
  $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
1874
1681
  else
1875
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.12 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
1876
- $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.12
1682
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.13 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
1683
+ $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.13
1877
1684
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
1878
1685
  endif
1879
1686
  endif
@@ -1997,8 +1804,8 @@ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OB
1997
1804
  ifeq ($(SYSTEM),Darwin)
1998
1805
  $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
1999
1806
  else
2000
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.12 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
2001
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.12
1807
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.13 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
1808
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.13
2002
1809
  $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
2003
1810
  endif
2004
1811
  endif
@@ -2039,8 +1846,8 @@ LIBGRPC_SRC = \
2039
1846
  src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \
2040
1847
  src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
2041
1848
  src/core/ext/filters/client_channel/lb_policy/xds/eds.cc \
2042
- src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc \
2043
- src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc \
1849
+ src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc \
1850
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \
2044
1851
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
2045
1852
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
2046
1853
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
@@ -2129,12 +1936,14 @@ LIBGRPC_SRC = \
2129
1936
  src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
2130
1937
  src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
2131
1938
  src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
1939
+ src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
2132
1940
  src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
2133
1941
  src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
2134
1942
  src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
2135
1943
  src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
2136
1944
  src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
2137
1945
  src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
1946
+ src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
2138
1947
  src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
2139
1948
  src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
2140
1949
  src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
@@ -2172,8 +1981,8 @@ LIBGRPC_SRC = \
2172
1981
  src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
2173
1982
  src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
2174
1983
  src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
2175
- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
2176
1984
  src/core/ext/upb-generated/google/api/annotations.upb.c \
1985
+ src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
2177
1986
  src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
2178
1987
  src/core/ext/upb-generated/google/api/http.upb.c \
2179
1988
  src/core/ext/upb-generated/google/protobuf/any.upb.c \
@@ -2190,14 +1999,22 @@ LIBGRPC_SRC = \
2190
1999
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
2191
2000
  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
2192
2001
  src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
2002
+ src/core/ext/upb-generated/udpa/annotations/security.upb.c \
2193
2003
  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
2194
2004
  src/core/ext/upb-generated/udpa/annotations/status.upb.c \
2195
2005
  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
2006
+ src/core/ext/upb-generated/udpa/core/v1/authority.upb.c \
2007
+ src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c \
2008
+ src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c \
2009
+ src/core/ext/upb-generated/udpa/core/v1/resource.upb.c \
2010
+ src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c \
2011
+ src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c \
2196
2012
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
2197
2013
  src/core/ext/upb-generated/validate/validate.upb.c \
2014
+ src/core/ext/xds/certificate_provider_registry.cc \
2015
+ src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc \
2198
2016
  src/core/ext/xds/xds_api.cc \
2199
2017
  src/core/ext/xds/xds_bootstrap.cc \
2200
- src/core/ext/xds/xds_channel_secure.cc \
2201
2018
  src/core/ext/xds/xds_client.cc \
2202
2019
  src/core/ext/xds/xds_client_stats.cc \
2203
2020
  src/core/lib/avl/avl.cc \
@@ -2323,6 +2140,7 @@ LIBGRPC_SRC = \
2323
2140
  src/core/lib/iomgr/wakeup_fd_posix.cc \
2324
2141
  src/core/lib/iomgr/work_serializer.cc \
2325
2142
  src/core/lib/json/json_reader.cc \
2143
+ src/core/lib/json/json_util.cc \
2326
2144
  src/core/lib/json/json_writer.cc \
2327
2145
  src/core/lib/security/authorization/authorization_engine.cc \
2328
2146
  src/core/lib/security/authorization/evaluate_args.cc \
@@ -2349,8 +2167,10 @@ LIBGRPC_SRC = \
2349
2167
  src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
2350
2168
  src/core/lib/security/credentials/plugin/plugin_credentials.cc \
2351
2169
  src/core/lib/security/credentials/ssl/ssl_credentials.cc \
2170
+ src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc \
2352
2171
  src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
2353
2172
  src/core/lib/security/credentials/tls/tls_credentials.cc \
2173
+ src/core/lib/security/credentials/xds/xds_credentials.cc \
2354
2174
  src/core/lib/security/security_connector/alts/alts_security_connector.cc \
2355
2175
  src/core/lib/security/security_connector/fake/fake_security_connector.cc \
2356
2176
  src/core/lib/security/security_connector/load_system_roots_fallback.cc \
@@ -2490,8 +2310,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
2490
2310
  ifeq ($(SYSTEM),Darwin)
2491
2311
  $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(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)
2492
2312
  else
2493
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.12 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(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)
2494
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.12
2313
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.13 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(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)
2314
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.13
2495
2315
  $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
2496
2316
  endif
2497
2317
  endif
@@ -2549,8 +2369,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
2549
2369
  ifeq ($(SYSTEM),Darwin)
2550
2370
  $(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)
2551
2371
  else
2552
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.12 -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)
2553
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).so.12
2372
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.13 -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)
2373
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).so.13
2554
2374
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CORE).so
2555
2375
  endif
2556
2376
  endif
@@ -2593,10 +2413,6 @@ LIBGRPC_UNSECURE_SRC = \
2593
2413
  src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \
2594
2414
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
2595
2415
  src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \
2596
- src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
2597
- src/core/ext/filters/client_channel/lb_policy/xds/eds.cc \
2598
- src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc \
2599
- src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc \
2600
2416
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
2601
2417
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
2602
2418
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
@@ -2615,7 +2431,6 @@ LIBGRPC_UNSECURE_SRC = \
2615
2431
  src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
2616
2432
  src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
2617
2433
  src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
2618
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
2619
2434
  src/core/ext/filters/client_channel/resolver_registry.cc \
2620
2435
  src/core/ext/filters/client_channel/resolver_result_parsing.cc \
2621
2436
  src/core/ext/filters/client_channel/resolving_lb_policy.cc \
@@ -2671,63 +2486,8 @@ LIBGRPC_UNSECURE_SRC = \
2671
2486
  src/core/ext/transport/chttp2/transport/writing.cc \
2672
2487
  src/core/ext/transport/inproc/inproc_plugin.cc \
2673
2488
  src/core/ext/transport/inproc/inproc_transport.cc \
2674
- src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
2675
- src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
2676
- src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
2677
- src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
2678
- src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
2679
- src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
2680
- src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
2681
- src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
2682
- src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
2683
- src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
2684
- src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
2685
- src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
2686
- src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
2687
- src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
2688
- src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
2689
- src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
2690
- src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
2691
- src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
2692
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
2693
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
2694
- src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
2695
- src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
2696
- src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
2697
- src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
2698
- src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
2699
- src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
2700
- src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
2701
- src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
2702
- src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
2703
- src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
2704
- src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
2705
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
2706
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
2707
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
2708
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
2709
- src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c \
2710
- src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
2711
- src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
2712
- src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c \
2713
- src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c \
2714
- src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
2715
- src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c \
2716
- src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c \
2717
- src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
2718
- src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
2719
- src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
2720
- src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
2721
- src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
2722
- src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
2723
- src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
2724
- src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
2725
- src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
2726
- src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
2727
- src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
2728
- src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
2729
- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
2730
2489
  src/core/ext/upb-generated/google/api/annotations.upb.c \
2490
+ src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
2731
2491
  src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
2732
2492
  src/core/ext/upb-generated/google/api/http.upb.c \
2733
2493
  src/core/ext/upb-generated/google/protobuf/any.upb.c \
@@ -2740,17 +2500,8 @@ LIBGRPC_UNSECURE_SRC = \
2740
2500
  src/core/ext/upb-generated/google/rpc/status.upb.c \
2741
2501
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
2742
2502
  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
2743
- src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
2744
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
2745
- src/core/ext/upb-generated/udpa/annotations/status.upb.c \
2746
- src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
2747
2503
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
2748
2504
  src/core/ext/upb-generated/validate/validate.upb.c \
2749
- src/core/ext/xds/xds_api.cc \
2750
- src/core/ext/xds/xds_bootstrap.cc \
2751
- src/core/ext/xds/xds_channel.cc \
2752
- src/core/ext/xds/xds_client.cc \
2753
- src/core/ext/xds/xds_client_stats.cc \
2754
2505
  src/core/lib/avl/avl.cc \
2755
2506
  src/core/lib/backoff/backoff.cc \
2756
2507
  src/core/lib/channel/channel_args.cc \
@@ -2873,6 +2624,7 @@ LIBGRPC_UNSECURE_SRC = \
2873
2624
  src/core/lib/iomgr/wakeup_fd_posix.cc \
2874
2625
  src/core/lib/iomgr/work_serializer.cc \
2875
2626
  src/core/lib/json/json_reader.cc \
2627
+ src/core/lib/json/json_util.cc \
2876
2628
  src/core/lib/json/json_writer.cc \
2877
2629
  src/core/lib/slice/b64.cc \
2878
2630
  src/core/lib/slice/percent_encoding.cc \
@@ -2958,8 +2710,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $
2958
2710
  ifeq ($(SYSTEM),Darwin)
2959
2711
  $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(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)
2960
2712
  else
2961
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.12 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(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)
2962
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.12
2713
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.13 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(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)
2714
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.13
2963
2715
  $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
2964
2716
  endif
2965
2717
  endif
@@ -3099,7 +2851,6 @@ PUBLIC_HEADERS_CXX += \
3099
2851
  include/grpc++/support/sync_stream.h \
3100
2852
  include/grpc++/support/time.h \
3101
2853
  include/grpcpp/alarm.h \
3102
- include/grpcpp/alarm_impl.h \
3103
2854
  include/grpcpp/channel.h \
3104
2855
  include/grpcpp/client_context.h \
3105
2856
  include/grpcpp/completion_queue.h \
@@ -3115,9 +2866,7 @@ PUBLIC_HEADERS_CXX += \
3115
2866
  include/grpcpp/impl/client_unary_call.h \
3116
2867
  include/grpcpp/impl/codegen/async_generic_service.h \
3117
2868
  include/grpcpp/impl/codegen/async_stream.h \
3118
- include/grpcpp/impl/codegen/async_stream_impl.h \
3119
2869
  include/grpcpp/impl/codegen/async_unary_call.h \
3120
- include/grpcpp/impl/codegen/async_unary_call_impl.h \
3121
2870
  include/grpcpp/impl/codegen/byte_buffer.h \
3122
2871
  include/grpcpp/impl/codegen/call.h \
3123
2872
  include/grpcpp/impl/codegen/call_hook.h \
@@ -3126,7 +2875,6 @@ PUBLIC_HEADERS_CXX += \
3126
2875
  include/grpcpp/impl/codegen/callback_common.h \
3127
2876
  include/grpcpp/impl/codegen/channel_interface.h \
3128
2877
  include/grpcpp/impl/codegen/client_callback.h \
3129
- include/grpcpp/impl/codegen/client_callback_impl.h \
3130
2878
  include/grpcpp/impl/codegen/client_context.h \
3131
2879
  include/grpcpp/impl/codegen/client_interceptor.h \
3132
2880
  include/grpcpp/impl/codegen/client_unary_call.h \
@@ -3145,7 +2893,6 @@ PUBLIC_HEADERS_CXX += \
3145
2893
  include/grpcpp/impl/codegen/message_allocator.h \
3146
2894
  include/grpcpp/impl/codegen/metadata_map.h \
3147
2895
  include/grpcpp/impl/codegen/method_handler.h \
3148
- include/grpcpp/impl/codegen/method_handler_impl.h \
3149
2896
  include/grpcpp/impl/codegen/proto_buffer_reader.h \
3150
2897
  include/grpcpp/impl/codegen/proto_buffer_writer.h \
3151
2898
  include/grpcpp/impl/codegen/proto_utils.h \
@@ -3155,9 +2902,7 @@ PUBLIC_HEADERS_CXX += \
3155
2902
  include/grpcpp/impl/codegen/serialization_traits.h \
3156
2903
  include/grpcpp/impl/codegen/server_callback.h \
3157
2904
  include/grpcpp/impl/codegen/server_callback_handlers.h \
3158
- include/grpcpp/impl/codegen/server_callback_impl.h \
3159
2905
  include/grpcpp/impl/codegen/server_context.h \
3160
- include/grpcpp/impl/codegen/server_context_impl.h \
3161
2906
  include/grpcpp/impl/codegen/server_interceptor.h \
3162
2907
  include/grpcpp/impl/codegen/server_interface.h \
3163
2908
  include/grpcpp/impl/codegen/service_type.h \
@@ -3168,7 +2913,6 @@ PUBLIC_HEADERS_CXX += \
3168
2913
  include/grpcpp/impl/codegen/stub_options.h \
3169
2914
  include/grpcpp/impl/codegen/sync.h \
3170
2915
  include/grpcpp/impl/codegen/sync_stream.h \
3171
- include/grpcpp/impl/codegen/sync_stream_impl.h \
3172
2916
  include/grpcpp/impl/codegen/time.h \
3173
2917
  include/grpcpp/impl/grpc_library.h \
3174
2918
  include/grpcpp/impl/method_handler_impl.h \
@@ -3176,10 +2920,8 @@ PUBLIC_HEADERS_CXX += \
3176
2920
  include/grpcpp/impl/rpc_service_method.h \
3177
2921
  include/grpcpp/impl/serialization_traits.h \
3178
2922
  include/grpcpp/impl/server_builder_option.h \
3179
- include/grpcpp/impl/server_builder_option_impl.h \
3180
2923
  include/grpcpp/impl/server_builder_plugin.h \
3181
2924
  include/grpcpp/impl/server_initializer.h \
3182
- include/grpcpp/impl/server_initializer_impl.h \
3183
2925
  include/grpcpp/impl/service_type.h \
3184
2926
  include/grpcpp/resource_quota.h \
3185
2927
  include/grpcpp/security/auth_context.h \
@@ -3190,16 +2932,12 @@ PUBLIC_HEADERS_CXX += \
3190
2932
  include/grpcpp/server.h \
3191
2933
  include/grpcpp/server_builder.h \
3192
2934
  include/grpcpp/server_context.h \
3193
- include/grpcpp/server_impl.h \
3194
2935
  include/grpcpp/server_posix.h \
3195
2936
  include/grpcpp/support/async_stream.h \
3196
- include/grpcpp/support/async_stream_impl.h \
3197
2937
  include/grpcpp/support/async_unary_call.h \
3198
- include/grpcpp/support/async_unary_call_impl.h \
3199
2938
  include/grpcpp/support/byte_buffer.h \
3200
2939
  include/grpcpp/support/channel_arguments.h \
3201
2940
  include/grpcpp/support/client_callback.h \
3202
- include/grpcpp/support/client_callback_impl.h \
3203
2941
  include/grpcpp/support/client_interceptor.h \
3204
2942
  include/grpcpp/support/config.h \
3205
2943
  include/grpcpp/support/interceptor.h \
@@ -3208,7 +2946,6 @@ PUBLIC_HEADERS_CXX += \
3208
2946
  include/grpcpp/support/proto_buffer_reader.h \
3209
2947
  include/grpcpp/support/proto_buffer_writer.h \
3210
2948
  include/grpcpp/support/server_callback.h \
3211
- include/grpcpp/support/server_callback_impl.h \
3212
2949
  include/grpcpp/support/server_interceptor.h \
3213
2950
  include/grpcpp/support/slice.h \
3214
2951
  include/grpcpp/support/status.h \
@@ -3216,7 +2953,6 @@ PUBLIC_HEADERS_CXX += \
3216
2953
  include/grpcpp/support/string_ref.h \
3217
2954
  include/grpcpp/support/stub_options.h \
3218
2955
  include/grpcpp/support/sync_stream.h \
3219
- include/grpcpp/support/sync_stream_impl.h \
3220
2956
  include/grpcpp/support/time.h \
3221
2957
  include/grpcpp/support/validate_service_config.h \
3222
2958
 
@@ -3629,7 +3365,6 @@ PUBLIC_HEADERS_CXX += \
3629
3365
  include/grpc++/support/sync_stream.h \
3630
3366
  include/grpc++/support/time.h \
3631
3367
  include/grpcpp/alarm.h \
3632
- include/grpcpp/alarm_impl.h \
3633
3368
  include/grpcpp/channel.h \
3634
3369
  include/grpcpp/client_context.h \
3635
3370
  include/grpcpp/completion_queue.h \
@@ -3645,9 +3380,7 @@ PUBLIC_HEADERS_CXX += \
3645
3380
  include/grpcpp/impl/client_unary_call.h \
3646
3381
  include/grpcpp/impl/codegen/async_generic_service.h \
3647
3382
  include/grpcpp/impl/codegen/async_stream.h \
3648
- include/grpcpp/impl/codegen/async_stream_impl.h \
3649
3383
  include/grpcpp/impl/codegen/async_unary_call.h \
3650
- include/grpcpp/impl/codegen/async_unary_call_impl.h \
3651
3384
  include/grpcpp/impl/codegen/byte_buffer.h \
3652
3385
  include/grpcpp/impl/codegen/call.h \
3653
3386
  include/grpcpp/impl/codegen/call_hook.h \
@@ -3656,7 +3389,6 @@ PUBLIC_HEADERS_CXX += \
3656
3389
  include/grpcpp/impl/codegen/callback_common.h \
3657
3390
  include/grpcpp/impl/codegen/channel_interface.h \
3658
3391
  include/grpcpp/impl/codegen/client_callback.h \
3659
- include/grpcpp/impl/codegen/client_callback_impl.h \
3660
3392
  include/grpcpp/impl/codegen/client_context.h \
3661
3393
  include/grpcpp/impl/codegen/client_interceptor.h \
3662
3394
  include/grpcpp/impl/codegen/client_unary_call.h \
@@ -3675,7 +3407,6 @@ PUBLIC_HEADERS_CXX += \
3675
3407
  include/grpcpp/impl/codegen/message_allocator.h \
3676
3408
  include/grpcpp/impl/codegen/metadata_map.h \
3677
3409
  include/grpcpp/impl/codegen/method_handler.h \
3678
- include/grpcpp/impl/codegen/method_handler_impl.h \
3679
3410
  include/grpcpp/impl/codegen/proto_buffer_reader.h \
3680
3411
  include/grpcpp/impl/codegen/proto_buffer_writer.h \
3681
3412
  include/grpcpp/impl/codegen/proto_utils.h \
@@ -3685,9 +3416,7 @@ PUBLIC_HEADERS_CXX += \
3685
3416
  include/grpcpp/impl/codegen/serialization_traits.h \
3686
3417
  include/grpcpp/impl/codegen/server_callback.h \
3687
3418
  include/grpcpp/impl/codegen/server_callback_handlers.h \
3688
- include/grpcpp/impl/codegen/server_callback_impl.h \
3689
3419
  include/grpcpp/impl/codegen/server_context.h \
3690
- include/grpcpp/impl/codegen/server_context_impl.h \
3691
3420
  include/grpcpp/impl/codegen/server_interceptor.h \
3692
3421
  include/grpcpp/impl/codegen/server_interface.h \
3693
3422
  include/grpcpp/impl/codegen/service_type.h \
@@ -3698,7 +3427,6 @@ PUBLIC_HEADERS_CXX += \
3698
3427
  include/grpcpp/impl/codegen/stub_options.h \
3699
3428
  include/grpcpp/impl/codegen/sync.h \
3700
3429
  include/grpcpp/impl/codegen/sync_stream.h \
3701
- include/grpcpp/impl/codegen/sync_stream_impl.h \
3702
3430
  include/grpcpp/impl/codegen/time.h \
3703
3431
  include/grpcpp/impl/grpc_library.h \
3704
3432
  include/grpcpp/impl/method_handler_impl.h \
@@ -3706,10 +3434,8 @@ PUBLIC_HEADERS_CXX += \
3706
3434
  include/grpcpp/impl/rpc_service_method.h \
3707
3435
  include/grpcpp/impl/serialization_traits.h \
3708
3436
  include/grpcpp/impl/server_builder_option.h \
3709
- include/grpcpp/impl/server_builder_option_impl.h \
3710
3437
  include/grpcpp/impl/server_builder_plugin.h \
3711
3438
  include/grpcpp/impl/server_initializer.h \
3712
- include/grpcpp/impl/server_initializer_impl.h \
3713
3439
  include/grpcpp/impl/service_type.h \
3714
3440
  include/grpcpp/resource_quota.h \
3715
3441
  include/grpcpp/security/auth_context.h \
@@ -3720,16 +3446,12 @@ PUBLIC_HEADERS_CXX += \
3720
3446
  include/grpcpp/server.h \
3721
3447
  include/grpcpp/server_builder.h \
3722
3448
  include/grpcpp/server_context.h \
3723
- include/grpcpp/server_impl.h \
3724
3449
  include/grpcpp/server_posix.h \
3725
3450
  include/grpcpp/support/async_stream.h \
3726
- include/grpcpp/support/async_stream_impl.h \
3727
3451
  include/grpcpp/support/async_unary_call.h \
3728
- include/grpcpp/support/async_unary_call_impl.h \
3729
3452
  include/grpcpp/support/byte_buffer.h \
3730
3453
  include/grpcpp/support/channel_arguments.h \
3731
3454
  include/grpcpp/support/client_callback.h \
3732
- include/grpcpp/support/client_callback_impl.h \
3733
3455
  include/grpcpp/support/client_interceptor.h \
3734
3456
  include/grpcpp/support/config.h \
3735
3457
  include/grpcpp/support/interceptor.h \
@@ -3738,7 +3460,6 @@ PUBLIC_HEADERS_CXX += \
3738
3460
  include/grpcpp/support/proto_buffer_reader.h \
3739
3461
  include/grpcpp/support/proto_buffer_writer.h \
3740
3462
  include/grpcpp/support/server_callback.h \
3741
- include/grpcpp/support/server_callback_impl.h \
3742
3463
  include/grpcpp/support/server_interceptor.h \
3743
3464
  include/grpcpp/support/slice.h \
3744
3465
  include/grpcpp/support/status.h \
@@ -3746,7 +3467,6 @@ PUBLIC_HEADERS_CXX += \
3746
3467
  include/grpcpp/support/string_ref.h \
3747
3468
  include/grpcpp/support/stub_options.h \
3748
3469
  include/grpcpp/support/sync_stream.h \
3749
- include/grpcpp/support/sync_stream_impl.h \
3750
3470
  include/grpcpp/support/time.h \
3751
3471
  include/grpcpp/support/validate_service_config.h \
3752
3472
 
@@ -4149,12 +3869,10 @@ LIBBORINGSSL_SRC = \
4149
3869
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pci.c \
4150
3870
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcia.c \
4151
3871
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c \
4152
- third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pku.c \
4153
3872
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c \
4154
3873
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c \
4155
3874
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c \
4156
3875
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c \
4157
- third_party/boringssl-with-bazel/src/crypto/x509v3/v3_sxnet.c \
4158
3876
  third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c \
4159
3877
  third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
4160
3878
  third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
@@ -4305,8 +4023,8 @@ $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OB
4305
4023
  ifeq ($(SYSTEM),Darwin)
4306
4024
  $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4307
4025
  else
4308
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.12 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4309
- $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.12
4026
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.13 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4027
+ $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.13
4310
4028
  $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so
4311
4029
  endif
4312
4030
  endif
@@ -4778,17 +4496,96 @@ endif
4778
4496
 
4779
4497
 
4780
4498
 
4499
+ # TODO(jtattermusch): is there a way to get around this hack?
4781
4500
  ifneq ($(OPENSSL_DEP),)
4782
4501
  # This is to ensure the embedded OpenSSL is built beforehand, properly
4783
4502
  # installing headers to their final destination on the drive. We need this
4784
4503
  # otherwise parallel compilation will fail if a source is compiled first.
4785
4504
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc: $(OPENSSL_DEP)
4505
+ src/core/ext/filters/client_channel/lb_policy/xds/cds.cc: $(OPENSSL_DEP)
4506
+ src/core/ext/filters/client_channel/lb_policy/xds/eds.cc: $(OPENSSL_DEP)
4507
+ src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc: $(OPENSSL_DEP)
4508
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc: $(OPENSSL_DEP)
4509
+ src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP)
4786
4510
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc: $(OPENSSL_DEP)
4787
4511
  src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc: $(OPENSSL_DEP)
4512
+ src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c: $(OPENSSL_DEP)
4513
+ src/core/ext/upb-generated/envoy/annotations/resource.upb.c: $(OPENSSL_DEP)
4514
+ src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c: $(OPENSSL_DEP)
4515
+ src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c: $(OPENSSL_DEP)
4516
+ src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c: $(OPENSSL_DEP)
4517
+ src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c: $(OPENSSL_DEP)
4518
+ src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c: $(OPENSSL_DEP)
4519
+ src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c: $(OPENSSL_DEP)
4520
+ src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c: $(OPENSSL_DEP)
4521
+ src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c: $(OPENSSL_DEP)
4522
+ src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c: $(OPENSSL_DEP)
4523
+ src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c: $(OPENSSL_DEP)
4524
+ src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c: $(OPENSSL_DEP)
4525
+ src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c: $(OPENSSL_DEP)
4526
+ src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c: $(OPENSSL_DEP)
4527
+ src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c: $(OPENSSL_DEP)
4528
+ src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c: $(OPENSSL_DEP)
4529
+ src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c: $(OPENSSL_DEP)
4530
+ src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c: $(OPENSSL_DEP)
4531
+ src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c: $(OPENSSL_DEP)
4532
+ src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c: $(OPENSSL_DEP)
4533
+ src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c: $(OPENSSL_DEP)
4534
+ src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c: $(OPENSSL_DEP)
4535
+ src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c: $(OPENSSL_DEP)
4536
+ src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c: $(OPENSSL_DEP)
4537
+ src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c: $(OPENSSL_DEP)
4538
+ src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c: $(OPENSSL_DEP)
4539
+ src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c: $(OPENSSL_DEP)
4540
+ src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c: $(OPENSSL_DEP)
4541
+ src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c: $(OPENSSL_DEP)
4542
+ src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c: $(OPENSSL_DEP)
4543
+ src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c: $(OPENSSL_DEP)
4544
+ src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c: $(OPENSSL_DEP)
4545
+ src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c: $(OPENSSL_DEP)
4546
+ src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c: $(OPENSSL_DEP)
4547
+ src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c: $(OPENSSL_DEP)
4548
+ src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c: $(OPENSSL_DEP)
4549
+ src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c: $(OPENSSL_DEP)
4550
+ src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c: $(OPENSSL_DEP)
4551
+ src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c: $(OPENSSL_DEP)
4552
+ src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c: $(OPENSSL_DEP)
4553
+ src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c: $(OPENSSL_DEP)
4554
+ src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c: $(OPENSSL_DEP)
4555
+ src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c: $(OPENSSL_DEP)
4556
+ src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c: $(OPENSSL_DEP)
4557
+ src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c: $(OPENSSL_DEP)
4558
+ src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c: $(OPENSSL_DEP)
4559
+ src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c: $(OPENSSL_DEP)
4560
+ src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c: $(OPENSSL_DEP)
4561
+ src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c: $(OPENSSL_DEP)
4562
+ src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c: $(OPENSSL_DEP)
4563
+ src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c: $(OPENSSL_DEP)
4564
+ src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c: $(OPENSSL_DEP)
4565
+ src/core/ext/upb-generated/envoy/type/v3/http.upb.c: $(OPENSSL_DEP)
4566
+ src/core/ext/upb-generated/envoy/type/v3/percent.upb.c: $(OPENSSL_DEP)
4567
+ src/core/ext/upb-generated/envoy/type/v3/range.upb.c: $(OPENSSL_DEP)
4568
+ src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c: $(OPENSSL_DEP)
4788
4569
  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c: $(OPENSSL_DEP)
4789
4570
  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c: $(OPENSSL_DEP)
4790
4571
  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c: $(OPENSSL_DEP)
4791
- src/core/ext/xds/xds_channel_secure.cc: $(OPENSSL_DEP)
4572
+ src/core/ext/upb-generated/udpa/annotations/migrate.upb.c: $(OPENSSL_DEP)
4573
+ src/core/ext/upb-generated/udpa/annotations/security.upb.c: $(OPENSSL_DEP)
4574
+ src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c: $(OPENSSL_DEP)
4575
+ src/core/ext/upb-generated/udpa/annotations/status.upb.c: $(OPENSSL_DEP)
4576
+ src/core/ext/upb-generated/udpa/annotations/versioning.upb.c: $(OPENSSL_DEP)
4577
+ src/core/ext/upb-generated/udpa/core/v1/authority.upb.c: $(OPENSSL_DEP)
4578
+ src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c: $(OPENSSL_DEP)
4579
+ src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c: $(OPENSSL_DEP)
4580
+ src/core/ext/upb-generated/udpa/core/v1/resource.upb.c: $(OPENSSL_DEP)
4581
+ src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c: $(OPENSSL_DEP)
4582
+ src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c: $(OPENSSL_DEP)
4583
+ src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP)
4584
+ src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc: $(OPENSSL_DEP)
4585
+ src/core/ext/xds/xds_api.cc: $(OPENSSL_DEP)
4586
+ src/core/ext/xds/xds_bootstrap.cc: $(OPENSSL_DEP)
4587
+ src/core/ext/xds/xds_client.cc: $(OPENSSL_DEP)
4588
+ src/core/ext/xds/xds_client_stats.cc: $(OPENSSL_DEP)
4792
4589
  src/core/lib/http/httpcli_security_connector.cc: $(OPENSSL_DEP)
4793
4590
  src/core/lib/security/authorization/authorization_engine.cc: $(OPENSSL_DEP)
4794
4591
  src/core/lib/security/authorization/evaluate_args.cc: $(OPENSSL_DEP)
@@ -4815,8 +4612,10 @@ src/core/lib/security/credentials/local/local_credentials.cc: $(OPENSSL_DEP)
4815
4612
  src/core/lib/security/credentials/oauth2/oauth2_credentials.cc: $(OPENSSL_DEP)
4816
4613
  src/core/lib/security/credentials/plugin/plugin_credentials.cc: $(OPENSSL_DEP)
4817
4614
  src/core/lib/security/credentials/ssl/ssl_credentials.cc: $(OPENSSL_DEP)
4615
+ src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc: $(OPENSSL_DEP)
4818
4616
  src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc: $(OPENSSL_DEP)
4819
4617
  src/core/lib/security/credentials/tls/tls_credentials.cc: $(OPENSSL_DEP)
4618
+ src/core/lib/security/credentials/xds/xds_credentials.cc: $(OPENSSL_DEP)
4820
4619
  src/core/lib/security/security_connector/alts/alts_security_connector.cc: $(OPENSSL_DEP)
4821
4620
  src/core/lib/security/security_connector/fake/fake_security_connector.cc: $(OPENSSL_DEP)
4822
4621
  src/core/lib/security/security_connector/load_system_roots_fallback.cc: $(OPENSSL_DEP)