grpc 1.25.0 → 1.26.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 (278) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +782 -291
  3. data/include/grpc/impl/codegen/grpc_types.h +4 -0
  4. data/include/grpc/impl/codegen/port_platform.h +7 -0
  5. data/include/grpc/support/alloc.h +0 -16
  6. data/src/core/ext/filters/client_channel/backend_metric.cc +2 -2
  7. data/src/core/ext/filters/client_channel/backup_poller.cc +1 -1
  8. data/src/core/ext/filters/client_channel/channel_connectivity.cc +2 -2
  9. data/src/core/ext/filters/client_channel/client_channel.cc +95 -88
  10. data/src/core/ext/filters/client_channel/client_channel_channelz.cc +7 -7
  11. data/src/core/ext/filters/client_channel/client_channel_channelz.h +4 -2
  12. data/src/core/ext/filters/client_channel/client_channel_factory.cc +1 -1
  13. data/src/core/ext/filters/client_channel/client_channel_plugin.cc +3 -3
  14. data/src/core/ext/filters/client_channel/connector.h +40 -45
  15. data/src/core/ext/filters/client_channel/global_subchannel_pool.cc +10 -10
  16. data/src/core/ext/filters/client_channel/health/health_check_client.cc +16 -13
  17. data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +66 -37
  18. data/src/core/ext/filters/client_channel/http_proxy.cc +107 -116
  19. data/src/core/ext/filters/client_channel/http_proxy.h +5 -1
  20. data/src/core/ext/filters/client_channel/lb_policy.cc +3 -3
  21. data/src/core/ext/filters/client_channel/lb_policy.h +9 -5
  22. data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +10 -8
  23. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +18 -19
  24. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +4 -3
  25. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +4 -4
  26. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +1 -1
  27. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +3 -3
  28. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +3 -3
  29. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +6 -9
  30. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +368 -0
  31. data/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +157 -77
  32. data/src/core/ext/filters/client_channel/lb_policy_registry.cc +5 -5
  33. data/src/core/ext/filters/client_channel/lb_policy_registry.h +1 -1
  34. data/src/core/ext/filters/client_channel/local_subchannel_pool.cc +8 -8
  35. data/src/core/ext/filters/client_channel/proxy_mapper.h +14 -34
  36. data/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +46 -79
  37. data/src/core/ext/filters/client_channel/proxy_mapper_registry.h +23 -17
  38. data/src/core/ext/filters/client_channel/resolver.cc +2 -1
  39. data/src/core/ext/filters/client_channel/resolver.h +2 -2
  40. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +1 -1
  41. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +4 -4
  42. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +1 -1
  43. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +13 -10
  44. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +3 -2
  45. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +9 -8
  46. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +17 -16
  47. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +2 -2
  48. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +4 -4
  49. data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +9 -9
  50. data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +5 -3
  51. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +1 -1
  52. data/src/core/ext/filters/client_channel/resolver_factory.h +3 -3
  53. data/src/core/ext/filters/client_channel/resolver_registry.cc +14 -12
  54. data/src/core/ext/filters/client_channel/resolver_registry.h +6 -4
  55. data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +6 -6
  56. data/src/core/ext/filters/client_channel/resolver_result_parsing.h +6 -6
  57. data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +5 -5
  58. data/src/core/ext/filters/client_channel/resolving_lb_policy.h +3 -3
  59. data/src/core/ext/filters/client_channel/service_config.cc +15 -14
  60. data/src/core/ext/filters/client_channel/service_config.h +14 -19
  61. data/src/core/ext/filters/client_channel/subchannel.cc +38 -36
  62. data/src/core/ext/filters/client_channel/subchannel.h +11 -12
  63. data/src/core/ext/filters/client_channel/subchannel_interface.h +1 -1
  64. data/src/core/ext/filters/client_channel/xds/xds_api.cc +19 -9
  65. data/src/core/ext/filters/client_channel/xds/xds_api.h +19 -9
  66. data/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +3 -3
  67. data/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +6 -5
  68. data/src/core/ext/filters/client_channel/xds/xds_client.cc +58 -31
  69. data/src/core/ext/filters/client_channel/xds/xds_client.h +20 -15
  70. data/src/core/ext/filters/client_channel/xds/xds_client_stats.cc +5 -3
  71. data/src/core/ext/filters/client_channel/xds/xds_client_stats.h +18 -15
  72. data/src/core/ext/filters/client_idle/client_idle_filter.cc +10 -10
  73. data/src/core/ext/filters/deadline/deadline_filter.cc +15 -13
  74. data/src/core/ext/filters/http/client/http_client_filter.cc +12 -12
  75. data/src/core/ext/filters/http/client_authority_filter.cc +3 -3
  76. data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +13 -7
  77. data/src/core/ext/filters/http/server/http_server_filter.cc +14 -13
  78. data/src/core/ext/filters/max_age/max_age_filter.cc +16 -14
  79. data/src/core/ext/filters/message_size/message_size_filter.cc +10 -8
  80. data/src/core/ext/filters/message_size/message_size_filter.h +1 -1
  81. data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +9 -8
  82. data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +141 -174
  83. data/src/core/ext/transport/chttp2/client/chttp2_connector.h +31 -1
  84. data/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +7 -6
  85. data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +14 -12
  86. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +8 -5
  87. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +46 -38
  88. data/src/core/ext/transport/chttp2/transport/context_list.cc +2 -2
  89. data/src/core/ext/transport/chttp2/transport/flow_control.h +0 -5
  90. data/src/core/ext/transport/chttp2/transport/frame_data.cc +6 -7
  91. data/src/core/ext/transport/chttp2/transport/frame_goaway.cc +2 -2
  92. data/src/core/ext/transport/chttp2/transport/frame_ping.cc +1 -1
  93. data/src/core/ext/transport/chttp2/transport/frame_settings.cc +4 -3
  94. data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +5 -5
  95. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +11 -8
  96. data/src/core/ext/transport/chttp2/transport/internal.h +3 -3
  97. data/src/core/ext/transport/chttp2/transport/parsing.cc +4 -4
  98. data/src/core/ext/transport/chttp2/transport/writing.cc +3 -2
  99. data/src/core/ext/transport/inproc/inproc_transport.cc +65 -41
  100. data/src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c +0 -1
  101. data/src/core/ext/upb-generated/envoy/api/v2/cds.upb.c +141 -70
  102. data/src/core/ext/upb-generated/envoy/api/v2/cds.upb.h +352 -118
  103. data/src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c +0 -1
  104. data/src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c +0 -1
  105. data/src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c +8 -4
  106. data/src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h +65 -0
  107. data/src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c +0 -1
  108. data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c +16 -2
  109. data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h +36 -0
  110. data/src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c +12 -5
  111. data/src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.h +34 -0
  112. data/src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c +1 -2
  113. data/src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c +13 -12
  114. data/src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h +28 -24
  115. data/src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c +0 -1
  116. data/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c +5 -4
  117. data/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h +13 -0
  118. data/src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c +0 -1
  119. data/src/core/ext/upb-generated/envoy/api/v2/eds.upb.c +23 -23
  120. data/src/core/ext/upb-generated/envoy/api/v2/eds.upb.h +48 -44
  121. data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c +0 -1
  122. data/src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c +0 -1
  123. data/src/core/ext/upb-generated/envoy/type/http.upb.c +16 -0
  124. data/src/core/ext/upb-generated/envoy/type/http.upb.h +36 -0
  125. data/src/core/ext/upb-generated/envoy/type/percent.upb.c +0 -1
  126. data/src/core/ext/upb-generated/envoy/type/range.upb.c +0 -1
  127. data/src/core/lib/avl/avl.cc +1 -1
  128. data/src/core/lib/channel/channel_stack.cc +1 -1
  129. data/src/core/lib/channel/channel_stack.h +16 -4
  130. data/src/core/lib/channel/channel_trace.cc +4 -4
  131. data/src/core/lib/channel/channelz.cc +46 -46
  132. data/src/core/lib/channel/channelz.h +37 -35
  133. data/src/core/lib/channel/channelz_registry.cc +2 -2
  134. data/src/core/lib/channel/channelz_registry.h +1 -1
  135. data/src/core/lib/channel/connected_channel.cc +3 -2
  136. data/src/core/lib/channel/handshaker.cc +1 -1
  137. data/src/core/lib/channel/handshaker_registry.cc +5 -5
  138. data/src/core/lib/channel/handshaker_registry.h +3 -3
  139. data/src/core/lib/compression/message_compress.cc +3 -2
  140. data/src/core/lib/compression/stream_compression_identity.cc +5 -7
  141. data/src/core/lib/gpr/alloc.cc +4 -29
  142. data/src/core/lib/gpr/cpu_linux.cc +1 -1
  143. data/src/core/lib/gprpp/fork.cc +4 -4
  144. data/src/core/lib/gprpp/global_config_env.cc +7 -7
  145. data/src/core/lib/gprpp/global_config_env.h +2 -2
  146. data/src/core/lib/gprpp/host_port.cc +8 -8
  147. data/src/core/lib/gprpp/host_port.h +3 -3
  148. data/src/core/lib/gprpp/inlined_vector.h +13 -0
  149. data/src/core/lib/gprpp/map.h +2 -9
  150. data/src/core/lib/gprpp/memory.h +12 -98
  151. data/src/core/lib/gprpp/orphanable.h +3 -3
  152. data/src/core/lib/gprpp/ref_counted.h +3 -3
  153. data/src/core/lib/gprpp/ref_counted_ptr.h +1 -1
  154. data/src/core/lib/gprpp/string_view.h +45 -23
  155. data/src/core/lib/gprpp/thd.h +1 -1
  156. data/src/core/lib/gprpp/thd_posix.cc +6 -5
  157. data/src/core/lib/gprpp/thd_windows.cc +3 -3
  158. data/src/core/lib/http/httpcli.cc +1 -1
  159. data/src/core/lib/http/httpcli_security_connector.cc +3 -3
  160. data/src/core/lib/iomgr/buffer_list.cc +10 -5
  161. data/src/core/lib/iomgr/call_combiner.cc +7 -6
  162. data/src/core/lib/iomgr/call_combiner.h +4 -3
  163. data/src/core/lib/iomgr/cfstream_handle.cc +2 -2
  164. data/src/core/lib/iomgr/closure.h +33 -135
  165. data/src/core/lib/iomgr/combiner.cc +10 -17
  166. data/src/core/lib/iomgr/combiner.h +0 -2
  167. data/src/core/lib/iomgr/endpoint_cfstream.cc +2 -2
  168. data/src/core/lib/iomgr/endpoint_pair_posix.cc +1 -1
  169. data/src/core/lib/iomgr/ev_epoll1_linux.cc +3 -2
  170. data/src/core/lib/iomgr/ev_epollex_linux.cc +23 -13
  171. data/src/core/lib/iomgr/ev_poll_posix.cc +30 -17
  172. data/src/core/lib/iomgr/exec_ctx.cc +52 -5
  173. data/src/core/lib/iomgr/exec_ctx.h +6 -2
  174. data/src/core/lib/iomgr/executor.cc +16 -37
  175. data/src/core/lib/iomgr/executor.h +4 -7
  176. data/src/core/lib/iomgr/executor/threadpool.cc +4 -4
  177. data/src/core/lib/iomgr/iomgr_custom.cc +1 -1
  178. data/src/core/lib/iomgr/lockfree_event.cc +9 -8
  179. data/src/core/lib/iomgr/logical_thread.cc +103 -0
  180. data/src/core/lib/iomgr/logical_thread.h +52 -0
  181. data/src/core/lib/iomgr/pollset_custom.cc +5 -5
  182. data/src/core/lib/iomgr/pollset_set_custom.cc +9 -9
  183. data/src/core/lib/iomgr/pollset_windows.cc +16 -2
  184. data/src/core/lib/iomgr/port.h +3 -0
  185. data/src/core/lib/iomgr/resolve_address_custom.cc +4 -4
  186. data/src/core/lib/iomgr/resolve_address_posix.cc +8 -9
  187. data/src/core/lib/iomgr/resolve_address_windows.cc +4 -6
  188. data/src/core/lib/iomgr/resource_quota.cc +26 -21
  189. data/src/core/lib/iomgr/socket_utils_common_posix.cc +11 -0
  190. data/src/core/lib/iomgr/socket_windows.cc +2 -2
  191. data/src/core/lib/iomgr/tcp_client_cfstream.cc +2 -2
  192. data/src/core/lib/iomgr/tcp_client_custom.cc +2 -2
  193. data/src/core/lib/iomgr/tcp_client_posix.cc +5 -4
  194. data/src/core/lib/iomgr/tcp_client_windows.cc +2 -2
  195. data/src/core/lib/iomgr/tcp_custom.cc +10 -9
  196. data/src/core/lib/iomgr/tcp_posix.cc +19 -15
  197. data/src/core/lib/iomgr/tcp_server_custom.cc +3 -2
  198. data/src/core/lib/iomgr/tcp_server_posix.cc +5 -4
  199. data/src/core/lib/iomgr/tcp_server_windows.cc +5 -3
  200. data/src/core/lib/iomgr/tcp_windows.cc +16 -13
  201. data/src/core/lib/iomgr/timer_custom.cc +4 -3
  202. data/src/core/lib/iomgr/timer_generic.cc +11 -9
  203. data/src/core/lib/iomgr/udp_server.cc +16 -13
  204. data/src/core/lib/security/credentials/alts/alts_credentials.cc +8 -5
  205. data/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +45 -57
  206. data/src/core/lib/security/credentials/composite/composite_credentials.cc +7 -6
  207. data/src/core/lib/security/credentials/credentials.cc +8 -8
  208. data/src/core/lib/security/credentials/credentials.h +5 -5
  209. data/src/core/lib/security/credentials/fake/fake_credentials.cc +5 -5
  210. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +1 -1
  211. data/src/core/lib/security/credentials/iam/iam_credentials.cc +4 -4
  212. data/src/core/lib/security/credentials/jwt/jwt_credentials.cc +4 -4
  213. data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +2 -2
  214. data/src/core/lib/security/credentials/local/local_credentials.cc +3 -3
  215. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +13 -11
  216. data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +6 -5
  217. data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +4 -4
  218. data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +5 -5
  219. data/src/core/lib/security/credentials/tls/spiffe_credentials.cc +2 -2
  220. data/src/core/lib/security/security_connector/alts/alts_security_connector.cc +28 -22
  221. data/src/core/lib/security/security_connector/alts/alts_security_connector.h +5 -0
  222. data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +10 -10
  223. data/src/core/lib/security/security_connector/load_system_roots_linux.cc +2 -1
  224. data/src/core/lib/security/security_connector/local/local_security_connector.cc +8 -8
  225. data/src/core/lib/security/security_connector/security_connector.h +1 -1
  226. data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +9 -9
  227. data/src/core/lib/security/security_connector/ssl_utils.cc +5 -4
  228. data/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +14 -15
  229. data/src/core/lib/security/transport/client_auth_filter.cc +4 -3
  230. data/src/core/lib/security/transport/secure_endpoint.cc +9 -8
  231. data/src/core/lib/security/transport/security_handshaker.cc +67 -23
  232. data/src/core/lib/security/transport/server_auth_filter.cc +6 -5
  233. data/src/core/lib/security/transport/target_authority_table.h +1 -1
  234. data/src/core/lib/slice/b64.cc +3 -4
  235. data/src/core/lib/slice/b64.h +1 -2
  236. data/src/core/lib/slice/slice.cc +8 -13
  237. data/src/core/lib/surface/call.cc +19 -19
  238. data/src/core/lib/surface/call.h +6 -7
  239. data/src/core/lib/surface/call_log_batch.cc +1 -2
  240. data/src/core/lib/surface/channel.cc +17 -18
  241. data/src/core/lib/surface/channel.h +4 -19
  242. data/src/core/lib/surface/channel_ping.cc +1 -1
  243. data/src/core/lib/surface/completion_queue.cc +21 -22
  244. data/src/core/lib/surface/completion_queue_factory.cc +1 -1
  245. data/src/core/lib/surface/init.cc +1 -1
  246. data/src/core/lib/surface/init_secure.cc +2 -2
  247. data/src/core/lib/surface/lame_client.cc +10 -12
  248. data/src/core/lib/surface/server.cc +24 -18
  249. data/src/core/lib/surface/version.cc +2 -2
  250. data/src/core/lib/transport/byte_stream.cc +2 -2
  251. data/src/core/lib/transport/byte_stream.h +2 -1
  252. data/src/core/lib/transport/connectivity_state.cc +4 -4
  253. data/src/core/lib/transport/connectivity_state.h +2 -2
  254. data/src/core/lib/transport/metadata.cc +8 -10
  255. data/src/core/lib/transport/metadata.h +5 -8
  256. data/src/core/lib/transport/metadata_batch.cc +6 -0
  257. data/src/core/lib/transport/static_metadata.cc +2 -4
  258. data/src/core/lib/transport/status_metadata.cc +7 -0
  259. data/src/core/lib/transport/status_metadata.h +18 -0
  260. data/src/core/lib/transport/transport.cc +9 -7
  261. data/src/core/plugin_registry/grpc_plugin_registry.cc +4 -0
  262. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +292 -43
  263. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +197 -46
  264. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +4 -2
  265. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h +5 -0
  266. data/src/core/tsi/ssl/session_cache/ssl_session.h +1 -1
  267. data/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc +1 -1
  268. data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +4 -4
  269. data/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +1 -1
  270. data/src/core/tsi/ssl_transport_security.cc +2 -1
  271. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +0 -4
  272. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +0 -6
  273. data/src/ruby/lib/grpc/version.rb +1 -1
  274. data/third_party/upb/upb/decode.c +1 -0
  275. metadata +34 -32
  276. data/src/core/ext/filters/client_channel/connector.cc +0 -41
  277. data/src/core/ext/filters/client_channel/proxy_mapper.cc +0 -48
  278. data/src/core/lib/gprpp/set.h +0 -33
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f30efb4297c8f61371e6031f5ded6baeb47525d34b17203e0b0d2427864d4214
4
- data.tar.gz: f13bceb9a5a316b8e8ffadeaae6ea8cfa50946063bc0ae22e26f0345f7d86324
3
+ metadata.gz: 3cc1cf095cf1d1ea2a7f658a08920c4011364e5e81a26fe2517c08f82d63dab2
4
+ data.tar.gz: c8dd9f0d51c98a4761f50fd958419518bfbc9c0c0d01a691f01c6bfa7700e31a
5
5
  SHA512:
6
- metadata.gz: 560fcb479dcd1a620be6cdcec5405184ad9418288aa05a26f55852b87ad2afd5efc7de7cefea9c2ef11bc22142a5b2a1132c29ed35fd9582b8346aecdf37178a
7
- data.tar.gz: 8471689811c79f7849a6287ab573e95ee7bae115d67e317c717f49ce6310ab374c1ee713b36327fce5853ca5d662bbe38cab20b27cd38fc619ae6475fb428ca0
6
+ metadata.gz: 36f13db105c2a7e37536f34fac7dfb1a55ccb23c586621970796bcc50db23f9aa523638b7d18f5a80d6bb912bf5ee37cb0c5fa52075fdff392031bdf496dff0f
7
+ data.tar.gz: 293f96c8389b51fb6b7e4a99039a94ffdf7050d4261223fbe3a98c24946d7bd2994a9f99f14ce31a3232e82a74058da64724e82e5da7e83892d49d104a326f44
data/Makefile CHANGED
@@ -171,6 +171,15 @@ CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-comman
171
171
  LDFLAGS_tsan = -fsanitize=thread
172
172
  DEFINES_tsan = GRPC_TSAN
173
173
 
174
+ VALID_CONFIG_counters_with_memory_counter = 1
175
+ CC_counters_with_memory_counter = $(DEFAULT_CC)
176
+ CXX_counters_with_memory_counter = $(DEFAULT_CXX)
177
+ LD_counters_with_memory_counter = $(DEFAULT_CC)
178
+ LDXX_counters_with_memory_counter = $(DEFAULT_CXX)
179
+ CPPFLAGS_counters_with_memory_counter = -O2 -DGPR_LOW_LEVEL_COUNTERS -DGPR_WRAP_MEMORY_COUNTER
180
+ LDFLAGS_counters_with_memory_counter = -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=free
181
+ DEFINES_counters_with_memory_counter = NDEBUG
182
+
174
183
  VALID_CONFIG_stapprof = 1
175
184
  CC_stapprof = $(DEFAULT_CC)
176
185
  CXX_stapprof = $(DEFAULT_CXX)
@@ -460,9 +469,9 @@ E = @echo
460
469
  Q = @
461
470
  endif
462
471
 
463
- CORE_VERSION = 8.0.0
464
- CPP_VERSION = 1.25.0
465
- CSHARP_VERSION = 2.25.0
472
+ CORE_VERSION = 9.0.0
473
+ CPP_VERSION = 1.26.0-pre1
474
+ CSHARP_VERSION = 2.26.0-pre1
466
475
 
467
476
  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
468
477
  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -510,7 +519,7 @@ SHARED_EXT_CORE = dll
510
519
  SHARED_EXT_CPP = dll
511
520
  SHARED_EXT_CSHARP = dll
512
521
  SHARED_PREFIX =
513
- SHARED_VERSION_CORE = -8
522
+ SHARED_VERSION_CORE = -9
514
523
  SHARED_VERSION_CPP = -1
515
524
  SHARED_VERSION_CSHARP = -2
516
525
  else ifeq ($(SYSTEM),Darwin)
@@ -713,6 +722,10 @@ ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS)
713
722
  ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
714
723
  CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS)
715
724
 
725
+ UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a
726
+ UPB_MERGE_OBJS = $(LIBUPB_OBJS)
727
+ UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a
728
+
716
729
  ifeq ($(EMBED_CARES),true)
717
730
  CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a
718
731
  CARES_MERGE_OBJS = $(LIBARES_OBJS)
@@ -1088,9 +1101,6 @@ json_test: $(BINDIR)/$(CONFIG)/json_test
1088
1101
  lame_client_test: $(BINDIR)/$(CONFIG)/lame_client_test
1089
1102
  load_file_test: $(BINDIR)/$(CONFIG)/load_file_test
1090
1103
  low_level_ping_pong_benchmark: $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark
1091
- memory_usage_client: $(BINDIR)/$(CONFIG)/memory_usage_client
1092
- memory_usage_server: $(BINDIR)/$(CONFIG)/memory_usage_server
1093
- memory_usage_test: $(BINDIR)/$(CONFIG)/memory_usage_test
1094
1104
  message_compress_test: $(BINDIR)/$(CONFIG)/message_compress_test
1095
1105
  minimal_stack_is_minimal_test: $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test
1096
1106
  mpmcqueue_test: $(BINDIR)/$(CONFIG)/mpmcqueue_test
@@ -1143,6 +1153,7 @@ udp_server_test: $(BINDIR)/$(CONFIG)/udp_server_test
1143
1153
  uri_fuzzer_test: $(BINDIR)/$(CONFIG)/uri_fuzzer_test
1144
1154
  uri_parser_test: $(BINDIR)/$(CONFIG)/uri_parser_test
1145
1155
  alarm_test: $(BINDIR)/$(CONFIG)/alarm_test
1156
+ alts_concurrent_connectivity_test: $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test
1146
1157
  alts_counter_test: $(BINDIR)/$(CONFIG)/alts_counter_test
1147
1158
  alts_crypt_test: $(BINDIR)/$(CONFIG)/alts_crypt_test
1148
1159
  alts_crypter_test: $(BINDIR)/$(CONFIG)/alts_crypter_test
@@ -1245,7 +1256,7 @@ interop_client: $(BINDIR)/$(CONFIG)/interop_client
1245
1256
  interop_server: $(BINDIR)/$(CONFIG)/interop_server
1246
1257
  interop_test: $(BINDIR)/$(CONFIG)/interop_test
1247
1258
  json_run_localhost: $(BINDIR)/$(CONFIG)/json_run_localhost
1248
- memory_test: $(BINDIR)/$(CONFIG)/memory_test
1259
+ logical_thread_test: $(BINDIR)/$(CONFIG)/logical_thread_test
1249
1260
  message_allocator_end2end_test: $(BINDIR)/$(CONFIG)/message_allocator_end2end_test
1250
1261
  metrics_client: $(BINDIR)/$(CONFIG)/metrics_client
1251
1262
  mock_test: $(BINDIR)/$(CONFIG)/mock_test
@@ -1253,6 +1264,7 @@ nonblocking_test: $(BINDIR)/$(CONFIG)/nonblocking_test
1253
1264
  noop-benchmark: $(BINDIR)/$(CONFIG)/noop-benchmark
1254
1265
  optional_test: $(BINDIR)/$(CONFIG)/optional_test
1255
1266
  orphanable_test: $(BINDIR)/$(CONFIG)/orphanable_test
1267
+ pollset_windows_starvation_test.cc: $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc
1256
1268
  port_sharing_end2end_test: $(BINDIR)/$(CONFIG)/port_sharing_end2end_test
1257
1269
  proto_server_reflection_test: $(BINDIR)/$(CONFIG)/proto_server_reflection_test
1258
1270
  proto_utils_test: $(BINDIR)/$(CONFIG)/proto_utils_test
@@ -1399,7 +1411,7 @@ $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure
1399
1411
 
1400
1412
  static: static_c static_cxx
1401
1413
 
1402
- static_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
1414
+ static_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libupb.a
1403
1415
 
1404
1416
  static_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
1405
1417
 
@@ -1407,7 +1419,7 @@ static_csharp: static_c $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
1407
1419
 
1408
1420
  shared: shared_c shared_cxx
1409
1421
 
1410
- shared_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
1422
+ shared_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
1411
1423
  shared_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
1412
1424
 
1413
1425
  shared_csharp: shared_c $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)
@@ -1520,9 +1532,6 @@ buildtests_c: privatelibs_c \
1520
1532
  $(BINDIR)/$(CONFIG)/json_test \
1521
1533
  $(BINDIR)/$(CONFIG)/lame_client_test \
1522
1534
  $(BINDIR)/$(CONFIG)/load_file_test \
1523
- $(BINDIR)/$(CONFIG)/memory_usage_client \
1524
- $(BINDIR)/$(CONFIG)/memory_usage_server \
1525
- $(BINDIR)/$(CONFIG)/memory_usage_test \
1526
1535
  $(BINDIR)/$(CONFIG)/message_compress_test \
1527
1536
  $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test \
1528
1537
  $(BINDIR)/$(CONFIG)/mpmcqueue_test \
@@ -1625,6 +1634,7 @@ buildtests_c: privatelibs_c \
1625
1634
  ifeq ($(EMBED_OPENSSL),true)
1626
1635
  buildtests_cxx: privatelibs_cxx \
1627
1636
  $(BINDIR)/$(CONFIG)/alarm_test \
1637
+ $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test \
1628
1638
  $(BINDIR)/$(CONFIG)/alts_counter_test \
1629
1639
  $(BINDIR)/$(CONFIG)/alts_crypt_test \
1630
1640
  $(BINDIR)/$(CONFIG)/alts_crypter_test \
@@ -1717,7 +1727,7 @@ buildtests_cxx: privatelibs_cxx \
1717
1727
  $(BINDIR)/$(CONFIG)/interop_server \
1718
1728
  $(BINDIR)/$(CONFIG)/interop_test \
1719
1729
  $(BINDIR)/$(CONFIG)/json_run_localhost \
1720
- $(BINDIR)/$(CONFIG)/memory_test \
1730
+ $(BINDIR)/$(CONFIG)/logical_thread_test \
1721
1731
  $(BINDIR)/$(CONFIG)/message_allocator_end2end_test \
1722
1732
  $(BINDIR)/$(CONFIG)/metrics_client \
1723
1733
  $(BINDIR)/$(CONFIG)/mock_test \
@@ -1725,6 +1735,7 @@ buildtests_cxx: privatelibs_cxx \
1725
1735
  $(BINDIR)/$(CONFIG)/noop-benchmark \
1726
1736
  $(BINDIR)/$(CONFIG)/optional_test \
1727
1737
  $(BINDIR)/$(CONFIG)/orphanable_test \
1738
+ $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc \
1728
1739
  $(BINDIR)/$(CONFIG)/port_sharing_end2end_test \
1729
1740
  $(BINDIR)/$(CONFIG)/proto_server_reflection_test \
1730
1741
  $(BINDIR)/$(CONFIG)/proto_utils_test \
@@ -1796,6 +1807,7 @@ buildtests_cxx: privatelibs_cxx \
1796
1807
  else
1797
1808
  buildtests_cxx: privatelibs_cxx \
1798
1809
  $(BINDIR)/$(CONFIG)/alarm_test \
1810
+ $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test \
1799
1811
  $(BINDIR)/$(CONFIG)/alts_counter_test \
1800
1812
  $(BINDIR)/$(CONFIG)/alts_crypt_test \
1801
1813
  $(BINDIR)/$(CONFIG)/alts_crypter_test \
@@ -1888,7 +1900,7 @@ buildtests_cxx: privatelibs_cxx \
1888
1900
  $(BINDIR)/$(CONFIG)/interop_server \
1889
1901
  $(BINDIR)/$(CONFIG)/interop_test \
1890
1902
  $(BINDIR)/$(CONFIG)/json_run_localhost \
1891
- $(BINDIR)/$(CONFIG)/memory_test \
1903
+ $(BINDIR)/$(CONFIG)/logical_thread_test \
1892
1904
  $(BINDIR)/$(CONFIG)/message_allocator_end2end_test \
1893
1905
  $(BINDIR)/$(CONFIG)/metrics_client \
1894
1906
  $(BINDIR)/$(CONFIG)/mock_test \
@@ -1896,6 +1908,7 @@ buildtests_cxx: privatelibs_cxx \
1896
1908
  $(BINDIR)/$(CONFIG)/noop-benchmark \
1897
1909
  $(BINDIR)/$(CONFIG)/optional_test \
1898
1910
  $(BINDIR)/$(CONFIG)/orphanable_test \
1911
+ $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc \
1899
1912
  $(BINDIR)/$(CONFIG)/port_sharing_end2end_test \
1900
1913
  $(BINDIR)/$(CONFIG)/proto_server_reflection_test \
1901
1914
  $(BINDIR)/$(CONFIG)/proto_utils_test \
@@ -2132,8 +2145,6 @@ test_c: buildtests_c
2132
2145
  $(Q) $(BINDIR)/$(CONFIG)/lame_client_test || ( echo test lame_client_test failed ; exit 1 )
2133
2146
  $(E) "[RUN] Testing load_file_test"
2134
2147
  $(Q) $(BINDIR)/$(CONFIG)/load_file_test || ( echo test load_file_test failed ; exit 1 )
2135
- $(E) "[RUN] Testing memory_usage_test"
2136
- $(Q) $(BINDIR)/$(CONFIG)/memory_usage_test || ( echo test memory_usage_test failed ; exit 1 )
2137
2148
  $(E) "[RUN] Testing message_compress_test"
2138
2149
  $(Q) $(BINDIR)/$(CONFIG)/message_compress_test || ( echo test message_compress_test failed ; exit 1 )
2139
2150
  $(E) "[RUN] Testing minimal_stack_is_minimal_test"
@@ -2234,6 +2245,8 @@ flaky_test_c: buildtests_c
2234
2245
  test_cxx: buildtests_cxx
2235
2246
  $(E) "[RUN] Testing alarm_test"
2236
2247
  $(Q) $(BINDIR)/$(CONFIG)/alarm_test || ( echo test alarm_test failed ; exit 1 )
2248
+ $(E) "[RUN] Testing alts_concurrent_connectivity_test"
2249
+ $(Q) $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test || ( echo test alts_concurrent_connectivity_test failed ; exit 1 )
2237
2250
  $(E) "[RUN] Testing alts_counter_test"
2238
2251
  $(Q) $(BINDIR)/$(CONFIG)/alts_counter_test || ( echo test alts_counter_test failed ; exit 1 )
2239
2252
  $(E) "[RUN] Testing alts_crypt_test"
@@ -2400,8 +2413,8 @@ test_cxx: buildtests_cxx
2400
2413
  $(Q) $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test || ( echo test inproc_sync_unary_ping_pong_test failed ; exit 1 )
2401
2414
  $(E) "[RUN] Testing interop_test"
2402
2415
  $(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
2403
- $(E) "[RUN] Testing memory_test"
2404
- $(Q) $(BINDIR)/$(CONFIG)/memory_test || ( echo test memory_test failed ; exit 1 )
2416
+ $(E) "[RUN] Testing logical_thread_test"
2417
+ $(Q) $(BINDIR)/$(CONFIG)/logical_thread_test || ( echo test logical_thread_test failed ; exit 1 )
2405
2418
  $(E) "[RUN] Testing message_allocator_end2end_test"
2406
2419
  $(Q) $(BINDIR)/$(CONFIG)/message_allocator_end2end_test || ( echo test message_allocator_end2end_test failed ; exit 1 )
2407
2420
  $(E) "[RUN] Testing mock_test"
@@ -2414,6 +2427,8 @@ test_cxx: buildtests_cxx
2414
2427
  $(Q) $(BINDIR)/$(CONFIG)/optional_test || ( echo test optional_test failed ; exit 1 )
2415
2428
  $(E) "[RUN] Testing orphanable_test"
2416
2429
  $(Q) $(BINDIR)/$(CONFIG)/orphanable_test || ( echo test orphanable_test failed ; exit 1 )
2430
+ $(E) "[RUN] Testing pollset_windows_starvation_test.cc"
2431
+ $(Q) $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc || ( echo test pollset_windows_starvation_test.cc failed ; exit 1 )
2417
2432
  $(E) "[RUN] Testing port_sharing_end2end_test"
2418
2433
  $(Q) $(BINDIR)/$(CONFIG)/port_sharing_end2end_test || ( echo test port_sharing_end2end_test failed ; exit 1 )
2419
2434
  $(E) "[RUN] Testing proto_server_reflection_test"
@@ -2572,6 +2587,8 @@ ifeq ($(CONFIG),opt)
2572
2587
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
2573
2588
  $(E) "[STRIP] Stripping libgrpc_unsecure.a"
2574
2589
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
2590
+ $(E) "[STRIP] Stripping libupb.a"
2591
+ $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb.a
2575
2592
  endif
2576
2593
 
2577
2594
  strip-static_cxx: static_cxx
@@ -2600,6 +2617,8 @@ ifeq ($(CONFIG),opt)
2600
2617
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
2601
2618
  $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
2602
2619
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
2620
+ $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
2621
+ $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
2603
2622
  endif
2604
2623
 
2605
2624
  strip-shared_cxx: shared_cxx
@@ -3053,6 +3072,38 @@ $(GENDIR)/src/proto/grpc/testing/xds/orca_load_report_for_test.grpc.pb.cc: src/p
3053
3072
  $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
3054
3073
  endif
3055
3074
 
3075
+ ifeq ($(NO_PROTOC),true)
3076
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc: protoc_dep_error
3077
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc: protoc_dep_error
3078
+ else
3079
+
3080
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc: test/core/tsi/alts/fake_handshaker/handshaker.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3081
+ $(E) "[PROTOC] Generating protobuf CC file from $<"
3082
+ $(Q) mkdir -p `dirname $@`
3083
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
3084
+
3085
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc: test/core/tsi/alts/fake_handshaker/handshaker.proto $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3086
+ $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
3087
+ $(Q) mkdir -p `dirname $@`
3088
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
3089
+ endif
3090
+
3091
+ ifeq ($(NO_PROTOC),true)
3092
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc: protoc_dep_error
3093
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc: protoc_dep_error
3094
+ else
3095
+
3096
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc: test/core/tsi/alts/fake_handshaker/transport_security_common.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3097
+ $(E) "[PROTOC] Generating protobuf CC file from $<"
3098
+ $(Q) mkdir -p `dirname $@`
3099
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
3100
+
3101
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc: test/core/tsi/alts/fake_handshaker/transport_security_common.proto $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3102
+ $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
3103
+ $(Q) mkdir -p `dirname $@`
3104
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
3105
+ endif
3106
+
3056
3107
 
3057
3108
  ifeq ($(CONFIG),stapprof)
3058
3109
  src/core/profiling/stap_timers.c: $(GENDIR)/src/core/profiling/stap_probes.h
@@ -3141,6 +3192,9 @@ install-static_c: static_c strip-static_c install-pkg-config_c
3141
3192
  $(E) "[INSTALL] Installing libgrpc_unsecure.a"
3142
3193
  $(Q) $(INSTALL) -d $(prefix)/lib
3143
3194
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(prefix)/lib/libgrpc_unsecure.a
3195
+ $(E) "[INSTALL] Installing libupb.a"
3196
+ $(Q) $(INSTALL) -d $(prefix)/lib
3197
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libupb.a $(prefix)/lib/libupb.a
3144
3198
 
3145
3199
  install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx
3146
3200
  $(E) "[INSTALL] Installing libgrpc++.a"
@@ -3168,7 +3222,7 @@ install-shared_c: shared_c strip-shared_c install-pkg-config_c
3168
3222
  ifeq ($(SYSTEM),MINGW32)
3169
3223
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libaddress_sorting.a
3170
3224
  else ifneq ($(SYSTEM),Darwin)
3171
- $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.8
3225
+ $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.9
3172
3226
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so
3173
3227
  endif
3174
3228
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3177,7 +3231,7 @@ endif
3177
3231
  ifeq ($(SYSTEM),MINGW32)
3178
3232
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgpr.a
3179
3233
  else ifneq ($(SYSTEM),Darwin)
3180
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.8
3234
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.9
3181
3235
  $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so
3182
3236
  endif
3183
3237
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3186,7 +3240,7 @@ endif
3186
3240
  ifeq ($(SYSTEM),MINGW32)
3187
3241
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc.a
3188
3242
  else ifneq ($(SYSTEM),Darwin)
3189
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.8
3243
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.9
3190
3244
  $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so
3191
3245
  endif
3192
3246
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3195,7 +3249,7 @@ endif
3195
3249
  ifeq ($(SYSTEM),MINGW32)
3196
3250
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_cronet.a
3197
3251
  else ifneq ($(SYSTEM),Darwin)
3198
- $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.8
3252
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.9
3199
3253
  $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so
3200
3254
  endif
3201
3255
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3204,8 +3258,17 @@ endif
3204
3258
  ifeq ($(SYSTEM),MINGW32)
3205
3259
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_unsecure.a
3206
3260
  else ifneq ($(SYSTEM),Darwin)
3207
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.8
3261
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.9
3208
3262
  $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so
3263
+ endif
3264
+ $(E) "[INSTALL] Installing $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
3265
+ $(Q) $(INSTALL) -d $(prefix)/lib
3266
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
3267
+ ifeq ($(SYSTEM),MINGW32)
3268
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libupb.a
3269
+ else ifneq ($(SYSTEM),Darwin)
3270
+ $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so.9
3271
+ $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so
3209
3272
  endif
3210
3273
  ifneq ($(SYSTEM),MINGW32)
3211
3274
  ifneq ($(SYSTEM),Darwin)
@@ -3354,19 +3417,19 @@ endif
3354
3417
 
3355
3418
 
3356
3419
  ifeq ($(SYSTEM),MINGW32)
3357
- $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)
3420
+ $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3358
3421
  $(E) "[LD] Linking $@"
3359
3422
  $(Q) mkdir -p `dirname $@`
3360
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3423
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3361
3424
  else
3362
- $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)
3425
+ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3363
3426
  $(E) "[LD] Linking $@"
3364
3427
  $(Q) mkdir -p `dirname $@`
3365
3428
  ifeq ($(SYSTEM),Darwin)
3366
- $(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) $(LDLIBS)
3429
+ $(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) $(UPB_MERGE_LIBS) $(LDLIBS)
3367
3430
  else
3368
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.8 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3369
- $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.8
3431
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.9 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3432
+ $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.9
3370
3433
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
3371
3434
  endif
3372
3435
  endif
@@ -3395,7 +3458,7 @@ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: openssl_dep_error
3395
3458
  else
3396
3459
 
3397
3460
 
3398
- $(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBALTS_TEST_UTIL_OBJS)
3461
+ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBALTS_TEST_UTIL_OBJS)
3399
3462
  $(E) "[AR] Creating $@"
3400
3463
  $(Q) mkdir -p `dirname $@`
3401
3464
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libalts_test_util.a
@@ -3494,7 +3557,7 @@ PUBLIC_HEADERS_C += \
3494
3557
  LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
3495
3558
 
3496
3559
 
3497
- $(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGPR_OBJS)
3560
+ $(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGPR_OBJS)
3498
3561
  $(E) "[AR] Creating $@"
3499
3562
  $(Q) mkdir -p `dirname $@`
3500
3563
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a
@@ -3506,19 +3569,19 @@ endif
3506
3569
 
3507
3570
 
3508
3571
  ifeq ($(SYSTEM),MINGW32)
3509
- $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)
3572
+ $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3510
3573
  $(E) "[LD] Linking $@"
3511
3574
  $(Q) mkdir -p `dirname $@`
3512
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3575
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3513
3576
  else
3514
- $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)
3577
+ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3515
3578
  $(E) "[LD] Linking $@"
3516
3579
  $(Q) mkdir -p `dirname $@`
3517
3580
  ifeq ($(SYSTEM),Darwin)
3518
- $(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) $(LDLIBS)
3581
+ $(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) $(UPB_MERGE_LIBS) $(LDLIBS)
3519
3582
  else
3520
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.8 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3521
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.8
3583
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.9 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3584
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.9
3522
3585
  $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
3523
3586
  endif
3524
3587
  endif
@@ -3593,6 +3656,7 @@ LIBGRPC_SRC = \
3593
3656
  src/core/lib/iomgr/is_epollexclusive_available.cc \
3594
3657
  src/core/lib/iomgr/load_file.cc \
3595
3658
  src/core/lib/iomgr/lockfree_event.cc \
3659
+ src/core/lib/iomgr/logical_thread.cc \
3596
3660
  src/core/lib/iomgr/polling_entity.cc \
3597
3661
  src/core/lib/iomgr/pollset.cc \
3598
3662
  src/core/lib/iomgr/pollset_custom.cc \
@@ -3783,12 +3847,6 @@ LIBGRPC_SRC = \
3783
3847
  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
3784
3848
  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
3785
3849
  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
3786
- third_party/upb/upb/decode.c \
3787
- third_party/upb/upb/encode.c \
3788
- third_party/upb/upb/msg.c \
3789
- third_party/upb/upb/port.c \
3790
- third_party/upb/upb/table.c \
3791
- third_party/upb/upb/upb.c \
3792
3850
  src/core/tsi/transport_security.cc \
3793
3851
  src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
3794
3852
  src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
@@ -3801,7 +3859,6 @@ LIBGRPC_SRC = \
3801
3859
  src/core/ext/filters/client_channel/client_channel_channelz.cc \
3802
3860
  src/core/ext/filters/client_channel/client_channel_factory.cc \
3803
3861
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
3804
- src/core/ext/filters/client_channel/connector.cc \
3805
3862
  src/core/ext/filters/client_channel/global_subchannel_pool.cc \
3806
3863
  src/core/ext/filters/client_channel/health/health_check_client.cc \
3807
3864
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
@@ -3810,7 +3867,6 @@ LIBGRPC_SRC = \
3810
3867
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
3811
3868
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
3812
3869
  src/core/ext/filters/client_channel/parse_address.cc \
3813
- src/core/ext/filters/client_channel/proxy_mapper.cc \
3814
3870
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
3815
3871
  src/core/ext/filters/client_channel/resolver.cc \
3816
3872
  src/core/ext/filters/client_channel/resolver_registry.cc \
@@ -3856,7 +3912,7 @@ LIBGRPC_SRC = \
3856
3912
  src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
3857
3913
  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
3858
3914
  src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
3859
- src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
3915
+ src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
3860
3916
  src/core/ext/filters/client_channel/xds/xds_api.cc \
3861
3917
  src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
3862
3918
  src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
@@ -3880,8 +3936,10 @@ LIBGRPC_SRC = \
3880
3936
  src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
3881
3937
  src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
3882
3938
  src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
3939
+ src/core/ext/upb-generated/envoy/type/http.upb.c \
3883
3940
  src/core/ext/upb-generated/envoy/type/percent.upb.c \
3884
3941
  src/core/ext/upb-generated/envoy/type/range.upb.c \
3942
+ src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
3885
3943
  src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
3886
3944
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
3887
3945
  src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
@@ -3959,11 +4017,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE
3959
4017
  else
3960
4018
 
3961
4019
 
3962
- $(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4020
+ $(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
3963
4021
  $(E) "[AR] Creating $@"
3964
4022
  $(Q) mkdir -p `dirname $@`
3965
4023
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
3966
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4024
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
3967
4025
  ifeq ($(SYSTEM),Darwin)
3968
4026
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a
3969
4027
  endif
@@ -3971,19 +4029,19 @@ endif
3971
4029
 
3972
4030
 
3973
4031
  ifeq ($(SYSTEM),MINGW32)
3974
- $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
4032
+ $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
3975
4033
  $(E) "[LD] Linking $@"
3976
4034
  $(Q) mkdir -p `dirname $@`
3977
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4035
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3978
4036
  else
3979
- $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
4037
+ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
3980
4038
  $(E) "[LD] Linking $@"
3981
4039
  $(Q) mkdir -p `dirname $@`
3982
4040
  ifeq ($(SYSTEM),Darwin)
3983
- $(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 $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4041
+ $(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)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
3984
4042
  else
3985
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3986
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.8
4043
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
4044
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.9
3987
4045
  $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
3988
4046
  endif
3989
4047
  endif
@@ -4063,6 +4121,7 @@ LIBGRPC_CRONET_SRC = \
4063
4121
  src/core/lib/iomgr/is_epollexclusive_available.cc \
4064
4122
  src/core/lib/iomgr/load_file.cc \
4065
4123
  src/core/lib/iomgr/lockfree_event.cc \
4124
+ src/core/lib/iomgr/logical_thread.cc \
4066
4125
  src/core/lib/iomgr/polling_entity.cc \
4067
4126
  src/core/lib/iomgr/pollset.cc \
4068
4127
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4197,7 +4256,6 @@ LIBGRPC_CRONET_SRC = \
4197
4256
  src/core/ext/filters/client_channel/client_channel_channelz.cc \
4198
4257
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4199
4258
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4200
- src/core/ext/filters/client_channel/connector.cc \
4201
4259
  src/core/ext/filters/client_channel/global_subchannel_pool.cc \
4202
4260
  src/core/ext/filters/client_channel/health/health_check_client.cc \
4203
4261
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
@@ -4206,7 +4264,6 @@ LIBGRPC_CRONET_SRC = \
4206
4264
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4207
4265
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
4208
4266
  src/core/ext/filters/client_channel/parse_address.cc \
4209
- src/core/ext/filters/client_channel/proxy_mapper.cc \
4210
4267
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4211
4268
  src/core/ext/filters/client_channel/resolver.cc \
4212
4269
  src/core/ext/filters/client_channel/resolver_registry.cc \
@@ -4219,12 +4276,6 @@ LIBGRPC_CRONET_SRC = \
4219
4276
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
4220
4277
  src/core/ext/filters/deadline/deadline_filter.cc \
4221
4278
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
4222
- third_party/upb/upb/decode.c \
4223
- third_party/upb/upb/encode.c \
4224
- third_party/upb/upb/msg.c \
4225
- third_party/upb/upb/port.c \
4226
- third_party/upb/upb/table.c \
4227
- third_party/upb/upb/upb.c \
4228
4279
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
4229
4280
  src/core/ext/upb-generated/gogoproto/gogo.upb.c \
4230
4281
  src/core/ext/upb-generated/validate/validate.upb.c \
@@ -4358,11 +4409,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_E
4358
4409
  else
4359
4410
 
4360
4411
 
4361
- $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4412
+ $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4362
4413
  $(E) "[AR] Creating $@"
4363
4414
  $(Q) mkdir -p `dirname $@`
4364
4415
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
4365
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4416
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4366
4417
  ifeq ($(SYSTEM),Darwin)
4367
4418
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
4368
4419
  endif
@@ -4370,19 +4421,19 @@ endif
4370
4421
 
4371
4422
 
4372
4423
  ifeq ($(SYSTEM),MINGW32)
4373
- $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
4424
+ $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4374
4425
  $(E) "[LD] Linking $@"
4375
4426
  $(Q) mkdir -p `dirname $@`
4376
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4427
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
4377
4428
  else
4378
- $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
4429
+ $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4379
4430
  $(E) "[LD] Linking $@"
4380
4431
  $(Q) mkdir -p `dirname $@`
4381
4432
  ifeq ($(SYSTEM),Darwin)
4382
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4433
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
4383
4434
  else
4384
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4385
- $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.8
4435
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
4436
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.9
4386
4437
  $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so
4387
4438
  endif
4388
4439
  endif
@@ -4490,6 +4541,7 @@ LIBGRPC_TEST_UTIL_SRC = \
4490
4541
  src/core/lib/iomgr/is_epollexclusive_available.cc \
4491
4542
  src/core/lib/iomgr/load_file.cc \
4492
4543
  src/core/lib/iomgr/lockfree_event.cc \
4544
+ src/core/lib/iomgr/logical_thread.cc \
4493
4545
  src/core/lib/iomgr/polling_entity.cc \
4494
4546
  src/core/lib/iomgr/pollset.cc \
4495
4547
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4592,7 +4644,6 @@ LIBGRPC_TEST_UTIL_SRC = \
4592
4644
  src/core/ext/filters/client_channel/client_channel_channelz.cc \
4593
4645
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4594
4646
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4595
- src/core/ext/filters/client_channel/connector.cc \
4596
4647
  src/core/ext/filters/client_channel/global_subchannel_pool.cc \
4597
4648
  src/core/ext/filters/client_channel/health/health_check_client.cc \
4598
4649
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
@@ -4601,7 +4652,6 @@ LIBGRPC_TEST_UTIL_SRC = \
4601
4652
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4602
4653
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
4603
4654
  src/core/ext/filters/client_channel/parse_address.cc \
4604
- src/core/ext/filters/client_channel/proxy_mapper.cc \
4605
4655
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4606
4656
  src/core/ext/filters/client_channel/resolver.cc \
4607
4657
  src/core/ext/filters/client_channel/resolver_registry.cc \
@@ -4614,12 +4664,6 @@ LIBGRPC_TEST_UTIL_SRC = \
4614
4664
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
4615
4665
  src/core/ext/filters/deadline/deadline_filter.cc \
4616
4666
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
4617
- third_party/upb/upb/decode.c \
4618
- third_party/upb/upb/encode.c \
4619
- third_party/upb/upb/msg.c \
4620
- third_party/upb/upb/port.c \
4621
- third_party/upb/upb/table.c \
4622
- third_party/upb/upb/upb.c \
4623
4667
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
4624
4668
  src/core/ext/upb-generated/gogoproto/gogo.upb.c \
4625
4669
  src/core/ext/upb-generated/validate/validate.upb.c \
@@ -4716,7 +4760,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error
4716
4760
  else
4717
4761
 
4718
4762
 
4719
- $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_OBJS)
4763
+ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_OBJS)
4720
4764
  $(E) "[AR] Creating $@"
4721
4765
  $(Q) mkdir -p `dirname $@`
4722
4766
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
@@ -4826,6 +4870,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4826
4870
  src/core/lib/iomgr/is_epollexclusive_available.cc \
4827
4871
  src/core/lib/iomgr/load_file.cc \
4828
4872
  src/core/lib/iomgr/lockfree_event.cc \
4873
+ src/core/lib/iomgr/logical_thread.cc \
4829
4874
  src/core/lib/iomgr/polling_entity.cc \
4830
4875
  src/core/lib/iomgr/pollset.cc \
4831
4876
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4928,7 +4973,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4928
4973
  src/core/ext/filters/client_channel/client_channel_channelz.cc \
4929
4974
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4930
4975
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4931
- src/core/ext/filters/client_channel/connector.cc \
4932
4976
  src/core/ext/filters/client_channel/global_subchannel_pool.cc \
4933
4977
  src/core/ext/filters/client_channel/health/health_check_client.cc \
4934
4978
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
@@ -4937,7 +4981,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4937
4981
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4938
4982
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
4939
4983
  src/core/ext/filters/client_channel/parse_address.cc \
4940
- src/core/ext/filters/client_channel/proxy_mapper.cc \
4941
4984
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4942
4985
  src/core/ext/filters/client_channel/resolver.cc \
4943
4986
  src/core/ext/filters/client_channel/resolver_registry.cc \
@@ -4950,12 +4993,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4950
4993
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
4951
4994
  src/core/ext/filters/deadline/deadline_filter.cc \
4952
4995
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
4953
- third_party/upb/upb/decode.c \
4954
- third_party/upb/upb/encode.c \
4955
- third_party/upb/upb/msg.c \
4956
- third_party/upb/upb/port.c \
4957
- third_party/upb/upb/table.c \
4958
- third_party/upb/upb/upb.c \
4959
4996
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
4960
4997
  src/core/ext/upb-generated/gogoproto/gogo.upb.c \
4961
4998
  src/core/ext/upb-generated/validate/validate.upb.c \
@@ -5042,7 +5079,7 @@ PUBLIC_HEADERS_C += \
5042
5079
  LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC))))
5043
5080
 
5044
5081
 
5045
- $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5082
+ $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5046
5083
  $(E) "[AR] Creating $@"
5047
5084
  $(Q) mkdir -p `dirname $@`
5048
5085
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
@@ -5125,6 +5162,7 @@ LIBGRPC_UNSECURE_SRC = \
5125
5162
  src/core/lib/iomgr/is_epollexclusive_available.cc \
5126
5163
  src/core/lib/iomgr/load_file.cc \
5127
5164
  src/core/lib/iomgr/lockfree_event.cc \
5165
+ src/core/lib/iomgr/logical_thread.cc \
5128
5166
  src/core/lib/iomgr/polling_entity.cc \
5129
5167
  src/core/lib/iomgr/pollset.cc \
5130
5168
  src/core/lib/iomgr/pollset_custom.cc \
@@ -5262,7 +5300,6 @@ LIBGRPC_UNSECURE_SRC = \
5262
5300
  src/core/ext/filters/client_channel/client_channel_channelz.cc \
5263
5301
  src/core/ext/filters/client_channel/client_channel_factory.cc \
5264
5302
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
5265
- src/core/ext/filters/client_channel/connector.cc \
5266
5303
  src/core/ext/filters/client_channel/global_subchannel_pool.cc \
5267
5304
  src/core/ext/filters/client_channel/health/health_check_client.cc \
5268
5305
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
@@ -5271,7 +5308,6 @@ LIBGRPC_UNSECURE_SRC = \
5271
5308
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
5272
5309
  src/core/ext/filters/client_channel/local_subchannel_pool.cc \
5273
5310
  src/core/ext/filters/client_channel/parse_address.cc \
5274
- src/core/ext/filters/client_channel/proxy_mapper.cc \
5275
5311
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5276
5312
  src/core/ext/filters/client_channel/resolver.cc \
5277
5313
  src/core/ext/filters/client_channel/resolver_registry.cc \
@@ -5284,12 +5320,6 @@ LIBGRPC_UNSECURE_SRC = \
5284
5320
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
5285
5321
  src/core/ext/filters/deadline/deadline_filter.cc \
5286
5322
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
5287
- third_party/upb/upb/decode.c \
5288
- third_party/upb/upb/encode.c \
5289
- third_party/upb/upb/msg.c \
5290
- third_party/upb/upb/port.c \
5291
- third_party/upb/upb/table.c \
5292
- third_party/upb/upb/upb.c \
5293
5323
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
5294
5324
  src/core/ext/upb-generated/gogoproto/gogo.upb.c \
5295
5325
  src/core/ext/upb-generated/validate/validate.upb.c \
@@ -5343,6 +5373,7 @@ LIBGRPC_UNSECURE_SRC = \
5343
5373
  src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
5344
5374
  src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
5345
5375
  src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
5376
+ src/core/ext/upb-generated/envoy/type/http.upb.c \
5346
5377
  src/core/ext/upb-generated/envoy/type/percent.upb.c \
5347
5378
  src/core/ext/upb-generated/envoy/type/range.upb.c \
5348
5379
  src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
@@ -5351,6 +5382,7 @@ LIBGRPC_UNSECURE_SRC = \
5351
5382
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
5352
5383
  src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
5353
5384
  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
5385
+ src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
5354
5386
  src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
5355
5387
  src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
5356
5388
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
@@ -5403,11 +5435,11 @@ PUBLIC_HEADERS_C += \
5403
5435
  LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
5404
5436
 
5405
5437
 
5406
- $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
5438
+ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5407
5439
  $(E) "[AR] Creating $@"
5408
5440
  $(Q) mkdir -p `dirname $@`
5409
5441
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
5410
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
5442
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5411
5443
  ifeq ($(SYSTEM),Darwin)
5412
5444
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
5413
5445
  endif
@@ -5415,19 +5447,19 @@ endif
5415
5447
 
5416
5448
 
5417
5449
  ifeq ($(SYSTEM),MINGW32)
5418
- $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a
5450
+ $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a
5419
5451
  $(E) "[LD] Linking $@"
5420
5452
  $(Q) mkdir -p `dirname $@`
5421
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5453
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
5422
5454
  else
5423
- $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a
5455
+ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a
5424
5456
  $(E) "[LD] Linking $@"
5425
5457
  $(Q) mkdir -p `dirname $@`
5426
5458
  ifeq ($(SYSTEM),Darwin)
5427
- $(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 $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5459
+ $(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)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
5428
5460
  else
5429
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5430
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.8
5461
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
5462
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.9
5431
5463
  $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
5432
5464
  endif
5433
5465
  endif
@@ -5455,7 +5487,7 @@ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error
5455
5487
  else
5456
5488
 
5457
5489
 
5458
- $(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBRECONNECT_SERVER_OBJS)
5490
+ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBRECONNECT_SERVER_OBJS)
5459
5491
  $(E) "[AR] Creating $@"
5460
5492
  $(Q) mkdir -p `dirname $@`
5461
5493
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a
@@ -5494,7 +5526,7 @@ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error
5494
5526
  else
5495
5527
 
5496
5528
 
5497
- $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBTEST_TCP_SERVER_OBJS)
5529
+ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBTEST_TCP_SERVER_OBJS)
5498
5530
  $(E) "[AR] Creating $@"
5499
5531
  $(Q) mkdir -p `dirname $@`
5500
5532
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
@@ -5543,7 +5575,7 @@ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: protobuf_dep_error
5543
5575
 
5544
5576
  else
5545
5577
 
5546
- $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS)
5578
+ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS)
5547
5579
  $(E) "[AR] Creating $@"
5548
5580
  $(Q) mkdir -p `dirname $@`
5549
5581
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a
@@ -5593,7 +5625,7 @@ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: protobuf_dep_error
5593
5625
 
5594
5626
  else
5595
5627
 
5596
- $(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS)
5628
+ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS)
5597
5629
  $(E) "[AR] Creating $@"
5598
5630
  $(Q) mkdir -p `dirname $@`
5599
5631
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libdns_test_util.a
@@ -5653,6 +5685,7 @@ LIBGRPC++_SRC = \
5653
5685
  src/cpp/server/health/health_check_service.cc \
5654
5686
  src/cpp/server/health/health_check_service_server_builder_option.cc \
5655
5687
  src/cpp/server/server_builder.cc \
5688
+ src/cpp/server/server_callback.cc \
5656
5689
  src/cpp/server/server_cc.cc \
5657
5690
  src/cpp/server/server_context.cc \
5658
5691
  src/cpp/server/server_credentials.cc \
@@ -5662,13 +5695,205 @@ LIBGRPC++_SRC = \
5662
5695
  src/cpp/util/status.cc \
5663
5696
  src/cpp/util/string_ref.cc \
5664
5697
  src/cpp/util/time_cc.cc \
5698
+ src/core/ext/filters/client_channel/backend_metric.cc \
5699
+ src/core/ext/filters/client_channel/backup_poller.cc \
5700
+ src/core/ext/filters/client_channel/channel_connectivity.cc \
5701
+ src/core/ext/filters/client_channel/client_channel.cc \
5702
+ src/core/ext/filters/client_channel/client_channel_channelz.cc \
5703
+ src/core/ext/filters/client_channel/client_channel_factory.cc \
5704
+ src/core/ext/filters/client_channel/client_channel_plugin.cc \
5705
+ src/core/ext/filters/client_channel/global_subchannel_pool.cc \
5706
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
5707
+ src/core/ext/filters/client_channel/http_connect_handshaker.cc \
5708
+ src/core/ext/filters/client_channel/http_proxy.cc \
5709
+ src/core/ext/filters/client_channel/lb_policy.cc \
5710
+ src/core/ext/filters/client_channel/lb_policy_registry.cc \
5711
+ src/core/ext/filters/client_channel/local_subchannel_pool.cc \
5712
+ src/core/ext/filters/client_channel/parse_address.cc \
5713
+ src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5714
+ src/core/ext/filters/client_channel/resolver.cc \
5715
+ src/core/ext/filters/client_channel/resolver_registry.cc \
5716
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5717
+ src/core/ext/filters/client_channel/resolving_lb_policy.cc \
5718
+ src/core/ext/filters/client_channel/retry_throttle.cc \
5719
+ src/core/ext/filters/client_channel/server_address.cc \
5720
+ src/core/ext/filters/client_channel/service_config.cc \
5721
+ src/core/ext/filters/client_channel/subchannel.cc \
5722
+ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
5723
+ src/core/lib/avl/avl.cc \
5724
+ src/core/lib/backoff/backoff.cc \
5725
+ src/core/lib/channel/channel_args.cc \
5726
+ src/core/lib/channel/channel_stack.cc \
5727
+ src/core/lib/channel/channel_stack_builder.cc \
5728
+ src/core/lib/channel/channel_trace.cc \
5729
+ src/core/lib/channel/channelz.cc \
5730
+ src/core/lib/channel/channelz_registry.cc \
5731
+ src/core/lib/channel/connected_channel.cc \
5732
+ src/core/lib/channel/handshaker.cc \
5733
+ src/core/lib/channel/handshaker_registry.cc \
5734
+ src/core/lib/channel/status_util.cc \
5735
+ src/core/lib/compression/compression.cc \
5736
+ src/core/lib/compression/compression_args.cc \
5737
+ src/core/lib/compression/compression_internal.cc \
5738
+ src/core/lib/compression/message_compress.cc \
5739
+ src/core/lib/compression/stream_compression.cc \
5740
+ src/core/lib/compression/stream_compression_gzip.cc \
5741
+ src/core/lib/compression/stream_compression_identity.cc \
5742
+ src/core/lib/debug/stats.cc \
5743
+ src/core/lib/debug/stats_data.cc \
5744
+ src/core/lib/http/format_request.cc \
5745
+ src/core/lib/http/httpcli.cc \
5746
+ src/core/lib/http/parser.cc \
5747
+ src/core/lib/iomgr/buffer_list.cc \
5748
+ src/core/lib/iomgr/call_combiner.cc \
5749
+ src/core/lib/iomgr/cfstream_handle.cc \
5750
+ src/core/lib/iomgr/combiner.cc \
5751
+ src/core/lib/iomgr/endpoint.cc \
5752
+ src/core/lib/iomgr/endpoint_cfstream.cc \
5753
+ src/core/lib/iomgr/endpoint_pair_posix.cc \
5754
+ src/core/lib/iomgr/endpoint_pair_uv.cc \
5755
+ src/core/lib/iomgr/endpoint_pair_windows.cc \
5756
+ src/core/lib/iomgr/error.cc \
5757
+ src/core/lib/iomgr/error_cfstream.cc \
5758
+ src/core/lib/iomgr/ev_epoll1_linux.cc \
5759
+ src/core/lib/iomgr/ev_epollex_linux.cc \
5760
+ src/core/lib/iomgr/ev_poll_posix.cc \
5761
+ src/core/lib/iomgr/ev_posix.cc \
5762
+ src/core/lib/iomgr/ev_windows.cc \
5763
+ src/core/lib/iomgr/exec_ctx.cc \
5764
+ src/core/lib/iomgr/executor.cc \
5765
+ src/core/lib/iomgr/executor/mpmcqueue.cc \
5766
+ src/core/lib/iomgr/executor/threadpool.cc \
5767
+ src/core/lib/iomgr/fork_posix.cc \
5768
+ src/core/lib/iomgr/fork_windows.cc \
5769
+ src/core/lib/iomgr/gethostname_fallback.cc \
5770
+ src/core/lib/iomgr/gethostname_host_name_max.cc \
5771
+ src/core/lib/iomgr/gethostname_sysconf.cc \
5772
+ src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
5773
+ src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
5774
+ src/core/lib/iomgr/internal_errqueue.cc \
5775
+ src/core/lib/iomgr/iocp_windows.cc \
5776
+ src/core/lib/iomgr/iomgr.cc \
5777
+ src/core/lib/iomgr/iomgr_custom.cc \
5778
+ src/core/lib/iomgr/iomgr_internal.cc \
5779
+ src/core/lib/iomgr/iomgr_posix.cc \
5780
+ src/core/lib/iomgr/iomgr_posix_cfstream.cc \
5781
+ src/core/lib/iomgr/iomgr_uv.cc \
5782
+ src/core/lib/iomgr/iomgr_windows.cc \
5783
+ src/core/lib/iomgr/is_epollexclusive_available.cc \
5784
+ src/core/lib/iomgr/load_file.cc \
5785
+ src/core/lib/iomgr/lockfree_event.cc \
5786
+ src/core/lib/iomgr/logical_thread.cc \
5787
+ src/core/lib/iomgr/polling_entity.cc \
5788
+ src/core/lib/iomgr/pollset.cc \
5789
+ src/core/lib/iomgr/pollset_custom.cc \
5790
+ src/core/lib/iomgr/pollset_set.cc \
5791
+ src/core/lib/iomgr/pollset_set_custom.cc \
5792
+ src/core/lib/iomgr/pollset_set_windows.cc \
5793
+ src/core/lib/iomgr/pollset_uv.cc \
5794
+ src/core/lib/iomgr/pollset_windows.cc \
5795
+ src/core/lib/iomgr/resolve_address.cc \
5796
+ src/core/lib/iomgr/resolve_address_custom.cc \
5797
+ src/core/lib/iomgr/resolve_address_posix.cc \
5798
+ src/core/lib/iomgr/resolve_address_windows.cc \
5799
+ src/core/lib/iomgr/resource_quota.cc \
5800
+ src/core/lib/iomgr/sockaddr_utils.cc \
5801
+ src/core/lib/iomgr/socket_factory_posix.cc \
5802
+ src/core/lib/iomgr/socket_mutator.cc \
5803
+ src/core/lib/iomgr/socket_utils_common_posix.cc \
5804
+ src/core/lib/iomgr/socket_utils_linux.cc \
5805
+ src/core/lib/iomgr/socket_utils_posix.cc \
5806
+ src/core/lib/iomgr/socket_utils_uv.cc \
5807
+ src/core/lib/iomgr/socket_utils_windows.cc \
5808
+ src/core/lib/iomgr/socket_windows.cc \
5809
+ src/core/lib/iomgr/tcp_client.cc \
5810
+ src/core/lib/iomgr/tcp_client_cfstream.cc \
5811
+ src/core/lib/iomgr/tcp_client_custom.cc \
5812
+ src/core/lib/iomgr/tcp_client_posix.cc \
5813
+ src/core/lib/iomgr/tcp_client_windows.cc \
5814
+ src/core/lib/iomgr/tcp_custom.cc \
5815
+ src/core/lib/iomgr/tcp_posix.cc \
5816
+ src/core/lib/iomgr/tcp_server.cc \
5817
+ src/core/lib/iomgr/tcp_server_custom.cc \
5818
+ src/core/lib/iomgr/tcp_server_posix.cc \
5819
+ src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
5820
+ src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
5821
+ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
5822
+ src/core/lib/iomgr/tcp_server_windows.cc \
5823
+ src/core/lib/iomgr/tcp_uv.cc \
5824
+ src/core/lib/iomgr/tcp_windows.cc \
5825
+ src/core/lib/iomgr/time_averaged_stats.cc \
5826
+ src/core/lib/iomgr/timer.cc \
5827
+ src/core/lib/iomgr/timer_custom.cc \
5828
+ src/core/lib/iomgr/timer_generic.cc \
5829
+ src/core/lib/iomgr/timer_heap.cc \
5830
+ src/core/lib/iomgr/timer_manager.cc \
5831
+ src/core/lib/iomgr/timer_uv.cc \
5832
+ src/core/lib/iomgr/udp_server.cc \
5833
+ src/core/lib/iomgr/unix_sockets_posix.cc \
5834
+ src/core/lib/iomgr/unix_sockets_posix_noop.cc \
5835
+ src/core/lib/iomgr/wakeup_fd_eventfd.cc \
5836
+ src/core/lib/iomgr/wakeup_fd_nospecial.cc \
5837
+ src/core/lib/iomgr/wakeup_fd_pipe.cc \
5838
+ src/core/lib/iomgr/wakeup_fd_posix.cc \
5839
+ src/core/lib/json/json.cc \
5840
+ src/core/lib/json/json_reader.cc \
5841
+ src/core/lib/json/json_string.cc \
5842
+ src/core/lib/json/json_writer.cc \
5843
+ src/core/lib/slice/b64.cc \
5844
+ src/core/lib/slice/percent_encoding.cc \
5845
+ src/core/lib/slice/slice.cc \
5846
+ src/core/lib/slice/slice_buffer.cc \
5847
+ src/core/lib/slice/slice_intern.cc \
5848
+ src/core/lib/slice/slice_string_helpers.cc \
5849
+ src/core/lib/surface/api_trace.cc \
5850
+ src/core/lib/surface/byte_buffer.cc \
5851
+ src/core/lib/surface/byte_buffer_reader.cc \
5852
+ src/core/lib/surface/call.cc \
5853
+ src/core/lib/surface/call_details.cc \
5854
+ src/core/lib/surface/call_log_batch.cc \
5855
+ src/core/lib/surface/channel.cc \
5856
+ src/core/lib/surface/channel_init.cc \
5857
+ src/core/lib/surface/channel_ping.cc \
5858
+ src/core/lib/surface/channel_stack_type.cc \
5859
+ src/core/lib/surface/completion_queue.cc \
5860
+ src/core/lib/surface/completion_queue_factory.cc \
5861
+ src/core/lib/surface/event_string.cc \
5862
+ src/core/lib/surface/lame_client.cc \
5863
+ src/core/lib/surface/metadata_array.cc \
5864
+ src/core/lib/surface/server.cc \
5865
+ src/core/lib/surface/validate_metadata.cc \
5866
+ src/core/lib/surface/version.cc \
5867
+ src/core/lib/transport/bdp_estimator.cc \
5868
+ src/core/lib/transport/byte_stream.cc \
5869
+ src/core/lib/transport/connectivity_state.cc \
5870
+ src/core/lib/transport/error_utils.cc \
5871
+ src/core/lib/transport/metadata.cc \
5872
+ src/core/lib/transport/metadata_batch.cc \
5873
+ src/core/lib/transport/pid_controller.cc \
5874
+ src/core/lib/transport/static_metadata.cc \
5875
+ src/core/lib/transport/status_conversion.cc \
5876
+ src/core/lib/transport/status_metadata.cc \
5877
+ src/core/lib/transport/timeout_encoding.cc \
5878
+ src/core/lib/transport/transport.cc \
5879
+ src/core/lib/transport/transport_op_string.cc \
5880
+ src/core/lib/uri/uri_parser.cc \
5881
+ src/core/lib/debug/trace.cc \
5882
+ src/core/ext/filters/deadline/deadline_filter.cc \
5665
5883
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
5666
- third_party/upb/upb/decode.c \
5667
- third_party/upb/upb/encode.c \
5668
- third_party/upb/upb/msg.c \
5669
- third_party/upb/upb/port.c \
5670
- third_party/upb/upb/table.c \
5671
- third_party/upb/upb/upb.c \
5884
+ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
5885
+ src/core/ext/upb-generated/gogoproto/gogo.upb.c \
5886
+ src/core/ext/upb-generated/validate/validate.upb.c \
5887
+ src/core/ext/upb-generated/google/api/annotations.upb.c \
5888
+ src/core/ext/upb-generated/google/api/http.upb.c \
5889
+ src/core/ext/upb-generated/google/protobuf/any.upb.c \
5890
+ src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
5891
+ src/core/ext/upb-generated/google/protobuf/duration.upb.c \
5892
+ src/core/ext/upb-generated/google/protobuf/empty.upb.c \
5893
+ src/core/ext/upb-generated/google/protobuf/struct.upb.c \
5894
+ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
5895
+ src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
5896
+ src/core/ext/upb-generated/google/rpc/status.upb.c \
5672
5897
  src/cpp/codegen/codegen_init.cc \
5673
5898
 
5674
5899
  PUBLIC_HEADERS_CXX += \
@@ -5913,6 +6138,7 @@ PUBLIC_HEADERS_CXX += \
5913
6138
  include/grpcpp/impl/codegen/security/auth_context.h \
5914
6139
  include/grpcpp/impl/codegen/serialization_traits.h \
5915
6140
  include/grpcpp/impl/codegen/server_callback.h \
6141
+ include/grpcpp/impl/codegen/server_callback_handlers.h \
5916
6142
  include/grpcpp/impl/codegen/server_callback_impl.h \
5917
6143
  include/grpcpp/impl/codegen/server_context.h \
5918
6144
  include/grpcpp/impl/codegen/server_context_impl.h \
@@ -5958,11 +6184,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP
5958
6184
 
5959
6185
  else
5960
6186
 
5961
- $(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
6187
+ $(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5962
6188
  $(E) "[AR] Creating $@"
5963
6189
  $(Q) mkdir -p `dirname $@`
5964
6190
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a
5965
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
6191
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5966
6192
  ifeq ($(SYSTEM),Darwin)
5967
6193
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a
5968
6194
  endif
@@ -5970,18 +6196,18 @@ endif
5970
6196
 
5971
6197
 
5972
6198
  ifeq ($(SYSTEM),MINGW32)
5973
- $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6199
+ $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
5974
6200
  $(E) "[LD] Linking $@"
5975
6201
  $(Q) mkdir -p `dirname $@`
5976
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll
6202
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll
5977
6203
  else
5978
- $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6204
+ $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
5979
6205
  $(E) "[LD] Linking $@"
5980
6206
  $(Q) mkdir -p `dirname $@`
5981
6207
  ifeq ($(SYSTEM),Darwin)
5982
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr
6208
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb
5983
6209
  else
5984
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr
6210
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb
5985
6211
  $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so.1
5986
6212
  $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so
5987
6213
  endif
@@ -6025,7 +6251,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: protobuf_dep_error
6025
6251
 
6026
6252
  else
6027
6253
 
6028
- $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS)
6254
+ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS)
6029
6255
  $(E) "[AR] Creating $@"
6030
6256
  $(Q) mkdir -p `dirname $@`
6031
6257
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
@@ -6081,11 +6307,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(
6081
6307
 
6082
6308
  else
6083
6309
 
6084
- $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
6310
+ $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6085
6311
  $(E) "[AR] Creating $@"
6086
6312
  $(Q) mkdir -p `dirname $@`
6087
6313
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
6088
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
6314
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6089
6315
  ifeq ($(SYSTEM),Darwin)
6090
6316
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
6091
6317
  endif
@@ -6093,18 +6319,18 @@ endif
6093
6319
 
6094
6320
 
6095
6321
  ifeq ($(SYSTEM),MINGW32)
6096
- $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6322
+ $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6097
6323
  $(E) "[LD] Linking $@"
6098
6324
  $(Q) mkdir -p `dirname $@`
6099
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll
6325
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll
6100
6326
  else
6101
- $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6327
+ $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6102
6328
  $(E) "[LD] Linking $@"
6103
6329
  $(Q) mkdir -p `dirname $@`
6104
6330
  ifeq ($(SYSTEM),Darwin)
6105
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6331
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6106
6332
  else
6107
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_error_details.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6333
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_error_details.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6108
6334
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so.1
6109
6335
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so
6110
6336
  endif
@@ -6151,7 +6377,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: protobuf_dep_error
6151
6377
 
6152
6378
  else
6153
6379
 
6154
- $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS)
6380
+ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS)
6155
6381
  $(E) "[AR] Creating $@"
6156
6382
  $(Q) mkdir -p `dirname $@`
6157
6383
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
@@ -6208,7 +6434,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHA
6208
6434
 
6209
6435
  else
6210
6436
 
6211
- $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS)
6437
+ $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS)
6212
6438
  $(E) "[AR] Creating $@"
6213
6439
  $(Q) mkdir -p `dirname $@`
6214
6440
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
@@ -6220,18 +6446,18 @@ endif
6220
6446
 
6221
6447
 
6222
6448
  ifeq ($(SYSTEM),MINGW32)
6223
- $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6449
+ $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6224
6450
  $(E) "[LD] Linking $@"
6225
6451
  $(Q) mkdir -p `dirname $@`
6226
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
6452
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
6227
6453
  else
6228
- $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6454
+ $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6229
6455
  $(E) "[LD] Linking $@"
6230
6456
  $(Q) mkdir -p `dirname $@`
6231
6457
  ifeq ($(SYSTEM),Darwin)
6232
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6458
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6233
6459
  else
6234
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_reflection.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6460
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_reflection.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6235
6461
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so.1
6236
6462
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so
6237
6463
  endif
@@ -6276,7 +6502,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: protobuf_dep_error
6276
6502
 
6277
6503
  else
6278
6504
 
6279
- $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS)
6505
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS)
6280
6506
  $(E) "[AR] Creating $@"
6281
6507
  $(Q) mkdir -p `dirname $@`
6282
6508
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
@@ -6385,6 +6611,7 @@ PUBLIC_HEADERS_CXX += \
6385
6611
  include/grpcpp/impl/codegen/security/auth_context.h \
6386
6612
  include/grpcpp/impl/codegen/serialization_traits.h \
6387
6613
  include/grpcpp/impl/codegen/server_callback.h \
6614
+ include/grpcpp/impl/codegen/server_callback_handlers.h \
6388
6615
  include/grpcpp/impl/codegen/server_callback_impl.h \
6389
6616
  include/grpcpp/impl/codegen/server_context.h \
6390
6617
  include/grpcpp/impl/codegen/server_context_impl.h \
@@ -6450,7 +6677,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: protobuf_dep_error
6450
6677
 
6451
6678
  else
6452
6679
 
6453
- $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS)
6680
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS)
6454
6681
  $(E) "[AR] Creating $@"
6455
6682
  $(Q) mkdir -p `dirname $@`
6456
6683
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
@@ -6564,6 +6791,7 @@ PUBLIC_HEADERS_CXX += \
6564
6791
  include/grpcpp/impl/codegen/security/auth_context.h \
6565
6792
  include/grpcpp/impl/codegen/serialization_traits.h \
6566
6793
  include/grpcpp/impl/codegen/server_callback.h \
6794
+ include/grpcpp/impl/codegen/server_callback_handlers.h \
6567
6795
  include/grpcpp/impl/codegen/server_callback_impl.h \
6568
6796
  include/grpcpp/impl/codegen/server_context.h \
6569
6797
  include/grpcpp/impl/codegen/server_context_impl.h \
@@ -6629,7 +6857,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: protobuf_dep_error
6629
6857
 
6630
6858
  else
6631
6859
 
6632
- $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS)
6860
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS)
6633
6861
  $(E) "[AR] Creating $@"
6634
6862
  $(Q) mkdir -p `dirname $@`
6635
6863
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
@@ -6688,6 +6916,7 @@ LIBGRPC++_UNSECURE_SRC = \
6688
6916
  src/cpp/server/health/health_check_service.cc \
6689
6917
  src/cpp/server/health/health_check_service_server_builder_option.cc \
6690
6918
  src/cpp/server/server_builder.cc \
6919
+ src/cpp/server/server_callback.cc \
6691
6920
  src/cpp/server/server_cc.cc \
6692
6921
  src/cpp/server/server_context.cc \
6693
6922
  src/cpp/server/server_credentials.cc \
@@ -6697,13 +6926,205 @@ LIBGRPC++_UNSECURE_SRC = \
6697
6926
  src/cpp/util/status.cc \
6698
6927
  src/cpp/util/string_ref.cc \
6699
6928
  src/cpp/util/time_cc.cc \
6929
+ src/core/ext/filters/client_channel/backend_metric.cc \
6930
+ src/core/ext/filters/client_channel/backup_poller.cc \
6931
+ src/core/ext/filters/client_channel/channel_connectivity.cc \
6932
+ src/core/ext/filters/client_channel/client_channel.cc \
6933
+ src/core/ext/filters/client_channel/client_channel_channelz.cc \
6934
+ src/core/ext/filters/client_channel/client_channel_factory.cc \
6935
+ src/core/ext/filters/client_channel/client_channel_plugin.cc \
6936
+ src/core/ext/filters/client_channel/global_subchannel_pool.cc \
6937
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
6938
+ src/core/ext/filters/client_channel/http_connect_handshaker.cc \
6939
+ src/core/ext/filters/client_channel/http_proxy.cc \
6940
+ src/core/ext/filters/client_channel/lb_policy.cc \
6941
+ src/core/ext/filters/client_channel/lb_policy_registry.cc \
6942
+ src/core/ext/filters/client_channel/local_subchannel_pool.cc \
6943
+ src/core/ext/filters/client_channel/parse_address.cc \
6944
+ src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
6945
+ src/core/ext/filters/client_channel/resolver.cc \
6946
+ src/core/ext/filters/client_channel/resolver_registry.cc \
6947
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
6948
+ src/core/ext/filters/client_channel/resolving_lb_policy.cc \
6949
+ src/core/ext/filters/client_channel/retry_throttle.cc \
6950
+ src/core/ext/filters/client_channel/server_address.cc \
6951
+ src/core/ext/filters/client_channel/service_config.cc \
6952
+ src/core/ext/filters/client_channel/subchannel.cc \
6953
+ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
6954
+ src/core/lib/avl/avl.cc \
6955
+ src/core/lib/backoff/backoff.cc \
6956
+ src/core/lib/channel/channel_args.cc \
6957
+ src/core/lib/channel/channel_stack.cc \
6958
+ src/core/lib/channel/channel_stack_builder.cc \
6959
+ src/core/lib/channel/channel_trace.cc \
6960
+ src/core/lib/channel/channelz.cc \
6961
+ src/core/lib/channel/channelz_registry.cc \
6962
+ src/core/lib/channel/connected_channel.cc \
6963
+ src/core/lib/channel/handshaker.cc \
6964
+ src/core/lib/channel/handshaker_registry.cc \
6965
+ src/core/lib/channel/status_util.cc \
6966
+ src/core/lib/compression/compression.cc \
6967
+ src/core/lib/compression/compression_args.cc \
6968
+ src/core/lib/compression/compression_internal.cc \
6969
+ src/core/lib/compression/message_compress.cc \
6970
+ src/core/lib/compression/stream_compression.cc \
6971
+ src/core/lib/compression/stream_compression_gzip.cc \
6972
+ src/core/lib/compression/stream_compression_identity.cc \
6973
+ src/core/lib/debug/stats.cc \
6974
+ src/core/lib/debug/stats_data.cc \
6975
+ src/core/lib/http/format_request.cc \
6976
+ src/core/lib/http/httpcli.cc \
6977
+ src/core/lib/http/parser.cc \
6978
+ src/core/lib/iomgr/buffer_list.cc \
6979
+ src/core/lib/iomgr/call_combiner.cc \
6980
+ src/core/lib/iomgr/cfstream_handle.cc \
6981
+ src/core/lib/iomgr/combiner.cc \
6982
+ src/core/lib/iomgr/endpoint.cc \
6983
+ src/core/lib/iomgr/endpoint_cfstream.cc \
6984
+ src/core/lib/iomgr/endpoint_pair_posix.cc \
6985
+ src/core/lib/iomgr/endpoint_pair_uv.cc \
6986
+ src/core/lib/iomgr/endpoint_pair_windows.cc \
6987
+ src/core/lib/iomgr/error.cc \
6988
+ src/core/lib/iomgr/error_cfstream.cc \
6989
+ src/core/lib/iomgr/ev_epoll1_linux.cc \
6990
+ src/core/lib/iomgr/ev_epollex_linux.cc \
6991
+ src/core/lib/iomgr/ev_poll_posix.cc \
6992
+ src/core/lib/iomgr/ev_posix.cc \
6993
+ src/core/lib/iomgr/ev_windows.cc \
6994
+ src/core/lib/iomgr/exec_ctx.cc \
6995
+ src/core/lib/iomgr/executor.cc \
6996
+ src/core/lib/iomgr/executor/mpmcqueue.cc \
6997
+ src/core/lib/iomgr/executor/threadpool.cc \
6998
+ src/core/lib/iomgr/fork_posix.cc \
6999
+ src/core/lib/iomgr/fork_windows.cc \
7000
+ src/core/lib/iomgr/gethostname_fallback.cc \
7001
+ src/core/lib/iomgr/gethostname_host_name_max.cc \
7002
+ src/core/lib/iomgr/gethostname_sysconf.cc \
7003
+ src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
7004
+ src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
7005
+ src/core/lib/iomgr/internal_errqueue.cc \
7006
+ src/core/lib/iomgr/iocp_windows.cc \
7007
+ src/core/lib/iomgr/iomgr.cc \
7008
+ src/core/lib/iomgr/iomgr_custom.cc \
7009
+ src/core/lib/iomgr/iomgr_internal.cc \
7010
+ src/core/lib/iomgr/iomgr_posix.cc \
7011
+ src/core/lib/iomgr/iomgr_posix_cfstream.cc \
7012
+ src/core/lib/iomgr/iomgr_uv.cc \
7013
+ src/core/lib/iomgr/iomgr_windows.cc \
7014
+ src/core/lib/iomgr/is_epollexclusive_available.cc \
7015
+ src/core/lib/iomgr/load_file.cc \
7016
+ src/core/lib/iomgr/lockfree_event.cc \
7017
+ src/core/lib/iomgr/logical_thread.cc \
7018
+ src/core/lib/iomgr/polling_entity.cc \
7019
+ src/core/lib/iomgr/pollset.cc \
7020
+ src/core/lib/iomgr/pollset_custom.cc \
7021
+ src/core/lib/iomgr/pollset_set.cc \
7022
+ src/core/lib/iomgr/pollset_set_custom.cc \
7023
+ src/core/lib/iomgr/pollset_set_windows.cc \
7024
+ src/core/lib/iomgr/pollset_uv.cc \
7025
+ src/core/lib/iomgr/pollset_windows.cc \
7026
+ src/core/lib/iomgr/resolve_address.cc \
7027
+ src/core/lib/iomgr/resolve_address_custom.cc \
7028
+ src/core/lib/iomgr/resolve_address_posix.cc \
7029
+ src/core/lib/iomgr/resolve_address_windows.cc \
7030
+ src/core/lib/iomgr/resource_quota.cc \
7031
+ src/core/lib/iomgr/sockaddr_utils.cc \
7032
+ src/core/lib/iomgr/socket_factory_posix.cc \
7033
+ src/core/lib/iomgr/socket_mutator.cc \
7034
+ src/core/lib/iomgr/socket_utils_common_posix.cc \
7035
+ src/core/lib/iomgr/socket_utils_linux.cc \
7036
+ src/core/lib/iomgr/socket_utils_posix.cc \
7037
+ src/core/lib/iomgr/socket_utils_uv.cc \
7038
+ src/core/lib/iomgr/socket_utils_windows.cc \
7039
+ src/core/lib/iomgr/socket_windows.cc \
7040
+ src/core/lib/iomgr/tcp_client.cc \
7041
+ src/core/lib/iomgr/tcp_client_cfstream.cc \
7042
+ src/core/lib/iomgr/tcp_client_custom.cc \
7043
+ src/core/lib/iomgr/tcp_client_posix.cc \
7044
+ src/core/lib/iomgr/tcp_client_windows.cc \
7045
+ src/core/lib/iomgr/tcp_custom.cc \
7046
+ src/core/lib/iomgr/tcp_posix.cc \
7047
+ src/core/lib/iomgr/tcp_server.cc \
7048
+ src/core/lib/iomgr/tcp_server_custom.cc \
7049
+ src/core/lib/iomgr/tcp_server_posix.cc \
7050
+ src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
7051
+ src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
7052
+ src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
7053
+ src/core/lib/iomgr/tcp_server_windows.cc \
7054
+ src/core/lib/iomgr/tcp_uv.cc \
7055
+ src/core/lib/iomgr/tcp_windows.cc \
7056
+ src/core/lib/iomgr/time_averaged_stats.cc \
7057
+ src/core/lib/iomgr/timer.cc \
7058
+ src/core/lib/iomgr/timer_custom.cc \
7059
+ src/core/lib/iomgr/timer_generic.cc \
7060
+ src/core/lib/iomgr/timer_heap.cc \
7061
+ src/core/lib/iomgr/timer_manager.cc \
7062
+ src/core/lib/iomgr/timer_uv.cc \
7063
+ src/core/lib/iomgr/udp_server.cc \
7064
+ src/core/lib/iomgr/unix_sockets_posix.cc \
7065
+ src/core/lib/iomgr/unix_sockets_posix_noop.cc \
7066
+ src/core/lib/iomgr/wakeup_fd_eventfd.cc \
7067
+ src/core/lib/iomgr/wakeup_fd_nospecial.cc \
7068
+ src/core/lib/iomgr/wakeup_fd_pipe.cc \
7069
+ src/core/lib/iomgr/wakeup_fd_posix.cc \
7070
+ src/core/lib/json/json.cc \
7071
+ src/core/lib/json/json_reader.cc \
7072
+ src/core/lib/json/json_string.cc \
7073
+ src/core/lib/json/json_writer.cc \
7074
+ src/core/lib/slice/b64.cc \
7075
+ src/core/lib/slice/percent_encoding.cc \
7076
+ src/core/lib/slice/slice.cc \
7077
+ src/core/lib/slice/slice_buffer.cc \
7078
+ src/core/lib/slice/slice_intern.cc \
7079
+ src/core/lib/slice/slice_string_helpers.cc \
7080
+ src/core/lib/surface/api_trace.cc \
7081
+ src/core/lib/surface/byte_buffer.cc \
7082
+ src/core/lib/surface/byte_buffer_reader.cc \
7083
+ src/core/lib/surface/call.cc \
7084
+ src/core/lib/surface/call_details.cc \
7085
+ src/core/lib/surface/call_log_batch.cc \
7086
+ src/core/lib/surface/channel.cc \
7087
+ src/core/lib/surface/channel_init.cc \
7088
+ src/core/lib/surface/channel_ping.cc \
7089
+ src/core/lib/surface/channel_stack_type.cc \
7090
+ src/core/lib/surface/completion_queue.cc \
7091
+ src/core/lib/surface/completion_queue_factory.cc \
7092
+ src/core/lib/surface/event_string.cc \
7093
+ src/core/lib/surface/lame_client.cc \
7094
+ src/core/lib/surface/metadata_array.cc \
7095
+ src/core/lib/surface/server.cc \
7096
+ src/core/lib/surface/validate_metadata.cc \
7097
+ src/core/lib/surface/version.cc \
7098
+ src/core/lib/transport/bdp_estimator.cc \
7099
+ src/core/lib/transport/byte_stream.cc \
7100
+ src/core/lib/transport/connectivity_state.cc \
7101
+ src/core/lib/transport/error_utils.cc \
7102
+ src/core/lib/transport/metadata.cc \
7103
+ src/core/lib/transport/metadata_batch.cc \
7104
+ src/core/lib/transport/pid_controller.cc \
7105
+ src/core/lib/transport/static_metadata.cc \
7106
+ src/core/lib/transport/status_conversion.cc \
7107
+ src/core/lib/transport/status_metadata.cc \
7108
+ src/core/lib/transport/timeout_encoding.cc \
7109
+ src/core/lib/transport/transport.cc \
7110
+ src/core/lib/transport/transport_op_string.cc \
7111
+ src/core/lib/uri/uri_parser.cc \
7112
+ src/core/lib/debug/trace.cc \
7113
+ src/core/ext/filters/deadline/deadline_filter.cc \
6700
7114
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
6701
- third_party/upb/upb/decode.c \
6702
- third_party/upb/upb/encode.c \
6703
- third_party/upb/upb/msg.c \
6704
- third_party/upb/upb/port.c \
6705
- third_party/upb/upb/table.c \
6706
- third_party/upb/upb/upb.c \
7115
+ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
7116
+ src/core/ext/upb-generated/gogoproto/gogo.upb.c \
7117
+ src/core/ext/upb-generated/validate/validate.upb.c \
7118
+ src/core/ext/upb-generated/google/api/annotations.upb.c \
7119
+ src/core/ext/upb-generated/google/api/http.upb.c \
7120
+ src/core/ext/upb-generated/google/protobuf/any.upb.c \
7121
+ src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
7122
+ src/core/ext/upb-generated/google/protobuf/duration.upb.c \
7123
+ src/core/ext/upb-generated/google/protobuf/empty.upb.c \
7124
+ src/core/ext/upb-generated/google/protobuf/struct.upb.c \
7125
+ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
7126
+ src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
7127
+ src/core/ext/upb-generated/google/rpc/status.upb.c \
6707
7128
  src/cpp/codegen/codegen_init.cc \
6708
7129
 
6709
7130
  PUBLIC_HEADERS_CXX += \
@@ -6948,6 +7369,7 @@ PUBLIC_HEADERS_CXX += \
6948
7369
  include/grpcpp/impl/codegen/security/auth_context.h \
6949
7370
  include/grpcpp/impl/codegen/serialization_traits.h \
6950
7371
  include/grpcpp/impl/codegen/server_callback.h \
7372
+ include/grpcpp/impl/codegen/server_callback_handlers.h \
6951
7373
  include/grpcpp/impl/codegen/server_callback_impl.h \
6952
7374
  include/grpcpp/impl/codegen/server_context.h \
6953
7375
  include/grpcpp/impl/codegen/server_context_impl.h \
@@ -6977,11 +7399,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARE
6977
7399
 
6978
7400
  else
6979
7401
 
6980
- $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
7402
+ $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6981
7403
  $(E) "[AR] Creating $@"
6982
7404
  $(Q) mkdir -p `dirname $@`
6983
7405
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
6984
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS)
7406
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6985
7407
  ifeq ($(SYSTEM),Darwin)
6986
7408
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
6987
7409
  endif
@@ -6989,18 +7411,18 @@ endif
6989
7411
 
6990
7412
 
6991
7413
  ifeq ($(SYSTEM),MINGW32)
6992
- $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
7414
+ $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
6993
7415
  $(E) "[LD] Linking $@"
6994
7416
  $(Q) mkdir -p `dirname $@`
6995
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll
7417
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll
6996
7418
  else
6997
- $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE)
7419
+ $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE)
6998
7420
  $(E) "[LD] Linking $@"
6999
7421
  $(Q) mkdir -p `dirname $@`
7000
7422
  ifeq ($(SYSTEM),Darwin)
7001
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure
7423
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb
7002
7424
  else
7003
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_unsecure.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure
7425
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_unsecure.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb
7004
7426
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so.1
7005
7427
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so
7006
7428
  endif
@@ -7040,7 +7462,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: protobuf_dep_error
7040
7462
 
7041
7463
  else
7042
7464
 
7043
- $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS)
7465
+ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS)
7044
7466
  $(E) "[AR] Creating $@"
7045
7467
  $(Q) mkdir -p `dirname $@`
7046
7468
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
@@ -7096,7 +7518,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: protobuf_dep_error
7096
7518
 
7097
7519
  else
7098
7520
 
7099
- $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS)
7521
+ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS)
7100
7522
  $(E) "[AR] Creating $@"
7101
7523
  $(Q) mkdir -p `dirname $@`
7102
7524
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
@@ -7149,7 +7571,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
7149
7571
 
7150
7572
  else
7151
7573
 
7152
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
7574
+ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
7153
7575
  $(E) "[AR] Creating $@"
7154
7576
  $(Q) mkdir -p `dirname $@`
7155
7577
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
@@ -7200,7 +7622,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARE
7200
7622
 
7201
7623
  else
7202
7624
 
7203
- $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS)
7625
+ $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS)
7204
7626
  $(E) "[AR] Creating $@"
7205
7627
  $(Q) mkdir -p `dirname $@`
7206
7628
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
@@ -7212,18 +7634,18 @@ endif
7212
7634
 
7213
7635
 
7214
7636
  ifeq ($(SYSTEM),MINGW32)
7215
- $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7637
+ $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7216
7638
  $(E) "[LD] Linking $@"
7217
7639
  $(Q) mkdir -p `dirname $@`
7218
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
7640
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
7219
7641
  else
7220
- $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7642
+ $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7221
7643
  $(E) "[LD] Linking $@"
7222
7644
  $(Q) mkdir -p `dirname $@`
7223
7645
  ifeq ($(SYSTEM),Darwin)
7224
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7646
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7225
7647
  else
7226
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpcpp_channelz.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7648
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpcpp_channelz.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7227
7649
  $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so.1
7228
7650
  $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so
7229
7651
  endif
@@ -7271,7 +7693,7 @@ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: protobuf_dep_error
7271
7693
 
7272
7694
  else
7273
7695
 
7274
- $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS)
7696
+ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS)
7275
7697
  $(E) "[AR] Creating $@"
7276
7698
  $(Q) mkdir -p `dirname $@`
7277
7699
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
@@ -7322,7 +7744,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: protobuf_dep_error
7322
7744
 
7323
7745
  else
7324
7746
 
7325
- $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS)
7747
+ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS)
7326
7748
  $(E) "[AR] Creating $@"
7327
7749
  $(Q) mkdir -p `dirname $@`
7328
7750
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
@@ -7376,7 +7798,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: protobuf_dep_error
7376
7798
 
7377
7799
  else
7378
7800
 
7379
- $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS)
7801
+ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS)
7380
7802
  $(E) "[AR] Creating $@"
7381
7803
  $(Q) mkdir -p `dirname $@`
7382
7804
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
@@ -7427,7 +7849,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: protobuf_dep_error
7427
7849
 
7428
7850
  else
7429
7851
 
7430
- $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS)
7852
+ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS)
7431
7853
  $(E) "[AR] Creating $@"
7432
7854
  $(Q) mkdir -p `dirname $@`
7433
7855
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
@@ -7479,7 +7901,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: protobuf_dep_error
7479
7901
 
7480
7902
  else
7481
7903
 
7482
- $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS)
7904
+ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS)
7483
7905
  $(E) "[AR] Creating $@"
7484
7906
  $(Q) mkdir -p `dirname $@`
7485
7907
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
@@ -7529,7 +7951,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: protobuf_dep_error
7529
7951
 
7530
7952
  else
7531
7953
 
7532
- $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS)
7954
+ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS)
7533
7955
  $(E) "[AR] Creating $@"
7534
7956
  $(Q) mkdir -p `dirname $@`
7535
7957
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
@@ -7597,7 +8019,7 @@ $(LIBDIR)/$(CONFIG)/libqps.a: protobuf_dep_error
7597
8019
 
7598
8020
  else
7599
8021
 
7600
- $(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS)
8022
+ $(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS)
7601
8023
  $(E) "[AR] Creating $@"
7602
8024
  $(Q) mkdir -p `dirname $@`
7603
8025
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libqps.a
@@ -7652,7 +8074,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SH
7652
8074
  else
7653
8075
 
7654
8076
 
7655
- $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CSHARP_EXT_OBJS)
8077
+ $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_CSHARP_EXT_OBJS)
7656
8078
  $(E) "[AR] Creating $@"
7657
8079
  $(Q) mkdir -p `dirname $@`
7658
8080
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
@@ -7664,18 +8086,18 @@ endif
7664
8086
 
7665
8087
 
7666
8088
  ifeq ($(SYSTEM),MINGW32)
7667
- $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
8089
+ $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
7668
8090
  $(E) "[LD] Linking $@"
7669
8091
  $(Q) mkdir -p `dirname $@`
7670
- $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
8092
+ $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
7671
8093
  else
7672
- $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
8094
+ $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
7673
8095
  $(E) "[LD] Linking $@"
7674
8096
  $(Q) mkdir -p `dirname $@`
7675
8097
  ifeq ($(SYSTEM),Darwin)
7676
- $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
8098
+ $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
7677
8099
  else
7678
- $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.2 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
8100
+ $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.2 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
7679
8101
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so.2
7680
8102
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so
7681
8103
  endif
@@ -7964,7 +8386,7 @@ $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=h
7964
8386
  $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-exceptions
7965
8387
  $(LIBBORINGSSL_OBJS): CFLAGS += -g
7966
8388
 
7967
- $(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBORINGSSL_OBJS)
8389
+ $(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBORINGSSL_OBJS)
7968
8390
  $(E) "[AR] Creating $@"
7969
8391
  $(Q) mkdir -p `dirname $@`
7970
8392
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a
@@ -8004,7 +8426,7 @@ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error
8004
8426
 
8005
8427
  else
8006
8428
 
8007
- $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS)
8429
+ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS)
8008
8430
  $(E) "[AR] Creating $@"
8009
8431
  $(Q) mkdir -p `dirname $@`
8010
8432
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
@@ -8059,7 +8481,7 @@ $(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error
8059
8481
 
8060
8482
  else
8061
8483
 
8062
- $(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS)
8484
+ $(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS)
8063
8485
  $(E) "[AR] Creating $@"
8064
8486
  $(Q) mkdir -p `dirname $@`
8065
8487
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a
@@ -8078,6 +8500,68 @@ ifneq ($(NO_DEPS),true)
8078
8500
  endif
8079
8501
 
8080
8502
 
8503
+ LIBUPB_SRC = \
8504
+ third_party/upb/upb/decode.c \
8505
+ third_party/upb/upb/encode.c \
8506
+ third_party/upb/upb/msg.c \
8507
+ third_party/upb/upb/port.c \
8508
+ third_party/upb/upb/table.c \
8509
+ third_party/upb/upb/upb.c \
8510
+
8511
+ PUBLIC_HEADERS_C += \
8512
+
8513
+ LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC))))
8514
+
8515
+
8516
+ ifeq ($(NO_SECURE),true)
8517
+
8518
+ # You can't build secure libraries if you don't have OpenSSL.
8519
+
8520
+ $(LIBDIR)/$(CONFIG)/libupb.a: openssl_dep_error
8521
+
8522
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
8523
+
8524
+ else
8525
+
8526
+
8527
+ $(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBUPB_OBJS)
8528
+ $(E) "[AR] Creating $@"
8529
+ $(Q) mkdir -p `dirname $@`
8530
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a
8531
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS)
8532
+ ifeq ($(SYSTEM),Darwin)
8533
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libupb.a
8534
+ endif
8535
+
8536
+
8537
+
8538
+ ifeq ($(SYSTEM),MINGW32)
8539
+ $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(OPENSSL_DEP)
8540
+ $(E) "[LD] Linking $@"
8541
+ $(Q) mkdir -p `dirname $@`
8542
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
8543
+ else
8544
+ $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(OPENSSL_DEP)
8545
+ $(E) "[LD] Linking $@"
8546
+ $(Q) mkdir -p `dirname $@`
8547
+ ifeq ($(SYSTEM),Darwin)
8548
+ $(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) $(UPB_MERGE_LIBS) $(LDLIBS)
8549
+ else
8550
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.9 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS)
8551
+ $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.9
8552
+ $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so
8553
+ endif
8554
+ endif
8555
+
8556
+ endif
8557
+
8558
+ ifneq ($(NO_SECURE),true)
8559
+ ifneq ($(NO_DEPS),true)
8560
+ -include $(LIBUPB_OBJS:.o=.dep)
8561
+ endif
8562
+ endif
8563
+
8564
+
8081
8565
  LIBZ_SRC = \
8082
8566
  third_party/zlib/adler32.c \
8083
8567
  third_party/zlib/compress.c \
@@ -8220,7 +8704,7 @@ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: protobuf_dep_error
8220
8704
 
8221
8705
  else
8222
8706
 
8223
- $(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS)
8707
+ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS)
8224
8708
  $(E) "[AR] Creating $@"
8225
8709
  $(Q) mkdir -p `dirname $@`
8226
8710
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_client_test.a
@@ -8261,7 +8745,7 @@ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: openssl_dep_error
8261
8745
  else
8262
8746
 
8263
8747
 
8264
- $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS)
8748
+ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS)
8265
8749
  $(E) "[AR] Creating $@"
8266
8750
  $(Q) mkdir -p `dirname $@`
8267
8751
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
@@ -8379,7 +8863,7 @@ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: openssl_dep_error
8379
8863
  else
8380
8864
 
8381
8865
 
8382
- $(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_TESTS_OBJS)
8866
+ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_TESTS_OBJS)
8383
8867
  $(E) "[AR] Creating $@"
8384
8868
  $(Q) mkdir -p `dirname $@`
8385
8869
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_tests.a
@@ -8486,7 +8970,7 @@ PUBLIC_HEADERS_C += \
8486
8970
  LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC))))
8487
8971
 
8488
8972
 
8489
- $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS)
8973
+ $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS)
8490
8974
  $(E) "[AR] Creating $@"
8491
8975
  $(Q) mkdir -p `dirname $@`
8492
8976
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
@@ -11597,102 +12081,6 @@ endif
11597
12081
  endif
11598
12082
 
11599
12083
 
11600
- MEMORY_USAGE_CLIENT_SRC = \
11601
- test/core/memory_usage/client.cc \
11602
-
11603
- MEMORY_USAGE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_CLIENT_SRC))))
11604
- ifeq ($(NO_SECURE),true)
11605
-
11606
- # You can't build secure targets if you don't have OpenSSL.
11607
-
11608
- $(BINDIR)/$(CONFIG)/memory_usage_client: openssl_dep_error
11609
-
11610
- else
11611
-
11612
-
11613
-
11614
- $(BINDIR)/$(CONFIG)/memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11615
- $(E) "[LD] Linking $@"
11616
- $(Q) mkdir -p `dirname $@`
11617
- $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_client
11618
-
11619
- endif
11620
-
11621
- $(OBJDIR)/$(CONFIG)/test/core/memory_usage/client.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11622
-
11623
- deps_memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep)
11624
-
11625
- ifneq ($(NO_SECURE),true)
11626
- ifneq ($(NO_DEPS),true)
11627
- -include $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep)
11628
- endif
11629
- endif
11630
-
11631
-
11632
- MEMORY_USAGE_SERVER_SRC = \
11633
- test/core/memory_usage/server.cc \
11634
-
11635
- MEMORY_USAGE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_SERVER_SRC))))
11636
- ifeq ($(NO_SECURE),true)
11637
-
11638
- # You can't build secure targets if you don't have OpenSSL.
11639
-
11640
- $(BINDIR)/$(CONFIG)/memory_usage_server: openssl_dep_error
11641
-
11642
- else
11643
-
11644
-
11645
-
11646
- $(BINDIR)/$(CONFIG)/memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11647
- $(E) "[LD] Linking $@"
11648
- $(Q) mkdir -p `dirname $@`
11649
- $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_server
11650
-
11651
- endif
11652
-
11653
- $(OBJDIR)/$(CONFIG)/test/core/memory_usage/server.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11654
-
11655
- deps_memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS:.o=.dep)
11656
-
11657
- ifneq ($(NO_SECURE),true)
11658
- ifneq ($(NO_DEPS),true)
11659
- -include $(MEMORY_USAGE_SERVER_OBJS:.o=.dep)
11660
- endif
11661
- endif
11662
-
11663
-
11664
- MEMORY_USAGE_TEST_SRC = \
11665
- test/core/memory_usage/memory_usage_test.cc \
11666
-
11667
- MEMORY_USAGE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_TEST_SRC))))
11668
- ifeq ($(NO_SECURE),true)
11669
-
11670
- # You can't build secure targets if you don't have OpenSSL.
11671
-
11672
- $(BINDIR)/$(CONFIG)/memory_usage_test: openssl_dep_error
11673
-
11674
- else
11675
-
11676
-
11677
-
11678
- $(BINDIR)/$(CONFIG)/memory_usage_test: $(MEMORY_USAGE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11679
- $(E) "[LD] Linking $@"
11680
- $(Q) mkdir -p `dirname $@`
11681
- $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_test
11682
-
11683
- endif
11684
-
11685
- $(OBJDIR)/$(CONFIG)/test/core/memory_usage/memory_usage_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11686
-
11687
- deps_memory_usage_test: $(MEMORY_USAGE_TEST_OBJS:.o=.dep)
11688
-
11689
- ifneq ($(NO_SECURE),true)
11690
- ifneq ($(NO_DEPS),true)
11691
- -include $(MEMORY_USAGE_TEST_OBJS:.o=.dep)
11692
- endif
11693
- endif
11694
-
11695
-
11696
12084
  MESSAGE_COMPRESS_TEST_SRC = \
11697
12085
  test/core/compression/message_compress_test.cc \
11698
12086
 
@@ -13371,6 +13759,60 @@ endif
13371
13759
  endif
13372
13760
 
13373
13761
 
13762
+ ALTS_CONCURRENT_CONNECTIVITY_TEST_SRC = \
13763
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc \
13764
+ $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc \
13765
+ test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc \
13766
+ test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc \
13767
+
13768
+ ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALTS_CONCURRENT_CONNECTIVITY_TEST_SRC))))
13769
+ ifeq ($(NO_SECURE),true)
13770
+
13771
+ # You can't build secure targets if you don't have OpenSSL.
13772
+
13773
+ $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: openssl_dep_error
13774
+
13775
+ else
13776
+
13777
+
13778
+
13779
+
13780
+ ifeq ($(NO_PROTOBUF),true)
13781
+
13782
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
13783
+
13784
+ $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: protobuf_dep_error
13785
+
13786
+ else
13787
+
13788
+ $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: $(PROTOBUF_DEP) $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
13789
+ $(E) "[LD] Linking $@"
13790
+ $(Q) mkdir -p `dirname $@`
13791
+ $(Q) $(LDXX) $(LDFLAGS) $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test
13792
+
13793
+ endif
13794
+
13795
+ endif
13796
+
13797
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/handshaker.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
13798
+
13799
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/transport_security_common.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
13800
+
13801
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
13802
+
13803
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
13804
+
13805
+ deps_alts_concurrent_connectivity_test: $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep)
13806
+
13807
+ ifneq ($(NO_SECURE),true)
13808
+ ifneq ($(NO_DEPS),true)
13809
+ -include $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep)
13810
+ endif
13811
+ endif
13812
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.o: $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc
13813
+ $(OBJDIR)/$(CONFIG)/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.o: $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc
13814
+
13815
+
13374
13816
  ALTS_COUNTER_TEST_SRC = \
13375
13817
  test/core/tsi/alts/frame_protector/alts_counter_test.cc \
13376
13818
 
@@ -17771,15 +18213,15 @@ endif
17771
18213
  endif
17772
18214
 
17773
18215
 
17774
- MEMORY_TEST_SRC = \
17775
- test/core/gprpp/memory_test.cc \
18216
+ LOGICAL_THREAD_TEST_SRC = \
18217
+ test/core/iomgr/logical_thread_test.cc \
17776
18218
 
17777
- MEMORY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_TEST_SRC))))
18219
+ LOGICAL_THREAD_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LOGICAL_THREAD_TEST_SRC))))
17778
18220
  ifeq ($(NO_SECURE),true)
17779
18221
 
17780
18222
  # You can't build secure targets if you don't have OpenSSL.
17781
18223
 
17782
- $(BINDIR)/$(CONFIG)/memory_test: openssl_dep_error
18224
+ $(BINDIR)/$(CONFIG)/logical_thread_test: openssl_dep_error
17783
18225
 
17784
18226
  else
17785
18227
 
@@ -17790,26 +18232,26 @@ ifeq ($(NO_PROTOBUF),true)
17790
18232
 
17791
18233
  # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
17792
18234
 
17793
- $(BINDIR)/$(CONFIG)/memory_test: protobuf_dep_error
18235
+ $(BINDIR)/$(CONFIG)/logical_thread_test: protobuf_dep_error
17794
18236
 
17795
18237
  else
17796
18238
 
17797
- $(BINDIR)/$(CONFIG)/memory_test: $(PROTOBUF_DEP) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
18239
+ $(BINDIR)/$(CONFIG)/logical_thread_test: $(PROTOBUF_DEP) $(LOGICAL_THREAD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
17798
18240
  $(E) "[LD] Linking $@"
17799
18241
  $(Q) mkdir -p `dirname $@`
17800
- $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/memory_test
18242
+ $(Q) $(LDXX) $(LDFLAGS) $(LOGICAL_THREAD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/logical_thread_test
17801
18243
 
17802
18244
  endif
17803
18245
 
17804
18246
  endif
17805
18247
 
17806
- $(OBJDIR)/$(CONFIG)/test/core/gprpp/memory_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
18248
+ $(OBJDIR)/$(CONFIG)/test/core/iomgr/logical_thread_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
17807
18249
 
17808
- deps_memory_test: $(MEMORY_TEST_OBJS:.o=.dep)
18250
+ deps_logical_thread_test: $(LOGICAL_THREAD_TEST_OBJS:.o=.dep)
17809
18251
 
17810
18252
  ifneq ($(NO_SECURE),true)
17811
18253
  ifneq ($(NO_DEPS),true)
17812
- -include $(MEMORY_TEST_OBJS:.o=.dep)
18254
+ -include $(LOGICAL_THREAD_TEST_OBJS:.o=.dep)
17813
18255
  endif
17814
18256
  endif
17815
18257
 
@@ -18120,6 +18562,49 @@ endif
18120
18562
  endif
18121
18563
 
18122
18564
 
18565
+ POLLSET_WINDOWS_STARVATION_TEST.CC_SRC = \
18566
+ test/core/iomgr/pollset_windows_starvation_test.cc \
18567
+
18568
+ POLLSET_WINDOWS_STARVATION_TEST.CC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(POLLSET_WINDOWS_STARVATION_TEST.CC_SRC))))
18569
+ ifeq ($(NO_SECURE),true)
18570
+
18571
+ # You can't build secure targets if you don't have OpenSSL.
18572
+
18573
+ $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc: openssl_dep_error
18574
+
18575
+ else
18576
+
18577
+
18578
+
18579
+
18580
+ ifeq ($(NO_PROTOBUF),true)
18581
+
18582
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
18583
+
18584
+ $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc: protobuf_dep_error
18585
+
18586
+ else
18587
+
18588
+ $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc: $(PROTOBUF_DEP) $(POLLSET_WINDOWS_STARVATION_TEST.CC_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
18589
+ $(E) "[LD] Linking $@"
18590
+ $(Q) mkdir -p `dirname $@`
18591
+ $(Q) $(LDXX) $(LDFLAGS) $(POLLSET_WINDOWS_STARVATION_TEST.CC_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/pollset_windows_starvation_test.cc
18592
+
18593
+ endif
18594
+
18595
+ endif
18596
+
18597
+ $(OBJDIR)/$(CONFIG)/test/core/iomgr/pollset_windows_starvation_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
18598
+
18599
+ deps_pollset_windows_starvation_test.cc: $(POLLSET_WINDOWS_STARVATION_TEST.CC_OBJS:.o=.dep)
18600
+
18601
+ ifneq ($(NO_SECURE),true)
18602
+ ifneq ($(NO_DEPS),true)
18603
+ -include $(POLLSET_WINDOWS_STARVATION_TEST.CC_OBJS:.o=.dep)
18604
+ endif
18605
+ endif
18606
+
18607
+
18123
18608
  PORT_SHARING_END2END_TEST_SRC = \
18124
18609
  test/cpp/end2end/port_sharing_end2end_test.cc \
18125
18610
 
@@ -19717,16 +20202,16 @@ $(BINDIR)/$(CONFIG)/thread_manager_test: protobuf_dep_error
19717
20202
 
19718
20203
  else
19719
20204
 
19720
- $(BINDIR)/$(CONFIG)/thread_manager_test: $(PROTOBUF_DEP) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
20205
+ $(BINDIR)/$(CONFIG)/thread_manager_test: $(PROTOBUF_DEP) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
19721
20206
  $(E) "[LD] Linking $@"
19722
20207
  $(Q) mkdir -p `dirname $@`
19723
- $(Q) $(LDXX) $(LDFLAGS) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/thread_manager_test
20208
+ $(Q) $(LDXX) $(LDFLAGS) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/thread_manager_test
19724
20209
 
19725
20210
  endif
19726
20211
 
19727
20212
  endif
19728
20213
 
19729
- $(OBJDIR)/$(CONFIG)/test/cpp/thread_manager/thread_manager_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
20214
+ $(OBJDIR)/$(CONFIG)/test/cpp/thread_manager/thread_manager_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
19730
20215
 
19731
20216
  deps_thread_manager_test: $(THREAD_MANAGER_TEST_OBJS:.o=.dep)
19732
20217
 
@@ -22853,6 +23338,12 @@ test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP)
22853
23338
  test/cpp/util/subprocess.cc: $(OPENSSL_DEP)
22854
23339
  test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP)
22855
23340
  test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP)
23341
+ third_party/upb/upb/decode.c: $(OPENSSL_DEP)
23342
+ third_party/upb/upb/encode.c: $(OPENSSL_DEP)
23343
+ third_party/upb/upb/msg.c: $(OPENSSL_DEP)
23344
+ third_party/upb/upb/port.c: $(OPENSSL_DEP)
23345
+ third_party/upb/upb/table.c: $(OPENSSL_DEP)
23346
+ third_party/upb/upb/upb.c: $(OPENSSL_DEP)
22856
23347
  endif
22857
23348
 
22858
23349
  .PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-headers install-headers_c install-headers_cxx install-shared install-shared_c install-shared_cxx install-static install-static_c install-static_cxx strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean