grpc 1.26.0 → 1.27.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 (209) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +1654 -1519
  3. data/etc/roots.pem +44 -0
  4. data/include/grpc/grpc_security.h +37 -15
  5. data/include/grpc/grpc_security_constants.h +27 -0
  6. data/include/grpc/impl/codegen/grpc_types.h +14 -0
  7. data/include/grpc/impl/codegen/port_platform.h +1 -1
  8. data/src/core/ext/filters/client_channel/client_channel.cc +0 -20
  9. data/src/core/ext/filters/client_channel/http_proxy.cc +4 -4
  10. data/src/core/ext/filters/client_channel/lb_policy.cc +4 -3
  11. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +191 -201
  12. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc +89 -0
  13. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h +40 -0
  14. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +3 -2
  15. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +88 -121
  16. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +28 -57
  17. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +0 -7
  18. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +8 -9
  19. data/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +53 -34
  20. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +18 -5
  21. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +24 -19
  22. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +2 -1
  23. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +4 -2
  24. data/src/core/ext/filters/client_channel/server_address.cc +6 -9
  25. data/src/core/ext/filters/client_channel/server_address.h +3 -10
  26. data/src/core/ext/filters/client_channel/xds/xds_api.cc +394 -150
  27. data/src/core/ext/filters/client_channel/xds/xds_api.h +75 -35
  28. data/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +59 -22
  29. data/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +13 -9
  30. data/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc +8 -6
  31. data/src/core/ext/filters/client_channel/xds/xds_client.cc +456 -175
  32. data/src/core/ext/filters/client_channel/xds/xds_client.h +33 -21
  33. data/src/core/ext/filters/client_channel/xds/xds_client_stats.cc +5 -8
  34. data/src/core/ext/filters/client_channel/xds/xds_client_stats.h +18 -24
  35. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +2 -2
  36. data/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c +13 -5
  37. data/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h +34 -0
  38. data/src/core/lib/channel/channelz.h +11 -1
  39. data/src/core/lib/gpr/time_precise.cc +1 -1
  40. data/src/core/lib/gprpp/optional.h +26 -0
  41. data/src/core/lib/gprpp/string_view.h +14 -10
  42. data/src/core/lib/iomgr/executor.cc +1 -1
  43. data/src/core/lib/iomgr/fork_posix.cc +4 -0
  44. data/src/core/lib/iomgr/poller/eventmanager_libuv.cc +87 -0
  45. data/src/core/lib/iomgr/poller/eventmanager_libuv.h +88 -0
  46. data/src/core/lib/iomgr/socket_utils_common_posix.cc +14 -0
  47. data/src/core/lib/iomgr/socket_utils_posix.h +12 -0
  48. data/src/core/lib/iomgr/tcp_custom.h +3 -0
  49. data/src/core/lib/iomgr/tcp_posix.cc +607 -56
  50. data/src/core/lib/iomgr/tcp_server_custom.cc +15 -2
  51. data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +8 -0
  52. data/src/core/lib/json/json.h +11 -1
  53. data/src/core/lib/json/json_reader.cc +206 -28
  54. data/src/core/lib/json/json_writer.cc +111 -24
  55. data/src/core/lib/security/credentials/composite/composite_credentials.cc +7 -0
  56. data/src/core/lib/security/credentials/composite/composite_credentials.h +5 -1
  57. data/src/core/lib/security/credentials/credentials.h +10 -1
  58. data/src/core/lib/security/credentials/fake/fake_credentials.h +2 -1
  59. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +1 -1
  60. data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +6 -4
  61. data/src/core/lib/security/credentials/plugin/plugin_credentials.h +2 -1
  62. data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +20 -0
  63. data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +8 -0
  64. data/src/core/lib/security/credentials/tls/{spiffe_credentials.cc → tls_credentials.cc} +23 -24
  65. data/src/core/lib/security/credentials/tls/{spiffe_credentials.h → tls_credentials.h} +9 -9
  66. data/src/core/lib/security/security_connector/alts/alts_security_connector.cc +13 -0
  67. data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +22 -2
  68. data/src/core/lib/security/security_connector/load_system_roots_fallback.cc +2 -2
  69. data/src/core/lib/security/security_connector/load_system_roots_linux.cc +2 -2
  70. data/src/core/lib/security/security_connector/local/local_security_connector.cc +30 -3
  71. data/src/core/lib/security/security_connector/ssl_utils.cc +45 -3
  72. data/src/core/lib/security/security_connector/ssl_utils.h +12 -0
  73. data/src/core/lib/security/security_connector/tls/{spiffe_security_connector.cc → tls_security_connector.cc} +82 -69
  74. data/src/core/lib/security/security_connector/tls/{spiffe_security_connector.h → tls_security_connector.h} +17 -18
  75. data/src/core/lib/security/transport/client_auth_filter.cc +33 -0
  76. data/src/core/lib/surface/completion_queue.cc +22 -1
  77. data/src/core/lib/surface/version.cc +1 -1
  78. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +11 -1
  79. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +1 -1
  80. data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +3 -3
  81. data/src/core/tsi/fake_transport_security.cc +7 -3
  82. data/src/core/tsi/fake_transport_security.h +2 -0
  83. data/src/core/tsi/ssl_transport_security.cc +144 -8
  84. data/src/core/tsi/ssl_transport_security.h +15 -1
  85. data/src/core/tsi/transport_security.cc +13 -0
  86. data/src/core/tsi/transport_security_grpc.cc +2 -2
  87. data/src/core/tsi/transport_security_grpc.h +2 -2
  88. data/src/core/tsi/transport_security_interface.h +12 -0
  89. data/src/ruby/bin/math_pb.rb +5 -5
  90. data/src/ruby/ext/grpc/rb_call_credentials.c +4 -1
  91. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +2 -0
  92. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +4 -1
  93. data/src/ruby/lib/grpc/version.rb +1 -1
  94. data/src/ruby/pb/grpc/health/v1/health_pb.rb +3 -3
  95. data/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb +1 -1
  96. data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +23 -13
  97. data/third_party/abseil-cpp/absl/algorithm/algorithm.h +159 -0
  98. data/third_party/abseil-cpp/absl/base/attributes.h +609 -0
  99. data/third_party/abseil-cpp/absl/base/call_once.h +226 -0
  100. data/third_party/abseil-cpp/absl/base/casts.h +184 -0
  101. data/third_party/abseil-cpp/absl/base/config.h +622 -0
  102. data/third_party/abseil-cpp/absl/base/const_init.h +76 -0
  103. data/third_party/abseil-cpp/absl/base/dynamic_annotations.cc +129 -0
  104. data/third_party/abseil-cpp/absl/base/dynamic_annotations.h +389 -0
  105. data/third_party/abseil-cpp/absl/base/internal/atomic_hook.h +179 -0
  106. data/third_party/abseil-cpp/absl/base/internal/bits.h +218 -0
  107. data/third_party/abseil-cpp/absl/base/internal/cycleclock.cc +107 -0
  108. data/third_party/abseil-cpp/absl/base/internal/cycleclock.h +94 -0
  109. data/third_party/abseil-cpp/absl/base/internal/endian.h +266 -0
  110. data/third_party/abseil-cpp/absl/base/internal/hide_ptr.h +51 -0
  111. data/third_party/abseil-cpp/absl/base/internal/identity.h +37 -0
  112. data/third_party/abseil-cpp/absl/base/internal/inline_variable.h +107 -0
  113. data/third_party/abseil-cpp/absl/base/internal/invoke.h +187 -0
  114. data/third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h +107 -0
  115. data/third_party/abseil-cpp/absl/base/internal/per_thread_tls.h +52 -0
  116. data/third_party/abseil-cpp/absl/base/internal/raw_logging.cc +237 -0
  117. data/third_party/abseil-cpp/absl/base/internal/raw_logging.h +179 -0
  118. data/third_party/abseil-cpp/absl/base/internal/scheduling_mode.h +58 -0
  119. data/third_party/abseil-cpp/absl/base/internal/spinlock.cc +233 -0
  120. data/third_party/abseil-cpp/absl/base/internal/spinlock.h +243 -0
  121. data/third_party/abseil-cpp/absl/base/internal/spinlock_akaros.inc +35 -0
  122. data/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc +67 -0
  123. data/third_party/abseil-cpp/absl/base/internal/spinlock_posix.inc +46 -0
  124. data/third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc +81 -0
  125. data/third_party/abseil-cpp/absl/base/internal/spinlock_wait.h +93 -0
  126. data/third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc +37 -0
  127. data/third_party/abseil-cpp/absl/base/internal/sysinfo.cc +414 -0
  128. data/third_party/abseil-cpp/absl/base/internal/sysinfo.h +66 -0
  129. data/third_party/abseil-cpp/absl/base/internal/thread_annotations.h +271 -0
  130. data/third_party/abseil-cpp/absl/base/internal/thread_identity.cc +140 -0
  131. data/third_party/abseil-cpp/absl/base/internal/thread_identity.h +250 -0
  132. data/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc +108 -0
  133. data/third_party/abseil-cpp/absl/base/internal/throw_delegate.h +75 -0
  134. data/third_party/abseil-cpp/absl/base/internal/tsan_mutex_interface.h +66 -0
  135. data/third_party/abseil-cpp/absl/base/internal/unaligned_access.h +158 -0
  136. data/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +103 -0
  137. data/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +124 -0
  138. data/third_party/abseil-cpp/absl/base/log_severity.cc +27 -0
  139. data/third_party/abseil-cpp/absl/base/log_severity.h +121 -0
  140. data/third_party/abseil-cpp/absl/base/macros.h +220 -0
  141. data/third_party/abseil-cpp/absl/base/optimization.h +181 -0
  142. data/third_party/abseil-cpp/absl/base/options.h +214 -0
  143. data/third_party/abseil-cpp/absl/base/policy_checks.h +111 -0
  144. data/third_party/abseil-cpp/absl/base/port.h +26 -0
  145. data/third_party/abseil-cpp/absl/base/thread_annotations.h +280 -0
  146. data/third_party/abseil-cpp/absl/container/inlined_vector.h +848 -0
  147. data/third_party/abseil-cpp/absl/container/internal/compressed_tuple.h +265 -0
  148. data/third_party/abseil-cpp/absl/container/internal/inlined_vector.h +892 -0
  149. data/third_party/abseil-cpp/absl/memory/memory.h +695 -0
  150. data/third_party/abseil-cpp/absl/meta/type_traits.h +759 -0
  151. data/third_party/abseil-cpp/absl/numeric/int128.cc +404 -0
  152. data/third_party/abseil-cpp/absl/numeric/int128.h +1091 -0
  153. data/third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc +302 -0
  154. data/third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc +308 -0
  155. data/third_party/abseil-cpp/absl/strings/ascii.cc +200 -0
  156. data/third_party/abseil-cpp/absl/strings/ascii.h +241 -0
  157. data/third_party/abseil-cpp/absl/strings/charconv.cc +985 -0
  158. data/third_party/abseil-cpp/absl/strings/charconv.h +119 -0
  159. data/third_party/abseil-cpp/absl/strings/escaping.cc +949 -0
  160. data/third_party/abseil-cpp/absl/strings/escaping.h +164 -0
  161. data/third_party/abseil-cpp/absl/strings/internal/char_map.h +156 -0
  162. data/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc +359 -0
  163. data/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h +421 -0
  164. data/third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc +504 -0
  165. data/third_party/abseil-cpp/absl/strings/internal/charconv_parse.h +99 -0
  166. data/third_party/abseil-cpp/absl/strings/internal/escaping.cc +180 -0
  167. data/third_party/abseil-cpp/absl/strings/internal/escaping.h +58 -0
  168. data/third_party/abseil-cpp/absl/strings/internal/memutil.cc +112 -0
  169. data/third_party/abseil-cpp/absl/strings/internal/memutil.h +148 -0
  170. data/third_party/abseil-cpp/absl/strings/internal/ostringstream.cc +36 -0
  171. data/third_party/abseil-cpp/absl/strings/internal/ostringstream.h +89 -0
  172. data/third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h +73 -0
  173. data/third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h +248 -0
  174. data/third_party/abseil-cpp/absl/strings/internal/str_join_internal.h +314 -0
  175. data/third_party/abseil-cpp/absl/strings/internal/str_split_internal.h +455 -0
  176. data/third_party/abseil-cpp/absl/strings/internal/utf8.cc +53 -0
  177. data/third_party/abseil-cpp/absl/strings/internal/utf8.h +50 -0
  178. data/third_party/abseil-cpp/absl/strings/match.cc +40 -0
  179. data/third_party/abseil-cpp/absl/strings/match.h +90 -0
  180. data/third_party/abseil-cpp/absl/strings/numbers.cc +916 -0
  181. data/third_party/abseil-cpp/absl/strings/numbers.h +263 -0
  182. data/third_party/abseil-cpp/absl/strings/str_cat.cc +246 -0
  183. data/third_party/abseil-cpp/absl/strings/str_cat.h +408 -0
  184. data/third_party/abseil-cpp/absl/strings/str_join.h +293 -0
  185. data/third_party/abseil-cpp/absl/strings/str_replace.cc +82 -0
  186. data/third_party/abseil-cpp/absl/strings/str_replace.h +219 -0
  187. data/third_party/abseil-cpp/absl/strings/str_split.cc +139 -0
  188. data/third_party/abseil-cpp/absl/strings/str_split.h +513 -0
  189. data/third_party/abseil-cpp/absl/strings/string_view.cc +235 -0
  190. data/third_party/abseil-cpp/absl/strings/string_view.h +615 -0
  191. data/third_party/abseil-cpp/absl/strings/strip.h +91 -0
  192. data/third_party/abseil-cpp/absl/strings/substitute.cc +171 -0
  193. data/third_party/abseil-cpp/absl/strings/substitute.h +693 -0
  194. data/third_party/abseil-cpp/absl/types/bad_optional_access.cc +48 -0
  195. data/third_party/abseil-cpp/absl/types/bad_optional_access.h +78 -0
  196. data/third_party/abseil-cpp/absl/types/internal/optional.h +396 -0
  197. data/third_party/abseil-cpp/absl/types/internal/span.h +128 -0
  198. data/third_party/abseil-cpp/absl/types/optional.h +776 -0
  199. data/third_party/abseil-cpp/absl/types/span.h +713 -0
  200. data/third_party/abseil-cpp/absl/utility/utility.h +350 -0
  201. data/third_party/upb/upb/decode.c +4 -0
  202. data/third_party/upb/upb/port.c +0 -1
  203. data/third_party/upb/upb/port_def.inc +1 -3
  204. data/third_party/upb/upb/table.c +2 -1
  205. metadata +147 -43
  206. data/src/core/lib/json/json_common.h +0 -34
  207. data/src/core/lib/json/json_reader.h +0 -146
  208. data/src/core/lib/json/json_string.cc +0 -367
  209. data/src/core/lib/json/json_writer.h +0 -84
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e0cf5bd27b63123dacba3a3ab8968927b12fe6b62c74b5773509d1aea0204d9c
4
- data.tar.gz: ecda3b1d08fe9ab5399d7b1aea40c6d701cb321cbd94ec8e55e3217e77f3b911
3
+ metadata.gz: a004003f8e51e315cbdddf21e89a4577f4dd516120eaf9c90c922b13fac86595
4
+ data.tar.gz: 551a605d59295b6dd8074325f8fa25431e96c1e88c990a2ab820ab5c5a0cd651
5
5
  SHA512:
6
- metadata.gz: cb741ad4e816fda58659284c9116ff3f1b00354f61980152a09289407bf6adca12288e28842a0e584ea8b1cbcf2c10e41880b698dbd77cccbd6ec6afd83ec462
7
- data.tar.gz: bbe0293e48ce3c4b7d8496634010ff413921dba9371a4e141888c2710339c8038483d55b54178966738b8fcdc4ac837525bcfe1b276a8736c3f6be077c75d961
6
+ metadata.gz: ae194974d47d46172497c86e1ca6a69abe029606b63aed5b15b2b92109b01aa6177a7359d9b17a0ac7d731d0e9bdeefe735d7dfe0c596f416bd9a1ff3bf86994
7
+ data.tar.gz: f852a15617ad5d721435b73abe1473bbf9a1ee39532a33e9fc004b3fab0d994887922662e4f8bda5263ce0a7b9163bc7a1877658afe9f5e0e87c7530a010ab0a
data/Makefile CHANGED
@@ -363,7 +363,7 @@ CXXFLAGS += -stdlib=libc++
363
363
  LDFLAGS += -framework CoreFoundation
364
364
  endif
365
365
  CFLAGS += -g
366
- CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/upb -Isrc/core/ext/upb-generated
366
+ CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/upb -Isrc/core/ext/upb-generated
367
367
  COREFLAGS += -fno-exceptions
368
368
  LDFLAGS += -g
369
369
 
@@ -470,8 +470,8 @@ Q = @
470
470
  endif
471
471
 
472
472
  CORE_VERSION = 9.0.0
473
- CPP_VERSION = 1.26.0
474
- CSHARP_VERSION = 2.26.0
473
+ CPP_VERSION = 1.27.0-pre1
474
+ CSHARP_VERSION = 2.27.0-pre1
475
475
 
476
476
  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
477
477
  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -643,9 +643,7 @@ endif
643
643
  # Note that for testing purposes, one can do:
644
644
  # make HAS_EMBEDDED_OPENSSL_ALPN=false
645
645
  # to emulate the fact we do not have OpenSSL in the third_party folder.
646
- ifneq ($(wildcard third_party/openssl-1.0.2f/libssl.a),)
647
- HAS_EMBEDDED_OPENSSL_ALPN = third_party/openssl-1.0.2f
648
- else ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),)
646
+ ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),)
649
647
  HAS_EMBEDDED_OPENSSL_ALPN = false
650
648
  else
651
649
  CAN_COMPILE_EMBEDDED_OPENSSL ?= $(shell $(BORINGSSL_COMPILE_CHECK_CMD) 2> /dev/null && echo true || echo false)
@@ -722,6 +720,9 @@ ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS)
722
720
  ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
723
721
  CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS)
724
722
 
723
+ GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
724
+ GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
725
+
725
726
  UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a
726
727
  UPB_MERGE_OBJS = $(LIBUPB_OBJS)
727
728
  UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a
@@ -1094,9 +1095,6 @@ init_test: $(BINDIR)/$(CONFIG)/init_test
1094
1095
  inproc_callback_test: $(BINDIR)/$(CONFIG)/inproc_callback_test
1095
1096
  invalid_call_argument_test: $(BINDIR)/$(CONFIG)/invalid_call_argument_test
1096
1097
  json_fuzzer_test: $(BINDIR)/$(CONFIG)/json_fuzzer_test
1097
- json_rewrite: $(BINDIR)/$(CONFIG)/json_rewrite
1098
- json_rewrite_test: $(BINDIR)/$(CONFIG)/json_rewrite_test
1099
- json_stream_error_test: $(BINDIR)/$(CONFIG)/json_stream_error_test
1100
1098
  json_test: $(BINDIR)/$(CONFIG)/json_test
1101
1099
  lame_client_test: $(BINDIR)/$(CONFIG)/lame_client_test
1102
1100
  load_file_test: $(BINDIR)/$(CONFIG)/load_file_test
@@ -1165,6 +1163,7 @@ alts_iovec_record_protocol_test: $(BINDIR)/$(CONFIG)/alts_iovec_record_protocol_
1165
1163
  alts_security_connector_test: $(BINDIR)/$(CONFIG)/alts_security_connector_test
1166
1164
  alts_tsi_handshaker_test: $(BINDIR)/$(CONFIG)/alts_tsi_handshaker_test
1167
1165
  alts_tsi_utils_test: $(BINDIR)/$(CONFIG)/alts_tsi_utils_test
1166
+ alts_util_test: $(BINDIR)/$(CONFIG)/alts_util_test
1168
1167
  alts_zero_copy_grpc_protector_test: $(BINDIR)/$(CONFIG)/alts_zero_copy_grpc_protector_test
1169
1168
  async_end2end_test: $(BINDIR)/$(CONFIG)/async_end2end_test
1170
1169
  auth_property_iterator_test: $(BINDIR)/$(CONFIG)/auth_property_iterator_test
@@ -1219,6 +1218,7 @@ cxx_time_test: $(BINDIR)/$(CONFIG)/cxx_time_test
1219
1218
  delegating_channel_test: $(BINDIR)/$(CONFIG)/delegating_channel_test
1220
1219
  end2end_test: $(BINDIR)/$(CONFIG)/end2end_test
1221
1220
  error_details_test: $(BINDIR)/$(CONFIG)/error_details_test
1221
+ eventmanager_libuv_test: $(BINDIR)/$(CONFIG)/eventmanager_libuv_test
1222
1222
  exception_test: $(BINDIR)/$(CONFIG)/exception_test
1223
1223
  filter_end2end_test: $(BINDIR)/$(CONFIG)/filter_end2end_test
1224
1224
  gen_hpack_tables: $(BINDIR)/$(CONFIG)/gen_hpack_tables
@@ -1240,7 +1240,7 @@ grpc_objective_c_plugin: $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin
1240
1240
  grpc_php_plugin: $(BINDIR)/$(CONFIG)/grpc_php_plugin
1241
1241
  grpc_python_plugin: $(BINDIR)/$(CONFIG)/grpc_python_plugin
1242
1242
  grpc_ruby_plugin: $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
1243
- grpc_spiffe_security_connector_test: $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test
1243
+ grpc_tls_security_connector_test: $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test
1244
1244
  grpc_tool_test: $(BINDIR)/$(CONFIG)/grpc_tool_test
1245
1245
  grpclb_api_test: $(BINDIR)/$(CONFIG)/grpclb_api_test
1246
1246
  grpclb_end2end_test: $(BINDIR)/$(CONFIG)/grpclb_end2end_test
@@ -1345,10 +1345,10 @@ h2_proxy_test: $(BINDIR)/$(CONFIG)/h2_proxy_test
1345
1345
  h2_sockpair_test: $(BINDIR)/$(CONFIG)/h2_sockpair_test
1346
1346
  h2_sockpair+trace_test: $(BINDIR)/$(CONFIG)/h2_sockpair+trace_test
1347
1347
  h2_sockpair_1byte_test: $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test
1348
- h2_spiffe_test: $(BINDIR)/$(CONFIG)/h2_spiffe_test
1349
1348
  h2_ssl_test: $(BINDIR)/$(CONFIG)/h2_ssl_test
1350
1349
  h2_ssl_cred_reload_test: $(BINDIR)/$(CONFIG)/h2_ssl_cred_reload_test
1351
1350
  h2_ssl_proxy_test: $(BINDIR)/$(CONFIG)/h2_ssl_proxy_test
1351
+ h2_tls_test: $(BINDIR)/$(CONFIG)/h2_tls_test
1352
1352
  h2_uds_test: $(BINDIR)/$(CONFIG)/h2_uds_test
1353
1353
  inproc_test: $(BINDIR)/$(CONFIG)/inproc_test
1354
1354
  h2_census_nosec_test: $(BINDIR)/$(CONFIG)/h2_census_nosec_test
@@ -1413,14 +1413,14 @@ static: static_c static_cxx
1413
1413
 
1414
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
1415
1415
 
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
1416
+ static_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
1417
1417
 
1418
1418
  static_csharp: static_c $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
1419
1419
 
1420
1420
  shared: shared_c shared_cxx
1421
1421
 
1422
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)
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)
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++_alts$(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)
1424
1424
 
1425
1425
  shared_csharp: shared_c $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)
1426
1426
  grpc_csharp_ext: shared_csharp
@@ -1526,9 +1526,6 @@ buildtests_c: privatelibs_c \
1526
1526
  $(BINDIR)/$(CONFIG)/init_test \
1527
1527
  $(BINDIR)/$(CONFIG)/inproc_callback_test \
1528
1528
  $(BINDIR)/$(CONFIG)/invalid_call_argument_test \
1529
- $(BINDIR)/$(CONFIG)/json_rewrite \
1530
- $(BINDIR)/$(CONFIG)/json_rewrite_test \
1531
- $(BINDIR)/$(CONFIG)/json_stream_error_test \
1532
1529
  $(BINDIR)/$(CONFIG)/json_test \
1533
1530
  $(BINDIR)/$(CONFIG)/lame_client_test \
1534
1531
  $(BINDIR)/$(CONFIG)/load_file_test \
@@ -1596,10 +1593,10 @@ buildtests_c: privatelibs_c \
1596
1593
  $(BINDIR)/$(CONFIG)/h2_sockpair_test \
1597
1594
  $(BINDIR)/$(CONFIG)/h2_sockpair+trace_test \
1598
1595
  $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test \
1599
- $(BINDIR)/$(CONFIG)/h2_spiffe_test \
1600
1596
  $(BINDIR)/$(CONFIG)/h2_ssl_test \
1601
1597
  $(BINDIR)/$(CONFIG)/h2_ssl_cred_reload_test \
1602
1598
  $(BINDIR)/$(CONFIG)/h2_ssl_proxy_test \
1599
+ $(BINDIR)/$(CONFIG)/h2_tls_test \
1603
1600
  $(BINDIR)/$(CONFIG)/h2_uds_test \
1604
1601
  $(BINDIR)/$(CONFIG)/inproc_test \
1605
1602
  $(BINDIR)/$(CONFIG)/h2_census_nosec_test \
@@ -1646,6 +1643,7 @@ buildtests_cxx: privatelibs_cxx \
1646
1643
  $(BINDIR)/$(CONFIG)/alts_security_connector_test \
1647
1644
  $(BINDIR)/$(CONFIG)/alts_tsi_handshaker_test \
1648
1645
  $(BINDIR)/$(CONFIG)/alts_tsi_utils_test \
1646
+ $(BINDIR)/$(CONFIG)/alts_util_test \
1649
1647
  $(BINDIR)/$(CONFIG)/alts_zero_copy_grpc_protector_test \
1650
1648
  $(BINDIR)/$(CONFIG)/async_end2end_test \
1651
1649
  $(BINDIR)/$(CONFIG)/auth_property_iterator_test \
@@ -1700,6 +1698,7 @@ buildtests_cxx: privatelibs_cxx \
1700
1698
  $(BINDIR)/$(CONFIG)/delegating_channel_test \
1701
1699
  $(BINDIR)/$(CONFIG)/end2end_test \
1702
1700
  $(BINDIR)/$(CONFIG)/error_details_test \
1701
+ $(BINDIR)/$(CONFIG)/eventmanager_libuv_test \
1703
1702
  $(BINDIR)/$(CONFIG)/exception_test \
1704
1703
  $(BINDIR)/$(CONFIG)/filter_end2end_test \
1705
1704
  $(BINDIR)/$(CONFIG)/generic_end2end_test \
@@ -1711,7 +1710,7 @@ buildtests_cxx: privatelibs_cxx \
1711
1710
  $(BINDIR)/$(CONFIG)/grpc_cli \
1712
1711
  $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2 \
1713
1712
  $(BINDIR)/$(CONFIG)/grpc_linux_system_roots_test \
1714
- $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test \
1713
+ $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test \
1715
1714
  $(BINDIR)/$(CONFIG)/grpc_tool_test \
1716
1715
  $(BINDIR)/$(CONFIG)/grpclb_api_test \
1717
1716
  $(BINDIR)/$(CONFIG)/grpclb_end2end_test \
@@ -1819,6 +1818,7 @@ buildtests_cxx: privatelibs_cxx \
1819
1818
  $(BINDIR)/$(CONFIG)/alts_security_connector_test \
1820
1819
  $(BINDIR)/$(CONFIG)/alts_tsi_handshaker_test \
1821
1820
  $(BINDIR)/$(CONFIG)/alts_tsi_utils_test \
1821
+ $(BINDIR)/$(CONFIG)/alts_util_test \
1822
1822
  $(BINDIR)/$(CONFIG)/alts_zero_copy_grpc_protector_test \
1823
1823
  $(BINDIR)/$(CONFIG)/async_end2end_test \
1824
1824
  $(BINDIR)/$(CONFIG)/auth_property_iterator_test \
@@ -1873,6 +1873,7 @@ buildtests_cxx: privatelibs_cxx \
1873
1873
  $(BINDIR)/$(CONFIG)/delegating_channel_test \
1874
1874
  $(BINDIR)/$(CONFIG)/end2end_test \
1875
1875
  $(BINDIR)/$(CONFIG)/error_details_test \
1876
+ $(BINDIR)/$(CONFIG)/eventmanager_libuv_test \
1876
1877
  $(BINDIR)/$(CONFIG)/exception_test \
1877
1878
  $(BINDIR)/$(CONFIG)/filter_end2end_test \
1878
1879
  $(BINDIR)/$(CONFIG)/generic_end2end_test \
@@ -1884,7 +1885,7 @@ buildtests_cxx: privatelibs_cxx \
1884
1885
  $(BINDIR)/$(CONFIG)/grpc_cli \
1885
1886
  $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2 \
1886
1887
  $(BINDIR)/$(CONFIG)/grpc_linux_system_roots_test \
1887
- $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test \
1888
+ $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test \
1888
1889
  $(BINDIR)/$(CONFIG)/grpc_tool_test \
1889
1890
  $(BINDIR)/$(CONFIG)/grpclb_api_test \
1890
1891
  $(BINDIR)/$(CONFIG)/grpclb_end2end_test \
@@ -2135,10 +2136,6 @@ test_c: buildtests_c
2135
2136
  $(Q) $(BINDIR)/$(CONFIG)/inproc_callback_test || ( echo test inproc_callback_test failed ; exit 1 )
2136
2137
  $(E) "[RUN] Testing invalid_call_argument_test"
2137
2138
  $(Q) $(BINDIR)/$(CONFIG)/invalid_call_argument_test || ( echo test invalid_call_argument_test failed ; exit 1 )
2138
- $(E) "[RUN] Testing json_rewrite_test"
2139
- $(Q) $(BINDIR)/$(CONFIG)/json_rewrite_test || ( echo test json_rewrite_test failed ; exit 1 )
2140
- $(E) "[RUN] Testing json_stream_error_test"
2141
- $(Q) $(BINDIR)/$(CONFIG)/json_stream_error_test || ( echo test json_stream_error_test failed ; exit 1 )
2142
2139
  $(E) "[RUN] Testing json_test"
2143
2140
  $(Q) $(BINDIR)/$(CONFIG)/json_test || ( echo test json_test failed ; exit 1 )
2144
2141
  $(E) "[RUN] Testing lame_client_test"
@@ -2269,6 +2266,8 @@ test_cxx: buildtests_cxx
2269
2266
  $(Q) $(BINDIR)/$(CONFIG)/alts_tsi_handshaker_test || ( echo test alts_tsi_handshaker_test failed ; exit 1 )
2270
2267
  $(E) "[RUN] Testing alts_tsi_utils_test"
2271
2268
  $(Q) $(BINDIR)/$(CONFIG)/alts_tsi_utils_test || ( echo test alts_tsi_utils_test failed ; exit 1 )
2269
+ $(E) "[RUN] Testing alts_util_test"
2270
+ $(Q) $(BINDIR)/$(CONFIG)/alts_util_test || ( echo test alts_util_test failed ; exit 1 )
2272
2271
  $(E) "[RUN] Testing alts_zero_copy_grpc_protector_test"
2273
2272
  $(Q) $(BINDIR)/$(CONFIG)/alts_zero_copy_grpc_protector_test || ( echo test alts_zero_copy_grpc_protector_test failed ; exit 1 )
2274
2273
  $(E) "[RUN] Testing async_end2end_test"
@@ -2375,6 +2374,8 @@ test_cxx: buildtests_cxx
2375
2374
  $(Q) $(BINDIR)/$(CONFIG)/end2end_test || ( echo test end2end_test failed ; exit 1 )
2376
2375
  $(E) "[RUN] Testing error_details_test"
2377
2376
  $(Q) $(BINDIR)/$(CONFIG)/error_details_test || ( echo test error_details_test failed ; exit 1 )
2377
+ $(E) "[RUN] Testing eventmanager_libuv_test"
2378
+ $(Q) $(BINDIR)/$(CONFIG)/eventmanager_libuv_test || ( echo test eventmanager_libuv_test failed ; exit 1 )
2378
2379
  $(E) "[RUN] Testing exception_test"
2379
2380
  $(Q) $(BINDIR)/$(CONFIG)/exception_test || ( echo test exception_test failed ; exit 1 )
2380
2381
  $(E) "[RUN] Testing filter_end2end_test"
@@ -2393,8 +2394,8 @@ test_cxx: buildtests_cxx
2393
2394
  $(Q) $(BINDIR)/$(CONFIG)/grpc_alts_credentials_options_test || ( echo test grpc_alts_credentials_options_test failed ; exit 1 )
2394
2395
  $(E) "[RUN] Testing grpc_linux_system_roots_test"
2395
2396
  $(Q) $(BINDIR)/$(CONFIG)/grpc_linux_system_roots_test || ( echo test grpc_linux_system_roots_test failed ; exit 1 )
2396
- $(E) "[RUN] Testing grpc_spiffe_security_connector_test"
2397
- $(Q) $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test || ( echo test grpc_spiffe_security_connector_test failed ; exit 1 )
2397
+ $(E) "[RUN] Testing grpc_tls_security_connector_test"
2398
+ $(Q) $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test || ( echo test grpc_tls_security_connector_test failed ; exit 1 )
2398
2399
  $(E) "[RUN] Testing grpc_tool_test"
2399
2400
  $(Q) $(BINDIR)/$(CONFIG)/grpc_tool_test || ( echo test grpc_tool_test failed ; exit 1 )
2400
2401
  $(E) "[RUN] Testing grpclb_api_test"
@@ -2595,6 +2596,8 @@ strip-static_cxx: static_cxx
2595
2596
  ifeq ($(CONFIG),opt)
2596
2597
  $(E) "[STRIP] Stripping libgrpc++.a"
2597
2598
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++.a
2599
+ $(E) "[STRIP] Stripping libgrpc++_alts.a"
2600
+ $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a
2598
2601
  $(E) "[STRIP] Stripping libgrpc++_error_details.a"
2599
2602
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
2600
2603
  $(E) "[STRIP] Stripping libgrpc++_reflection.a"
@@ -2625,6 +2628,8 @@ strip-shared_cxx: shared_cxx
2625
2628
  ifeq ($(CONFIG),opt)
2626
2629
  $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
2627
2630
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
2631
+ $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
2632
+ $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
2628
2633
  $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
2629
2634
  $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
2630
2635
  $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3024,6 +3029,22 @@ $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.grpc.pb.cc: src/proto/grpc/tes
3024
3029
  $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
3025
3030
  endif
3026
3031
 
3032
+ ifeq ($(NO_PROTOC),true)
3033
+ $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc: protoc_dep_error
3034
+ $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.grpc.pb.cc: protoc_dep_error
3035
+ else
3036
+
3037
+ $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc: src/proto/grpc/testing/xds/cds_for_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3038
+ $(E) "[PROTOC] Generating protobuf CC file from $<"
3039
+ $(Q) mkdir -p `dirname $@`
3040
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
3041
+
3042
+ $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.grpc.pb.cc: src/proto/grpc/testing/xds/cds_for_test.proto $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
3043
+ $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
3044
+ $(Q) mkdir -p `dirname $@`
3045
+ $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
3046
+ endif
3047
+
3027
3048
  ifeq ($(NO_PROTOC),true)
3028
3049
  $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.pb.cc: protoc_dep_error
3029
3050
  $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.grpc.pb.cc: protoc_dep_error
@@ -3200,6 +3221,9 @@ install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx
3200
3221
  $(E) "[INSTALL] Installing libgrpc++.a"
3201
3222
  $(Q) $(INSTALL) -d $(prefix)/lib
3202
3223
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(prefix)/lib/libgrpc++.a
3224
+ $(E) "[INSTALL] Installing libgrpc++_alts.a"
3225
+ $(Q) $(INSTALL) -d $(prefix)/lib
3226
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a $(prefix)/lib/libgrpc++_alts.a
3203
3227
  $(E) "[INSTALL] Installing libgrpc++_error_details.a"
3204
3228
  $(Q) $(INSTALL) -d $(prefix)/lib
3205
3229
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(prefix)/lib/libgrpc++_error_details.a
@@ -3286,6 +3310,15 @@ ifeq ($(SYSTEM),MINGW32)
3286
3310
  else ifneq ($(SYSTEM),Darwin)
3287
3311
  $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.1
3288
3312
  $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so
3313
+ endif
3314
+ $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
3315
+ $(Q) $(INSTALL) -d $(prefix)/lib
3316
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
3317
+ ifeq ($(SYSTEM),MINGW32)
3318
+ $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_alts.a
3319
+ else ifneq ($(SYSTEM),Darwin)
3320
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_alts.so.1
3321
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_alts.so
3289
3322
  endif
3290
3323
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
3291
3324
  $(Q) $(INSTALL) -d $(prefix)/lib
@@ -3417,18 +3450,18 @@ endif
3417
3450
 
3418
3451
 
3419
3452
  ifeq ($(SYSTEM),MINGW32)
3420
- $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3453
+ $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)
3421
3454
  $(E) "[LD] Linking $@"
3422
3455
  $(Q) mkdir -p `dirname $@`
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)
3456
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3424
3457
  else
3425
- $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3458
+ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)
3426
3459
  $(E) "[LD] Linking $@"
3427
3460
  $(Q) mkdir -p `dirname $@`
3428
3461
  ifeq ($(SYSTEM),Darwin)
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)
3462
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3430
3463
  else
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)
3464
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3432
3465
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.9
3433
3466
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
3434
3467
  endif
@@ -3442,157 +3475,31 @@ endif
3442
3475
  LIBALTS_TEST_UTIL_SRC = \
3443
3476
  test/core/tsi/alts/crypt/gsec_test_util.cc \
3444
3477
  test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc \
3445
-
3446
- PUBLIC_HEADERS_C += \
3447
-
3448
- LIBALTS_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBALTS_TEST_UTIL_SRC))))
3449
-
3450
-
3451
- ifeq ($(NO_SECURE),true)
3452
-
3453
- # You can't build secure libraries if you don't have OpenSSL.
3454
-
3455
- $(LIBDIR)/$(CONFIG)/libalts_test_util.a: openssl_dep_error
3456
-
3457
-
3458
- else
3459
-
3460
-
3461
- $(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBALTS_TEST_UTIL_OBJS)
3462
- $(E) "[AR] Creating $@"
3463
- $(Q) mkdir -p `dirname $@`
3464
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libalts_test_util.a
3465
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBALTS_TEST_UTIL_OBJS)
3466
- ifeq ($(SYSTEM),Darwin)
3467
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libalts_test_util.a
3468
- endif
3469
-
3470
-
3471
-
3472
-
3473
- endif
3474
-
3475
- ifneq ($(NO_SECURE),true)
3476
- ifneq ($(NO_DEPS),true)
3477
- -include $(LIBALTS_TEST_UTIL_OBJS:.o=.dep)
3478
- endif
3479
- endif
3480
-
3481
-
3482
- LIBGPR_SRC = \
3483
- src/core/lib/gpr/alloc.cc \
3484
- src/core/lib/gpr/atm.cc \
3485
- src/core/lib/gpr/cpu_iphone.cc \
3486
- src/core/lib/gpr/cpu_linux.cc \
3487
- src/core/lib/gpr/cpu_posix.cc \
3488
- src/core/lib/gpr/cpu_windows.cc \
3489
- src/core/lib/gpr/env_linux.cc \
3490
- src/core/lib/gpr/env_posix.cc \
3491
- src/core/lib/gpr/env_windows.cc \
3492
- src/core/lib/gpr/log.cc \
3493
- src/core/lib/gpr/log_android.cc \
3494
- src/core/lib/gpr/log_linux.cc \
3495
- src/core/lib/gpr/log_posix.cc \
3496
- src/core/lib/gpr/log_windows.cc \
3497
- src/core/lib/gpr/murmur_hash.cc \
3498
- src/core/lib/gpr/string.cc \
3499
- src/core/lib/gpr/string_posix.cc \
3500
- src/core/lib/gpr/string_util_windows.cc \
3501
- src/core/lib/gpr/string_windows.cc \
3502
- src/core/lib/gpr/sync.cc \
3503
- src/core/lib/gpr/sync_posix.cc \
3504
- src/core/lib/gpr/sync_windows.cc \
3505
- src/core/lib/gpr/time.cc \
3506
- src/core/lib/gpr/time_posix.cc \
3507
- src/core/lib/gpr/time_precise.cc \
3508
- src/core/lib/gpr/time_windows.cc \
3509
- src/core/lib/gpr/tls_pthread.cc \
3510
- src/core/lib/gpr/tmpfile_msys.cc \
3511
- src/core/lib/gpr/tmpfile_posix.cc \
3512
- src/core/lib/gpr/tmpfile_windows.cc \
3513
- src/core/lib/gpr/wrap_memcpy.cc \
3514
- src/core/lib/gprpp/arena.cc \
3515
- src/core/lib/gprpp/fork.cc \
3516
- src/core/lib/gprpp/global_config_env.cc \
3517
- src/core/lib/gprpp/host_port.cc \
3518
- src/core/lib/gprpp/mpscq.cc \
3519
- src/core/lib/gprpp/thd_posix.cc \
3520
- src/core/lib/gprpp/thd_windows.cc \
3521
- src/core/lib/profiling/basic_timers.cc \
3522
- src/core/lib/profiling/stap_timers.cc \
3523
-
3524
- PUBLIC_HEADERS_C += \
3525
- include/grpc/support/alloc.h \
3526
- include/grpc/support/atm.h \
3527
- include/grpc/support/atm_gcc_atomic.h \
3528
- include/grpc/support/atm_gcc_sync.h \
3529
- include/grpc/support/atm_windows.h \
3530
- include/grpc/support/cpu.h \
3531
- include/grpc/support/log.h \
3532
- include/grpc/support/log_windows.h \
3533
- include/grpc/support/port_platform.h \
3534
- include/grpc/support/string_util.h \
3535
- include/grpc/support/sync.h \
3536
- include/grpc/support/sync_custom.h \
3537
- include/grpc/support/sync_generic.h \
3538
- include/grpc/support/sync_posix.h \
3539
- include/grpc/support/sync_windows.h \
3540
- include/grpc/support/thd_id.h \
3541
- include/grpc/support/time.h \
3542
- include/grpc/impl/codegen/atm.h \
3543
- include/grpc/impl/codegen/atm_gcc_atomic.h \
3544
- include/grpc/impl/codegen/atm_gcc_sync.h \
3545
- include/grpc/impl/codegen/atm_windows.h \
3546
- include/grpc/impl/codegen/fork.h \
3547
- include/grpc/impl/codegen/gpr_slice.h \
3548
- include/grpc/impl/codegen/gpr_types.h \
3549
- include/grpc/impl/codegen/log.h \
3550
- include/grpc/impl/codegen/port_platform.h \
3551
- include/grpc/impl/codegen/sync.h \
3552
- include/grpc/impl/codegen/sync_custom.h \
3553
- include/grpc/impl/codegen/sync_generic.h \
3554
- include/grpc/impl/codegen/sync_posix.h \
3555
- include/grpc/impl/codegen/sync_windows.h \
3556
-
3557
- LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
3558
-
3559
-
3560
- $(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGPR_OBJS)
3561
- $(E) "[AR] Creating $@"
3562
- $(Q) mkdir -p `dirname $@`
3563
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a
3564
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS)
3565
- ifeq ($(SYSTEM),Darwin)
3566
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgpr.a
3567
- endif
3568
-
3569
-
3570
-
3571
- ifeq ($(SYSTEM),MINGW32)
3572
- $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3573
- $(E) "[LD] Linking $@"
3574
- $(Q) mkdir -p `dirname $@`
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)
3576
- else
3577
- $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)
3578
- $(E) "[LD] Linking $@"
3579
- $(Q) mkdir -p `dirname $@`
3580
- ifeq ($(SYSTEM),Darwin)
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)
3582
- else
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
3585
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
3586
- endif
3587
- endif
3588
-
3589
- ifneq ($(NO_DEPS),true)
3590
- -include $(LIBGPR_OBJS:.o=.dep)
3591
- endif
3592
-
3593
-
3594
- LIBGRPC_SRC = \
3595
- src/core/lib/surface/init.cc \
3478
+ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
3479
+ test/core/end2end/cq_verifier.cc \
3480
+ test/core/end2end/fixtures/http_proxy_fixture.cc \
3481
+ test/core/end2end/fixtures/local_util.cc \
3482
+ test/core/end2end/fixtures/proxy.cc \
3483
+ test/core/iomgr/endpoint_tests.cc \
3484
+ test/core/util/debugger_macros.cc \
3485
+ test/core/util/fuzzer_util.cc \
3486
+ test/core/util/grpc_profiler.cc \
3487
+ test/core/util/histogram.cc \
3488
+ test/core/util/memory_counters.cc \
3489
+ test/core/util/mock_endpoint.cc \
3490
+ test/core/util/parse_hexstring.cc \
3491
+ test/core/util/passthru_endpoint.cc \
3492
+ test/core/util/port.cc \
3493
+ test/core/util/port_isolated_runtime_environment.cc \
3494
+ test/core/util/port_server_client.cc \
3495
+ test/core/util/slice_splitter.cc \
3496
+ test/core/util/subprocess_posix.cc \
3497
+ test/core/util/subprocess_windows.cc \
3498
+ test/core/util/test_config.cc \
3499
+ test/core/util/test_lb_policies.cc \
3500
+ test/core/util/tracer_util.cc \
3501
+ test/core/util/trickle_endpoint.cc \
3502
+ test/core/util/cmdline.cc \
3596
3503
  src/core/lib/avl/avl.cc \
3597
3504
  src/core/lib/backoff/backoff.cc \
3598
3505
  src/core/lib/channel/channel_args.cc \
@@ -3657,6 +3564,7 @@ LIBGRPC_SRC = \
3657
3564
  src/core/lib/iomgr/load_file.cc \
3658
3565
  src/core/lib/iomgr/lockfree_event.cc \
3659
3566
  src/core/lib/iomgr/logical_thread.cc \
3567
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
3660
3568
  src/core/lib/iomgr/polling_entity.cc \
3661
3569
  src/core/lib/iomgr/pollset.cc \
3662
3570
  src/core/lib/iomgr/pollset_custom.cc \
@@ -3711,7 +3619,6 @@ LIBGRPC_SRC = \
3711
3619
  src/core/lib/iomgr/wakeup_fd_posix.cc \
3712
3620
  src/core/lib/json/json.cc \
3713
3621
  src/core/lib/json/json_reader.cc \
3714
- src/core/lib/json/json_string.cc \
3715
3622
  src/core/lib/json/json_writer.cc \
3716
3623
  src/core/lib/slice/b64.cc \
3717
3624
  src/core/lib/slice/percent_encoding.cc \
@@ -3752,7 +3659,46 @@ LIBGRPC_SRC = \
3752
3659
  src/core/lib/transport/transport_op_string.cc \
3753
3660
  src/core/lib/uri/uri_parser.cc \
3754
3661
  src/core/lib/debug/trace.cc \
3755
- src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc \
3662
+ src/core/ext/filters/client_channel/backend_metric.cc \
3663
+ src/core/ext/filters/client_channel/backup_poller.cc \
3664
+ src/core/ext/filters/client_channel/channel_connectivity.cc \
3665
+ src/core/ext/filters/client_channel/client_channel.cc \
3666
+ src/core/ext/filters/client_channel/client_channel_channelz.cc \
3667
+ src/core/ext/filters/client_channel/client_channel_factory.cc \
3668
+ src/core/ext/filters/client_channel/client_channel_plugin.cc \
3669
+ src/core/ext/filters/client_channel/global_subchannel_pool.cc \
3670
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
3671
+ src/core/ext/filters/client_channel/http_connect_handshaker.cc \
3672
+ src/core/ext/filters/client_channel/http_proxy.cc \
3673
+ src/core/ext/filters/client_channel/lb_policy.cc \
3674
+ src/core/ext/filters/client_channel/lb_policy_registry.cc \
3675
+ src/core/ext/filters/client_channel/local_subchannel_pool.cc \
3676
+ src/core/ext/filters/client_channel/parse_address.cc \
3677
+ src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
3678
+ src/core/ext/filters/client_channel/resolver.cc \
3679
+ src/core/ext/filters/client_channel/resolver_registry.cc \
3680
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
3681
+ src/core/ext/filters/client_channel/resolving_lb_policy.cc \
3682
+ src/core/ext/filters/client_channel/retry_throttle.cc \
3683
+ src/core/ext/filters/client_channel/server_address.cc \
3684
+ src/core/ext/filters/client_channel/service_config.cc \
3685
+ src/core/ext/filters/client_channel/subchannel.cc \
3686
+ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
3687
+ src/core/ext/filters/deadline/deadline_filter.cc \
3688
+ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
3689
+ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
3690
+ src/core/ext/upb-generated/gogoproto/gogo.upb.c \
3691
+ src/core/ext/upb-generated/validate/validate.upb.c \
3692
+ src/core/ext/upb-generated/google/api/annotations.upb.c \
3693
+ src/core/ext/upb-generated/google/api/http.upb.c \
3694
+ src/core/ext/upb-generated/google/protobuf/any.upb.c \
3695
+ src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
3696
+ src/core/ext/upb-generated/google/protobuf/duration.upb.c \
3697
+ src/core/ext/upb-generated/google/protobuf/empty.upb.c \
3698
+ src/core/ext/upb-generated/google/protobuf/struct.upb.c \
3699
+ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
3700
+ src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
3701
+ src/core/ext/upb-generated/google/rpc/status.upb.c \
3756
3702
  src/core/ext/transport/chttp2/transport/bin_decoder.cc \
3757
3703
  src/core/ext/transport/chttp2/transport/bin_encoder.cc \
3758
3704
  src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
@@ -3781,199 +3727,25 @@ LIBGRPC_SRC = \
3781
3727
  src/core/ext/filters/http/http_filters_plugin.cc \
3782
3728
  src/core/ext/filters/http/message_compress/message_compress_filter.cc \
3783
3729
  src/core/ext/filters/http/server/http_server_filter.cc \
3784
- src/core/lib/http/httpcli_security_connector.cc \
3785
- src/core/lib/security/context/security_context.cc \
3786
- src/core/lib/security/credentials/alts/alts_credentials.cc \
3787
- src/core/lib/security/credentials/composite/composite_credentials.cc \
3788
- src/core/lib/security/credentials/credentials.cc \
3789
- src/core/lib/security/credentials/credentials_metadata.cc \
3790
- src/core/lib/security/credentials/fake/fake_credentials.cc \
3791
- src/core/lib/security/credentials/google_default/credentials_generic.cc \
3792
- src/core/lib/security/credentials/google_default/google_default_credentials.cc \
3793
- src/core/lib/security/credentials/iam/iam_credentials.cc \
3794
- src/core/lib/security/credentials/jwt/json_token.cc \
3795
- src/core/lib/security/credentials/jwt/jwt_credentials.cc \
3796
- src/core/lib/security/credentials/jwt/jwt_verifier.cc \
3797
- src/core/lib/security/credentials/local/local_credentials.cc \
3798
- src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
3799
- src/core/lib/security/credentials/plugin/plugin_credentials.cc \
3800
- src/core/lib/security/credentials/ssl/ssl_credentials.cc \
3801
- src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
3802
- src/core/lib/security/credentials/tls/spiffe_credentials.cc \
3803
- src/core/lib/security/security_connector/alts/alts_security_connector.cc \
3804
- src/core/lib/security/security_connector/fake/fake_security_connector.cc \
3805
- src/core/lib/security/security_connector/load_system_roots_fallback.cc \
3806
- src/core/lib/security/security_connector/load_system_roots_linux.cc \
3807
- src/core/lib/security/security_connector/local/local_security_connector.cc \
3808
- src/core/lib/security/security_connector/security_connector.cc \
3809
- src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
3810
- src/core/lib/security/security_connector/ssl_utils.cc \
3811
- src/core/lib/security/security_connector/ssl_utils_config.cc \
3812
- src/core/lib/security/security_connector/tls/spiffe_security_connector.cc \
3813
- src/core/lib/security/transport/client_auth_filter.cc \
3814
- src/core/lib/security/transport/secure_endpoint.cc \
3815
- src/core/lib/security/transport/security_handshaker.cc \
3816
- src/core/lib/security/transport/server_auth_filter.cc \
3817
- src/core/lib/security/transport/target_authority_table.cc \
3818
- src/core/lib/security/transport/tsi_error.cc \
3819
- src/core/lib/security/util/json_util.cc \
3820
- src/core/lib/surface/init_secure.cc \
3821
- src/core/tsi/alts/crypt/aes_gcm.cc \
3822
- src/core/tsi/alts/crypt/gsec.cc \
3823
- src/core/tsi/alts/frame_protector/alts_counter.cc \
3824
- src/core/tsi/alts/frame_protector/alts_crypter.cc \
3825
- src/core/tsi/alts/frame_protector/alts_frame_protector.cc \
3826
- src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc \
3827
- src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc \
3828
- src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
3829
- src/core/tsi/alts/frame_protector/frame_handler.cc \
3830
- src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
3831
- src/core/tsi/alts/handshaker/alts_shared_resource.cc \
3832
- src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
3833
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
3834
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
3835
- src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc \
3836
- src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc \
3837
- src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc \
3838
- src/core/lib/security/credentials/alts/check_gcp_environment.cc \
3839
- src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc \
3840
- src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc \
3841
- src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc \
3842
- src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc \
3843
- src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc \
3844
- src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc \
3845
- src/core/tsi/alts/handshaker/alts_tsi_utils.cc \
3846
- src/core/tsi/alts/handshaker/transport_security_common_api.cc \
3847
- src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
3848
- src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
3849
- src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
3850
- src/core/tsi/transport_security.cc \
3851
- src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
3852
- src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
3853
- src/core/ext/transport/chttp2/client/authority.cc \
3854
- src/core/ext/transport/chttp2/client/chttp2_connector.cc \
3855
- src/core/ext/filters/client_channel/backend_metric.cc \
3856
- src/core/ext/filters/client_channel/backup_poller.cc \
3857
- src/core/ext/filters/client_channel/channel_connectivity.cc \
3858
- src/core/ext/filters/client_channel/client_channel.cc \
3859
- src/core/ext/filters/client_channel/client_channel_channelz.cc \
3860
- src/core/ext/filters/client_channel/client_channel_factory.cc \
3861
- src/core/ext/filters/client_channel/client_channel_plugin.cc \
3862
- src/core/ext/filters/client_channel/global_subchannel_pool.cc \
3863
- src/core/ext/filters/client_channel/health/health_check_client.cc \
3864
- src/core/ext/filters/client_channel/http_connect_handshaker.cc \
3865
- src/core/ext/filters/client_channel/http_proxy.cc \
3866
- src/core/ext/filters/client_channel/lb_policy.cc \
3867
- src/core/ext/filters/client_channel/lb_policy_registry.cc \
3868
- src/core/ext/filters/client_channel/local_subchannel_pool.cc \
3869
- src/core/ext/filters/client_channel/parse_address.cc \
3870
- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
3871
- src/core/ext/filters/client_channel/resolver.cc \
3872
- src/core/ext/filters/client_channel/resolver_registry.cc \
3873
- src/core/ext/filters/client_channel/resolver_result_parsing.cc \
3874
- src/core/ext/filters/client_channel/resolving_lb_policy.cc \
3875
- src/core/ext/filters/client_channel/retry_throttle.cc \
3876
- src/core/ext/filters/client_channel/server_address.cc \
3877
- src/core/ext/filters/client_channel/service_config.cc \
3878
- src/core/ext/filters/client_channel/subchannel.cc \
3879
- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
3880
- src/core/ext/filters/deadline/deadline_filter.cc \
3881
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
3882
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
3883
- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
3884
- src/core/ext/upb-generated/validate/validate.upb.c \
3885
- src/core/ext/upb-generated/google/api/annotations.upb.c \
3886
- src/core/ext/upb-generated/google/api/http.upb.c \
3887
- src/core/ext/upb-generated/google/protobuf/any.upb.c \
3888
- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
3889
- src/core/ext/upb-generated/google/protobuf/duration.upb.c \
3890
- src/core/ext/upb-generated/google/protobuf/empty.upb.c \
3891
- src/core/ext/upb-generated/google/protobuf/struct.upb.c \
3892
- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
3893
- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
3894
- src/core/ext/upb-generated/google/rpc/status.upb.c \
3895
- src/core/tsi/fake_transport_security.cc \
3896
- src/core/tsi/local_transport_security.cc \
3897
- src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
3898
- src/core/tsi/ssl/session_cache/ssl_session_cache.cc \
3899
- src/core/tsi/ssl/session_cache/ssl_session_openssl.cc \
3900
- src/core/tsi/ssl_transport_security.cc \
3901
- src/core/tsi/transport_security_grpc.cc \
3902
- src/core/ext/transport/chttp2/server/chttp2_server.cc \
3903
- src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
3904
- src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
3905
- src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
3906
- src/core/ext/transport/inproc/inproc_plugin.cc \
3907
- src/core/ext/transport/inproc/inproc_transport.cc \
3908
- src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
3909
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
3910
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
3911
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
3912
- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
3913
- src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
3914
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
3915
- src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
3916
- src/core/ext/filters/client_channel/xds/xds_api.cc \
3917
- src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
3918
- src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
3919
- src/core/ext/filters/client_channel/xds/xds_client.cc \
3920
- src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
3921
- src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c \
3922
- src/core/ext/upb-generated/envoy/api/v2/cds.upb.c \
3923
- src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c \
3924
- src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c \
3925
- src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c \
3926
- src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c \
3927
- src/core/ext/upb-generated/envoy/api/v2/eds.upb.c \
3928
- src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c \
3929
- src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c \
3930
- src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c \
3931
- src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c \
3932
- src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c \
3933
- src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c \
3934
- src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c \
3935
- src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c \
3936
- src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
3937
- src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
3938
- src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
3939
- src/core/ext/upb-generated/envoy/type/http.upb.c \
3940
- src/core/ext/upb-generated/envoy/type/percent.upb.c \
3941
- src/core/ext/upb-generated/envoy/type/range.upb.c \
3942
- src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
3943
- src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
3944
- src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
3945
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
3946
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
3947
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc \
3948
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
3949
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
3950
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
3951
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
3952
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc \
3953
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
3954
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
3955
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc \
3956
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
3957
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
3958
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
3959
- src/core/ext/filters/census/grpc_context.cc \
3960
- src/core/ext/filters/client_idle/client_idle_filter.cc \
3961
- src/core/ext/filters/max_age/max_age_filter.cc \
3962
- src/core/ext/filters/message_size/message_size_filter.cc \
3963
- src/core/ext/filters/http/client_authority_filter.cc \
3964
- src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
3965
- src/core/ext/filters/workarounds/workaround_utils.cc \
3966
- src/core/plugin_registry/grpc_plugin_registry.cc \
3967
3730
 
3968
3731
  PUBLIC_HEADERS_C += \
3969
- include/grpc/impl/codegen/byte_buffer.h \
3970
- include/grpc/impl/codegen/byte_buffer_reader.h \
3971
- include/grpc/impl/codegen/compression_types.h \
3972
- include/grpc/impl/codegen/connectivity_state.h \
3973
- include/grpc/impl/codegen/grpc_types.h \
3974
- include/grpc/impl/codegen/propagation_bits.h \
3975
- include/grpc/impl/codegen/slice.h \
3976
- include/grpc/impl/codegen/status.h \
3732
+ include/grpc/support/alloc.h \
3733
+ include/grpc/support/atm.h \
3734
+ include/grpc/support/atm_gcc_atomic.h \
3735
+ include/grpc/support/atm_gcc_sync.h \
3736
+ include/grpc/support/atm_windows.h \
3737
+ include/grpc/support/cpu.h \
3738
+ include/grpc/support/log.h \
3739
+ include/grpc/support/log_windows.h \
3740
+ include/grpc/support/port_platform.h \
3741
+ include/grpc/support/string_util.h \
3742
+ include/grpc/support/sync.h \
3743
+ include/grpc/support/sync_custom.h \
3744
+ include/grpc/support/sync_generic.h \
3745
+ include/grpc/support/sync_posix.h \
3746
+ include/grpc/support/sync_windows.h \
3747
+ include/grpc/support/thd_id.h \
3748
+ include/grpc/support/time.h \
3977
3749
  include/grpc/impl/codegen/atm.h \
3978
3750
  include/grpc/impl/codegen/atm_gcc_atomic.h \
3979
3751
  include/grpc/impl/codegen/atm_gcc_sync.h \
@@ -3988,83 +3760,209 @@ PUBLIC_HEADERS_C += \
3988
3760
  include/grpc/impl/codegen/sync_generic.h \
3989
3761
  include/grpc/impl/codegen/sync_posix.h \
3990
3762
  include/grpc/impl/codegen/sync_windows.h \
3991
- include/grpc/grpc_security.h \
3992
- include/grpc/byte_buffer.h \
3993
- include/grpc/byte_buffer_reader.h \
3994
- include/grpc/compression.h \
3995
- include/grpc/fork.h \
3996
- include/grpc/grpc.h \
3997
- include/grpc/grpc_posix.h \
3998
- include/grpc/grpc_security_constants.h \
3999
- include/grpc/load_reporting.h \
4000
- include/grpc/slice.h \
4001
- include/grpc/slice_buffer.h \
4002
- include/grpc/status.h \
4003
- include/grpc/support/workaround_list.h \
4004
- include/grpc/census.h \
3763
+ include/grpc/impl/codegen/byte_buffer.h \
3764
+ include/grpc/impl/codegen/byte_buffer_reader.h \
3765
+ include/grpc/impl/codegen/compression_types.h \
3766
+ include/grpc/impl/codegen/connectivity_state.h \
3767
+ include/grpc/impl/codegen/grpc_types.h \
3768
+ include/grpc/impl/codegen/propagation_bits.h \
3769
+ include/grpc/impl/codegen/slice.h \
3770
+ include/grpc/impl/codegen/status.h \
4005
3771
 
4006
- LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
3772
+ LIBALTS_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBALTS_TEST_UTIL_SRC))))
4007
3773
 
4008
3774
 
4009
3775
  ifeq ($(NO_SECURE),true)
4010
3776
 
4011
3777
  # You can't build secure libraries if you don't have OpenSSL.
4012
3778
 
4013
- $(LIBDIR)/$(CONFIG)/libgrpc.a: openssl_dep_error
3779
+ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: openssl_dep_error
4014
3780
 
4015
- $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
4016
3781
 
4017
3782
  else
4018
3783
 
4019
3784
 
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)
3785
+ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBALTS_TEST_UTIL_OBJS)
4021
3786
  $(E) "[AR] Creating $@"
4022
3787
  $(Q) mkdir -p `dirname $@`
4023
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
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)
3788
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libalts_test_util.a
3789
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBALTS_TEST_UTIL_OBJS)
4025
3790
  ifeq ($(SYSTEM),Darwin)
4026
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a
3791
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libalts_test_util.a
4027
3792
  endif
4028
3793
 
4029
3794
 
4030
3795
 
4031
- ifeq ($(SYSTEM),MINGW32)
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)
4033
- $(E) "[LD] Linking $@"
4034
- $(Q) mkdir -p `dirname $@`
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)
3796
+
3797
+ endif
3798
+
3799
+ ifneq ($(NO_SECURE),true)
3800
+ ifneq ($(NO_DEPS),true)
3801
+ -include $(LIBALTS_TEST_UTIL_OBJS:.o=.dep)
3802
+ endif
3803
+ endif
3804
+
3805
+
3806
+ LIBENGINE_PASSTHROUGH_SRC = \
3807
+ test/core/end2end/engine_passthrough.cc \
3808
+
3809
+ PUBLIC_HEADERS_C += \
3810
+
3811
+ LIBENGINE_PASSTHROUGH_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBENGINE_PASSTHROUGH_SRC))))
3812
+
3813
+
3814
+ ifeq ($(NO_SECURE),true)
3815
+
3816
+ # You can't build secure libraries if you don't have OpenSSL.
3817
+
3818
+ $(LIBDIR)/$(CONFIG)/libengine_passthrough.a: openssl_dep_error
3819
+
3820
+
4036
3821
  else
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)
4038
- $(E) "[LD] Linking $@"
3822
+
3823
+
3824
+ $(LIBDIR)/$(CONFIG)/libengine_passthrough.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBENGINE_PASSTHROUGH_OBJS)
3825
+ $(E) "[AR] Creating $@"
4039
3826
  $(Q) mkdir -p `dirname $@`
3827
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libengine_passthrough.a
3828
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libengine_passthrough.a $(LIBENGINE_PASSTHROUGH_OBJS)
4040
3829
  ifeq ($(SYSTEM),Darwin)
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)
4042
- else
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
4045
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
4046
- endif
3830
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libengine_passthrough.a
4047
3831
  endif
4048
3832
 
3833
+
3834
+
3835
+
4049
3836
  endif
4050
3837
 
4051
3838
  ifneq ($(NO_SECURE),true)
4052
3839
  ifneq ($(NO_DEPS),true)
4053
- -include $(LIBGRPC_OBJS:.o=.dep)
3840
+ -include $(LIBENGINE_PASSTHROUGH_OBJS:.o=.dep)
4054
3841
  endif
4055
3842
  endif
4056
3843
 
4057
3844
 
4058
- LIBGRPC_CRONET_SRC = \
4059
- src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc \
4060
- src/core/lib/surface/init.cc \
4061
- src/core/lib/avl/avl.cc \
4062
- src/core/lib/backoff/backoff.cc \
4063
- src/core/lib/channel/channel_args.cc \
4064
- src/core/lib/channel/channel_stack.cc \
4065
- src/core/lib/channel/channel_stack_builder.cc \
4066
- src/core/lib/channel/channel_trace.cc \
4067
- src/core/lib/channel/channelz.cc \
3845
+ LIBGPR_SRC = \
3846
+ src/core/lib/gpr/alloc.cc \
3847
+ src/core/lib/gpr/atm.cc \
3848
+ src/core/lib/gpr/cpu_iphone.cc \
3849
+ src/core/lib/gpr/cpu_linux.cc \
3850
+ src/core/lib/gpr/cpu_posix.cc \
3851
+ src/core/lib/gpr/cpu_windows.cc \
3852
+ src/core/lib/gpr/env_linux.cc \
3853
+ src/core/lib/gpr/env_posix.cc \
3854
+ src/core/lib/gpr/env_windows.cc \
3855
+ src/core/lib/gpr/log.cc \
3856
+ src/core/lib/gpr/log_android.cc \
3857
+ src/core/lib/gpr/log_linux.cc \
3858
+ src/core/lib/gpr/log_posix.cc \
3859
+ src/core/lib/gpr/log_windows.cc \
3860
+ src/core/lib/gpr/murmur_hash.cc \
3861
+ src/core/lib/gpr/string.cc \
3862
+ src/core/lib/gpr/string_posix.cc \
3863
+ src/core/lib/gpr/string_util_windows.cc \
3864
+ src/core/lib/gpr/string_windows.cc \
3865
+ src/core/lib/gpr/sync.cc \
3866
+ src/core/lib/gpr/sync_posix.cc \
3867
+ src/core/lib/gpr/sync_windows.cc \
3868
+ src/core/lib/gpr/time.cc \
3869
+ src/core/lib/gpr/time_posix.cc \
3870
+ src/core/lib/gpr/time_precise.cc \
3871
+ src/core/lib/gpr/time_windows.cc \
3872
+ src/core/lib/gpr/tls_pthread.cc \
3873
+ src/core/lib/gpr/tmpfile_msys.cc \
3874
+ src/core/lib/gpr/tmpfile_posix.cc \
3875
+ src/core/lib/gpr/tmpfile_windows.cc \
3876
+ src/core/lib/gpr/wrap_memcpy.cc \
3877
+ src/core/lib/gprpp/arena.cc \
3878
+ src/core/lib/gprpp/fork.cc \
3879
+ src/core/lib/gprpp/global_config_env.cc \
3880
+ src/core/lib/gprpp/host_port.cc \
3881
+ src/core/lib/gprpp/mpscq.cc \
3882
+ src/core/lib/gprpp/thd_posix.cc \
3883
+ src/core/lib/gprpp/thd_windows.cc \
3884
+ src/core/lib/profiling/basic_timers.cc \
3885
+ src/core/lib/profiling/stap_timers.cc \
3886
+
3887
+ PUBLIC_HEADERS_C += \
3888
+ include/grpc/support/alloc.h \
3889
+ include/grpc/support/atm.h \
3890
+ include/grpc/support/atm_gcc_atomic.h \
3891
+ include/grpc/support/atm_gcc_sync.h \
3892
+ include/grpc/support/atm_windows.h \
3893
+ include/grpc/support/cpu.h \
3894
+ include/grpc/support/log.h \
3895
+ include/grpc/support/log_windows.h \
3896
+ include/grpc/support/port_platform.h \
3897
+ include/grpc/support/string_util.h \
3898
+ include/grpc/support/sync.h \
3899
+ include/grpc/support/sync_custom.h \
3900
+ include/grpc/support/sync_generic.h \
3901
+ include/grpc/support/sync_posix.h \
3902
+ include/grpc/support/sync_windows.h \
3903
+ include/grpc/support/thd_id.h \
3904
+ include/grpc/support/time.h \
3905
+ include/grpc/impl/codegen/atm.h \
3906
+ include/grpc/impl/codegen/atm_gcc_atomic.h \
3907
+ include/grpc/impl/codegen/atm_gcc_sync.h \
3908
+ include/grpc/impl/codegen/atm_windows.h \
3909
+ include/grpc/impl/codegen/fork.h \
3910
+ include/grpc/impl/codegen/gpr_slice.h \
3911
+ include/grpc/impl/codegen/gpr_types.h \
3912
+ include/grpc/impl/codegen/log.h \
3913
+ include/grpc/impl/codegen/port_platform.h \
3914
+ include/grpc/impl/codegen/sync.h \
3915
+ include/grpc/impl/codegen/sync_custom.h \
3916
+ include/grpc/impl/codegen/sync_generic.h \
3917
+ include/grpc/impl/codegen/sync_posix.h \
3918
+ include/grpc/impl/codegen/sync_windows.h \
3919
+
3920
+ LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
3921
+
3922
+
3923
+ $(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGPR_OBJS)
3924
+ $(E) "[AR] Creating $@"
3925
+ $(Q) mkdir -p `dirname $@`
3926
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a
3927
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS)
3928
+ ifeq ($(SYSTEM),Darwin)
3929
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgpr.a
3930
+ endif
3931
+
3932
+
3933
+
3934
+ ifeq ($(SYSTEM),MINGW32)
3935
+ $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)
3936
+ $(E) "[LD] Linking $@"
3937
+ $(Q) mkdir -p `dirname $@`
3938
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3939
+ else
3940
+ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)
3941
+ $(E) "[LD] Linking $@"
3942
+ $(Q) mkdir -p `dirname $@`
3943
+ ifeq ($(SYSTEM),Darwin)
3944
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3945
+ else
3946
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
3947
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.9
3948
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
3949
+ endif
3950
+ endif
3951
+
3952
+ ifneq ($(NO_DEPS),true)
3953
+ -include $(LIBGPR_OBJS:.o=.dep)
3954
+ endif
3955
+
3956
+
3957
+ LIBGRPC_SRC = \
3958
+ src/core/lib/surface/init.cc \
3959
+ src/core/lib/avl/avl.cc \
3960
+ src/core/lib/backoff/backoff.cc \
3961
+ src/core/lib/channel/channel_args.cc \
3962
+ src/core/lib/channel/channel_stack.cc \
3963
+ src/core/lib/channel/channel_stack_builder.cc \
3964
+ src/core/lib/channel/channel_trace.cc \
3965
+ src/core/lib/channel/channelz.cc \
4068
3966
  src/core/lib/channel/channelz_registry.cc \
4069
3967
  src/core/lib/channel/connected_channel.cc \
4070
3968
  src/core/lib/channel/handshaker.cc \
@@ -4122,6 +4020,7 @@ LIBGRPC_CRONET_SRC = \
4122
4020
  src/core/lib/iomgr/load_file.cc \
4123
4021
  src/core/lib/iomgr/lockfree_event.cc \
4124
4022
  src/core/lib/iomgr/logical_thread.cc \
4023
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
4125
4024
  src/core/lib/iomgr/polling_entity.cc \
4126
4025
  src/core/lib/iomgr/pollset.cc \
4127
4026
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4176,7 +4075,6 @@ LIBGRPC_CRONET_SRC = \
4176
4075
  src/core/lib/iomgr/wakeup_fd_posix.cc \
4177
4076
  src/core/lib/json/json.cc \
4178
4077
  src/core/lib/json/json_reader.cc \
4179
- src/core/lib/json/json_string.cc \
4180
4078
  src/core/lib/json/json_writer.cc \
4181
4079
  src/core/lib/slice/b64.cc \
4182
4080
  src/core/lib/slice/percent_encoding.cc \
@@ -4217,10 +4115,7 @@ LIBGRPC_CRONET_SRC = \
4217
4115
  src/core/lib/transport/transport_op_string.cc \
4218
4116
  src/core/lib/uri/uri_parser.cc \
4219
4117
  src/core/lib/debug/trace.cc \
4220
- src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc \
4221
- src/core/ext/transport/cronet/transport/cronet_api_dummy.cc \
4222
- src/core/ext/transport/cronet/transport/cronet_transport.cc \
4223
- src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
4118
+ src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc \
4224
4119
  src/core/ext/transport/chttp2/transport/bin_decoder.cc \
4225
4120
  src/core/ext/transport/chttp2/transport/bin_encoder.cc \
4226
4121
  src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
@@ -4249,46 +4144,6 @@ LIBGRPC_CRONET_SRC = \
4249
4144
  src/core/ext/filters/http/http_filters_plugin.cc \
4250
4145
  src/core/ext/filters/http/message_compress/message_compress_filter.cc \
4251
4146
  src/core/ext/filters/http/server/http_server_filter.cc \
4252
- src/core/ext/filters/client_channel/backend_metric.cc \
4253
- src/core/ext/filters/client_channel/backup_poller.cc \
4254
- src/core/ext/filters/client_channel/channel_connectivity.cc \
4255
- src/core/ext/filters/client_channel/client_channel.cc \
4256
- src/core/ext/filters/client_channel/client_channel_channelz.cc \
4257
- src/core/ext/filters/client_channel/client_channel_factory.cc \
4258
- src/core/ext/filters/client_channel/client_channel_plugin.cc \
4259
- src/core/ext/filters/client_channel/global_subchannel_pool.cc \
4260
- src/core/ext/filters/client_channel/health/health_check_client.cc \
4261
- src/core/ext/filters/client_channel/http_connect_handshaker.cc \
4262
- src/core/ext/filters/client_channel/http_proxy.cc \
4263
- src/core/ext/filters/client_channel/lb_policy.cc \
4264
- src/core/ext/filters/client_channel/lb_policy_registry.cc \
4265
- src/core/ext/filters/client_channel/local_subchannel_pool.cc \
4266
- src/core/ext/filters/client_channel/parse_address.cc \
4267
- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4268
- src/core/ext/filters/client_channel/resolver.cc \
4269
- src/core/ext/filters/client_channel/resolver_registry.cc \
4270
- src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4271
- src/core/ext/filters/client_channel/resolving_lb_policy.cc \
4272
- src/core/ext/filters/client_channel/retry_throttle.cc \
4273
- src/core/ext/filters/client_channel/server_address.cc \
4274
- src/core/ext/filters/client_channel/service_config.cc \
4275
- src/core/ext/filters/client_channel/subchannel.cc \
4276
- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
4277
- src/core/ext/filters/deadline/deadline_filter.cc \
4278
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
4279
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
4280
- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
4281
- src/core/ext/upb-generated/validate/validate.upb.c \
4282
- src/core/ext/upb-generated/google/api/annotations.upb.c \
4283
- src/core/ext/upb-generated/google/api/http.upb.c \
4284
- src/core/ext/upb-generated/google/protobuf/any.upb.c \
4285
- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
4286
- src/core/ext/upb-generated/google/protobuf/duration.upb.c \
4287
- src/core/ext/upb-generated/google/protobuf/empty.upb.c \
4288
- src/core/ext/upb-generated/google/protobuf/struct.upb.c \
4289
- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
4290
- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
4291
- src/core/ext/upb-generated/google/rpc/status.upb.c \
4292
4147
  src/core/lib/http/httpcli_security_connector.cc \
4293
4148
  src/core/lib/security/context/security_context.cc \
4294
4149
  src/core/lib/security/credentials/alts/alts_credentials.cc \
@@ -4307,7 +4162,7 @@ LIBGRPC_CRONET_SRC = \
4307
4162
  src/core/lib/security/credentials/plugin/plugin_credentials.cc \
4308
4163
  src/core/lib/security/credentials/ssl/ssl_credentials.cc \
4309
4164
  src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
4310
- src/core/lib/security/credentials/tls/spiffe_credentials.cc \
4165
+ src/core/lib/security/credentials/tls/tls_credentials.cc \
4311
4166
  src/core/lib/security/security_connector/alts/alts_security_connector.cc \
4312
4167
  src/core/lib/security/security_connector/fake/fake_security_connector.cc \
4313
4168
  src/core/lib/security/security_connector/load_system_roots_fallback.cc \
@@ -4317,7 +4172,7 @@ LIBGRPC_CRONET_SRC = \
4317
4172
  src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
4318
4173
  src/core/lib/security/security_connector/ssl_utils.cc \
4319
4174
  src/core/lib/security/security_connector/ssl_utils_config.cc \
4320
- src/core/lib/security/security_connector/tls/spiffe_security_connector.cc \
4175
+ src/core/lib/security/security_connector/tls/tls_security_connector.cc \
4321
4176
  src/core/lib/security/transport/client_auth_filter.cc \
4322
4177
  src/core/lib/security/transport/secure_endpoint.cc \
4323
4178
  src/core/lib/security/transport/security_handshaker.cc \
@@ -4360,6 +4215,46 @@ LIBGRPC_CRONET_SRC = \
4360
4215
  src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
4361
4216
  src/core/ext/transport/chttp2/client/authority.cc \
4362
4217
  src/core/ext/transport/chttp2/client/chttp2_connector.cc \
4218
+ src/core/ext/filters/client_channel/backend_metric.cc \
4219
+ src/core/ext/filters/client_channel/backup_poller.cc \
4220
+ src/core/ext/filters/client_channel/channel_connectivity.cc \
4221
+ src/core/ext/filters/client_channel/client_channel.cc \
4222
+ src/core/ext/filters/client_channel/client_channel_channelz.cc \
4223
+ src/core/ext/filters/client_channel/client_channel_factory.cc \
4224
+ src/core/ext/filters/client_channel/client_channel_plugin.cc \
4225
+ src/core/ext/filters/client_channel/global_subchannel_pool.cc \
4226
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
4227
+ src/core/ext/filters/client_channel/http_connect_handshaker.cc \
4228
+ src/core/ext/filters/client_channel/http_proxy.cc \
4229
+ src/core/ext/filters/client_channel/lb_policy.cc \
4230
+ src/core/ext/filters/client_channel/lb_policy_registry.cc \
4231
+ src/core/ext/filters/client_channel/local_subchannel_pool.cc \
4232
+ src/core/ext/filters/client_channel/parse_address.cc \
4233
+ src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4234
+ src/core/ext/filters/client_channel/resolver.cc \
4235
+ src/core/ext/filters/client_channel/resolver_registry.cc \
4236
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4237
+ src/core/ext/filters/client_channel/resolving_lb_policy.cc \
4238
+ src/core/ext/filters/client_channel/retry_throttle.cc \
4239
+ src/core/ext/filters/client_channel/server_address.cc \
4240
+ src/core/ext/filters/client_channel/service_config.cc \
4241
+ src/core/ext/filters/client_channel/subchannel.cc \
4242
+ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
4243
+ src/core/ext/filters/deadline/deadline_filter.cc \
4244
+ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
4245
+ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
4246
+ src/core/ext/upb-generated/gogoproto/gogo.upb.c \
4247
+ src/core/ext/upb-generated/validate/validate.upb.c \
4248
+ src/core/ext/upb-generated/google/api/annotations.upb.c \
4249
+ src/core/ext/upb-generated/google/api/http.upb.c \
4250
+ src/core/ext/upb-generated/google/protobuf/any.upb.c \
4251
+ src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
4252
+ src/core/ext/upb-generated/google/protobuf/duration.upb.c \
4253
+ src/core/ext/upb-generated/google/protobuf/empty.upb.c \
4254
+ src/core/ext/upb-generated/google/protobuf/struct.upb.c \
4255
+ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
4256
+ src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
4257
+ src/core/ext/upb-generated/google/rpc/status.upb.c \
4363
4258
  src/core/tsi/fake_transport_security.cc \
4364
4259
  src/core/tsi/local_transport_security.cc \
4365
4260
  src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
@@ -4367,74 +4262,151 @@ LIBGRPC_CRONET_SRC = \
4367
4262
  src/core/tsi/ssl/session_cache/ssl_session_openssl.cc \
4368
4263
  src/core/tsi/ssl_transport_security.cc \
4369
4264
  src/core/tsi/transport_security_grpc.cc \
4370
-
4371
- PUBLIC_HEADERS_C += \
4372
- include/grpc/impl/codegen/byte_buffer.h \
4373
- include/grpc/impl/codegen/byte_buffer_reader.h \
4374
- include/grpc/impl/codegen/compression_types.h \
4375
- include/grpc/impl/codegen/connectivity_state.h \
4376
- include/grpc/impl/codegen/grpc_types.h \
4377
- include/grpc/impl/codegen/propagation_bits.h \
4378
- include/grpc/impl/codegen/slice.h \
4379
- include/grpc/impl/codegen/status.h \
4380
- include/grpc/impl/codegen/atm.h \
4381
- include/grpc/impl/codegen/atm_gcc_atomic.h \
4382
- include/grpc/impl/codegen/atm_gcc_sync.h \
4383
- include/grpc/impl/codegen/atm_windows.h \
4384
- include/grpc/impl/codegen/fork.h \
4385
- include/grpc/impl/codegen/gpr_slice.h \
4386
- include/grpc/impl/codegen/gpr_types.h \
4387
- include/grpc/impl/codegen/log.h \
4388
- include/grpc/impl/codegen/port_platform.h \
4389
- include/grpc/impl/codegen/sync.h \
4390
- include/grpc/impl/codegen/sync_custom.h \
4391
- include/grpc/impl/codegen/sync_generic.h \
4392
- include/grpc/impl/codegen/sync_posix.h \
4393
- include/grpc/impl/codegen/sync_windows.h \
4394
- include/grpc/grpc_cronet.h \
4395
- include/grpc/grpc_security.h \
4396
- include/grpc/grpc_security_constants.h \
4397
-
4398
- LIBGRPC_CRONET_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_CRONET_SRC))))
4399
-
4400
-
4401
- ifeq ($(NO_SECURE),true)
4402
-
4403
- # You can't build secure libraries if you don't have OpenSSL.
4404
-
4405
- $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: openssl_dep_error
4406
-
4407
- $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
4408
-
4409
- else
4410
-
4411
-
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)
4413
- $(E) "[AR] Creating $@"
4414
- $(Q) mkdir -p `dirname $@`
4415
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
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)
4417
- ifeq ($(SYSTEM),Darwin)
4418
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
4419
- endif
4420
-
4421
-
4422
-
4423
- ifeq ($(SYSTEM),MINGW32)
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)
4425
- $(E) "[LD] Linking $@"
4426
- $(Q) mkdir -p `dirname $@`
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)
4428
- else
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)
4430
- $(E) "[LD] Linking $@"
4265
+ src/core/ext/transport/chttp2/server/chttp2_server.cc \
4266
+ src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
4267
+ src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
4268
+ src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
4269
+ src/core/ext/transport/inproc/inproc_plugin.cc \
4270
+ src/core/ext/transport/inproc/inproc_transport.cc \
4271
+ src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
4272
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
4273
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
4274
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
4275
+ src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
4276
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \
4277
+ src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
4278
+ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
4279
+ src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
4280
+ src/core/ext/filters/client_channel/xds/xds_api.cc \
4281
+ src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
4282
+ src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
4283
+ src/core/ext/filters/client_channel/xds/xds_client.cc \
4284
+ src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
4285
+ src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c \
4286
+ src/core/ext/upb-generated/envoy/api/v2/cds.upb.c \
4287
+ src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c \
4288
+ src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c \
4289
+ src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c \
4290
+ src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c \
4291
+ src/core/ext/upb-generated/envoy/api/v2/eds.upb.c \
4292
+ src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c \
4293
+ src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c \
4294
+ src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c \
4295
+ src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c \
4296
+ src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c \
4297
+ src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c \
4298
+ src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c \
4299
+ src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c \
4300
+ src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
4301
+ src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
4302
+ src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
4303
+ src/core/ext/upb-generated/envoy/type/http.upb.c \
4304
+ src/core/ext/upb-generated/envoy/type/percent.upb.c \
4305
+ src/core/ext/upb-generated/envoy/type/range.upb.c \
4306
+ src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
4307
+ src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
4308
+ src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
4309
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
4310
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
4311
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc \
4312
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
4313
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
4314
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
4315
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
4316
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc \
4317
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
4318
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
4319
+ src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc \
4320
+ src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
4321
+ src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
4322
+ src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
4323
+ src/core/ext/filters/census/grpc_context.cc \
4324
+ src/core/ext/filters/client_idle/client_idle_filter.cc \
4325
+ src/core/ext/filters/max_age/max_age_filter.cc \
4326
+ src/core/ext/filters/message_size/message_size_filter.cc \
4327
+ src/core/ext/filters/http/client_authority_filter.cc \
4328
+ src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
4329
+ src/core/ext/filters/workarounds/workaround_utils.cc \
4330
+ src/core/plugin_registry/grpc_plugin_registry.cc \
4331
+
4332
+ PUBLIC_HEADERS_C += \
4333
+ include/grpc/impl/codegen/byte_buffer.h \
4334
+ include/grpc/impl/codegen/byte_buffer_reader.h \
4335
+ include/grpc/impl/codegen/compression_types.h \
4336
+ include/grpc/impl/codegen/connectivity_state.h \
4337
+ include/grpc/impl/codegen/grpc_types.h \
4338
+ include/grpc/impl/codegen/propagation_bits.h \
4339
+ include/grpc/impl/codegen/slice.h \
4340
+ include/grpc/impl/codegen/status.h \
4341
+ include/grpc/impl/codegen/atm.h \
4342
+ include/grpc/impl/codegen/atm_gcc_atomic.h \
4343
+ include/grpc/impl/codegen/atm_gcc_sync.h \
4344
+ include/grpc/impl/codegen/atm_windows.h \
4345
+ include/grpc/impl/codegen/fork.h \
4346
+ include/grpc/impl/codegen/gpr_slice.h \
4347
+ include/grpc/impl/codegen/gpr_types.h \
4348
+ include/grpc/impl/codegen/log.h \
4349
+ include/grpc/impl/codegen/port_platform.h \
4350
+ include/grpc/impl/codegen/sync.h \
4351
+ include/grpc/impl/codegen/sync_custom.h \
4352
+ include/grpc/impl/codegen/sync_generic.h \
4353
+ include/grpc/impl/codegen/sync_posix.h \
4354
+ include/grpc/impl/codegen/sync_windows.h \
4355
+ include/grpc/grpc_security.h \
4356
+ include/grpc/byte_buffer.h \
4357
+ include/grpc/byte_buffer_reader.h \
4358
+ include/grpc/compression.h \
4359
+ include/grpc/fork.h \
4360
+ include/grpc/grpc.h \
4361
+ include/grpc/grpc_posix.h \
4362
+ include/grpc/grpc_security_constants.h \
4363
+ include/grpc/load_reporting.h \
4364
+ include/grpc/slice.h \
4365
+ include/grpc/slice_buffer.h \
4366
+ include/grpc/status.h \
4367
+ include/grpc/support/workaround_list.h \
4368
+ include/grpc/census.h \
4369
+
4370
+ LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
4371
+
4372
+
4373
+ ifeq ($(NO_SECURE),true)
4374
+
4375
+ # You can't build secure libraries if you don't have OpenSSL.
4376
+
4377
+ $(LIBDIR)/$(CONFIG)/libgrpc.a: openssl_dep_error
4378
+
4379
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
4380
+
4381
+ else
4382
+
4383
+
4384
+ $(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4385
+ $(E) "[AR] Creating $@"
4386
+ $(Q) mkdir -p `dirname $@`
4387
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
4388
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4389
+ ifeq ($(SYSTEM),Darwin)
4390
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a
4391
+ endif
4392
+
4393
+
4394
+
4395
+ ifeq ($(SYSTEM),MINGW32)
4396
+ $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4397
+ $(E) "[LD] Linking $@"
4398
+ $(Q) mkdir -p `dirname $@`
4399
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4400
+ else
4401
+ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4402
+ $(E) "[LD] Linking $@"
4431
4403
  $(Q) mkdir -p `dirname $@`
4432
4404
  ifeq ($(SYSTEM),Darwin)
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)
4405
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4434
4406
  else
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
4437
- $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so
4407
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4408
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.9
4409
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
4438
4410
  endif
4439
4411
  endif
4440
4412
 
@@ -4442,42 +4414,14 @@ endif
4442
4414
 
4443
4415
  ifneq ($(NO_SECURE),true)
4444
4416
  ifneq ($(NO_DEPS),true)
4445
- -include $(LIBGRPC_CRONET_OBJS:.o=.dep)
4417
+ -include $(LIBGRPC_OBJS:.o=.dep)
4446
4418
  endif
4447
4419
  endif
4448
4420
 
4449
4421
 
4450
- LIBGRPC_TEST_UTIL_SRC = \
4451
- test/core/end2end/data/client_certs.cc \
4452
- test/core/end2end/data/server1_cert.cc \
4453
- test/core/end2end/data/server1_key.cc \
4454
- test/core/end2end/data/test_root_cert.cc \
4455
- test/core/security/oauth2_utils.cc \
4456
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
4457
- test/core/end2end/cq_verifier.cc \
4458
- test/core/end2end/fixtures/http_proxy_fixture.cc \
4459
- test/core/end2end/fixtures/local_util.cc \
4460
- test/core/end2end/fixtures/proxy.cc \
4461
- test/core/iomgr/endpoint_tests.cc \
4462
- test/core/util/debugger_macros.cc \
4463
- test/core/util/fuzzer_util.cc \
4464
- test/core/util/grpc_profiler.cc \
4465
- test/core/util/histogram.cc \
4466
- test/core/util/memory_counters.cc \
4467
- test/core/util/mock_endpoint.cc \
4468
- test/core/util/parse_hexstring.cc \
4469
- test/core/util/passthru_endpoint.cc \
4470
- test/core/util/port.cc \
4471
- test/core/util/port_isolated_runtime_environment.cc \
4472
- test/core/util/port_server_client.cc \
4473
- test/core/util/slice_splitter.cc \
4474
- test/core/util/subprocess_posix.cc \
4475
- test/core/util/subprocess_windows.cc \
4476
- test/core/util/test_config.cc \
4477
- test/core/util/test_lb_policies.cc \
4478
- test/core/util/tracer_util.cc \
4479
- test/core/util/trickle_endpoint.cc \
4480
- test/core/util/cmdline.cc \
4422
+ LIBGRPC_CRONET_SRC = \
4423
+ src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc \
4424
+ src/core/lib/surface/init.cc \
4481
4425
  src/core/lib/avl/avl.cc \
4482
4426
  src/core/lib/backoff/backoff.cc \
4483
4427
  src/core/lib/channel/channel_args.cc \
@@ -4542,6 +4486,7 @@ LIBGRPC_TEST_UTIL_SRC = \
4542
4486
  src/core/lib/iomgr/load_file.cc \
4543
4487
  src/core/lib/iomgr/lockfree_event.cc \
4544
4488
  src/core/lib/iomgr/logical_thread.cc \
4489
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
4545
4490
  src/core/lib/iomgr/polling_entity.cc \
4546
4491
  src/core/lib/iomgr/pollset.cc \
4547
4492
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4596,7 +4541,6 @@ LIBGRPC_TEST_UTIL_SRC = \
4596
4541
  src/core/lib/iomgr/wakeup_fd_posix.cc \
4597
4542
  src/core/lib/json/json.cc \
4598
4543
  src/core/lib/json/json_reader.cc \
4599
- src/core/lib/json/json_string.cc \
4600
4544
  src/core/lib/json/json_writer.cc \
4601
4545
  src/core/lib/slice/b64.cc \
4602
4546
  src/core/lib/slice/percent_encoding.cc \
@@ -4637,6 +4581,38 @@ LIBGRPC_TEST_UTIL_SRC = \
4637
4581
  src/core/lib/transport/transport_op_string.cc \
4638
4582
  src/core/lib/uri/uri_parser.cc \
4639
4583
  src/core/lib/debug/trace.cc \
4584
+ src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc \
4585
+ src/core/ext/transport/cronet/transport/cronet_api_dummy.cc \
4586
+ src/core/ext/transport/cronet/transport/cronet_transport.cc \
4587
+ src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
4588
+ src/core/ext/transport/chttp2/transport/bin_decoder.cc \
4589
+ src/core/ext/transport/chttp2/transport/bin_encoder.cc \
4590
+ src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
4591
+ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
4592
+ src/core/ext/transport/chttp2/transport/context_list.cc \
4593
+ src/core/ext/transport/chttp2/transport/flow_control.cc \
4594
+ src/core/ext/transport/chttp2/transport/frame_data.cc \
4595
+ src/core/ext/transport/chttp2/transport/frame_goaway.cc \
4596
+ src/core/ext/transport/chttp2/transport/frame_ping.cc \
4597
+ src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
4598
+ src/core/ext/transport/chttp2/transport/frame_settings.cc \
4599
+ src/core/ext/transport/chttp2/transport/frame_window_update.cc \
4600
+ src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
4601
+ src/core/ext/transport/chttp2/transport/hpack_parser.cc \
4602
+ src/core/ext/transport/chttp2/transport/hpack_table.cc \
4603
+ src/core/ext/transport/chttp2/transport/http2_settings.cc \
4604
+ src/core/ext/transport/chttp2/transport/huffsyms.cc \
4605
+ src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
4606
+ src/core/ext/transport/chttp2/transport/parsing.cc \
4607
+ src/core/ext/transport/chttp2/transport/stream_lists.cc \
4608
+ src/core/ext/transport/chttp2/transport/stream_map.cc \
4609
+ src/core/ext/transport/chttp2/transport/varint.cc \
4610
+ src/core/ext/transport/chttp2/transport/writing.cc \
4611
+ src/core/ext/transport/chttp2/alpn/alpn.cc \
4612
+ src/core/ext/filters/http/client/http_client_filter.cc \
4613
+ src/core/ext/filters/http/http_filters_plugin.cc \
4614
+ src/core/ext/filters/http/message_compress/message_compress_filter.cc \
4615
+ src/core/ext/filters/http/server/http_server_filter.cc \
4640
4616
  src/core/ext/filters/client_channel/backend_metric.cc \
4641
4617
  src/core/ext/filters/client_channel/backup_poller.cc \
4642
4618
  src/core/ext/filters/client_channel/channel_connectivity.cc \
@@ -4677,58 +4653,99 @@ LIBGRPC_TEST_UTIL_SRC = \
4677
4653
  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
4678
4654
  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
4679
4655
  src/core/ext/upb-generated/google/rpc/status.upb.c \
4680
- src/core/ext/transport/chttp2/transport/bin_decoder.cc \
4681
- src/core/ext/transport/chttp2/transport/bin_encoder.cc \
4682
- src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
4683
- src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
4684
- src/core/ext/transport/chttp2/transport/context_list.cc \
4685
- src/core/ext/transport/chttp2/transport/flow_control.cc \
4686
- src/core/ext/transport/chttp2/transport/frame_data.cc \
4687
- src/core/ext/transport/chttp2/transport/frame_goaway.cc \
4688
- src/core/ext/transport/chttp2/transport/frame_ping.cc \
4689
- src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
4690
- src/core/ext/transport/chttp2/transport/frame_settings.cc \
4691
- src/core/ext/transport/chttp2/transport/frame_window_update.cc \
4692
- src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
4693
- src/core/ext/transport/chttp2/transport/hpack_parser.cc \
4694
- src/core/ext/transport/chttp2/transport/hpack_table.cc \
4695
- src/core/ext/transport/chttp2/transport/http2_settings.cc \
4696
- src/core/ext/transport/chttp2/transport/huffsyms.cc \
4697
- src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
4698
- src/core/ext/transport/chttp2/transport/parsing.cc \
4699
- src/core/ext/transport/chttp2/transport/stream_lists.cc \
4700
- src/core/ext/transport/chttp2/transport/stream_map.cc \
4701
- src/core/ext/transport/chttp2/transport/varint.cc \
4702
- src/core/ext/transport/chttp2/transport/writing.cc \
4703
- src/core/ext/transport/chttp2/alpn/alpn.cc \
4704
- src/core/ext/filters/http/client/http_client_filter.cc \
4705
- src/core/ext/filters/http/http_filters_plugin.cc \
4706
- src/core/ext/filters/http/message_compress/message_compress_filter.cc \
4707
- src/core/ext/filters/http/server/http_server_filter.cc \
4708
-
4709
- PUBLIC_HEADERS_C += \
4710
- include/grpc/support/alloc.h \
4711
- include/grpc/support/atm.h \
4712
- include/grpc/support/atm_gcc_atomic.h \
4713
- include/grpc/support/atm_gcc_sync.h \
4714
- include/grpc/support/atm_windows.h \
4715
- include/grpc/support/cpu.h \
4716
- include/grpc/support/log.h \
4717
- include/grpc/support/log_windows.h \
4718
- include/grpc/support/port_platform.h \
4719
- include/grpc/support/string_util.h \
4720
- include/grpc/support/sync.h \
4721
- include/grpc/support/sync_custom.h \
4722
- include/grpc/support/sync_generic.h \
4723
- include/grpc/support/sync_posix.h \
4724
- include/grpc/support/sync_windows.h \
4725
- include/grpc/support/thd_id.h \
4726
- include/grpc/support/time.h \
4727
- include/grpc/impl/codegen/atm.h \
4728
- include/grpc/impl/codegen/atm_gcc_atomic.h \
4729
- include/grpc/impl/codegen/atm_gcc_sync.h \
4730
- include/grpc/impl/codegen/atm_windows.h \
4731
- include/grpc/impl/codegen/fork.h \
4656
+ src/core/lib/http/httpcli_security_connector.cc \
4657
+ src/core/lib/security/context/security_context.cc \
4658
+ src/core/lib/security/credentials/alts/alts_credentials.cc \
4659
+ src/core/lib/security/credentials/composite/composite_credentials.cc \
4660
+ src/core/lib/security/credentials/credentials.cc \
4661
+ src/core/lib/security/credentials/credentials_metadata.cc \
4662
+ src/core/lib/security/credentials/fake/fake_credentials.cc \
4663
+ src/core/lib/security/credentials/google_default/credentials_generic.cc \
4664
+ src/core/lib/security/credentials/google_default/google_default_credentials.cc \
4665
+ src/core/lib/security/credentials/iam/iam_credentials.cc \
4666
+ src/core/lib/security/credentials/jwt/json_token.cc \
4667
+ src/core/lib/security/credentials/jwt/jwt_credentials.cc \
4668
+ src/core/lib/security/credentials/jwt/jwt_verifier.cc \
4669
+ src/core/lib/security/credentials/local/local_credentials.cc \
4670
+ src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
4671
+ src/core/lib/security/credentials/plugin/plugin_credentials.cc \
4672
+ src/core/lib/security/credentials/ssl/ssl_credentials.cc \
4673
+ src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
4674
+ src/core/lib/security/credentials/tls/tls_credentials.cc \
4675
+ src/core/lib/security/security_connector/alts/alts_security_connector.cc \
4676
+ src/core/lib/security/security_connector/fake/fake_security_connector.cc \
4677
+ src/core/lib/security/security_connector/load_system_roots_fallback.cc \
4678
+ src/core/lib/security/security_connector/load_system_roots_linux.cc \
4679
+ src/core/lib/security/security_connector/local/local_security_connector.cc \
4680
+ src/core/lib/security/security_connector/security_connector.cc \
4681
+ src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
4682
+ src/core/lib/security/security_connector/ssl_utils.cc \
4683
+ src/core/lib/security/security_connector/ssl_utils_config.cc \
4684
+ src/core/lib/security/security_connector/tls/tls_security_connector.cc \
4685
+ src/core/lib/security/transport/client_auth_filter.cc \
4686
+ src/core/lib/security/transport/secure_endpoint.cc \
4687
+ src/core/lib/security/transport/security_handshaker.cc \
4688
+ src/core/lib/security/transport/server_auth_filter.cc \
4689
+ src/core/lib/security/transport/target_authority_table.cc \
4690
+ src/core/lib/security/transport/tsi_error.cc \
4691
+ src/core/lib/security/util/json_util.cc \
4692
+ src/core/lib/surface/init_secure.cc \
4693
+ src/core/tsi/alts/crypt/aes_gcm.cc \
4694
+ src/core/tsi/alts/crypt/gsec.cc \
4695
+ src/core/tsi/alts/frame_protector/alts_counter.cc \
4696
+ src/core/tsi/alts/frame_protector/alts_crypter.cc \
4697
+ src/core/tsi/alts/frame_protector/alts_frame_protector.cc \
4698
+ src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc \
4699
+ src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc \
4700
+ src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
4701
+ src/core/tsi/alts/frame_protector/frame_handler.cc \
4702
+ src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
4703
+ src/core/tsi/alts/handshaker/alts_shared_resource.cc \
4704
+ src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
4705
+ src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
4706
+ src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
4707
+ src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc \
4708
+ src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc \
4709
+ src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc \
4710
+ src/core/lib/security/credentials/alts/check_gcp_environment.cc \
4711
+ src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc \
4712
+ src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc \
4713
+ src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc \
4714
+ src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc \
4715
+ src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc \
4716
+ src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc \
4717
+ src/core/tsi/alts/handshaker/alts_tsi_utils.cc \
4718
+ src/core/tsi/alts/handshaker/transport_security_common_api.cc \
4719
+ src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
4720
+ src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
4721
+ src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
4722
+ src/core/tsi/transport_security.cc \
4723
+ src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
4724
+ src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
4725
+ src/core/ext/transport/chttp2/client/authority.cc \
4726
+ src/core/ext/transport/chttp2/client/chttp2_connector.cc \
4727
+ src/core/tsi/fake_transport_security.cc \
4728
+ src/core/tsi/local_transport_security.cc \
4729
+ src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
4730
+ src/core/tsi/ssl/session_cache/ssl_session_cache.cc \
4731
+ src/core/tsi/ssl/session_cache/ssl_session_openssl.cc \
4732
+ src/core/tsi/ssl_transport_security.cc \
4733
+ src/core/tsi/transport_security_grpc.cc \
4734
+
4735
+ PUBLIC_HEADERS_C += \
4736
+ include/grpc/impl/codegen/byte_buffer.h \
4737
+ include/grpc/impl/codegen/byte_buffer_reader.h \
4738
+ include/grpc/impl/codegen/compression_types.h \
4739
+ include/grpc/impl/codegen/connectivity_state.h \
4740
+ include/grpc/impl/codegen/grpc_types.h \
4741
+ include/grpc/impl/codegen/propagation_bits.h \
4742
+ include/grpc/impl/codegen/slice.h \
4743
+ include/grpc/impl/codegen/status.h \
4744
+ include/grpc/impl/codegen/atm.h \
4745
+ include/grpc/impl/codegen/atm_gcc_atomic.h \
4746
+ include/grpc/impl/codegen/atm_gcc_sync.h \
4747
+ include/grpc/impl/codegen/atm_windows.h \
4748
+ include/grpc/impl/codegen/fork.h \
4732
4749
  include/grpc/impl/codegen/gpr_slice.h \
4733
4750
  include/grpc/impl/codegen/gpr_types.h \
4734
4751
  include/grpc/impl/codegen/log.h \
@@ -4738,50 +4755,68 @@ PUBLIC_HEADERS_C += \
4738
4755
  include/grpc/impl/codegen/sync_generic.h \
4739
4756
  include/grpc/impl/codegen/sync_posix.h \
4740
4757
  include/grpc/impl/codegen/sync_windows.h \
4741
- include/grpc/impl/codegen/byte_buffer.h \
4742
- include/grpc/impl/codegen/byte_buffer_reader.h \
4743
- include/grpc/impl/codegen/compression_types.h \
4744
- include/grpc/impl/codegen/connectivity_state.h \
4745
- include/grpc/impl/codegen/grpc_types.h \
4746
- include/grpc/impl/codegen/propagation_bits.h \
4747
- include/grpc/impl/codegen/slice.h \
4748
- include/grpc/impl/codegen/status.h \
4758
+ include/grpc/grpc_cronet.h \
4759
+ include/grpc/grpc_security.h \
4760
+ include/grpc/grpc_security_constants.h \
4749
4761
 
4750
- LIBGRPC_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_SRC))))
4762
+ LIBGRPC_CRONET_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_CRONET_SRC))))
4751
4763
 
4752
4764
 
4753
4765
  ifeq ($(NO_SECURE),true)
4754
4766
 
4755
4767
  # You can't build secure libraries if you don't have OpenSSL.
4756
4768
 
4757
- $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error
4769
+ $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: openssl_dep_error
4758
4770
 
4771
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
4759
4772
 
4760
4773
  else
4761
4774
 
4762
4775
 
4763
- $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_OBJS)
4776
+ $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4764
4777
  $(E) "[AR] Creating $@"
4765
4778
  $(Q) mkdir -p `dirname $@`
4766
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
4767
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBGRPC_TEST_UTIL_OBJS)
4779
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
4780
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS)
4768
4781
  ifeq ($(SYSTEM),Darwin)
4769
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
4782
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
4770
4783
  endif
4771
4784
 
4772
4785
 
4773
4786
 
4787
+ ifeq ($(SYSTEM),MINGW32)
4788
+ $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4789
+ $(E) "[LD] Linking $@"
4790
+ $(Q) mkdir -p `dirname $@`
4791
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4792
+ else
4793
+ $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP)
4794
+ $(E) "[LD] Linking $@"
4795
+ $(Q) mkdir -p `dirname $@`
4796
+ ifeq ($(SYSTEM),Darwin)
4797
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4798
+ else
4799
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
4800
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.9
4801
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so
4802
+ endif
4803
+ endif
4774
4804
 
4775
4805
  endif
4776
4806
 
4777
4807
  ifneq ($(NO_SECURE),true)
4778
4808
  ifneq ($(NO_DEPS),true)
4779
- -include $(LIBGRPC_TEST_UTIL_OBJS:.o=.dep)
4809
+ -include $(LIBGRPC_CRONET_OBJS:.o=.dep)
4780
4810
  endif
4781
4811
  endif
4782
4812
 
4783
4813
 
4784
- LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4814
+ LIBGRPC_TEST_UTIL_SRC = \
4815
+ test/core/end2end/data/client_certs.cc \
4816
+ test/core/end2end/data/server1_cert.cc \
4817
+ test/core/end2end/data/server1_key.cc \
4818
+ test/core/end2end/data/test_root_cert.cc \
4819
+ test/core/security/oauth2_utils.cc \
4785
4820
  src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
4786
4821
  test/core/end2end/cq_verifier.cc \
4787
4822
  test/core/end2end/fixtures/http_proxy_fixture.cc \
@@ -4871,6 +4906,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4871
4906
  src/core/lib/iomgr/load_file.cc \
4872
4907
  src/core/lib/iomgr/lockfree_event.cc \
4873
4908
  src/core/lib/iomgr/logical_thread.cc \
4909
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
4874
4910
  src/core/lib/iomgr/polling_entity.cc \
4875
4911
  src/core/lib/iomgr/pollset.cc \
4876
4912
  src/core/lib/iomgr/pollset_custom.cc \
@@ -4925,7 +4961,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4925
4961
  src/core/lib/iomgr/wakeup_fd_posix.cc \
4926
4962
  src/core/lib/json/json.cc \
4927
4963
  src/core/lib/json/json_reader.cc \
4928
- src/core/lib/json/json_string.cc \
4929
4964
  src/core/lib/json/json_writer.cc \
4930
4965
  src/core/lib/slice/b64.cc \
4931
4966
  src/core/lib/slice/percent_encoding.cc \
@@ -5076,29 +5111,66 @@ PUBLIC_HEADERS_C += \
5076
5111
  include/grpc/impl/codegen/slice.h \
5077
5112
  include/grpc/impl/codegen/status.h \
5078
5113
 
5079
- LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC))))
5114
+ LIBGRPC_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_SRC))))
5115
+
5116
+
5117
+ ifeq ($(NO_SECURE),true)
5118
+
5119
+ # You can't build secure libraries if you don't have OpenSSL.
5120
+
5121
+ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error
5122
+
5123
+
5124
+ else
5080
5125
 
5081
5126
 
5082
- $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5127
+ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_TEST_UTIL_OBJS)
5083
5128
  $(E) "[AR] Creating $@"
5084
5129
  $(Q) mkdir -p `dirname $@`
5085
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
5086
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5130
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
5131
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBGRPC_TEST_UTIL_OBJS)
5087
5132
  ifeq ($(SYSTEM),Darwin)
5088
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
5133
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
5089
5134
  endif
5090
5135
 
5091
5136
 
5092
5137
 
5093
5138
 
5139
+ endif
5140
+
5141
+ ifneq ($(NO_SECURE),true)
5094
5142
  ifneq ($(NO_DEPS),true)
5095
- -include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
5143
+ -include $(LIBGRPC_TEST_UTIL_OBJS:.o=.dep)
5144
+ endif
5096
5145
  endif
5097
5146
 
5098
5147
 
5099
- LIBGRPC_UNSECURE_SRC = \
5100
- src/core/lib/surface/init.cc \
5101
- src/core/lib/surface/init_unsecure.cc \
5148
+ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
5149
+ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
5150
+ test/core/end2end/cq_verifier.cc \
5151
+ test/core/end2end/fixtures/http_proxy_fixture.cc \
5152
+ test/core/end2end/fixtures/local_util.cc \
5153
+ test/core/end2end/fixtures/proxy.cc \
5154
+ test/core/iomgr/endpoint_tests.cc \
5155
+ test/core/util/debugger_macros.cc \
5156
+ test/core/util/fuzzer_util.cc \
5157
+ test/core/util/grpc_profiler.cc \
5158
+ test/core/util/histogram.cc \
5159
+ test/core/util/memory_counters.cc \
5160
+ test/core/util/mock_endpoint.cc \
5161
+ test/core/util/parse_hexstring.cc \
5162
+ test/core/util/passthru_endpoint.cc \
5163
+ test/core/util/port.cc \
5164
+ test/core/util/port_isolated_runtime_environment.cc \
5165
+ test/core/util/port_server_client.cc \
5166
+ test/core/util/slice_splitter.cc \
5167
+ test/core/util/subprocess_posix.cc \
5168
+ test/core/util/subprocess_windows.cc \
5169
+ test/core/util/test_config.cc \
5170
+ test/core/util/test_lb_policies.cc \
5171
+ test/core/util/tracer_util.cc \
5172
+ test/core/util/trickle_endpoint.cc \
5173
+ test/core/util/cmdline.cc \
5102
5174
  src/core/lib/avl/avl.cc \
5103
5175
  src/core/lib/backoff/backoff.cc \
5104
5176
  src/core/lib/channel/channel_args.cc \
@@ -5163,6 +5235,7 @@ LIBGRPC_UNSECURE_SRC = \
5163
5235
  src/core/lib/iomgr/load_file.cc \
5164
5236
  src/core/lib/iomgr/lockfree_event.cc \
5165
5237
  src/core/lib/iomgr/logical_thread.cc \
5238
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
5166
5239
  src/core/lib/iomgr/polling_entity.cc \
5167
5240
  src/core/lib/iomgr/pollset.cc \
5168
5241
  src/core/lib/iomgr/pollset_custom.cc \
@@ -5217,7 +5290,6 @@ LIBGRPC_UNSECURE_SRC = \
5217
5290
  src/core/lib/iomgr/wakeup_fd_posix.cc \
5218
5291
  src/core/lib/json/json.cc \
5219
5292
  src/core/lib/json/json_reader.cc \
5220
- src/core/lib/json/json_string.cc \
5221
5293
  src/core/lib/json/json_writer.cc \
5222
5294
  src/core/lib/slice/b64.cc \
5223
5295
  src/core/lib/slice/percent_encoding.cc \
@@ -5258,41 +5330,6 @@ LIBGRPC_UNSECURE_SRC = \
5258
5330
  src/core/lib/transport/transport_op_string.cc \
5259
5331
  src/core/lib/uri/uri_parser.cc \
5260
5332
  src/core/lib/debug/trace.cc \
5261
- src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
5262
- src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
5263
- src/core/ext/transport/chttp2/transport/bin_decoder.cc \
5264
- src/core/ext/transport/chttp2/transport/bin_encoder.cc \
5265
- src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
5266
- src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
5267
- src/core/ext/transport/chttp2/transport/context_list.cc \
5268
- src/core/ext/transport/chttp2/transport/flow_control.cc \
5269
- src/core/ext/transport/chttp2/transport/frame_data.cc \
5270
- src/core/ext/transport/chttp2/transport/frame_goaway.cc \
5271
- src/core/ext/transport/chttp2/transport/frame_ping.cc \
5272
- src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
5273
- src/core/ext/transport/chttp2/transport/frame_settings.cc \
5274
- src/core/ext/transport/chttp2/transport/frame_window_update.cc \
5275
- src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
5276
- src/core/ext/transport/chttp2/transport/hpack_parser.cc \
5277
- src/core/ext/transport/chttp2/transport/hpack_table.cc \
5278
- src/core/ext/transport/chttp2/transport/http2_settings.cc \
5279
- src/core/ext/transport/chttp2/transport/huffsyms.cc \
5280
- src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
5281
- src/core/ext/transport/chttp2/transport/parsing.cc \
5282
- src/core/ext/transport/chttp2/transport/stream_lists.cc \
5283
- src/core/ext/transport/chttp2/transport/stream_map.cc \
5284
- src/core/ext/transport/chttp2/transport/varint.cc \
5285
- src/core/ext/transport/chttp2/transport/writing.cc \
5286
- src/core/ext/transport/chttp2/alpn/alpn.cc \
5287
- src/core/ext/filters/http/client/http_client_filter.cc \
5288
- src/core/ext/filters/http/http_filters_plugin.cc \
5289
- src/core/ext/filters/http/message_compress/message_compress_filter.cc \
5290
- src/core/ext/filters/http/server/http_server_filter.cc \
5291
- src/core/ext/transport/chttp2/server/chttp2_server.cc \
5292
- src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
5293
- src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
5294
- src/core/ext/transport/chttp2/client/authority.cc \
5295
- src/core/ext/transport/chttp2/client/chttp2_connector.cc \
5296
5333
  src/core/ext/filters/client_channel/backend_metric.cc \
5297
5334
  src/core/ext/filters/client_channel/backup_poller.cc \
5298
5335
  src/core/ext/filters/client_channel/channel_connectivity.cc \
@@ -5333,77 +5370,53 @@ LIBGRPC_UNSECURE_SRC = \
5333
5370
  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
5334
5371
  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
5335
5372
  src/core/ext/upb-generated/google/rpc/status.upb.c \
5336
- src/core/ext/transport/inproc/inproc_plugin.cc \
5337
- src/core/ext/transport/inproc/inproc_transport.cc \
5338
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
5339
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
5340
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc \
5341
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
5342
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
5343
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
5344
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
5345
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc \
5346
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
5347
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
5348
- src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc \
5349
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
5350
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
5351
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
5352
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
5353
- src/core/ext/filters/client_channel/xds/xds_api.cc \
5354
- src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
5355
- src/core/ext/filters/client_channel/xds/xds_channel.cc \
5356
- src/core/ext/filters/client_channel/xds/xds_client.cc \
5357
- src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
5358
- src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c \
5359
- src/core/ext/upb-generated/envoy/api/v2/cds.upb.c \
5360
- src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c \
5361
- src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c \
5362
- src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c \
5363
- src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c \
5364
- src/core/ext/upb-generated/envoy/api/v2/eds.upb.c \
5365
- src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c \
5366
- src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c \
5367
- src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c \
5368
- src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c \
5369
- src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c \
5370
- src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c \
5371
- src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c \
5372
- src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c \
5373
- src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
5374
- src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
5375
- src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
5376
- src/core/ext/upb-generated/envoy/type/http.upb.c \
5377
- src/core/ext/upb-generated/envoy/type/percent.upb.c \
5378
- src/core/ext/upb-generated/envoy/type/range.upb.c \
5379
- src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
5380
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
5381
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc \
5382
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
5383
- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
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 \
5386
- src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
5387
- src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
5388
- src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
5389
- src/core/ext/filters/census/grpc_context.cc \
5390
- src/core/ext/filters/client_idle/client_idle_filter.cc \
5391
- src/core/ext/filters/max_age/max_age_filter.cc \
5392
- src/core/ext/filters/message_size/message_size_filter.cc \
5393
- src/core/ext/filters/http/client_authority_filter.cc \
5394
- src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
5395
- src/core/ext/filters/workarounds/workaround_utils.cc \
5396
- src/core/plugin_registry/grpc_unsecure_plugin_registry.cc \
5373
+ src/core/ext/transport/chttp2/transport/bin_decoder.cc \
5374
+ src/core/ext/transport/chttp2/transport/bin_encoder.cc \
5375
+ src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
5376
+ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
5377
+ src/core/ext/transport/chttp2/transport/context_list.cc \
5378
+ src/core/ext/transport/chttp2/transport/flow_control.cc \
5379
+ src/core/ext/transport/chttp2/transport/frame_data.cc \
5380
+ src/core/ext/transport/chttp2/transport/frame_goaway.cc \
5381
+ src/core/ext/transport/chttp2/transport/frame_ping.cc \
5382
+ src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
5383
+ src/core/ext/transport/chttp2/transport/frame_settings.cc \
5384
+ src/core/ext/transport/chttp2/transport/frame_window_update.cc \
5385
+ src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
5386
+ src/core/ext/transport/chttp2/transport/hpack_parser.cc \
5387
+ src/core/ext/transport/chttp2/transport/hpack_table.cc \
5388
+ src/core/ext/transport/chttp2/transport/http2_settings.cc \
5389
+ src/core/ext/transport/chttp2/transport/huffsyms.cc \
5390
+ src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
5391
+ src/core/ext/transport/chttp2/transport/parsing.cc \
5392
+ src/core/ext/transport/chttp2/transport/stream_lists.cc \
5393
+ src/core/ext/transport/chttp2/transport/stream_map.cc \
5394
+ src/core/ext/transport/chttp2/transport/varint.cc \
5395
+ src/core/ext/transport/chttp2/transport/writing.cc \
5396
+ src/core/ext/transport/chttp2/alpn/alpn.cc \
5397
+ src/core/ext/filters/http/client/http_client_filter.cc \
5398
+ src/core/ext/filters/http/http_filters_plugin.cc \
5399
+ src/core/ext/filters/http/message_compress/message_compress_filter.cc \
5400
+ src/core/ext/filters/http/server/http_server_filter.cc \
5397
5401
 
5398
5402
  PUBLIC_HEADERS_C += \
5399
- include/grpc/impl/codegen/byte_buffer.h \
5400
- include/grpc/impl/codegen/byte_buffer_reader.h \
5401
- include/grpc/impl/codegen/compression_types.h \
5402
- include/grpc/impl/codegen/connectivity_state.h \
5403
- include/grpc/impl/codegen/grpc_types.h \
5404
- include/grpc/impl/codegen/propagation_bits.h \
5405
- include/grpc/impl/codegen/slice.h \
5406
- include/grpc/impl/codegen/status.h \
5403
+ include/grpc/support/alloc.h \
5404
+ include/grpc/support/atm.h \
5405
+ include/grpc/support/atm_gcc_atomic.h \
5406
+ include/grpc/support/atm_gcc_sync.h \
5407
+ include/grpc/support/atm_windows.h \
5408
+ include/grpc/support/cpu.h \
5409
+ include/grpc/support/log.h \
5410
+ include/grpc/support/log_windows.h \
5411
+ include/grpc/support/port_platform.h \
5412
+ include/grpc/support/string_util.h \
5413
+ include/grpc/support/sync.h \
5414
+ include/grpc/support/sync_custom.h \
5415
+ include/grpc/support/sync_generic.h \
5416
+ include/grpc/support/sync_posix.h \
5417
+ include/grpc/support/sync_windows.h \
5418
+ include/grpc/support/thd_id.h \
5419
+ include/grpc/support/time.h \
5407
5420
  include/grpc/impl/codegen/atm.h \
5408
5421
  include/grpc/impl/codegen/atm_gcc_atomic.h \
5409
5422
  include/grpc/impl/codegen/atm_gcc_sync.h \
@@ -5418,308 +5431,38 @@ PUBLIC_HEADERS_C += \
5418
5431
  include/grpc/impl/codegen/sync_generic.h \
5419
5432
  include/grpc/impl/codegen/sync_posix.h \
5420
5433
  include/grpc/impl/codegen/sync_windows.h \
5421
- include/grpc/byte_buffer.h \
5422
- include/grpc/byte_buffer_reader.h \
5423
- include/grpc/compression.h \
5424
- include/grpc/fork.h \
5425
- include/grpc/grpc.h \
5426
- include/grpc/grpc_posix.h \
5427
- include/grpc/grpc_security_constants.h \
5428
- include/grpc/load_reporting.h \
5429
- include/grpc/slice.h \
5430
- include/grpc/slice_buffer.h \
5431
- include/grpc/status.h \
5432
- include/grpc/support/workaround_list.h \
5433
- include/grpc/census.h \
5434
-
5435
- LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
5436
-
5437
-
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)
5439
- $(E) "[AR] Creating $@"
5440
- $(Q) mkdir -p `dirname $@`
5441
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
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)
5443
- ifeq ($(SYSTEM),Darwin)
5444
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
5445
- endif
5446
-
5447
-
5448
-
5449
- ifeq ($(SYSTEM),MINGW32)
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
5451
- $(E) "[LD] Linking $@"
5452
- $(Q) mkdir -p `dirname $@`
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)
5454
- else
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
5456
- $(E) "[LD] Linking $@"
5457
- $(Q) mkdir -p `dirname $@`
5458
- ifeq ($(SYSTEM),Darwin)
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)
5460
- else
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
5463
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
5464
- endif
5465
- endif
5466
-
5467
- ifneq ($(NO_DEPS),true)
5468
- -include $(LIBGRPC_UNSECURE_OBJS:.o=.dep)
5469
- endif
5470
-
5471
-
5472
- LIBRECONNECT_SERVER_SRC = \
5473
- test/core/util/reconnect_server.cc \
5474
-
5475
- PUBLIC_HEADERS_C += \
5476
-
5477
- LIBRECONNECT_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBRECONNECT_SERVER_SRC))))
5478
-
5479
-
5480
- ifeq ($(NO_SECURE),true)
5481
-
5482
- # You can't build secure libraries if you don't have OpenSSL.
5483
-
5484
- $(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error
5485
-
5486
-
5487
- else
5488
-
5489
-
5490
- $(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBRECONNECT_SERVER_OBJS)
5491
- $(E) "[AR] Creating $@"
5492
- $(Q) mkdir -p `dirname $@`
5493
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a
5494
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBRECONNECT_SERVER_OBJS)
5495
- ifeq ($(SYSTEM),Darwin)
5496
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libreconnect_server.a
5497
- endif
5498
-
5499
-
5500
-
5501
-
5502
- endif
5503
-
5504
- ifneq ($(NO_SECURE),true)
5505
- ifneq ($(NO_DEPS),true)
5506
- -include $(LIBRECONNECT_SERVER_OBJS:.o=.dep)
5507
- endif
5508
- endif
5509
-
5510
-
5511
- LIBTEST_TCP_SERVER_SRC = \
5512
- test/core/util/test_tcp_server.cc \
5513
-
5514
- PUBLIC_HEADERS_C += \
5515
-
5516
- LIBTEST_TCP_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBTEST_TCP_SERVER_SRC))))
5517
-
5518
-
5519
- ifeq ($(NO_SECURE),true)
5520
-
5521
- # You can't build secure libraries if you don't have OpenSSL.
5522
-
5523
- $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error
5524
-
5525
-
5526
- else
5527
-
5528
-
5529
- $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBTEST_TCP_SERVER_OBJS)
5530
- $(E) "[AR] Creating $@"
5531
- $(Q) mkdir -p `dirname $@`
5532
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
5533
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBTEST_TCP_SERVER_OBJS)
5534
- ifeq ($(SYSTEM),Darwin)
5535
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
5536
- endif
5537
-
5538
-
5539
-
5540
-
5541
- endif
5542
-
5543
- ifneq ($(NO_SECURE),true)
5544
- ifneq ($(NO_DEPS),true)
5545
- -include $(LIBTEST_TCP_SERVER_OBJS:.o=.dep)
5546
- endif
5547
- endif
5548
-
5549
-
5550
- LIBBM_CALLBACK_TEST_SERVICE_IMPL_SRC = \
5551
- $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
5552
- test/cpp/microbenchmarks/callback_test_service.cc \
5553
-
5554
- PUBLIC_HEADERS_CXX += \
5555
-
5556
- LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_SRC))))
5557
-
5558
- $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
5559
-
5560
- ifeq ($(NO_SECURE),true)
5561
-
5562
- # You can't build secure libraries if you don't have OpenSSL.
5563
-
5564
- $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: openssl_dep_error
5565
-
5566
-
5567
- else
5568
-
5569
- ifeq ($(NO_PROTOBUF),true)
5570
-
5571
- # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
5572
-
5573
- $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: protobuf_dep_error
5434
+ include/grpc/impl/codegen/byte_buffer.h \
5435
+ include/grpc/impl/codegen/byte_buffer_reader.h \
5436
+ include/grpc/impl/codegen/compression_types.h \
5437
+ include/grpc/impl/codegen/connectivity_state.h \
5438
+ include/grpc/impl/codegen/grpc_types.h \
5439
+ include/grpc/impl/codegen/propagation_bits.h \
5440
+ include/grpc/impl/codegen/slice.h \
5441
+ include/grpc/impl/codegen/status.h \
5574
5442
 
5443
+ LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC))))
5575
5444
 
5576
- else
5577
5445
 
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)
5446
+ $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5579
5447
  $(E) "[AR] Creating $@"
5580
5448
  $(Q) mkdir -p `dirname $@`
5581
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a
5582
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS)
5449
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
5450
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
5583
5451
  ifeq ($(SYSTEM),Darwin)
5584
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a
5452
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
5585
5453
  endif
5586
5454
 
5587
5455
 
5588
5456
 
5589
5457
 
5590
- endif
5591
-
5592
- endif
5593
-
5594
- ifneq ($(NO_SECURE),true)
5595
5458
  ifneq ($(NO_DEPS),true)
5596
- -include $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS:.o=.dep)
5597
- endif
5459
+ -include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
5598
5460
  endif
5599
- $(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/callback_test_service.o: $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc
5600
-
5601
-
5602
- LIBDNS_TEST_UTIL_SRC = \
5603
- test/cpp/naming/dns_test_util.cc \
5604
-
5605
- PUBLIC_HEADERS_CXX += \
5606
-
5607
- LIBDNS_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBDNS_TEST_UTIL_SRC))))
5608
5461
 
5609
5462
 
5610
- ifeq ($(NO_SECURE),true)
5611
-
5612
- # You can't build secure libraries if you don't have OpenSSL.
5613
-
5614
- $(LIBDIR)/$(CONFIG)/libdns_test_util.a: openssl_dep_error
5615
-
5616
-
5617
- else
5618
-
5619
- ifeq ($(NO_PROTOBUF),true)
5620
-
5621
- # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
5622
-
5623
- $(LIBDIR)/$(CONFIG)/libdns_test_util.a: protobuf_dep_error
5624
-
5625
-
5626
- else
5627
-
5628
- $(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS)
5629
- $(E) "[AR] Creating $@"
5630
- $(Q) mkdir -p `dirname $@`
5631
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libdns_test_util.a
5632
- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libdns_test_util.a $(LIBDNS_TEST_UTIL_OBJS)
5633
- ifeq ($(SYSTEM),Darwin)
5634
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libdns_test_util.a
5635
- endif
5636
-
5637
-
5638
-
5639
-
5640
- endif
5641
-
5642
- endif
5643
-
5644
- ifneq ($(NO_SECURE),true)
5645
- ifneq ($(NO_DEPS),true)
5646
- -include $(LIBDNS_TEST_UTIL_OBJS:.o=.dep)
5647
- endif
5648
- endif
5649
-
5650
-
5651
- LIBGRPC++_SRC = \
5652
- src/cpp/client/insecure_credentials.cc \
5653
- src/cpp/client/secure_credentials.cc \
5654
- src/cpp/common/auth_property_iterator.cc \
5655
- src/cpp/common/secure_auth_context.cc \
5656
- src/cpp/common/secure_channel_arguments.cc \
5657
- src/cpp/common/secure_create_auth_context.cc \
5658
- src/cpp/common/tls_credentials_options.cc \
5659
- src/cpp/common/tls_credentials_options_util.cc \
5660
- src/cpp/server/insecure_server_credentials.cc \
5661
- src/cpp/server/secure_server_credentials.cc \
5662
- src/cpp/client/channel_cc.cc \
5663
- src/cpp/client/client_context.cc \
5664
- src/cpp/client/client_interceptor.cc \
5665
- src/cpp/client/create_channel.cc \
5666
- src/cpp/client/create_channel_internal.cc \
5667
- src/cpp/client/create_channel_posix.cc \
5668
- src/cpp/client/credentials_cc.cc \
5669
- src/cpp/client/generic_stub.cc \
5670
- src/cpp/common/alarm.cc \
5671
- src/cpp/common/channel_arguments.cc \
5672
- src/cpp/common/channel_filter.cc \
5673
- src/cpp/common/completion_queue_cc.cc \
5674
- src/cpp/common/core_codegen.cc \
5675
- src/cpp/common/resource_quota_cc.cc \
5676
- src/cpp/common/rpc_method.cc \
5677
- src/cpp/common/validate_service_config.cc \
5678
- src/cpp/common/version_cc.cc \
5679
- src/cpp/server/async_generic_service.cc \
5680
- src/cpp/server/channel_argument_option.cc \
5681
- src/cpp/server/create_default_thread_pool.cc \
5682
- src/cpp/server/dynamic_thread_pool.cc \
5683
- src/cpp/server/external_connection_acceptor_impl.cc \
5684
- src/cpp/server/health/default_health_check_service.cc \
5685
- src/cpp/server/health/health_check_service.cc \
5686
- src/cpp/server/health/health_check_service_server_builder_option.cc \
5687
- src/cpp/server/server_builder.cc \
5688
- src/cpp/server/server_callback.cc \
5689
- src/cpp/server/server_cc.cc \
5690
- src/cpp/server/server_context.cc \
5691
- src/cpp/server/server_credentials.cc \
5692
- src/cpp/server/server_posix.cc \
5693
- src/cpp/thread_manager/thread_manager.cc \
5694
- src/cpp/util/byte_buffer_cc.cc \
5695
- src/cpp/util/status.cc \
5696
- src/cpp/util/string_ref.cc \
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 \
5463
+ LIBGRPC_UNSECURE_SRC = \
5464
+ src/core/lib/surface/init.cc \
5465
+ src/core/lib/surface/init_unsecure.cc \
5723
5466
  src/core/lib/avl/avl.cc \
5724
5467
  src/core/lib/backoff/backoff.cc \
5725
5468
  src/core/lib/channel/channel_args.cc \
@@ -5784,6 +5527,7 @@ LIBGRPC++_SRC = \
5784
5527
  src/core/lib/iomgr/load_file.cc \
5785
5528
  src/core/lib/iomgr/lockfree_event.cc \
5786
5529
  src/core/lib/iomgr/logical_thread.cc \
5530
+ src/core/lib/iomgr/poller/eventmanager_libuv.cc \
5787
5531
  src/core/lib/iomgr/polling_entity.cc \
5788
5532
  src/core/lib/iomgr/pollset.cc \
5789
5533
  src/core/lib/iomgr/pollset_custom.cc \
@@ -5838,7 +5582,6 @@ LIBGRPC++_SRC = \
5838
5582
  src/core/lib/iomgr/wakeup_fd_posix.cc \
5839
5583
  src/core/lib/json/json.cc \
5840
5584
  src/core/lib/json/json_reader.cc \
5841
- src/core/lib/json/json_string.cc \
5842
5585
  src/core/lib/json/json_writer.cc \
5843
5586
  src/core/lib/slice/b64.cc \
5844
5587
  src/core/lib/slice/percent_encoding.cc \
@@ -5879,21 +5622,445 @@ LIBGRPC++_SRC = \
5879
5622
  src/core/lib/transport/transport_op_string.cc \
5880
5623
  src/core/lib/uri/uri_parser.cc \
5881
5624
  src/core/lib/debug/trace.cc \
5625
+ src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
5626
+ src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
5627
+ src/core/ext/transport/chttp2/transport/bin_decoder.cc \
5628
+ src/core/ext/transport/chttp2/transport/bin_encoder.cc \
5629
+ src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
5630
+ src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
5631
+ src/core/ext/transport/chttp2/transport/context_list.cc \
5632
+ src/core/ext/transport/chttp2/transport/flow_control.cc \
5633
+ src/core/ext/transport/chttp2/transport/frame_data.cc \
5634
+ src/core/ext/transport/chttp2/transport/frame_goaway.cc \
5635
+ src/core/ext/transport/chttp2/transport/frame_ping.cc \
5636
+ src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
5637
+ src/core/ext/transport/chttp2/transport/frame_settings.cc \
5638
+ src/core/ext/transport/chttp2/transport/frame_window_update.cc \
5639
+ src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
5640
+ src/core/ext/transport/chttp2/transport/hpack_parser.cc \
5641
+ src/core/ext/transport/chttp2/transport/hpack_table.cc \
5642
+ src/core/ext/transport/chttp2/transport/http2_settings.cc \
5643
+ src/core/ext/transport/chttp2/transport/huffsyms.cc \
5644
+ src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
5645
+ src/core/ext/transport/chttp2/transport/parsing.cc \
5646
+ src/core/ext/transport/chttp2/transport/stream_lists.cc \
5647
+ src/core/ext/transport/chttp2/transport/stream_map.cc \
5648
+ src/core/ext/transport/chttp2/transport/varint.cc \
5649
+ src/core/ext/transport/chttp2/transport/writing.cc \
5650
+ src/core/ext/transport/chttp2/alpn/alpn.cc \
5651
+ src/core/ext/filters/http/client/http_client_filter.cc \
5652
+ src/core/ext/filters/http/http_filters_plugin.cc \
5653
+ src/core/ext/filters/http/message_compress/message_compress_filter.cc \
5654
+ src/core/ext/filters/http/server/http_server_filter.cc \
5655
+ src/core/ext/transport/chttp2/server/chttp2_server.cc \
5656
+ src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
5657
+ src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
5658
+ src/core/ext/transport/chttp2/client/authority.cc \
5659
+ src/core/ext/transport/chttp2/client/chttp2_connector.cc \
5660
+ src/core/ext/filters/client_channel/backend_metric.cc \
5661
+ src/core/ext/filters/client_channel/backup_poller.cc \
5662
+ src/core/ext/filters/client_channel/channel_connectivity.cc \
5663
+ src/core/ext/filters/client_channel/client_channel.cc \
5664
+ src/core/ext/filters/client_channel/client_channel_channelz.cc \
5665
+ src/core/ext/filters/client_channel/client_channel_factory.cc \
5666
+ src/core/ext/filters/client_channel/client_channel_plugin.cc \
5667
+ src/core/ext/filters/client_channel/global_subchannel_pool.cc \
5668
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
5669
+ src/core/ext/filters/client_channel/http_connect_handshaker.cc \
5670
+ src/core/ext/filters/client_channel/http_proxy.cc \
5671
+ src/core/ext/filters/client_channel/lb_policy.cc \
5672
+ src/core/ext/filters/client_channel/lb_policy_registry.cc \
5673
+ src/core/ext/filters/client_channel/local_subchannel_pool.cc \
5674
+ src/core/ext/filters/client_channel/parse_address.cc \
5675
+ src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5676
+ src/core/ext/filters/client_channel/resolver.cc \
5677
+ src/core/ext/filters/client_channel/resolver_registry.cc \
5678
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5679
+ src/core/ext/filters/client_channel/resolving_lb_policy.cc \
5680
+ src/core/ext/filters/client_channel/retry_throttle.cc \
5681
+ src/core/ext/filters/client_channel/server_address.cc \
5682
+ src/core/ext/filters/client_channel/service_config.cc \
5683
+ src/core/ext/filters/client_channel/subchannel.cc \
5684
+ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
5882
5685
  src/core/ext/filters/deadline/deadline_filter.cc \
5883
5686
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.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 \
5687
+ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
5688
+ src/core/ext/upb-generated/gogoproto/gogo.upb.c \
5689
+ src/core/ext/upb-generated/validate/validate.upb.c \
5690
+ src/core/ext/upb-generated/google/api/annotations.upb.c \
5691
+ src/core/ext/upb-generated/google/api/http.upb.c \
5692
+ src/core/ext/upb-generated/google/protobuf/any.upb.c \
5693
+ src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
5694
+ src/core/ext/upb-generated/google/protobuf/duration.upb.c \
5695
+ src/core/ext/upb-generated/google/protobuf/empty.upb.c \
5696
+ src/core/ext/upb-generated/google/protobuf/struct.upb.c \
5697
+ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
5698
+ src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
5699
+ src/core/ext/upb-generated/google/rpc/status.upb.c \
5700
+ src/core/ext/transport/inproc/inproc_plugin.cc \
5701
+ src/core/ext/transport/inproc/inproc_transport.cc \
5702
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
5703
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
5704
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc \
5705
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
5706
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
5707
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
5708
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
5709
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc \
5710
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
5711
+ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
5712
+ src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc \
5713
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc \
5714
+ src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
5715
+ src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
5716
+ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
5717
+ src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
5718
+ src/core/ext/filters/client_channel/xds/xds_api.cc \
5719
+ src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
5720
+ src/core/ext/filters/client_channel/xds/xds_channel.cc \
5721
+ src/core/ext/filters/client_channel/xds/xds_client.cc \
5722
+ src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
5723
+ src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c \
5724
+ src/core/ext/upb-generated/envoy/api/v2/cds.upb.c \
5725
+ src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c \
5726
+ src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c \
5727
+ src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c \
5728
+ src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c \
5729
+ src/core/ext/upb-generated/envoy/api/v2/eds.upb.c \
5730
+ src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c \
5731
+ src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c \
5732
+ src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c \
5733
+ src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c \
5734
+ src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c \
5735
+ src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c \
5736
+ src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c \
5737
+ src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c \
5738
+ src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c \
5739
+ src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c \
5740
+ src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c \
5741
+ src/core/ext/upb-generated/envoy/type/http.upb.c \
5742
+ src/core/ext/upb-generated/envoy/type/percent.upb.c \
5743
+ src/core/ext/upb-generated/envoy/type/range.upb.c \
5744
+ src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
5745
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
5746
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc \
5747
+ src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
5748
+ src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
5749
+ src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
5750
+ src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
5751
+ src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
5752
+ src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
5753
+ src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
5754
+ src/core/ext/filters/census/grpc_context.cc \
5755
+ src/core/ext/filters/client_idle/client_idle_filter.cc \
5756
+ src/core/ext/filters/max_age/max_age_filter.cc \
5757
+ src/core/ext/filters/message_size/message_size_filter.cc \
5758
+ src/core/ext/filters/http/client_authority_filter.cc \
5759
+ src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
5760
+ src/core/ext/filters/workarounds/workaround_utils.cc \
5761
+ src/core/plugin_registry/grpc_unsecure_plugin_registry.cc \
5762
+
5763
+ PUBLIC_HEADERS_C += \
5764
+ include/grpc/impl/codegen/byte_buffer.h \
5765
+ include/grpc/impl/codegen/byte_buffer_reader.h \
5766
+ include/grpc/impl/codegen/compression_types.h \
5767
+ include/grpc/impl/codegen/connectivity_state.h \
5768
+ include/grpc/impl/codegen/grpc_types.h \
5769
+ include/grpc/impl/codegen/propagation_bits.h \
5770
+ include/grpc/impl/codegen/slice.h \
5771
+ include/grpc/impl/codegen/status.h \
5772
+ include/grpc/impl/codegen/atm.h \
5773
+ include/grpc/impl/codegen/atm_gcc_atomic.h \
5774
+ include/grpc/impl/codegen/atm_gcc_sync.h \
5775
+ include/grpc/impl/codegen/atm_windows.h \
5776
+ include/grpc/impl/codegen/fork.h \
5777
+ include/grpc/impl/codegen/gpr_slice.h \
5778
+ include/grpc/impl/codegen/gpr_types.h \
5779
+ include/grpc/impl/codegen/log.h \
5780
+ include/grpc/impl/codegen/port_platform.h \
5781
+ include/grpc/impl/codegen/sync.h \
5782
+ include/grpc/impl/codegen/sync_custom.h \
5783
+ include/grpc/impl/codegen/sync_generic.h \
5784
+ include/grpc/impl/codegen/sync_posix.h \
5785
+ include/grpc/impl/codegen/sync_windows.h \
5786
+ include/grpc/byte_buffer.h \
5787
+ include/grpc/byte_buffer_reader.h \
5788
+ include/grpc/compression.h \
5789
+ include/grpc/fork.h \
5790
+ include/grpc/grpc.h \
5791
+ include/grpc/grpc_posix.h \
5792
+ include/grpc/grpc_security_constants.h \
5793
+ include/grpc/load_reporting.h \
5794
+ include/grpc/slice.h \
5795
+ include/grpc/slice_buffer.h \
5796
+ include/grpc/status.h \
5797
+ include/grpc/support/workaround_list.h \
5798
+ include/grpc/census.h \
5799
+
5800
+ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
5801
+
5802
+
5803
+ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5804
+ $(E) "[AR] Creating $@"
5805
+ $(Q) mkdir -p `dirname $@`
5806
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
5807
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
5808
+ ifeq ($(SYSTEM),Darwin)
5809
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
5810
+ endif
5811
+
5812
+
5813
+
5814
+ ifeq ($(SYSTEM),MINGW32)
5815
+ $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a
5816
+ $(E) "[LD] Linking $@"
5817
+ $(Q) mkdir -p `dirname $@`
5818
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
5819
+ else
5820
+ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a
5821
+ $(E) "[LD] Linking $@"
5822
+ $(Q) mkdir -p `dirname $@`
5823
+ ifeq ($(SYSTEM),Darwin)
5824
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
5825
+ else
5826
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
5827
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.9
5828
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
5829
+ endif
5830
+ endif
5831
+
5832
+ ifneq ($(NO_DEPS),true)
5833
+ -include $(LIBGRPC_UNSECURE_OBJS:.o=.dep)
5834
+ endif
5835
+
5836
+
5837
+ LIBRECONNECT_SERVER_SRC = \
5838
+ test/core/util/reconnect_server.cc \
5839
+
5840
+ PUBLIC_HEADERS_C += \
5841
+
5842
+ LIBRECONNECT_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBRECONNECT_SERVER_SRC))))
5843
+
5844
+
5845
+ ifeq ($(NO_SECURE),true)
5846
+
5847
+ # You can't build secure libraries if you don't have OpenSSL.
5848
+
5849
+ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error
5850
+
5851
+
5852
+ else
5853
+
5854
+
5855
+ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBRECONNECT_SERVER_OBJS)
5856
+ $(E) "[AR] Creating $@"
5857
+ $(Q) mkdir -p `dirname $@`
5858
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a
5859
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBRECONNECT_SERVER_OBJS)
5860
+ ifeq ($(SYSTEM),Darwin)
5861
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libreconnect_server.a
5862
+ endif
5863
+
5864
+
5865
+
5866
+
5867
+ endif
5868
+
5869
+ ifneq ($(NO_SECURE),true)
5870
+ ifneq ($(NO_DEPS),true)
5871
+ -include $(LIBRECONNECT_SERVER_OBJS:.o=.dep)
5872
+ endif
5873
+ endif
5874
+
5875
+
5876
+ LIBTEST_TCP_SERVER_SRC = \
5877
+ test/core/util/test_tcp_server.cc \
5878
+
5879
+ PUBLIC_HEADERS_C += \
5880
+
5881
+ LIBTEST_TCP_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBTEST_TCP_SERVER_SRC))))
5882
+
5883
+
5884
+ ifeq ($(NO_SECURE),true)
5885
+
5886
+ # You can't build secure libraries if you don't have OpenSSL.
5887
+
5888
+ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error
5889
+
5890
+
5891
+ else
5892
+
5893
+
5894
+ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBTEST_TCP_SERVER_OBJS)
5895
+ $(E) "[AR] Creating $@"
5896
+ $(Q) mkdir -p `dirname $@`
5897
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
5898
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBTEST_TCP_SERVER_OBJS)
5899
+ ifeq ($(SYSTEM),Darwin)
5900
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
5901
+ endif
5902
+
5903
+
5904
+
5905
+
5906
+ endif
5907
+
5908
+ ifneq ($(NO_SECURE),true)
5909
+ ifneq ($(NO_DEPS),true)
5910
+ -include $(LIBTEST_TCP_SERVER_OBJS:.o=.dep)
5911
+ endif
5912
+ endif
5913
+
5914
+
5915
+ LIBBM_CALLBACK_TEST_SERVICE_IMPL_SRC = \
5916
+ $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
5917
+ test/cpp/microbenchmarks/callback_test_service.cc \
5918
+
5919
+ PUBLIC_HEADERS_CXX += \
5920
+
5921
+ LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_SRC))))
5922
+
5923
+ $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
5924
+
5925
+ ifeq ($(NO_SECURE),true)
5926
+
5927
+ # You can't build secure libraries if you don't have OpenSSL.
5928
+
5929
+ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: openssl_dep_error
5930
+
5931
+
5932
+ else
5933
+
5934
+ ifeq ($(NO_PROTOBUF),true)
5935
+
5936
+ # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
5937
+
5938
+ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: protobuf_dep_error
5939
+
5940
+
5941
+ else
5942
+
5943
+ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS)
5944
+ $(E) "[AR] Creating $@"
5945
+ $(Q) mkdir -p `dirname $@`
5946
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a
5947
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS)
5948
+ ifeq ($(SYSTEM),Darwin)
5949
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a
5950
+ endif
5951
+
5952
+
5953
+
5954
+
5955
+ endif
5956
+
5957
+ endif
5958
+
5959
+ ifneq ($(NO_SECURE),true)
5960
+ ifneq ($(NO_DEPS),true)
5961
+ -include $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS:.o=.dep)
5962
+ endif
5963
+ endif
5964
+ $(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/callback_test_service.o: $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc
5965
+
5966
+
5967
+ LIBDNS_TEST_UTIL_SRC = \
5968
+ test/cpp/naming/dns_test_util.cc \
5969
+
5970
+ PUBLIC_HEADERS_CXX += \
5971
+
5972
+ LIBDNS_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBDNS_TEST_UTIL_SRC))))
5973
+
5974
+
5975
+ ifeq ($(NO_SECURE),true)
5976
+
5977
+ # You can't build secure libraries if you don't have OpenSSL.
5978
+
5979
+ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: openssl_dep_error
5980
+
5981
+
5982
+ else
5983
+
5984
+ ifeq ($(NO_PROTOBUF),true)
5985
+
5986
+ # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
5987
+
5988
+ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: protobuf_dep_error
5989
+
5990
+
5991
+ else
5992
+
5993
+ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS)
5994
+ $(E) "[AR] Creating $@"
5995
+ $(Q) mkdir -p `dirname $@`
5996
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libdns_test_util.a
5997
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libdns_test_util.a $(LIBDNS_TEST_UTIL_OBJS)
5998
+ ifeq ($(SYSTEM),Darwin)
5999
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libdns_test_util.a
6000
+ endif
6001
+
6002
+
6003
+
6004
+
6005
+ endif
6006
+
6007
+ endif
6008
+
6009
+ ifneq ($(NO_SECURE),true)
6010
+ ifneq ($(NO_DEPS),true)
6011
+ -include $(LIBDNS_TEST_UTIL_OBJS:.o=.dep)
6012
+ endif
6013
+ endif
6014
+
6015
+
6016
+ LIBGRPC++_SRC = \
6017
+ src/cpp/client/insecure_credentials.cc \
6018
+ src/cpp/client/secure_credentials.cc \
6019
+ src/cpp/common/auth_property_iterator.cc \
6020
+ src/cpp/common/secure_auth_context.cc \
6021
+ src/cpp/common/secure_channel_arguments.cc \
6022
+ src/cpp/common/secure_create_auth_context.cc \
6023
+ src/cpp/common/tls_credentials_options.cc \
6024
+ src/cpp/common/tls_credentials_options_util.cc \
6025
+ src/cpp/server/insecure_server_credentials.cc \
6026
+ src/cpp/server/secure_server_credentials.cc \
6027
+ src/cpp/client/channel_cc.cc \
6028
+ src/cpp/client/client_context.cc \
6029
+ src/cpp/client/client_interceptor.cc \
6030
+ src/cpp/client/create_channel.cc \
6031
+ src/cpp/client/create_channel_internal.cc \
6032
+ src/cpp/client/create_channel_posix.cc \
6033
+ src/cpp/client/credentials_cc.cc \
6034
+ src/cpp/client/generic_stub.cc \
6035
+ src/cpp/common/alarm.cc \
6036
+ src/cpp/common/channel_arguments.cc \
6037
+ src/cpp/common/channel_filter.cc \
6038
+ src/cpp/common/completion_queue_cc.cc \
6039
+ src/cpp/common/core_codegen.cc \
6040
+ src/cpp/common/resource_quota_cc.cc \
6041
+ src/cpp/common/rpc_method.cc \
6042
+ src/cpp/common/validate_service_config.cc \
6043
+ src/cpp/common/version_cc.cc \
6044
+ src/cpp/server/async_generic_service.cc \
6045
+ src/cpp/server/channel_argument_option.cc \
6046
+ src/cpp/server/create_default_thread_pool.cc \
6047
+ src/cpp/server/dynamic_thread_pool.cc \
6048
+ src/cpp/server/external_connection_acceptor_impl.cc \
6049
+ src/cpp/server/health/default_health_check_service.cc \
6050
+ src/cpp/server/health/health_check_service.cc \
6051
+ src/cpp/server/health/health_check_service_server_builder_option.cc \
6052
+ src/cpp/server/server_builder.cc \
6053
+ src/cpp/server/server_callback.cc \
6054
+ src/cpp/server/server_cc.cc \
6055
+ src/cpp/server/server_context.cc \
6056
+ src/cpp/server/server_credentials.cc \
6057
+ src/cpp/server/server_posix.cc \
6058
+ src/cpp/thread_manager/thread_manager.cc \
6059
+ src/cpp/util/byte_buffer_cc.cc \
6060
+ src/cpp/util/status.cc \
6061
+ src/cpp/util/string_ref.cc \
6062
+ src/cpp/util/time_cc.cc \
6063
+ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
5897
6064
  src/cpp/codegen/codegen_init.cc \
5898
6065
 
5899
6066
  PUBLIC_HEADERS_CXX += \
@@ -6136,41 +6303,116 @@ PUBLIC_HEADERS_CXX += \
6136
6303
  include/grpcpp/impl/codegen/rpc_method.h \
6137
6304
  include/grpcpp/impl/codegen/rpc_service_method.h \
6138
6305
  include/grpcpp/impl/codegen/security/auth_context.h \
6139
- include/grpcpp/impl/codegen/serialization_traits.h \
6140
- include/grpcpp/impl/codegen/server_callback.h \
6141
- include/grpcpp/impl/codegen/server_callback_handlers.h \
6142
- include/grpcpp/impl/codegen/server_callback_impl.h \
6143
- include/grpcpp/impl/codegen/server_context.h \
6144
- include/grpcpp/impl/codegen/server_context_impl.h \
6145
- include/grpcpp/impl/codegen/server_interceptor.h \
6146
- include/grpcpp/impl/codegen/server_interface.h \
6147
- include/grpcpp/impl/codegen/service_type.h \
6148
- include/grpcpp/impl/codegen/slice.h \
6149
- include/grpcpp/impl/codegen/status.h \
6150
- include/grpcpp/impl/codegen/status_code_enum.h \
6151
- include/grpcpp/impl/codegen/string_ref.h \
6152
- include/grpcpp/impl/codegen/stub_options.h \
6153
- include/grpcpp/impl/codegen/sync_stream.h \
6154
- include/grpcpp/impl/codegen/sync_stream_impl.h \
6155
- include/grpcpp/impl/codegen/time.h \
6156
- include/grpcpp/impl/codegen/sync.h \
6157
- include/grpc++/impl/codegen/proto_utils.h \
6158
- include/grpcpp/impl/codegen/proto_buffer_reader.h \
6159
- include/grpcpp/impl/codegen/proto_buffer_writer.h \
6160
- include/grpcpp/impl/codegen/proto_utils.h \
6161
- include/grpc++/impl/codegen/config_protobuf.h \
6162
- include/grpcpp/impl/codegen/config_protobuf.h \
6306
+ include/grpcpp/impl/codegen/serialization_traits.h \
6307
+ include/grpcpp/impl/codegen/server_callback.h \
6308
+ include/grpcpp/impl/codegen/server_callback_handlers.h \
6309
+ include/grpcpp/impl/codegen/server_callback_impl.h \
6310
+ include/grpcpp/impl/codegen/server_context.h \
6311
+ include/grpcpp/impl/codegen/server_context_impl.h \
6312
+ include/grpcpp/impl/codegen/server_interceptor.h \
6313
+ include/grpcpp/impl/codegen/server_interface.h \
6314
+ include/grpcpp/impl/codegen/service_type.h \
6315
+ include/grpcpp/impl/codegen/slice.h \
6316
+ include/grpcpp/impl/codegen/status.h \
6317
+ include/grpcpp/impl/codegen/status_code_enum.h \
6318
+ include/grpcpp/impl/codegen/string_ref.h \
6319
+ include/grpcpp/impl/codegen/stub_options.h \
6320
+ include/grpcpp/impl/codegen/sync_stream.h \
6321
+ include/grpcpp/impl/codegen/sync_stream_impl.h \
6322
+ include/grpcpp/impl/codegen/time.h \
6323
+ include/grpcpp/impl/codegen/sync.h \
6324
+ include/grpc++/impl/codegen/proto_utils.h \
6325
+ include/grpcpp/impl/codegen/proto_buffer_reader.h \
6326
+ include/grpcpp/impl/codegen/proto_buffer_writer.h \
6327
+ include/grpcpp/impl/codegen/proto_utils.h \
6328
+ include/grpc++/impl/codegen/config_protobuf.h \
6329
+ include/grpcpp/impl/codegen/config_protobuf.h \
6330
+
6331
+ LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
6332
+
6333
+
6334
+ ifeq ($(NO_SECURE),true)
6335
+
6336
+ # You can't build secure libraries if you don't have OpenSSL.
6337
+
6338
+ $(LIBDIR)/$(CONFIG)/libgrpc++.a: openssl_dep_error
6339
+
6340
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
6341
+
6342
+ else
6343
+
6344
+ ifeq ($(NO_PROTOBUF),true)
6345
+
6346
+ # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
6347
+
6348
+ $(LIBDIR)/$(CONFIG)/libgrpc++.a: protobuf_dep_error
6349
+
6350
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
6351
+
6352
+ else
6353
+
6354
+ $(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6355
+ $(E) "[AR] Creating $@"
6356
+ $(Q) mkdir -p `dirname $@`
6357
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a
6358
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6359
+ ifeq ($(SYSTEM),Darwin)
6360
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a
6361
+ endif
6362
+
6363
+
6364
+
6365
+ ifeq ($(SYSTEM),MINGW32)
6366
+ $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_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)
6367
+ $(E) "[LD] Linking $@"
6368
+ $(Q) mkdir -p `dirname $@`
6369
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll
6370
+ else
6371
+ $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6372
+ $(E) "[LD] Linking $@"
6373
+ $(Q) mkdir -p `dirname $@`
6374
+ ifeq ($(SYSTEM),Darwin)
6375
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb
6376
+ else
6377
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb
6378
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so.1
6379
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so
6380
+ endif
6381
+ endif
6382
+
6383
+ endif
6384
+
6385
+ endif
6386
+
6387
+ ifneq ($(NO_SECURE),true)
6388
+ ifneq ($(NO_DEPS),true)
6389
+ -include $(LIBGRPC++_OBJS:.o=.dep)
6390
+ endif
6391
+ endif
6392
+
6393
+
6394
+ LIBGRPC++_ALTS_SRC = \
6395
+ src/cpp/common/alts_context.cc \
6396
+ src/cpp/common/alts_util.cc \
6397
+ src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
6398
+ src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
6399
+ src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
6400
+
6401
+ PUBLIC_HEADERS_CXX += \
6402
+ include/grpcpp/impl/codegen/security/auth_context.h \
6403
+ include/grpcpp/security/alts_context.h \
6404
+ include/grpcpp/security/alts_util.h \
6163
6405
 
6164
- LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
6406
+ LIBGRPC++_ALTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_ALTS_SRC))))
6165
6407
 
6166
6408
 
6167
6409
  ifeq ($(NO_SECURE),true)
6168
6410
 
6169
6411
  # You can't build secure libraries if you don't have OpenSSL.
6170
6412
 
6171
- $(LIBDIR)/$(CONFIG)/libgrpc++.a: openssl_dep_error
6413
+ $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a: openssl_dep_error
6172
6414
 
6173
- $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
6415
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
6174
6416
 
6175
6417
  else
6176
6418
 
@@ -6178,38 +6420,38 @@ ifeq ($(NO_PROTOBUF),true)
6178
6420
 
6179
6421
  # You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
6180
6422
 
6181
- $(LIBDIR)/$(CONFIG)/libgrpc++.a: protobuf_dep_error
6423
+ $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a: protobuf_dep_error
6182
6424
 
6183
- $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
6425
+ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
6184
6426
 
6185
6427
  else
6186
6428
 
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)
6429
+ $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ALTS_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6188
6430
  $(E) "[AR] Creating $@"
6189
6431
  $(Q) mkdir -p `dirname $@`
6190
- $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a
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)
6432
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a
6433
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a $(LIBGRPC++_ALTS_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6192
6434
  ifeq ($(SYSTEM),Darwin)
6193
- $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a
6435
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a
6194
6436
  endif
6195
6437
 
6196
6438
 
6197
6439
 
6198
6440
  ifeq ($(SYSTEM),MINGW32)
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)
6441
+ $(LIBDIR)/$(CONFIG)/grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ALTS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6200
6442
  $(E) "[LD] Linking $@"
6201
6443
  $(Q) mkdir -p `dirname $@`
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
6444
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_alts$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ALTS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgpr$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll
6203
6445
  else
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)
6446
+ $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ALTS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6205
6447
  $(E) "[LD] Linking $@"
6206
6448
  $(Q) mkdir -p `dirname $@`
6207
6449
  ifeq ($(SYSTEM),Darwin)
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
6450
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ALTS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgpr -lupb
6209
6451
  else
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
6211
- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so.1
6212
- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so
6452
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_alts.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ALTS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgpr -lupb
6453
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP).so.1
6454
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_alts$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_alts$(SHARED_VERSION_CPP).so
6213
6455
  endif
6214
6456
  endif
6215
6457
 
@@ -6219,7 +6461,7 @@ endif
6219
6461
 
6220
6462
  ifneq ($(NO_SECURE),true)
6221
6463
  ifneq ($(NO_DEPS),true)
6222
- -include $(LIBGRPC++_OBJS:.o=.dep)
6464
+ -include $(LIBGRPC++_ALTS_OBJS:.o=.dep)
6223
6465
  endif
6224
6466
  endif
6225
6467
 
@@ -6251,7 +6493,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: protobuf_dep_error
6251
6493
 
6252
6494
  else
6253
6495
 
6254
- $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS)
6496
+ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS)
6255
6497
  $(E) "[AR] Creating $@"
6256
6498
  $(Q) mkdir -p `dirname $@`
6257
6499
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
@@ -6307,11 +6549,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(
6307
6549
 
6308
6550
  else
6309
6551
 
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)
6552
+ $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6311
6553
  $(E) "[AR] Creating $@"
6312
6554
  $(Q) mkdir -p `dirname $@`
6313
6555
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
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)
6556
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
6315
6557
  ifeq ($(SYSTEM),Darwin)
6316
6558
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
6317
6559
  endif
@@ -6319,18 +6561,18 @@ endif
6319
6561
 
6320
6562
 
6321
6563
  ifeq ($(SYSTEM),MINGW32)
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)
6564
+ $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6323
6565
  $(E) "[LD] Linking $@"
6324
6566
  $(Q) mkdir -p `dirname $@`
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
6567
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll
6326
6568
  else
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)
6569
+ $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP)
6328
6570
  $(E) "[LD] Linking $@"
6329
6571
  $(Q) mkdir -p `dirname $@`
6330
6572
  ifeq ($(SYSTEM),Darwin)
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++
6573
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6332
6574
  else
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++
6575
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
6334
6576
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so.1
6335
6577
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so
6336
6578
  endif
@@ -6377,7 +6619,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: protobuf_dep_error
6377
6619
 
6378
6620
  else
6379
6621
 
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)
6622
+ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS)
6381
6623
  $(E) "[AR] Creating $@"
6382
6624
  $(Q) mkdir -p `dirname $@`
6383
6625
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
@@ -6434,7 +6676,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHA
6434
6676
 
6435
6677
  else
6436
6678
 
6437
- $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS)
6679
+ $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS)
6438
6680
  $(E) "[AR] Creating $@"
6439
6681
  $(Q) mkdir -p `dirname $@`
6440
6682
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
@@ -6446,18 +6688,18 @@ endif
6446
6688
 
6447
6689
 
6448
6690
  ifeq ($(SYSTEM),MINGW32)
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)
6691
+ $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6450
6692
  $(E) "[LD] Linking $@"
6451
6693
  $(Q) mkdir -p `dirname $@`
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
6694
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
6453
6695
  else
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)
6696
+ $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
6455
6697
  $(E) "[LD] Linking $@"
6456
6698
  $(Q) mkdir -p `dirname $@`
6457
6699
  ifeq ($(SYSTEM),Darwin)
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
6700
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6459
6701
  else
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
6702
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
6461
6703
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so.1
6462
6704
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so
6463
6705
  endif
@@ -6502,7 +6744,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: protobuf_dep_error
6502
6744
 
6503
6745
  else
6504
6746
 
6505
- $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS)
6747
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS)
6506
6748
  $(E) "[AR] Creating $@"
6507
6749
  $(Q) mkdir -p `dirname $@`
6508
6750
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
@@ -6677,7 +6919,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: protobuf_dep_error
6677
6919
 
6678
6920
  else
6679
6921
 
6680
- $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS)
6922
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS)
6681
6923
  $(E) "[AR] Creating $@"
6682
6924
  $(Q) mkdir -p `dirname $@`
6683
6925
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
@@ -6857,7 +7099,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: protobuf_dep_error
6857
7099
 
6858
7100
  else
6859
7101
 
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)
7102
+ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS)
6861
7103
  $(E) "[AR] Creating $@"
6862
7104
  $(Q) mkdir -p `dirname $@`
6863
7105
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
@@ -6895,236 +7137,38 @@ LIBGRPC++_UNSECURE_SRC = \
6895
7137
  src/cpp/client/client_interceptor.cc \
6896
7138
  src/cpp/client/create_channel.cc \
6897
7139
  src/cpp/client/create_channel_internal.cc \
6898
- src/cpp/client/create_channel_posix.cc \
6899
- src/cpp/client/credentials_cc.cc \
6900
- src/cpp/client/generic_stub.cc \
6901
- src/cpp/common/alarm.cc \
6902
- src/cpp/common/channel_arguments.cc \
6903
- src/cpp/common/channel_filter.cc \
6904
- src/cpp/common/completion_queue_cc.cc \
6905
- src/cpp/common/core_codegen.cc \
6906
- src/cpp/common/resource_quota_cc.cc \
6907
- src/cpp/common/rpc_method.cc \
6908
- src/cpp/common/validate_service_config.cc \
6909
- src/cpp/common/version_cc.cc \
6910
- src/cpp/server/async_generic_service.cc \
6911
- src/cpp/server/channel_argument_option.cc \
6912
- src/cpp/server/create_default_thread_pool.cc \
6913
- src/cpp/server/dynamic_thread_pool.cc \
6914
- src/cpp/server/external_connection_acceptor_impl.cc \
6915
- src/cpp/server/health/default_health_check_service.cc \
6916
- src/cpp/server/health/health_check_service.cc \
6917
- src/cpp/server/health/health_check_service_server_builder_option.cc \
6918
- src/cpp/server/server_builder.cc \
6919
- src/cpp/server/server_callback.cc \
6920
- src/cpp/server/server_cc.cc \
6921
- src/cpp/server/server_context.cc \
6922
- src/cpp/server/server_credentials.cc \
6923
- src/cpp/server/server_posix.cc \
6924
- src/cpp/thread_manager/thread_manager.cc \
6925
- src/cpp/util/byte_buffer_cc.cc \
6926
- src/cpp/util/status.cc \
6927
- src/cpp/util/string_ref.cc \
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 \
7140
+ src/cpp/client/create_channel_posix.cc \
7141
+ src/cpp/client/credentials_cc.cc \
7142
+ src/cpp/client/generic_stub.cc \
7143
+ src/cpp/common/alarm.cc \
7144
+ src/cpp/common/channel_arguments.cc \
7145
+ src/cpp/common/channel_filter.cc \
7146
+ src/cpp/common/completion_queue_cc.cc \
7147
+ src/cpp/common/core_codegen.cc \
7148
+ src/cpp/common/resource_quota_cc.cc \
7149
+ src/cpp/common/rpc_method.cc \
7150
+ src/cpp/common/validate_service_config.cc \
7151
+ src/cpp/common/version_cc.cc \
7152
+ src/cpp/server/async_generic_service.cc \
7153
+ src/cpp/server/channel_argument_option.cc \
7154
+ src/cpp/server/create_default_thread_pool.cc \
7155
+ src/cpp/server/dynamic_thread_pool.cc \
7156
+ src/cpp/server/external_connection_acceptor_impl.cc \
7157
+ src/cpp/server/health/default_health_check_service.cc \
7158
+ src/cpp/server/health/health_check_service.cc \
7159
+ src/cpp/server/health/health_check_service_server_builder_option.cc \
7160
+ src/cpp/server/server_builder.cc \
7161
+ src/cpp/server/server_callback.cc \
7162
+ src/cpp/server/server_cc.cc \
7163
+ src/cpp/server/server_context.cc \
7164
+ src/cpp/server/server_credentials.cc \
7165
+ src/cpp/server/server_posix.cc \
7166
+ src/cpp/thread_manager/thread_manager.cc \
7167
+ src/cpp/util/byte_buffer_cc.cc \
7168
+ src/cpp/util/status.cc \
7169
+ src/cpp/util/string_ref.cc \
7170
+ src/cpp/util/time_cc.cc \
7114
7171
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.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 \
7128
7172
  src/cpp/codegen/codegen_init.cc \
7129
7173
 
7130
7174
  PUBLIC_HEADERS_CXX += \
@@ -7399,11 +7443,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARE
7399
7443
 
7400
7444
  else
7401
7445
 
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)
7446
+ $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
7403
7447
  $(E) "[AR] Creating $@"
7404
7448
  $(Q) mkdir -p `dirname $@`
7405
7449
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
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)
7450
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS)
7407
7451
  ifeq ($(SYSTEM),Darwin)
7408
7452
  $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
7409
7453
  endif
@@ -7411,18 +7455,18 @@ endif
7411
7455
 
7412
7456
 
7413
7457
  ifeq ($(SYSTEM),MINGW32)
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)
7458
+ $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_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)
7415
7459
  $(E) "[LD] Linking $@"
7416
7460
  $(Q) mkdir -p `dirname $@`
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
7461
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll
7418
7462
  else
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)
7463
+ $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE)
7420
7464
  $(E) "[LD] Linking $@"
7421
7465
  $(Q) mkdir -p `dirname $@`
7422
7466
  ifeq ($(SYSTEM),Darwin)
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
7467
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb
7424
7468
  else
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
7469
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb
7426
7470
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so.1
7427
7471
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so
7428
7472
  endif
@@ -7462,7 +7506,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: protobuf_dep_error
7462
7506
 
7463
7507
  else
7464
7508
 
7465
- $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS)
7509
+ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS)
7466
7510
  $(E) "[AR] Creating $@"
7467
7511
  $(Q) mkdir -p `dirname $@`
7468
7512
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
@@ -7518,7 +7562,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: protobuf_dep_error
7518
7562
 
7519
7563
  else
7520
7564
 
7521
- $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS)
7565
+ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS)
7522
7566
  $(E) "[AR] Creating $@"
7523
7567
  $(Q) mkdir -p `dirname $@`
7524
7568
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
@@ -7571,7 +7615,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
7571
7615
 
7572
7616
  else
7573
7617
 
7574
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
7618
+ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
7575
7619
  $(E) "[AR] Creating $@"
7576
7620
  $(Q) mkdir -p `dirname $@`
7577
7621
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
@@ -7622,7 +7666,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARE
7622
7666
 
7623
7667
  else
7624
7668
 
7625
- $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS)
7669
+ $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS)
7626
7670
  $(E) "[AR] Creating $@"
7627
7671
  $(Q) mkdir -p `dirname $@`
7628
7672
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
@@ -7634,18 +7678,18 @@ endif
7634
7678
 
7635
7679
 
7636
7680
  ifeq ($(SYSTEM),MINGW32)
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)
7681
+ $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7638
7682
  $(E) "[LD] Linking $@"
7639
7683
  $(Q) mkdir -p `dirname $@`
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
7684
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
7641
7685
  else
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)
7686
+ $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
7643
7687
  $(E) "[LD] Linking $@"
7644
7688
  $(Q) mkdir -p `dirname $@`
7645
7689
  ifeq ($(SYSTEM),Darwin)
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
7690
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7647
7691
  else
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
7692
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
7649
7693
  $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so.1
7650
7694
  $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so
7651
7695
  endif
@@ -7693,7 +7737,7 @@ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: protobuf_dep_error
7693
7737
 
7694
7738
  else
7695
7739
 
7696
- $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS)
7740
+ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS)
7697
7741
  $(E) "[AR] Creating $@"
7698
7742
  $(Q) mkdir -p `dirname $@`
7699
7743
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
@@ -7744,7 +7788,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: protobuf_dep_error
7744
7788
 
7745
7789
  else
7746
7790
 
7747
- $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS)
7791
+ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS)
7748
7792
  $(E) "[AR] Creating $@"
7749
7793
  $(Q) mkdir -p `dirname $@`
7750
7794
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
@@ -7798,7 +7842,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: protobuf_dep_error
7798
7842
 
7799
7843
  else
7800
7844
 
7801
- $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS)
7845
+ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS)
7802
7846
  $(E) "[AR] Creating $@"
7803
7847
  $(Q) mkdir -p `dirname $@`
7804
7848
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
@@ -7849,7 +7893,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: protobuf_dep_error
7849
7893
 
7850
7894
  else
7851
7895
 
7852
- $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS)
7896
+ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS)
7853
7897
  $(E) "[AR] Creating $@"
7854
7898
  $(Q) mkdir -p `dirname $@`
7855
7899
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
@@ -7901,7 +7945,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: protobuf_dep_error
7901
7945
 
7902
7946
  else
7903
7947
 
7904
- $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS)
7948
+ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS)
7905
7949
  $(E) "[AR] Creating $@"
7906
7950
  $(Q) mkdir -p `dirname $@`
7907
7951
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
@@ -7951,7 +7995,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: protobuf_dep_error
7951
7995
 
7952
7996
  else
7953
7997
 
7954
- $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS)
7998
+ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS)
7955
7999
  $(E) "[AR] Creating $@"
7956
8000
  $(Q) mkdir -p `dirname $@`
7957
8001
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
@@ -8019,7 +8063,7 @@ $(LIBDIR)/$(CONFIG)/libqps.a: protobuf_dep_error
8019
8063
 
8020
8064
  else
8021
8065
 
8022
- $(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS)
8066
+ $(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS)
8023
8067
  $(E) "[AR] Creating $@"
8024
8068
  $(Q) mkdir -p `dirname $@`
8025
8069
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libqps.a
@@ -8074,7 +8118,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SH
8074
8118
  else
8075
8119
 
8076
8120
 
8077
- $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_CSHARP_EXT_OBJS)
8121
+ $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_CSHARP_EXT_OBJS)
8078
8122
  $(E) "[AR] Creating $@"
8079
8123
  $(Q) mkdir -p `dirname $@`
8080
8124
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
@@ -8086,18 +8130,18 @@ endif
8086
8130
 
8087
8131
 
8088
8132
  ifeq ($(SYSTEM),MINGW32)
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)
8133
+ $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
8090
8134
  $(E) "[LD] Linking $@"
8091
8135
  $(Q) mkdir -p `dirname $@`
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)
8136
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8093
8137
  else
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)
8138
+ $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
8095
8139
  $(E) "[LD] Linking $@"
8096
8140
  $(Q) mkdir -p `dirname $@`
8097
8141
  ifeq ($(SYSTEM),Darwin)
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)
8142
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8099
8143
  else
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)
8144
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8101
8145
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so.2
8102
8146
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so
8103
8147
  endif
@@ -8386,7 +8430,7 @@ $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=h
8386
8430
  $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-exceptions
8387
8431
  $(LIBBORINGSSL_OBJS): CFLAGS += -g
8388
8432
 
8389
- $(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBORINGSSL_OBJS)
8433
+ $(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBBORINGSSL_OBJS)
8390
8434
  $(E) "[AR] Creating $@"
8391
8435
  $(Q) mkdir -p `dirname $@`
8392
8436
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a
@@ -8426,7 +8470,7 @@ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error
8426
8470
 
8427
8471
  else
8428
8472
 
8429
- $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS)
8473
+ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS)
8430
8474
  $(E) "[AR] Creating $@"
8431
8475
  $(Q) mkdir -p `dirname $@`
8432
8476
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
@@ -8481,7 +8525,7 @@ $(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error
8481
8525
 
8482
8526
  else
8483
8527
 
8484
- $(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS)
8528
+ $(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS)
8485
8529
  $(E) "[AR] Creating $@"
8486
8530
  $(Q) mkdir -p `dirname $@`
8487
8531
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a
@@ -8524,7 +8568,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
8524
8568
  else
8525
8569
 
8526
8570
 
8527
- $(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBUPB_OBJS)
8571
+ $(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBUPB_OBJS)
8528
8572
  $(E) "[AR] Creating $@"
8529
8573
  $(Q) mkdir -p `dirname $@`
8530
8574
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a
@@ -8536,18 +8580,18 @@ endif
8536
8580
 
8537
8581
 
8538
8582
  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)
8583
+ $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(OPENSSL_DEP)
8540
8584
  $(E) "[LD] Linking $@"
8541
8585
  $(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)
8586
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8543
8587
  else
8544
- $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(OPENSSL_DEP)
8588
+ $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(OPENSSL_DEP)
8545
8589
  $(E) "[LD] Linking $@"
8546
8590
  $(Q) mkdir -p `dirname $@`
8547
8591
  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)
8592
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8549
8593
  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)
8594
+ $(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
8551
8595
  $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.9
8552
8596
  $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so
8553
8597
  endif
@@ -8704,7 +8748,7 @@ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: protobuf_dep_error
8704
8748
 
8705
8749
  else
8706
8750
 
8707
- $(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS)
8751
+ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS)
8708
8752
  $(E) "[AR] Creating $@"
8709
8753
  $(Q) mkdir -p `dirname $@`
8710
8754
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_client_test.a
@@ -8745,7 +8789,7 @@ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: openssl_dep_error
8745
8789
  else
8746
8790
 
8747
8791
 
8748
- $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS)
8792
+ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS)
8749
8793
  $(E) "[AR] Creating $@"
8750
8794
  $(Q) mkdir -p `dirname $@`
8751
8795
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
@@ -8863,7 +8907,7 @@ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: openssl_dep_error
8863
8907
  else
8864
8908
 
8865
8909
 
8866
- $(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_TESTS_OBJS)
8910
+ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBEND2END_TESTS_OBJS)
8867
8911
  $(E) "[AR] Creating $@"
8868
8912
  $(Q) mkdir -p `dirname $@`
8869
8913
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_tests.a
@@ -8970,7 +9014,7 @@ PUBLIC_HEADERS_C += \
8970
9014
  LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC))))
8971
9015
 
8972
9016
 
8973
- $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS)
9017
+ $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_ABSEIL_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS)
8974
9018
  $(E) "[AR] Creating $@"
8975
9019
  $(Q) mkdir -p `dirname $@`
8976
9020
  $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
@@ -8987,6 +9031,73 @@ ifneq ($(NO_DEPS),true)
8987
9031
  endif
8988
9032
 
8989
9033
 
9034
+ # Add private ABSEIL target which contains all sources used by all baselib libraries.
9035
+
9036
+
9037
+ LIBGRPC_ABSEIL_SRC = \
9038
+ third_party/abseil-cpp/absl/base/dynamic_annotations.cc \
9039
+ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
9040
+ third_party/abseil-cpp/absl/base/internal/raw_logging.cc \
9041
+ third_party/abseil-cpp/absl/base/internal/spinlock.cc \
9042
+ third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc \
9043
+ third_party/abseil-cpp/absl/base/internal/sysinfo.cc \
9044
+ third_party/abseil-cpp/absl/base/internal/thread_identity.cc \
9045
+ third_party/abseil-cpp/absl/base/internal/throw_delegate.cc \
9046
+ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc \
9047
+ third_party/abseil-cpp/absl/base/log_severity.cc \
9048
+ third_party/abseil-cpp/absl/numeric/int128.cc \
9049
+ third_party/abseil-cpp/absl/strings/ascii.cc \
9050
+ third_party/abseil-cpp/absl/strings/charconv.cc \
9051
+ third_party/abseil-cpp/absl/strings/escaping.cc \
9052
+ third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \
9053
+ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \
9054
+ third_party/abseil-cpp/absl/strings/internal/escaping.cc \
9055
+ third_party/abseil-cpp/absl/strings/internal/memutil.cc \
9056
+ third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \
9057
+ third_party/abseil-cpp/absl/strings/internal/utf8.cc \
9058
+ third_party/abseil-cpp/absl/strings/match.cc \
9059
+ third_party/abseil-cpp/absl/strings/numbers.cc \
9060
+ third_party/abseil-cpp/absl/strings/str_cat.cc \
9061
+ third_party/abseil-cpp/absl/strings/str_replace.cc \
9062
+ third_party/abseil-cpp/absl/strings/str_split.cc \
9063
+ third_party/abseil-cpp/absl/strings/string_view.cc \
9064
+ third_party/abseil-cpp/absl/strings/substitute.cc \
9065
+ third_party/abseil-cpp/absl/types/bad_optional_access.cc \
9066
+
9067
+
9068
+ LIBGRPC_ABSEIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_ABSEIL_SRC))))
9069
+
9070
+
9071
+ ifeq ($(NO_SECURE),true)
9072
+
9073
+ # You can't build secure libraries if you don't have OpenSSL.
9074
+
9075
+ $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: openssl_dep_error
9076
+
9077
+
9078
+ else
9079
+
9080
+
9081
+ $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_ABSEIL_OBJS)
9082
+ $(E) "[AR] Creating $@"
9083
+ $(Q) mkdir -p `dirname $@`
9084
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
9085
+ $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a $(LIBGRPC_ABSEIL_OBJS)
9086
+ ifeq ($(SYSTEM),Darwin)
9087
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
9088
+ endif
9089
+
9090
+
9091
+
9092
+
9093
+ endif
9094
+
9095
+ ifneq ($(NO_SECURE),true)
9096
+ ifneq ($(NO_DEPS),true)
9097
+ -include $(LIBGRPC_ABSEIL_OBJS:.o=.dep)
9098
+ endif
9099
+ endif
9100
+
8990
9101
 
8991
9102
  # All of the test targets, and protoc plugins
8992
9103
 
@@ -11857,102 +11968,6 @@ endif
11857
11968
  endif
11858
11969
 
11859
11970
 
11860
- JSON_REWRITE_SRC = \
11861
- test/core/json/json_rewrite.cc \
11862
-
11863
- JSON_REWRITE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_REWRITE_SRC))))
11864
- ifeq ($(NO_SECURE),true)
11865
-
11866
- # You can't build secure targets if you don't have OpenSSL.
11867
-
11868
- $(BINDIR)/$(CONFIG)/json_rewrite: openssl_dep_error
11869
-
11870
- else
11871
-
11872
-
11873
-
11874
- $(BINDIR)/$(CONFIG)/json_rewrite: $(JSON_REWRITE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11875
- $(E) "[LD] Linking $@"
11876
- $(Q) mkdir -p `dirname $@`
11877
- $(Q) $(LDXX) $(LDFLAGS) $(JSON_REWRITE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_rewrite
11878
-
11879
- endif
11880
-
11881
- $(OBJDIR)/$(CONFIG)/test/core/json/json_rewrite.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11882
-
11883
- deps_json_rewrite: $(JSON_REWRITE_OBJS:.o=.dep)
11884
-
11885
- ifneq ($(NO_SECURE),true)
11886
- ifneq ($(NO_DEPS),true)
11887
- -include $(JSON_REWRITE_OBJS:.o=.dep)
11888
- endif
11889
- endif
11890
-
11891
-
11892
- JSON_REWRITE_TEST_SRC = \
11893
- test/core/json/json_rewrite_test.cc \
11894
-
11895
- JSON_REWRITE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_REWRITE_TEST_SRC))))
11896
- ifeq ($(NO_SECURE),true)
11897
-
11898
- # You can't build secure targets if you don't have OpenSSL.
11899
-
11900
- $(BINDIR)/$(CONFIG)/json_rewrite_test: openssl_dep_error
11901
-
11902
- else
11903
-
11904
-
11905
-
11906
- $(BINDIR)/$(CONFIG)/json_rewrite_test: $(JSON_REWRITE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11907
- $(E) "[LD] Linking $@"
11908
- $(Q) mkdir -p `dirname $@`
11909
- $(Q) $(LDXX) $(LDFLAGS) $(JSON_REWRITE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_rewrite_test
11910
-
11911
- endif
11912
-
11913
- $(OBJDIR)/$(CONFIG)/test/core/json/json_rewrite_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11914
-
11915
- deps_json_rewrite_test: $(JSON_REWRITE_TEST_OBJS:.o=.dep)
11916
-
11917
- ifneq ($(NO_SECURE),true)
11918
- ifneq ($(NO_DEPS),true)
11919
- -include $(JSON_REWRITE_TEST_OBJS:.o=.dep)
11920
- endif
11921
- endif
11922
-
11923
-
11924
- JSON_STREAM_ERROR_TEST_SRC = \
11925
- test/core/json/json_stream_error_test.cc \
11926
-
11927
- JSON_STREAM_ERROR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_STREAM_ERROR_TEST_SRC))))
11928
- ifeq ($(NO_SECURE),true)
11929
-
11930
- # You can't build secure targets if you don't have OpenSSL.
11931
-
11932
- $(BINDIR)/$(CONFIG)/json_stream_error_test: openssl_dep_error
11933
-
11934
- else
11935
-
11936
-
11937
-
11938
- $(BINDIR)/$(CONFIG)/json_stream_error_test: $(JSON_STREAM_ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11939
- $(E) "[LD] Linking $@"
11940
- $(Q) mkdir -p `dirname $@`
11941
- $(Q) $(LDXX) $(LDFLAGS) $(JSON_STREAM_ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_stream_error_test
11942
-
11943
- endif
11944
-
11945
- $(OBJDIR)/$(CONFIG)/test/core/json/json_stream_error_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
11946
-
11947
- deps_json_stream_error_test: $(JSON_STREAM_ERROR_TEST_OBJS:.o=.dep)
11948
-
11949
- ifneq ($(NO_SECURE),true)
11950
- ifneq ($(NO_DEPS),true)
11951
- -include $(JSON_STREAM_ERROR_TEST_OBJS:.o=.dep)
11952
- endif
11953
- endif
11954
-
11955
-
11956
11971
  JSON_TEST_SRC = \
11957
11972
  test/core/json/json_test.cc \
11958
11973
 
@@ -14289,6 +14304,49 @@ endif
14289
14304
  endif
14290
14305
 
14291
14306
 
14307
+ ALTS_UTIL_TEST_SRC = \
14308
+ test/cpp/common/alts_util_test.cc \
14309
+
14310
+ ALTS_UTIL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALTS_UTIL_TEST_SRC))))
14311
+ ifeq ($(NO_SECURE),true)
14312
+
14313
+ # You can't build secure targets if you don't have OpenSSL.
14314
+
14315
+ $(BINDIR)/$(CONFIG)/alts_util_test: openssl_dep_error
14316
+
14317
+ else
14318
+
14319
+
14320
+
14321
+
14322
+ ifeq ($(NO_PROTOBUF),true)
14323
+
14324
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
14325
+
14326
+ $(BINDIR)/$(CONFIG)/alts_util_test: protobuf_dep_error
14327
+
14328
+ else
14329
+
14330
+ $(BINDIR)/$(CONFIG)/alts_util_test: $(PROTOBUF_DEP) $(ALTS_UTIL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
14331
+ $(E) "[LD] Linking $@"
14332
+ $(Q) mkdir -p `dirname $@`
14333
+ $(Q) $(LDXX) $(LDFLAGS) $(ALTS_UTIL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_alts.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_util_test
14334
+
14335
+ endif
14336
+
14337
+ endif
14338
+
14339
+ $(OBJDIR)/$(CONFIG)/test/cpp/common/alts_util_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_alts.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
14340
+
14341
+ deps_alts_util_test: $(ALTS_UTIL_TEST_OBJS:.o=.dep)
14342
+
14343
+ ifneq ($(NO_SECURE),true)
14344
+ ifneq ($(NO_DEPS),true)
14345
+ -include $(ALTS_UTIL_TEST_OBJS:.o=.dep)
14346
+ endif
14347
+ endif
14348
+
14349
+
14292
14350
  ALTS_ZERO_COPY_GRPC_PROTECTOR_TEST_SRC = \
14293
14351
  test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc \
14294
14352
 
@@ -16713,6 +16771,49 @@ endif
16713
16771
  $(OBJDIR)/$(CONFIG)/test/cpp/util/error_details_test.o: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
16714
16772
 
16715
16773
 
16774
+ EVENTMANAGER_LIBUV_TEST_SRC = \
16775
+ test/core/iomgr/poller/eventmanager_libuv_test.cc \
16776
+
16777
+ EVENTMANAGER_LIBUV_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(EVENTMANAGER_LIBUV_TEST_SRC))))
16778
+ ifeq ($(NO_SECURE),true)
16779
+
16780
+ # You can't build secure targets if you don't have OpenSSL.
16781
+
16782
+ $(BINDIR)/$(CONFIG)/eventmanager_libuv_test: openssl_dep_error
16783
+
16784
+ else
16785
+
16786
+
16787
+
16788
+
16789
+ ifeq ($(NO_PROTOBUF),true)
16790
+
16791
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
16792
+
16793
+ $(BINDIR)/$(CONFIG)/eventmanager_libuv_test: protobuf_dep_error
16794
+
16795
+ else
16796
+
16797
+ $(BINDIR)/$(CONFIG)/eventmanager_libuv_test: $(PROTOBUF_DEP) $(EVENTMANAGER_LIBUV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
16798
+ $(E) "[LD] Linking $@"
16799
+ $(Q) mkdir -p `dirname $@`
16800
+ $(Q) $(LDXX) $(LDFLAGS) $(EVENTMANAGER_LIBUV_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)/eventmanager_libuv_test
16801
+
16802
+ endif
16803
+
16804
+ endif
16805
+
16806
+ $(OBJDIR)/$(CONFIG)/test/core/iomgr/poller/eventmanager_libuv_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
16807
+
16808
+ deps_eventmanager_libuv_test: $(EVENTMANAGER_LIBUV_TEST_OBJS:.o=.dep)
16809
+
16810
+ ifneq ($(NO_SECURE),true)
16811
+ ifneq ($(NO_DEPS),true)
16812
+ -include $(EVENTMANAGER_LIBUV_TEST_OBJS:.o=.dep)
16813
+ endif
16814
+ endif
16815
+
16816
+
16716
16817
  EXCEPTION_TEST_SRC = \
16717
16818
  test/cpp/end2end/exception_test.cc \
16718
16819
 
@@ -17536,15 +17637,15 @@ ifneq ($(NO_DEPS),true)
17536
17637
  endif
17537
17638
 
17538
17639
 
17539
- GRPC_SPIFFE_SECURITY_CONNECTOR_TEST_SRC = \
17540
- test/core/security/spiffe_security_connector_test.cc \
17640
+ GRPC_TLS_SECURITY_CONNECTOR_TEST_SRC = \
17641
+ test/core/security/tls_security_connector_test.cc \
17541
17642
 
17542
- GRPC_SPIFFE_SECURITY_CONNECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_SPIFFE_SECURITY_CONNECTOR_TEST_SRC))))
17643
+ GRPC_TLS_SECURITY_CONNECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_TLS_SECURITY_CONNECTOR_TEST_SRC))))
17543
17644
  ifeq ($(NO_SECURE),true)
17544
17645
 
17545
17646
  # You can't build secure targets if you don't have OpenSSL.
17546
17647
 
17547
- $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test: openssl_dep_error
17648
+ $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test: openssl_dep_error
17548
17649
 
17549
17650
  else
17550
17651
 
@@ -17555,26 +17656,26 @@ ifeq ($(NO_PROTOBUF),true)
17555
17656
 
17556
17657
  # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
17557
17658
 
17558
- $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test: protobuf_dep_error
17659
+ $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test: protobuf_dep_error
17559
17660
 
17560
17661
  else
17561
17662
 
17562
- $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test: $(PROTOBUF_DEP) $(GRPC_SPIFFE_SECURITY_CONNECTOR_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
17663
+ $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test: $(PROTOBUF_DEP) $(GRPC_TLS_SECURITY_CONNECTOR_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
17563
17664
  $(E) "[LD] Linking $@"
17564
17665
  $(Q) mkdir -p `dirname $@`
17565
- $(Q) $(LDXX) $(LDFLAGS) $(GRPC_SPIFFE_SECURITY_CONNECTOR_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 $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpc_spiffe_security_connector_test
17666
+ $(Q) $(LDXX) $(LDFLAGS) $(GRPC_TLS_SECURITY_CONNECTOR_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 $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpc_tls_security_connector_test
17566
17667
 
17567
17668
  endif
17568
17669
 
17569
17670
  endif
17570
17671
 
17571
- $(OBJDIR)/$(CONFIG)/test/core/security/spiffe_security_connector_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
17672
+ $(OBJDIR)/$(CONFIG)/test/core/security/tls_security_connector_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
17572
17673
 
17573
- deps_grpc_spiffe_security_connector_test: $(GRPC_SPIFFE_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
17674
+ deps_grpc_tls_security_connector_test: $(GRPC_TLS_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
17574
17675
 
17575
17676
  ifneq ($(NO_SECURE),true)
17576
17677
  ifneq ($(NO_DEPS),true)
17577
- -include $(GRPC_SPIFFE_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
17678
+ -include $(GRPC_TLS_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
17578
17679
  endif
17579
17680
  endif
17580
17681
 
@@ -20568,6 +20669,7 @@ endif
20568
20669
 
20569
20670
  XDS_END2END_TEST_SRC = \
20570
20671
  $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.grpc.pb.cc \
20672
+ $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.grpc.pb.cc \
20571
20673
  $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.grpc.pb.cc \
20572
20674
  $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.grpc.pb.cc \
20573
20675
  test/cpp/end2end/xds_end2end_test.cc \
@@ -20603,6 +20705,8 @@ endif
20603
20705
 
20604
20706
  $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/xds/ads_for_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
20605
20707
 
20708
+ $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/xds/cds_for_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
20709
+
20606
20710
  $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/xds/eds_for_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
20607
20711
 
20608
20712
  $(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/xds/lrs_for_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
@@ -20616,7 +20720,7 @@ ifneq ($(NO_DEPS),true)
20616
20720
  -include $(XDS_END2END_TEST_OBJS:.o=.dep)
20617
20721
  endif
20618
20722
  endif
20619
- $(OBJDIR)/$(CONFIG)/test/cpp/end2end/xds_end2end_test.o: $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.grpc.pb.cc
20723
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/xds_end2end_test.o: $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.grpc.pb.cc
20620
20724
 
20621
20725
 
20622
20726
  PUBLIC_HEADERS_MUST_BE_C89_SRC = \
@@ -21938,38 +22042,6 @@ endif
21938
22042
  endif
21939
22043
 
21940
22044
 
21941
- H2_SPIFFE_TEST_SRC = \
21942
- test/core/end2end/fixtures/h2_spiffe.cc \
21943
-
21944
- H2_SPIFFE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SPIFFE_TEST_SRC))))
21945
- ifeq ($(NO_SECURE),true)
21946
-
21947
- # You can't build secure targets if you don't have OpenSSL.
21948
-
21949
- $(BINDIR)/$(CONFIG)/h2_spiffe_test: openssl_dep_error
21950
-
21951
- else
21952
-
21953
-
21954
-
21955
- $(BINDIR)/$(CONFIG)/h2_spiffe_test: $(H2_SPIFFE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
21956
- $(E) "[LD] Linking $@"
21957
- $(Q) mkdir -p `dirname $@`
21958
- $(Q) $(LDXX) $(LDFLAGS) $(H2_SPIFFE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_spiffe_test
21959
-
21960
- endif
21961
-
21962
- $(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_spiffe.o: $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
21963
-
21964
- deps_h2_spiffe_test: $(H2_SPIFFE_TEST_OBJS:.o=.dep)
21965
-
21966
- ifneq ($(NO_SECURE),true)
21967
- ifneq ($(NO_DEPS),true)
21968
- -include $(H2_SPIFFE_TEST_OBJS:.o=.dep)
21969
- endif
21970
- endif
21971
-
21972
-
21973
22045
  H2_SSL_TEST_SRC = \
21974
22046
  test/core/end2end/fixtures/h2_ssl.cc \
21975
22047
 
@@ -22066,6 +22138,38 @@ endif
22066
22138
  endif
22067
22139
 
22068
22140
 
22141
+ H2_TLS_TEST_SRC = \
22142
+ test/core/end2end/fixtures/h2_tls.cc \
22143
+
22144
+ H2_TLS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_TLS_TEST_SRC))))
22145
+ ifeq ($(NO_SECURE),true)
22146
+
22147
+ # You can't build secure targets if you don't have OpenSSL.
22148
+
22149
+ $(BINDIR)/$(CONFIG)/h2_tls_test: openssl_dep_error
22150
+
22151
+ else
22152
+
22153
+
22154
+
22155
+ $(BINDIR)/$(CONFIG)/h2_tls_test: $(H2_TLS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
22156
+ $(E) "[LD] Linking $@"
22157
+ $(Q) mkdir -p `dirname $@`
22158
+ $(Q) $(LDXX) $(LDFLAGS) $(H2_TLS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_tls_test
22159
+
22160
+ endif
22161
+
22162
+ $(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_tls.o: $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
22163
+
22164
+ deps_h2_tls_test: $(H2_TLS_TEST_OBJS:.o=.dep)
22165
+
22166
+ ifneq ($(NO_SECURE),true)
22167
+ ifneq ($(NO_DEPS),true)
22168
+ -include $(H2_TLS_TEST_OBJS:.o=.dep)
22169
+ endif
22170
+ endif
22171
+
22172
+
22069
22173
  H2_UDS_TEST_SRC = \
22070
22174
  test/core/end2end/fixtures/h2_uds.cc \
22071
22175
 
@@ -23225,7 +23329,7 @@ src/core/lib/security/credentials/oauth2/oauth2_credentials.cc: $(OPENSSL_DEP)
23225
23329
  src/core/lib/security/credentials/plugin/plugin_credentials.cc: $(OPENSSL_DEP)
23226
23330
  src/core/lib/security/credentials/ssl/ssl_credentials.cc: $(OPENSSL_DEP)
23227
23331
  src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc: $(OPENSSL_DEP)
23228
- src/core/lib/security/credentials/tls/spiffe_credentials.cc: $(OPENSSL_DEP)
23332
+ src/core/lib/security/credentials/tls/tls_credentials.cc: $(OPENSSL_DEP)
23229
23333
  src/core/lib/security/security_connector/alts/alts_security_connector.cc: $(OPENSSL_DEP)
23230
23334
  src/core/lib/security/security_connector/fake/fake_security_connector.cc: $(OPENSSL_DEP)
23231
23335
  src/core/lib/security/security_connector/load_system_roots_fallback.cc: $(OPENSSL_DEP)
@@ -23235,7 +23339,7 @@ src/core/lib/security/security_connector/security_connector.cc: $(OPENSSL_DEP)
23235
23339
  src/core/lib/security/security_connector/ssl/ssl_security_connector.cc: $(OPENSSL_DEP)
23236
23340
  src/core/lib/security/security_connector/ssl_utils.cc: $(OPENSSL_DEP)
23237
23341
  src/core/lib/security/security_connector/ssl_utils_config.cc: $(OPENSSL_DEP)
23238
- src/core/lib/security/security_connector/tls/spiffe_security_connector.cc: $(OPENSSL_DEP)
23342
+ src/core/lib/security/security_connector/tls/tls_security_connector.cc: $(OPENSSL_DEP)
23239
23343
  src/core/lib/security/transport/client_auth_filter.cc: $(OPENSSL_DEP)
23240
23344
  src/core/lib/security/transport/secure_endpoint.cc: $(OPENSSL_DEP)
23241
23345
  src/core/lib/security/transport/security_handshaker.cc: $(OPENSSL_DEP)
@@ -23273,6 +23377,8 @@ src/core/tsi/ssl_transport_security.cc: $(OPENSSL_DEP)
23273
23377
  src/core/tsi/transport_security.cc: $(OPENSSL_DEP)
23274
23378
  src/core/tsi/transport_security_grpc.cc: $(OPENSSL_DEP)
23275
23379
  src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
23380
+ src/cpp/common/alts_context.cc: $(OPENSSL_DEP)
23381
+ src/cpp/common/alts_util.cc: $(OPENSSL_DEP)
23276
23382
  src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
23277
23383
  src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
23278
23384
  src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP)
@@ -23294,6 +23400,7 @@ test/core/end2end/data/server1_cert.cc: $(OPENSSL_DEP)
23294
23400
  test/core/end2end/data/server1_key.cc: $(OPENSSL_DEP)
23295
23401
  test/core/end2end/data/test_root_cert.cc: $(OPENSSL_DEP)
23296
23402
  test/core/end2end/end2end_tests.cc: $(OPENSSL_DEP)
23403
+ test/core/end2end/engine_passthrough.cc: $(OPENSSL_DEP)
23297
23404
  test/core/end2end/tests/call_creds.cc: $(OPENSSL_DEP)
23298
23405
  test/core/security/oauth2_utils.cc: $(OPENSSL_DEP)
23299
23406
  test/core/tsi/alts/crypt/gsec_test_util.cc: $(OPENSSL_DEP)
@@ -23338,6 +23445,34 @@ test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP)
23338
23445
  test/cpp/util/subprocess.cc: $(OPENSSL_DEP)
23339
23446
  test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP)
23340
23447
  test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP)
23448
+ third_party/abseil-cpp/absl/base/dynamic_annotations.cc: $(OPENSSL_DEP)
23449
+ third_party/abseil-cpp/absl/base/internal/cycleclock.cc: $(OPENSSL_DEP)
23450
+ third_party/abseil-cpp/absl/base/internal/raw_logging.cc: $(OPENSSL_DEP)
23451
+ third_party/abseil-cpp/absl/base/internal/spinlock.cc: $(OPENSSL_DEP)
23452
+ third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc: $(OPENSSL_DEP)
23453
+ third_party/abseil-cpp/absl/base/internal/sysinfo.cc: $(OPENSSL_DEP)
23454
+ third_party/abseil-cpp/absl/base/internal/thread_identity.cc: $(OPENSSL_DEP)
23455
+ third_party/abseil-cpp/absl/base/internal/throw_delegate.cc: $(OPENSSL_DEP)
23456
+ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc: $(OPENSSL_DEP)
23457
+ third_party/abseil-cpp/absl/base/log_severity.cc: $(OPENSSL_DEP)
23458
+ third_party/abseil-cpp/absl/numeric/int128.cc: $(OPENSSL_DEP)
23459
+ third_party/abseil-cpp/absl/strings/ascii.cc: $(OPENSSL_DEP)
23460
+ third_party/abseil-cpp/absl/strings/charconv.cc: $(OPENSSL_DEP)
23461
+ third_party/abseil-cpp/absl/strings/escaping.cc: $(OPENSSL_DEP)
23462
+ third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc: $(OPENSSL_DEP)
23463
+ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc: $(OPENSSL_DEP)
23464
+ third_party/abseil-cpp/absl/strings/internal/escaping.cc: $(OPENSSL_DEP)
23465
+ third_party/abseil-cpp/absl/strings/internal/memutil.cc: $(OPENSSL_DEP)
23466
+ third_party/abseil-cpp/absl/strings/internal/ostringstream.cc: $(OPENSSL_DEP)
23467
+ third_party/abseil-cpp/absl/strings/internal/utf8.cc: $(OPENSSL_DEP)
23468
+ third_party/abseil-cpp/absl/strings/match.cc: $(OPENSSL_DEP)
23469
+ third_party/abseil-cpp/absl/strings/numbers.cc: $(OPENSSL_DEP)
23470
+ third_party/abseil-cpp/absl/strings/str_cat.cc: $(OPENSSL_DEP)
23471
+ third_party/abseil-cpp/absl/strings/str_replace.cc: $(OPENSSL_DEP)
23472
+ third_party/abseil-cpp/absl/strings/str_split.cc: $(OPENSSL_DEP)
23473
+ third_party/abseil-cpp/absl/strings/string_view.cc: $(OPENSSL_DEP)
23474
+ third_party/abseil-cpp/absl/strings/substitute.cc: $(OPENSSL_DEP)
23475
+ third_party/abseil-cpp/absl/types/bad_optional_access.cc: $(OPENSSL_DEP)
23341
23476
  third_party/upb/upb/decode.c: $(OPENSSL_DEP)
23342
23477
  third_party/upb/upb/encode.c: $(OPENSSL_DEP)
23343
23478
  third_party/upb/upb/msg.c: $(OPENSSL_DEP)