grpc 1.60.2 → 1.61.0.pre2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Makefile +208 -165
- data/include/grpc/event_engine/event_engine.h +59 -12
- data/include/grpc/event_engine/internal/memory_allocator_impl.h +6 -0
- data/include/grpc/event_engine/internal/slice_cast.h +12 -0
- data/include/grpc/event_engine/memory_allocator.h +3 -1
- data/include/grpc/event_engine/slice.h +5 -0
- data/include/grpc/grpc_security.h +22 -1
- data/include/grpc/impl/call.h +29 -0
- data/include/grpc/impl/channel_arg_names.h +12 -1
- data/include/grpc/impl/slice_type.h +1 -1
- data/include/grpc/module.modulemap +1 -0
- data/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +54 -7
- data/src/core/ext/filters/backend_metrics/backend_metric_filter.h +20 -6
- data/src/core/ext/filters/channel_idle/channel_idle_filter.cc +10 -13
- data/src/core/ext/filters/channel_idle/channel_idle_filter.h +18 -10
- data/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +326 -0
- data/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +143 -0
- data/src/core/ext/filters/client_channel/backend_metric.cc +2 -2
- data/src/core/ext/filters/client_channel/client_channel.cc +32 -6
- data/src/core/ext/filters/client_channel/client_channel_internal.h +2 -0
- data/src/core/ext/filters/client_channel/global_subchannel_pool.cc +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +54 -21
- data/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +3 -2
- data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +2 -1
- data/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc +12 -15
- data/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h +8 -5
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +139 -92
- data/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc +9 -4
- data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +9 -4
- data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +10 -11
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +94 -93
- data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +5 -3
- data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +12 -15
- data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +38 -16
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +25 -28
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +10 -10
- data/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc +37 -35
- data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +11 -9
- data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +504 -461
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +232 -122
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +8 -6
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc +642 -251
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h +2 -6
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc +7 -8
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +2 -1
- data/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +3 -1
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver/polling_resolver.cc +6 -8
- data/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc +1031 -0
- data/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h +277 -0
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +128 -270
- data/src/core/ext/filters/client_channel/resolver/xds/{xds_resolver.h → xds_resolver_attributes.h} +5 -4
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc +25 -0
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h +30 -0
- data/src/core/ext/filters/client_channel/retry_filter.cc +1 -0
- data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +35 -17
- data/src/core/ext/filters/deadline/deadline_filter.cc +12 -0
- data/src/core/ext/filters/fault_injection/fault_injection_filter.cc +17 -13
- data/src/core/ext/filters/fault_injection/fault_injection_filter.h +13 -4
- data/src/core/ext/filters/http/client/http_client_filter.cc +23 -32
- data/src/core/ext/filters/http/client/http_client_filter.h +10 -5
- data/src/core/ext/filters/http/client_authority_filter.cc +14 -14
- data/src/core/ext/filters/http/client_authority_filter.h +12 -4
- data/src/core/ext/filters/http/http_filters_plugin.cc +42 -20
- data/src/core/ext/filters/http/message_compress/compression_filter.cc +55 -80
- data/src/core/ext/filters/http/message_compress/compression_filter.h +54 -12
- data/src/core/ext/filters/http/message_compress/legacy_compression_filter.cc +325 -0
- data/src/core/ext/filters/http/message_compress/legacy_compression_filter.h +139 -0
- data/src/core/ext/filters/http/server/http_server_filter.cc +41 -41
- data/src/core/ext/filters/http/server/http_server_filter.h +11 -4
- data/src/core/ext/filters/message_size/message_size_filter.cc +56 -76
- data/src/core/ext/filters/message_size/message_size_filter.h +35 -23
- data/src/core/ext/filters/rbac/rbac_filter.cc +15 -11
- data/src/core/ext/filters/rbac/rbac_filter.h +11 -4
- data/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc +25 -13
- data/src/core/ext/filters/stateful_session/stateful_session_filter.cc +47 -50
- data/src/core/ext/filters/stateful_session/stateful_session_filter.h +21 -4
- data/src/core/ext/transport/chttp2/alpn/alpn.cc +1 -1
- data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +2 -2
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +11 -2
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +68 -145
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.h +3 -3
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +21 -82
- data/src/core/ext/transport/chttp2/transport/flow_control.h +1 -8
- data/src/core/ext/transport/chttp2/transport/frame.cc +506 -0
- data/src/core/ext/transport/chttp2/transport/frame.h +214 -0
- data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +1 -1
- data/src/core/ext/transport/chttp2/transport/frame_settings.cc +33 -79
- data/src/core/ext/transport/chttp2/transport/frame_settings.h +4 -7
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +27 -36
- data/src/core/ext/transport/chttp2/transport/hpack_parser.h +0 -2
- data/src/core/ext/transport/chttp2/transport/http2_settings.cc +122 -32
- data/src/core/ext/transport/chttp2/transport/http2_settings.h +142 -37
- data/src/core/ext/transport/chttp2/transport/internal.h +1 -22
- data/src/core/ext/transport/chttp2/transport/parsing.cc +23 -37
- data/src/core/ext/transport/chttp2/transport/writing.cc +26 -58
- data/src/core/ext/transport/inproc/inproc_transport.cc +172 -13
- data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h +712 -0
- data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c +151 -0
- data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h +33 -0
- data/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c +133 -0
- data/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h +50 -0
- data/src/core/ext/xds/certificate_provider_store.cc +2 -1
- data/src/core/ext/xds/certificate_provider_store.h +0 -5
- data/src/core/ext/xds/xds_api.cc +31 -18
- data/src/core/ext/xds/xds_api.h +2 -2
- data/src/core/ext/xds/xds_bootstrap.h +3 -0
- data/src/core/ext/xds/xds_certificate_provider.cc +88 -287
- data/src/core/ext/xds/xds_certificate_provider.h +44 -111
- data/src/core/ext/xds/xds_client.cc +420 -414
- data/src/core/ext/xds/xds_client.h +31 -22
- data/src/core/ext/xds/xds_client_grpc.cc +3 -1
- data/src/core/ext/xds/xds_cluster.cc +104 -11
- data/src/core/ext/xds/xds_cluster.h +9 -1
- data/src/core/ext/xds/xds_cluster_specifier_plugin.cc +9 -5
- data/src/core/ext/xds/xds_common_types.cc +14 -10
- data/src/core/ext/xds/xds_endpoint.cc +9 -4
- data/src/core/ext/xds/xds_endpoint.h +5 -1
- data/src/core/ext/xds/xds_health_status.cc +12 -2
- data/src/core/ext/xds/xds_health_status.h +4 -2
- data/src/core/ext/xds/xds_http_rbac_filter.cc +5 -3
- data/src/core/ext/xds/xds_listener.cc +14 -8
- data/src/core/ext/xds/xds_resource_type_impl.h +6 -4
- data/src/core/ext/xds/xds_route_config.cc +34 -22
- data/src/core/ext/xds/xds_route_config.h +1 -0
- data/src/core/ext/xds/xds_server_config_fetcher.cc +61 -57
- data/src/core/ext/xds/xds_transport.h +3 -0
- data/src/core/ext/xds/xds_transport_grpc.cc +47 -50
- data/src/core/ext/xds/xds_transport_grpc.h +4 -0
- data/src/core/lib/channel/call_tracer.cc +12 -0
- data/src/core/lib/channel/call_tracer.h +17 -3
- data/src/core/lib/channel/channel_args.cc +24 -14
- data/src/core/lib/channel/channel_args.h +74 -13
- data/src/core/lib/channel/channel_stack.cc +27 -0
- data/src/core/lib/channel/channel_stack.h +10 -10
- data/src/core/lib/channel/connected_channel.cc +64 -18
- data/src/core/lib/channel/promise_based_filter.h +1041 -1
- data/src/core/lib/channel/server_call_tracer_filter.cc +43 -35
- data/src/core/lib/compression/compression_internal.cc +0 -3
- data/src/core/lib/event_engine/ares_resolver.cc +35 -14
- data/src/core/lib/event_engine/ares_resolver.h +9 -10
- data/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +8 -1
- data/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc +132 -0
- data/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h +61 -0
- data/src/core/lib/event_engine/posix_engine/posix_engine.cc +52 -36
- data/src/core/lib/event_engine/posix_engine/posix_engine.h +4 -9
- data/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +11 -3
- data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +9 -2
- data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +7 -0
- data/src/core/lib/event_engine/posix_engine/timer_manager.cc +17 -27
- data/src/core/lib/event_engine/posix_engine/timer_manager.h +0 -3
- data/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +55 -0
- data/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +114 -0
- data/src/core/lib/event_engine/windows/native_windows_dns_resolver.h +51 -0
- data/src/core/lib/event_engine/windows/windows_engine.cc +7 -7
- data/src/core/lib/experiments/config.cc +13 -0
- data/src/core/lib/experiments/config.h +3 -0
- data/src/core/lib/experiments/experiments.cc +245 -366
- data/src/core/lib/experiments/experiments.h +50 -156
- data/src/core/lib/gprpp/debug_location.h +13 -0
- data/src/core/lib/gprpp/dual_ref_counted.h +36 -7
- data/src/core/lib/gprpp/orphanable.h +27 -0
- data/src/core/lib/gprpp/ref_counted.h +63 -22
- data/src/core/lib/gprpp/ref_counted_ptr.h +70 -27
- data/src/core/lib/gprpp/ref_counted_string.h +13 -0
- data/src/core/lib/gprpp/status_helper.cc +1 -2
- data/src/core/lib/iomgr/combiner.cc +15 -51
- data/src/core/lib/iomgr/event_engine_shims/endpoint.cc +31 -0
- data/src/core/lib/iomgr/event_engine_shims/endpoint.h +16 -0
- data/src/core/lib/iomgr/tcp_client_posix.cc +4 -3
- data/src/core/lib/load_balancing/lb_policy.h +1 -1
- data/src/core/lib/promise/activity.cc +17 -2
- data/src/core/lib/promise/activity.h +5 -4
- data/src/core/lib/promise/all_ok.h +80 -0
- data/src/core/lib/promise/detail/join_state.h +2077 -0
- data/src/core/lib/promise/detail/promise_factory.h +1 -0
- data/src/core/lib/promise/detail/promise_like.h +8 -1
- data/src/core/lib/promise/detail/seq_state.h +3458 -150
- data/src/core/lib/promise/detail/status.h +42 -5
- data/src/core/lib/promise/for_each.h +13 -1
- data/src/core/lib/promise/if.h +4 -0
- data/src/core/lib/promise/latch.h +6 -3
- data/src/core/lib/promise/party.cc +33 -31
- data/src/core/lib/promise/party.h +142 -6
- data/src/core/lib/promise/poll.h +39 -13
- data/src/core/lib/promise/promise.h +4 -0
- data/src/core/lib/promise/seq.h +107 -7
- data/src/core/lib/promise/status_flag.h +196 -0
- data/src/core/lib/promise/try_join.h +132 -0
- data/src/core/lib/promise/try_seq.h +132 -10
- data/src/core/lib/resolver/endpoint_addresses.cc +0 -1
- data/src/core/lib/resolver/endpoint_addresses.h +48 -0
- data/src/core/lib/resource_quota/arena.h +2 -2
- data/src/core/lib/resource_quota/memory_quota.cc +57 -8
- data/src/core/lib/resource_quota/memory_quota.h +6 -0
- data/src/core/lib/security/authorization/grpc_server_authz_filter.cc +14 -11
- data/src/core/lib/security/authorization/grpc_server_authz_filter.h +14 -5
- data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +4 -0
- data/src/core/lib/security/credentials/external/aws_external_account_credentials.h +4 -0
- data/src/core/lib/security/credentials/external/external_account_credentials.cc +28 -20
- data/src/core/lib/security/credentials/external/external_account_credentials.h +4 -0
- data/src/core/lib/security/credentials/external/file_external_account_credentials.cc +4 -0
- data/src/core/lib/security/credentials/external/file_external_account_credentials.h +4 -0
- data/src/core/lib/security/credentials/external/url_external_account_credentials.cc +4 -0
- data/src/core/lib/security/credentials/external/url_external_account_credentials.h +4 -0
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +2 -1
- data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +0 -3
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +12 -0
- data/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +22 -5
- data/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +1 -5
- data/src/core/lib/security/credentials/tls/tls_credentials.cc +16 -0
- data/src/core/lib/security/credentials/xds/xds_credentials.cc +21 -28
- data/src/core/lib/security/credentials/xds/xds_credentials.h +2 -4
- data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +4 -3
- data/src/core/lib/security/transport/auth_filters.h +71 -4
- data/src/core/lib/security/transport/client_auth_filter.cc +2 -4
- data/src/core/lib/security/transport/legacy_server_auth_filter.cc +244 -0
- data/src/core/lib/security/transport/server_auth_filter.cc +70 -90
- data/src/core/lib/slice/slice_buffer.h +3 -0
- data/src/core/lib/surface/builtins.cc +1 -1
- data/src/core/lib/surface/call.cc +683 -196
- data/src/core/lib/surface/call.h +26 -13
- data/src/core/lib/surface/call_trace.cc +42 -1
- data/src/core/lib/surface/channel.cc +0 -1
- data/src/core/lib/surface/channel.h +0 -6
- data/src/core/lib/surface/channel_init.h +26 -0
- data/src/core/lib/surface/init.cc +14 -8
- data/src/core/lib/surface/server.cc +256 -237
- data/src/core/lib/surface/server.h +26 -54
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/surface/wait_for_cq_end_op.h +94 -0
- data/src/core/lib/transport/call_final_info.cc +38 -0
- data/src/core/lib/transport/call_final_info.h +54 -0
- data/src/core/lib/transport/connectivity_state.cc +3 -2
- data/src/core/lib/transport/connectivity_state.h +4 -0
- data/src/core/lib/transport/metadata_batch.h +4 -4
- data/src/core/lib/transport/transport.cc +70 -19
- data/src/core/lib/transport/transport.h +395 -25
- data/src/core/plugin_registry/grpc_plugin_registry.cc +3 -0
- data/src/core/plugin_registry/grpc_plugin_registry_extra.cc +0 -3
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +1 -1
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +1 -1
- data/src/core/tsi/alts/handshaker/transport_security_common_api.cc +1 -1
- data/src/core/tsi/ssl_transport_security.cc +65 -43
- data/src/ruby/ext/grpc/rb_channel_args.c +3 -1
- data/src/ruby/ext/grpc/rb_grpc.c +0 -1
- data/src/ruby/ext/grpc/rb_grpc.h +0 -2
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -0
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/third_party/upb/upb/reflection/def_pool.h +2 -2
- data/third_party/zlib/adler32.c +5 -27
- data/third_party/zlib/compress.c +5 -16
- data/third_party/zlib/crc32.c +86 -162
- data/third_party/zlib/deflate.c +233 -336
- data/third_party/zlib/deflate.h +8 -8
- data/third_party/zlib/gzguts.h +11 -12
- data/third_party/zlib/infback.c +7 -23
- data/third_party/zlib/inffast.c +1 -4
- data/third_party/zlib/inffast.h +1 -1
- data/third_party/zlib/inflate.c +30 -99
- data/third_party/zlib/inftrees.c +6 -11
- data/third_party/zlib/inftrees.h +3 -3
- data/third_party/zlib/trees.c +224 -302
- data/third_party/zlib/uncompr.c +4 -12
- data/third_party/zlib/zconf.h +6 -2
- data/third_party/zlib/zlib.h +191 -188
- data/third_party/zlib/zutil.c +16 -44
- data/third_party/zlib/zutil.h +10 -10
- metadata +35 -13
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +0 -1173
- data/src/core/lib/event_engine/memory_allocator.cc +0 -74
- data/src/core/lib/transport/pid_controller.cc +0 -51
- data/src/core/lib/transport/pid_controller.h +0 -116
- data/third_party/upb/upb/collections/array.h +0 -17
- data/third_party/upb/upb/collections/map.h +0 -17
- data/third_party/upb/upb/upb.hpp +0 -18
data/Makefile
CHANGED
@@ -410,8 +410,8 @@ E = @echo
|
|
410
410
|
Q = @
|
411
411
|
endif
|
412
412
|
|
413
|
-
CORE_VERSION =
|
414
|
-
CPP_VERSION = 1.
|
413
|
+
CORE_VERSION = 38.0.0
|
414
|
+
CPP_VERSION = 1.61.0-pre2
|
415
415
|
|
416
416
|
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
|
417
417
|
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
|
@@ -447,7 +447,7 @@ SHARED_EXT_CORE = dll
|
|
447
447
|
SHARED_EXT_CPP = dll
|
448
448
|
|
449
449
|
SHARED_PREFIX =
|
450
|
-
SHARED_VERSION_CORE = -
|
450
|
+
SHARED_VERSION_CORE = -38
|
451
451
|
SHARED_VERSION_CPP = -1
|
452
452
|
else ifeq ($(SYSTEM),Darwin)
|
453
453
|
EXECUTABLE_SUFFIX =
|
@@ -640,13 +640,13 @@ run_dep_checks:
|
|
640
640
|
|
641
641
|
static: static_c static_cxx
|
642
642
|
|
643
|
-
static_c: cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
643
|
+
static_c: cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
|
644
644
|
|
645
645
|
static_cxx: cache.mk
|
646
646
|
|
647
647
|
shared: shared_c shared_cxx
|
648
648
|
|
649
|
-
shared_c: 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_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)
|
649
|
+
shared_c: 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_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
650
650
|
shared_cxx: cache.mk
|
651
651
|
|
652
652
|
privatelibs: privatelibs_c privatelibs_cxx
|
@@ -677,12 +677,14 @@ ifeq ($(CONFIG),opt)
|
|
677
677
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
|
678
678
|
$(E) "[STRIP] Stripping libre2.a"
|
679
679
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libre2.a
|
680
|
-
$(E) "[STRIP] Stripping
|
681
|
-
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/
|
682
|
-
$(E) "[STRIP] Stripping libupb_collections_lib.a"
|
683
|
-
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
|
680
|
+
$(E) "[STRIP] Stripping libupb_base_lib.a"
|
681
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
684
682
|
$(E) "[STRIP] Stripping libupb_json_lib.a"
|
685
683
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
|
684
|
+
$(E) "[STRIP] Stripping libupb_mem_lib.a"
|
685
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a
|
686
|
+
$(E) "[STRIP] Stripping libupb_message_lib.a"
|
687
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a
|
686
688
|
$(E) "[STRIP] Stripping libupb_textformat_lib.a"
|
687
689
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
|
688
690
|
$(E) "[STRIP] Stripping libutf8_range_lib.a"
|
@@ -705,12 +707,14 @@ ifeq ($(CONFIG),opt)
|
|
705
707
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
706
708
|
$(E) "[STRIP] Stripping $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
707
709
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
708
|
-
$(E) "[STRIP] Stripping $(SHARED_PREFIX)
|
709
|
-
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)
|
710
|
-
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
711
|
-
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
710
|
+
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
711
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
712
712
|
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
713
713
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
714
|
+
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
715
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
716
|
+
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
717
|
+
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
714
718
|
$(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
715
719
|
$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
|
716
720
|
$(E) "[STRIP] Stripping $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
|
@@ -814,8 +818,8 @@ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
|
|
814
818
|
ifeq ($(SYSTEM),Darwin)
|
815
819
|
$(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) $(LDLIBS)
|
816
820
|
else
|
817
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.
|
818
|
-
$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.
|
821
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.38 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS)
|
822
|
+
$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.38
|
819
823
|
$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
|
820
824
|
endif
|
821
825
|
endif
|
@@ -878,6 +882,7 @@ LIBGPR_SRC = \
|
|
878
882
|
src/core/lib/gprpp/windows/thd.cc \
|
879
883
|
|
880
884
|
PUBLIC_HEADERS_C += \
|
885
|
+
include/grpc/impl/call.h \
|
881
886
|
include/grpc/impl/codegen/atm.h \
|
882
887
|
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
883
888
|
include/grpc/impl/codegen/atm_gcc_sync.h \
|
@@ -938,8 +943,8 @@ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OB
|
|
938
943
|
ifeq ($(SYSTEM),Darwin)
|
939
944
|
$(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) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
|
940
945
|
else
|
941
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.
|
942
|
-
$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.
|
946
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.38 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
|
947
|
+
$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.38
|
943
948
|
$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
|
944
949
|
endif
|
945
950
|
endif
|
@@ -951,13 +956,14 @@ endif
|
|
951
956
|
|
952
957
|
|
953
958
|
# start of build recipe for library "grpc" (generated by makelib(lib) template function)
|
954
|
-
# deps: ['
|
955
|
-
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', '
|
959
|
+
# deps: ['upb_json_lib', 'upb_textformat_lib', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting']
|
960
|
+
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb_textformat_lib', 'upb_json_lib', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib', 'libssl']
|
956
961
|
LIBGRPC_SRC = \
|
957
962
|
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
|
958
963
|
src/core/ext/filters/census/grpc_context.cc \
|
959
964
|
src/core/ext/filters/channel_idle/channel_idle_filter.cc \
|
960
965
|
src/core/ext/filters/channel_idle/idle_filter_state.cc \
|
966
|
+
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
|
961
967
|
src/core/ext/filters/client_channel/backend_metric.cc \
|
962
968
|
src/core/ext/filters/client_channel/backup_poller.cc \
|
963
969
|
src/core/ext/filters/client_channel/channel_connectivity.cc \
|
@@ -992,7 +998,6 @@ LIBGRPC_SRC = \
|
|
992
998
|
src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
|
993
999
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc \
|
994
1000
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc \
|
995
|
-
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc \
|
996
1001
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc \
|
997
1002
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc \
|
998
1003
|
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
|
@@ -1011,7 +1016,9 @@ LIBGRPC_SRC = \
|
|
1011
1016
|
src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc \
|
1012
1017
|
src/core/ext/filters/client_channel/resolver/polling_resolver.cc \
|
1013
1018
|
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
|
1019
|
+
src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc \
|
1014
1020
|
src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
|
1021
|
+
src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc \
|
1015
1022
|
src/core/ext/filters/client_channel/retry_filter.cc \
|
1016
1023
|
src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc \
|
1017
1024
|
src/core/ext/filters/client_channel/retry_service_config.cc \
|
@@ -1027,6 +1034,7 @@ LIBGRPC_SRC = \
|
|
1027
1034
|
src/core/ext/filters/http/client_authority_filter.cc \
|
1028
1035
|
src/core/ext/filters/http/http_filters_plugin.cc \
|
1029
1036
|
src/core/ext/filters/http/message_compress/compression_filter.cc \
|
1037
|
+
src/core/ext/filters/http/message_compress/legacy_compression_filter.cc \
|
1030
1038
|
src/core/ext/filters/http/server/http_server_filter.cc \
|
1031
1039
|
src/core/ext/filters/message_size/message_size_filter.cc \
|
1032
1040
|
src/core/ext/filters/rbac/rbac_filter.cc \
|
@@ -1043,6 +1051,7 @@ LIBGRPC_SRC = \
|
|
1043
1051
|
src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
|
1044
1052
|
src/core/ext/transport/chttp2/transport/decode_huff.cc \
|
1045
1053
|
src/core/ext/transport/chttp2/transport/flow_control.cc \
|
1054
|
+
src/core/ext/transport/chttp2/transport/frame.cc \
|
1046
1055
|
src/core/ext/transport/chttp2/transport/frame_data.cc \
|
1047
1056
|
src/core/ext/transport/chttp2/transport/frame_goaway.cc \
|
1048
1057
|
src/core/ext/transport/chttp2/transport/frame_ping.cc \
|
@@ -1151,6 +1160,7 @@ LIBGRPC_SRC = \
|
|
1151
1160
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
|
1152
1161
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
|
1153
1162
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
|
1163
|
+
src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c \
|
1154
1164
|
src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
|
1155
1165
|
src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
|
1156
1166
|
src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
|
@@ -1309,6 +1319,7 @@ LIBGRPC_SRC = \
|
|
1309
1319
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
|
1310
1320
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
|
1311
1321
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
|
1322
|
+
src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c \
|
1312
1323
|
src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
|
1313
1324
|
src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
|
1314
1325
|
src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
|
@@ -1444,12 +1455,12 @@ LIBGRPC_SRC = \
|
|
1444
1455
|
src/core/lib/event_engine/default_event_engine_factory.cc \
|
1445
1456
|
src/core/lib/event_engine/event_engine.cc \
|
1446
1457
|
src/core/lib/event_engine/forkable.cc \
|
1447
|
-
src/core/lib/event_engine/memory_allocator.cc \
|
1448
1458
|
src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \
|
1449
1459
|
src/core/lib/event_engine/posix_engine/ev_poll_posix.cc \
|
1450
1460
|
src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
|
1451
1461
|
src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
|
1452
1462
|
src/core/lib/event_engine/posix_engine/lockfree_event.cc \
|
1463
|
+
src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
|
1453
1464
|
src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
|
1454
1465
|
src/core/lib/event_engine/posix_engine/posix_engine.cc \
|
1455
1466
|
src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
|
@@ -1476,6 +1487,7 @@ LIBGRPC_SRC = \
|
|
1476
1487
|
src/core/lib/event_engine/utils.cc \
|
1477
1488
|
src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
|
1478
1489
|
src/core/lib/event_engine/windows/iocp.cc \
|
1490
|
+
src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
|
1479
1491
|
src/core/lib/event_engine/windows/win_socket.cc \
|
1480
1492
|
src/core/lib/event_engine/windows/windows_endpoint.cc \
|
1481
1493
|
src/core/lib/event_engine/windows/windows_engine.cc \
|
@@ -1656,6 +1668,7 @@ LIBGRPC_SRC = \
|
|
1656
1668
|
src/core/lib/security/security_connector/ssl_utils.cc \
|
1657
1669
|
src/core/lib/security/security_connector/tls/tls_security_connector.cc \
|
1658
1670
|
src/core/lib/security/transport/client_auth_filter.cc \
|
1671
|
+
src/core/lib/security/transport/legacy_server_auth_filter.cc \
|
1659
1672
|
src/core/lib/security/transport/secure_endpoint.cc \
|
1660
1673
|
src/core/lib/security/transport/security_handshaker.cc \
|
1661
1674
|
src/core/lib/security/transport/server_auth_filter.cc \
|
@@ -1693,6 +1706,7 @@ LIBGRPC_SRC = \
|
|
1693
1706
|
src/core/lib/surface/version.cc \
|
1694
1707
|
src/core/lib/transport/batch_builder.cc \
|
1695
1708
|
src/core/lib/transport/bdp_estimator.cc \
|
1709
|
+
src/core/lib/transport/call_final_info.cc \
|
1696
1710
|
src/core/lib/transport/connectivity_state.cc \
|
1697
1711
|
src/core/lib/transport/error_utils.cc \
|
1698
1712
|
src/core/lib/transport/handshaker.cc \
|
@@ -1700,7 +1714,6 @@ LIBGRPC_SRC = \
|
|
1700
1714
|
src/core/lib/transport/http_connect_handshaker.cc \
|
1701
1715
|
src/core/lib/transport/metadata_batch.cc \
|
1702
1716
|
src/core/lib/transport/parsed_metadata.cc \
|
1703
|
-
src/core/lib/transport/pid_controller.cc \
|
1704
1717
|
src/core/lib/transport/status_conversion.cc \
|
1705
1718
|
src/core/lib/transport/tcp_connect_handshaker.cc \
|
1706
1719
|
src/core/lib/transport/timeout_encoding.cc \
|
@@ -1760,6 +1773,7 @@ PUBLIC_HEADERS_C += \
|
|
1760
1773
|
include/grpc/grpc_posix.h \
|
1761
1774
|
include/grpc/grpc_security.h \
|
1762
1775
|
include/grpc/grpc_security_constants.h \
|
1776
|
+
include/grpc/impl/call.h \
|
1763
1777
|
include/grpc/impl/channel_arg_names.h \
|
1764
1778
|
include/grpc/impl/codegen/atm.h \
|
1765
1779
|
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
@@ -1826,30 +1840,30 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE
|
|
1826
1840
|
else
|
1827
1841
|
|
1828
1842
|
# static library for "grpc"
|
1829
|
-
$(LIBDIR)/$(CONFIG)/libgrpc.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
1843
|
+
$(LIBDIR)/$(CONFIG)/libgrpc.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
|
1830
1844
|
$(E) "[AR] Creating $@"
|
1831
1845
|
$(Q) mkdir -p `dirname $@`
|
1832
1846
|
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
|
1833
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(
|
1847
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
|
1834
1848
|
ifeq ($(SYSTEM),Darwin)
|
1835
1849
|
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a
|
1836
1850
|
endif
|
1837
1851
|
|
1838
1852
|
# shared library for "grpc"
|
1839
1853
|
ifeq ($(SYSTEM),MINGW32)
|
1840
|
-
$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
1854
|
+
$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_DEP)
|
1841
1855
|
$(E) "[LD] Linking $@"
|
1842
1856
|
$(Q) mkdir -p `dirname $@`
|
1843
|
-
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
1857
|
+
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
|
1844
1858
|
else
|
1845
|
-
$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
1859
|
+
$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_DEP)
|
1846
1860
|
$(E) "[LD] Linking $@"
|
1847
1861
|
$(Q) mkdir -p `dirname $@`
|
1848
1862
|
ifeq ($(SYSTEM),Darwin)
|
1849
|
-
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/
|
1863
|
+
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
|
1850
1864
|
else
|
1851
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.
|
1852
|
-
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.
|
1865
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.38 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
|
1866
|
+
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.38
|
1853
1867
|
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
|
1854
1868
|
endif
|
1855
1869
|
endif
|
@@ -1865,13 +1879,14 @@ endif
|
|
1865
1879
|
|
1866
1880
|
|
1867
1881
|
# start of build recipe for library "grpc_unsecure" (generated by makelib(lib) template function)
|
1868
|
-
# deps: ['
|
1869
|
-
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', '
|
1882
|
+
# deps: ['upb_message_lib', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
|
1883
|
+
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib']
|
1870
1884
|
LIBGRPC_UNSECURE_SRC = \
|
1871
1885
|
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
|
1872
1886
|
src/core/ext/filters/census/grpc_context.cc \
|
1873
1887
|
src/core/ext/filters/channel_idle/channel_idle_filter.cc \
|
1874
1888
|
src/core/ext/filters/channel_idle/idle_filter_state.cc \
|
1889
|
+
src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
|
1875
1890
|
src/core/ext/filters/client_channel/backend_metric.cc \
|
1876
1891
|
src/core/ext/filters/client_channel/backup_poller.cc \
|
1877
1892
|
src/core/ext/filters/client_channel/channel_connectivity.cc \
|
@@ -1932,6 +1947,7 @@ LIBGRPC_UNSECURE_SRC = \
|
|
1932
1947
|
src/core/ext/filters/http/client_authority_filter.cc \
|
1933
1948
|
src/core/ext/filters/http/http_filters_plugin.cc \
|
1934
1949
|
src/core/ext/filters/http/message_compress/compression_filter.cc \
|
1950
|
+
src/core/ext/filters/http/message_compress/legacy_compression_filter.cc \
|
1935
1951
|
src/core/ext/filters/http/server/http_server_filter.cc \
|
1936
1952
|
src/core/ext/filters/message_size/message_size_filter.cc \
|
1937
1953
|
src/core/ext/transport/chttp2/client/chttp2_connector.cc \
|
@@ -1941,6 +1957,7 @@ LIBGRPC_UNSECURE_SRC = \
|
|
1941
1957
|
src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
|
1942
1958
|
src/core/ext/transport/chttp2/transport/decode_huff.cc \
|
1943
1959
|
src/core/ext/transport/chttp2/transport/flow_control.cc \
|
1960
|
+
src/core/ext/transport/chttp2/transport/frame.cc \
|
1944
1961
|
src/core/ext/transport/chttp2/transport/frame_data.cc \
|
1945
1962
|
src/core/ext/transport/chttp2/transport/frame_goaway.cc \
|
1946
1963
|
src/core/ext/transport/chttp2/transport/frame_ping.cc \
|
@@ -2022,12 +2039,12 @@ LIBGRPC_UNSECURE_SRC = \
|
|
2022
2039
|
src/core/lib/event_engine/default_event_engine_factory.cc \
|
2023
2040
|
src/core/lib/event_engine/event_engine.cc \
|
2024
2041
|
src/core/lib/event_engine/forkable.cc \
|
2025
|
-
src/core/lib/event_engine/memory_allocator.cc \
|
2026
2042
|
src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \
|
2027
2043
|
src/core/lib/event_engine/posix_engine/ev_poll_posix.cc \
|
2028
2044
|
src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
|
2029
2045
|
src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
|
2030
2046
|
src/core/lib/event_engine/posix_engine/lockfree_event.cc \
|
2047
|
+
src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
|
2031
2048
|
src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
|
2032
2049
|
src/core/lib/event_engine/posix_engine/posix_engine.cc \
|
2033
2050
|
src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
|
@@ -2054,6 +2071,7 @@ LIBGRPC_UNSECURE_SRC = \
|
|
2054
2071
|
src/core/lib/event_engine/utils.cc \
|
2055
2072
|
src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
|
2056
2073
|
src/core/lib/event_engine/windows/iocp.cc \
|
2074
|
+
src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
|
2057
2075
|
src/core/lib/event_engine/windows/win_socket.cc \
|
2058
2076
|
src/core/lib/event_engine/windows/windows_endpoint.cc \
|
2059
2077
|
src/core/lib/event_engine/windows/windows_engine.cc \
|
@@ -2195,6 +2213,7 @@ LIBGRPC_UNSECURE_SRC = \
|
|
2195
2213
|
src/core/lib/security/security_connector/load_system_roots_supported.cc \
|
2196
2214
|
src/core/lib/security/security_connector/security_connector.cc \
|
2197
2215
|
src/core/lib/security/transport/client_auth_filter.cc \
|
2216
|
+
src/core/lib/security/transport/legacy_server_auth_filter.cc \
|
2198
2217
|
src/core/lib/security/transport/secure_endpoint.cc \
|
2199
2218
|
src/core/lib/security/transport/security_handshaker.cc \
|
2200
2219
|
src/core/lib/security/transport/server_auth_filter.cc \
|
@@ -2232,6 +2251,7 @@ LIBGRPC_UNSECURE_SRC = \
|
|
2232
2251
|
src/core/lib/surface/version.cc \
|
2233
2252
|
src/core/lib/transport/batch_builder.cc \
|
2234
2253
|
src/core/lib/transport/bdp_estimator.cc \
|
2254
|
+
src/core/lib/transport/call_final_info.cc \
|
2235
2255
|
src/core/lib/transport/connectivity_state.cc \
|
2236
2256
|
src/core/lib/transport/error_utils.cc \
|
2237
2257
|
src/core/lib/transport/handshaker.cc \
|
@@ -2239,7 +2259,6 @@ LIBGRPC_UNSECURE_SRC = \
|
|
2239
2259
|
src/core/lib/transport/http_connect_handshaker.cc \
|
2240
2260
|
src/core/lib/transport/metadata_batch.cc \
|
2241
2261
|
src/core/lib/transport/parsed_metadata.cc \
|
2242
|
-
src/core/lib/transport/pid_controller.cc \
|
2243
2262
|
src/core/lib/transport/status_conversion.cc \
|
2244
2263
|
src/core/lib/transport/tcp_connect_handshaker.cc \
|
2245
2264
|
src/core/lib/transport/timeout_encoding.cc \
|
@@ -2286,6 +2305,7 @@ PUBLIC_HEADERS_C += \
|
|
2286
2305
|
include/grpc/grpc_posix.h \
|
2287
2306
|
include/grpc/grpc_security.h \
|
2288
2307
|
include/grpc/grpc_security_constants.h \
|
2308
|
+
include/grpc/impl/call.h \
|
2289
2309
|
include/grpc/impl/channel_arg_names.h \
|
2290
2310
|
include/grpc/impl/codegen/atm.h \
|
2291
2311
|
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
@@ -2342,30 +2362,30 @@ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(base
|
|
2342
2362
|
|
2343
2363
|
|
2344
2364
|
# static library for "grpc_unsecure"
|
2345
|
-
$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/
|
2365
|
+
$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2346
2366
|
$(E) "[AR] Creating $@"
|
2347
2367
|
$(Q) mkdir -p `dirname $@`
|
2348
2368
|
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
|
2349
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(
|
2369
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2350
2370
|
ifeq ($(SYSTEM),Darwin)
|
2351
2371
|
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
|
2352
2372
|
endif
|
2353
2373
|
|
2354
2374
|
# shared library for "grpc_unsecure"
|
2355
2375
|
ifeq ($(SYSTEM),MINGW32)
|
2356
|
-
$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/
|
2376
|
+
$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2357
2377
|
$(E) "[LD] Linking $@"
|
2358
2378
|
$(Q) mkdir -p `dirname $@`
|
2359
|
-
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/
|
2379
|
+
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2360
2380
|
else
|
2361
|
-
$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/
|
2381
|
+
$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2362
2382
|
$(E) "[LD] Linking $@"
|
2363
2383
|
$(Q) mkdir -p `dirname $@`
|
2364
2384
|
ifeq ($(SYSTEM),Darwin)
|
2365
|
-
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/
|
2385
|
+
$(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)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2366
2386
|
else
|
2367
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.
|
2368
|
-
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.
|
2387
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.38 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2388
|
+
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.38
|
2369
2389
|
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
|
2370
2390
|
endif
|
2371
2391
|
endif
|
@@ -2431,8 +2451,8 @@ $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBRE2_OB
|
|
2431
2451
|
ifeq ($(SYSTEM),Darwin)
|
2432
2452
|
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS)
|
2433
2453
|
else
|
2434
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libre2.so.
|
2435
|
-
$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so.
|
2454
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libre2.so.38 -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS)
|
2455
|
+
$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so.38
|
2436
2456
|
$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so
|
2437
2457
|
endif
|
2438
2458
|
endif
|
@@ -2443,138 +2463,69 @@ endif
|
|
2443
2463
|
# end of build recipe for library "re2"
|
2444
2464
|
|
2445
2465
|
|
2446
|
-
# start of build recipe for library "
|
2466
|
+
# start of build recipe for library "upb_base_lib" (generated by makelib(lib) template function)
|
2447
2467
|
# deps: []
|
2448
2468
|
# transitive_deps: []
|
2449
|
-
|
2469
|
+
LIBUPB_BASE_LIB_SRC = \
|
2450
2470
|
third_party/upb/upb/base/status.c \
|
2451
|
-
third_party/upb/upb/mem/alloc.c \
|
2452
|
-
third_party/upb/upb/mem/arena.c \
|
2453
|
-
|
2454
|
-
PUBLIC_HEADERS_C += \
|
2455
|
-
|
2456
|
-
LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC))))
|
2457
|
-
|
2458
|
-
|
2459
|
-
# static library for "upb"
|
2460
|
-
$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBUPB_OBJS)
|
2461
|
-
$(E) "[AR] Creating $@"
|
2462
|
-
$(Q) mkdir -p `dirname $@`
|
2463
|
-
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a
|
2464
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS)
|
2465
|
-
ifeq ($(SYSTEM),Darwin)
|
2466
|
-
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a
|
2467
|
-
endif
|
2468
|
-
|
2469
|
-
# shared library for "upb"
|
2470
|
-
ifeq ($(SYSTEM),MINGW32)
|
2471
|
-
$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS)
|
2472
|
-
$(E) "[LD] Linking $@"
|
2473
|
-
$(Q) mkdir -p `dirname $@`
|
2474
|
-
$(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) $(LDLIBS)
|
2475
|
-
else
|
2476
|
-
$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS)
|
2477
|
-
$(E) "[LD] Linking $@"
|
2478
|
-
$(Q) mkdir -p `dirname $@`
|
2479
|
-
ifeq ($(SYSTEM),Darwin)
|
2480
|
-
$(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) $(LDLIBS)
|
2481
|
-
else
|
2482
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.37 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LDLIBS)
|
2483
|
-
$(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.37
|
2484
|
-
$(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so
|
2485
|
-
endif
|
2486
|
-
endif
|
2487
|
-
|
2488
|
-
ifneq ($(NO_DEPS),true)
|
2489
|
-
-include $(LIBUPB_OBJS:.o=.dep)
|
2490
|
-
endif
|
2491
|
-
# end of build recipe for library "upb"
|
2492
|
-
|
2493
|
-
|
2494
|
-
# start of build recipe for library "upb_collections_lib" (generated by makelib(lib) template function)
|
2495
|
-
# deps: []
|
2496
|
-
# transitive_deps: []
|
2497
|
-
LIBUPB_COLLECTIONS_LIB_SRC = \
|
2498
|
-
third_party/upb/upb/base/status.c \
|
2499
|
-
third_party/upb/upb/hash/common.c \
|
2500
|
-
third_party/upb/upb/mem/alloc.c \
|
2501
|
-
third_party/upb/upb/mem/arena.c \
|
2502
|
-
third_party/upb/upb/message/array.c \
|
2503
|
-
third_party/upb/upb/message/map.c \
|
2504
|
-
third_party/upb/upb/message/map_sorter.c \
|
2505
|
-
third_party/upb/upb/message/message.c \
|
2506
|
-
third_party/upb/upb/mini_table/extension_registry.c \
|
2507
|
-
third_party/upb/upb/mini_table/internal/message.c \
|
2508
|
-
third_party/upb/upb/mini_table/message.c \
|
2509
2471
|
|
2510
2472
|
PUBLIC_HEADERS_C += \
|
2511
2473
|
|
2512
|
-
|
2474
|
+
LIBUPB_BASE_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_BASE_LIB_SRC))))
|
2513
2475
|
|
2514
2476
|
|
2515
|
-
# static library for "
|
2516
|
-
$(LIBDIR)/$(CONFIG)/
|
2477
|
+
# static library for "upb_base_lib"
|
2478
|
+
$(LIBDIR)/$(CONFIG)/libupb_base_lib.a: $(LIBUPB_BASE_LIB_OBJS)
|
2517
2479
|
$(E) "[AR] Creating $@"
|
2518
2480
|
$(Q) mkdir -p `dirname $@`
|
2519
|
-
$(Q) rm -f $(LIBDIR)/$(CONFIG)/
|
2520
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/
|
2481
|
+
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2482
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBUPB_BASE_LIB_OBJS)
|
2521
2483
|
ifeq ($(SYSTEM),Darwin)
|
2522
|
-
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/
|
2484
|
+
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2523
2485
|
endif
|
2524
2486
|
|
2525
|
-
# shared library for "
|
2487
|
+
# shared library for "upb_base_lib"
|
2526
2488
|
ifeq ($(SYSTEM),MINGW32)
|
2527
|
-
$(LIBDIR)/$(CONFIG)/
|
2489
|
+
$(LIBDIR)/$(CONFIG)/upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_BASE_LIB_OBJS)
|
2528
2490
|
$(E) "[LD] Linking $@"
|
2529
2491
|
$(Q) mkdir -p `dirname $@`
|
2530
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/
|
2492
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_base_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_BASE_LIB_OBJS) $(LDLIBS)
|
2531
2493
|
else
|
2532
|
-
$(LIBDIR)/$(CONFIG)/
|
2494
|
+
$(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_BASE_LIB_OBJS)
|
2533
2495
|
$(E) "[LD] Linking $@"
|
2534
2496
|
$(Q) mkdir -p `dirname $@`
|
2535
2497
|
ifeq ($(SYSTEM),Darwin)
|
2536
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)
|
2498
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_BASE_LIB_OBJS) $(LDLIBS)
|
2537
2499
|
else
|
2538
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,
|
2539
|
-
$(Q) ln -sf $(SHARED_PREFIX)
|
2540
|
-
$(Q) ln -sf $(SHARED_PREFIX)
|
2500
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_base_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_BASE_LIB_OBJS) $(LDLIBS)
|
2501
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).so.38
|
2502
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).so
|
2541
2503
|
endif
|
2542
2504
|
endif
|
2543
2505
|
|
2544
2506
|
ifneq ($(NO_DEPS),true)
|
2545
|
-
-include $(
|
2507
|
+
-include $(LIBUPB_BASE_LIB_OBJS:.o=.dep)
|
2546
2508
|
endif
|
2547
|
-
# end of build recipe for library "
|
2509
|
+
# end of build recipe for library "upb_base_lib"
|
2548
2510
|
|
2549
2511
|
|
2550
2512
|
# start of build recipe for library "upb_json_lib" (generated by makelib(lib) template function)
|
2551
|
-
# deps: ['utf8_range_lib']
|
2552
|
-
# transitive_deps: ['utf8_range_lib']
|
2513
|
+
# deps: ['upb_message_lib', 'utf8_range_lib']
|
2514
|
+
# transitive_deps: ['utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib']
|
2553
2515
|
LIBUPB_JSON_LIB_SRC = \
|
2554
2516
|
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
|
2555
|
-
third_party/upb/upb/base/status.c \
|
2556
|
-
third_party/upb/upb/hash/common.c \
|
2557
2517
|
third_party/upb/upb/json/decode.c \
|
2558
2518
|
third_party/upb/upb/json/encode.c \
|
2559
2519
|
third_party/upb/upb/lex/atoi.c \
|
2560
2520
|
third_party/upb/upb/lex/round_trip.c \
|
2561
2521
|
third_party/upb/upb/lex/strtod.c \
|
2562
2522
|
third_party/upb/upb/lex/unicode.c \
|
2563
|
-
third_party/upb/upb/mem/alloc.c \
|
2564
|
-
third_party/upb/upb/mem/arena.c \
|
2565
2523
|
third_party/upb/upb/message/accessors.c \
|
2566
|
-
third_party/upb/upb/message/array.c \
|
2567
|
-
third_party/upb/upb/message/map.c \
|
2568
|
-
third_party/upb/upb/message/map_sorter.c \
|
2569
|
-
third_party/upb/upb/message/message.c \
|
2570
2524
|
third_party/upb/upb/mini_descriptor/build_enum.c \
|
2571
2525
|
third_party/upb/upb/mini_descriptor/decode.c \
|
2572
2526
|
third_party/upb/upb/mini_descriptor/internal/base92.c \
|
2573
2527
|
third_party/upb/upb/mini_descriptor/internal/encode.c \
|
2574
2528
|
third_party/upb/upb/mini_descriptor/link.c \
|
2575
|
-
third_party/upb/upb/mini_table/extension_registry.c \
|
2576
|
-
third_party/upb/upb/mini_table/internal/message.c \
|
2577
|
-
third_party/upb/upb/mini_table/message.c \
|
2578
2529
|
third_party/upb/upb/reflection/def_pool.c \
|
2579
2530
|
third_party/upb/upb/reflection/def_type.c \
|
2580
2531
|
third_party/upb/upb/reflection/desc_state.c \
|
@@ -2604,30 +2555,30 @@ LIBUPB_JSON_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basen
|
|
2604
2555
|
|
2605
2556
|
|
2606
2557
|
# static library for "upb_json_lib"
|
2607
|
-
$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
|
2558
|
+
$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2608
2559
|
$(E) "[AR] Creating $@"
|
2609
2560
|
$(Q) mkdir -p `dirname $@`
|
2610
2561
|
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
|
2611
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
|
2562
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2612
2563
|
ifeq ($(SYSTEM),Darwin)
|
2613
2564
|
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
|
2614
2565
|
endif
|
2615
2566
|
|
2616
2567
|
# shared library for "upb_json_lib"
|
2617
2568
|
ifeq ($(SYSTEM),MINGW32)
|
2618
|
-
$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
|
2569
|
+
$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2619
2570
|
$(E) "[LD] Linking $@"
|
2620
2571
|
$(Q) mkdir -p `dirname $@`
|
2621
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
|
2572
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2622
2573
|
else
|
2623
|
-
$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
|
2574
|
+
$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2624
2575
|
$(E) "[LD] Linking $@"
|
2625
2576
|
$(Q) mkdir -p `dirname $@`
|
2626
2577
|
ifeq ($(SYSTEM),Darwin)
|
2627
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
|
2578
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2628
2579
|
else
|
2629
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.
|
2630
|
-
$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so.
|
2580
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2581
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so.38
|
2631
2582
|
$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so
|
2632
2583
|
endif
|
2633
2584
|
endif
|
@@ -2638,32 +2589,121 @@ endif
|
|
2638
2589
|
# end of build recipe for library "upb_json_lib"
|
2639
2590
|
|
2640
2591
|
|
2592
|
+
# start of build recipe for library "upb_mem_lib" (generated by makelib(lib) template function)
|
2593
|
+
# deps: []
|
2594
|
+
# transitive_deps: []
|
2595
|
+
LIBUPB_MEM_LIB_SRC = \
|
2596
|
+
third_party/upb/upb/mem/alloc.c \
|
2597
|
+
third_party/upb/upb/mem/arena.c \
|
2598
|
+
|
2599
|
+
PUBLIC_HEADERS_C += \
|
2600
|
+
|
2601
|
+
LIBUPB_MEM_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_MEM_LIB_SRC))))
|
2602
|
+
|
2603
|
+
|
2604
|
+
# static library for "upb_mem_lib"
|
2605
|
+
$(LIBDIR)/$(CONFIG)/libupb_mem_lib.a: $(LIBUPB_MEM_LIB_OBJS)
|
2606
|
+
$(E) "[AR] Creating $@"
|
2607
|
+
$(Q) mkdir -p `dirname $@`
|
2608
|
+
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a
|
2609
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBUPB_MEM_LIB_OBJS)
|
2610
|
+
ifeq ($(SYSTEM),Darwin)
|
2611
|
+
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a
|
2612
|
+
endif
|
2613
|
+
|
2614
|
+
# shared library for "upb_mem_lib"
|
2615
|
+
ifeq ($(SYSTEM),MINGW32)
|
2616
|
+
$(LIBDIR)/$(CONFIG)/upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MEM_LIB_OBJS)
|
2617
|
+
$(E) "[LD] Linking $@"
|
2618
|
+
$(Q) mkdir -p `dirname $@`
|
2619
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_mem_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MEM_LIB_OBJS) $(LDLIBS)
|
2620
|
+
else
|
2621
|
+
$(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MEM_LIB_OBJS)
|
2622
|
+
$(E) "[LD] Linking $@"
|
2623
|
+
$(Q) mkdir -p `dirname $@`
|
2624
|
+
ifeq ($(SYSTEM),Darwin)
|
2625
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MEM_LIB_OBJS) $(LDLIBS)
|
2626
|
+
else
|
2627
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_mem_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MEM_LIB_OBJS) $(LDLIBS)
|
2628
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).so.38
|
2629
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).so
|
2630
|
+
endif
|
2631
|
+
endif
|
2632
|
+
|
2633
|
+
ifneq ($(NO_DEPS),true)
|
2634
|
+
-include $(LIBUPB_MEM_LIB_OBJS:.o=.dep)
|
2635
|
+
endif
|
2636
|
+
# end of build recipe for library "upb_mem_lib"
|
2637
|
+
|
2638
|
+
|
2639
|
+
# start of build recipe for library "upb_message_lib" (generated by makelib(lib) template function)
|
2640
|
+
# deps: ['upb_base_lib', 'upb_mem_lib']
|
2641
|
+
# transitive_deps: ['upb_mem_lib', 'upb_base_lib']
|
2642
|
+
LIBUPB_MESSAGE_LIB_SRC = \
|
2643
|
+
third_party/upb/upb/hash/common.c \
|
2644
|
+
third_party/upb/upb/message/array.c \
|
2645
|
+
third_party/upb/upb/message/map.c \
|
2646
|
+
third_party/upb/upb/message/map_sorter.c \
|
2647
|
+
third_party/upb/upb/message/message.c \
|
2648
|
+
third_party/upb/upb/mini_table/extension_registry.c \
|
2649
|
+
third_party/upb/upb/mini_table/internal/message.c \
|
2650
|
+
third_party/upb/upb/mini_table/message.c \
|
2651
|
+
|
2652
|
+
PUBLIC_HEADERS_C += \
|
2653
|
+
|
2654
|
+
LIBUPB_MESSAGE_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_MESSAGE_LIB_SRC))))
|
2655
|
+
|
2656
|
+
|
2657
|
+
# static library for "upb_message_lib"
|
2658
|
+
$(LIBDIR)/$(CONFIG)/libupb_message_lib.a: $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2659
|
+
$(E) "[AR] Creating $@"
|
2660
|
+
$(Q) mkdir -p `dirname $@`
|
2661
|
+
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_message_lib.a
|
2662
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2663
|
+
ifeq ($(SYSTEM),Darwin)
|
2664
|
+
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a
|
2665
|
+
endif
|
2666
|
+
|
2667
|
+
# shared library for "upb_message_lib"
|
2668
|
+
ifeq ($(SYSTEM),MINGW32)
|
2669
|
+
$(LIBDIR)/$(CONFIG)/upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2670
|
+
$(E) "[LD] Linking $@"
|
2671
|
+
$(Q) mkdir -p `dirname $@`
|
2672
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_message_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2673
|
+
else
|
2674
|
+
$(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2675
|
+
$(E) "[LD] Linking $@"
|
2676
|
+
$(Q) mkdir -p `dirname $@`
|
2677
|
+
ifeq ($(SYSTEM),Darwin)
|
2678
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2679
|
+
else
|
2680
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_message_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2681
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).so.38
|
2682
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).so
|
2683
|
+
endif
|
2684
|
+
endif
|
2685
|
+
|
2686
|
+
ifneq ($(NO_DEPS),true)
|
2687
|
+
-include $(LIBUPB_MESSAGE_LIB_OBJS:.o=.dep)
|
2688
|
+
endif
|
2689
|
+
# end of build recipe for library "upb_message_lib"
|
2690
|
+
|
2691
|
+
|
2641
2692
|
# start of build recipe for library "upb_textformat_lib" (generated by makelib(lib) template function)
|
2642
|
-
# deps: ['utf8_range_lib']
|
2643
|
-
# transitive_deps: ['utf8_range_lib']
|
2693
|
+
# deps: ['upb_message_lib', 'utf8_range_lib']
|
2694
|
+
# transitive_deps: ['utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib']
|
2644
2695
|
LIBUPB_TEXTFORMAT_LIB_SRC = \
|
2645
2696
|
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
|
2646
|
-
third_party/upb/upb/base/status.c \
|
2647
|
-
third_party/upb/upb/hash/common.c \
|
2648
2697
|
third_party/upb/upb/lex/atoi.c \
|
2649
2698
|
third_party/upb/upb/lex/round_trip.c \
|
2650
2699
|
third_party/upb/upb/lex/strtod.c \
|
2651
2700
|
third_party/upb/upb/lex/unicode.c \
|
2652
|
-
third_party/upb/upb/mem/alloc.c \
|
2653
|
-
third_party/upb/upb/mem/arena.c \
|
2654
2701
|
third_party/upb/upb/message/accessors.c \
|
2655
|
-
third_party/upb/upb/message/array.c \
|
2656
|
-
third_party/upb/upb/message/map.c \
|
2657
|
-
third_party/upb/upb/message/map_sorter.c \
|
2658
|
-
third_party/upb/upb/message/message.c \
|
2659
2702
|
third_party/upb/upb/mini_descriptor/build_enum.c \
|
2660
2703
|
third_party/upb/upb/mini_descriptor/decode.c \
|
2661
2704
|
third_party/upb/upb/mini_descriptor/internal/base92.c \
|
2662
2705
|
third_party/upb/upb/mini_descriptor/internal/encode.c \
|
2663
2706
|
third_party/upb/upb/mini_descriptor/link.c \
|
2664
|
-
third_party/upb/upb/mini_table/extension_registry.c \
|
2665
|
-
third_party/upb/upb/mini_table/internal/message.c \
|
2666
|
-
third_party/upb/upb/mini_table/message.c \
|
2667
2707
|
third_party/upb/upb/reflection/def_pool.c \
|
2668
2708
|
third_party/upb/upb/reflection/def_type.c \
|
2669
2709
|
third_party/upb/upb/reflection/desc_state.c \
|
@@ -2694,30 +2734,30 @@ LIBUPB_TEXTFORMAT_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $
|
|
2694
2734
|
|
2695
2735
|
|
2696
2736
|
# static library for "upb_textformat_lib"
|
2697
|
-
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
|
2737
|
+
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2698
2738
|
$(E) "[AR] Creating $@"
|
2699
2739
|
$(Q) mkdir -p `dirname $@`
|
2700
2740
|
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
|
2701
|
-
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
|
2741
|
+
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS)
|
2702
2742
|
ifeq ($(SYSTEM),Darwin)
|
2703
2743
|
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
|
2704
2744
|
endif
|
2705
2745
|
|
2706
2746
|
# shared library for "upb_textformat_lib"
|
2707
2747
|
ifeq ($(SYSTEM),MINGW32)
|
2708
|
-
$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
|
2748
|
+
$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2709
2749
|
$(E) "[LD] Linking $@"
|
2710
2750
|
$(Q) mkdir -p `dirname $@`
|
2711
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
|
2751
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2712
2752
|
else
|
2713
|
-
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
|
2753
|
+
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a
|
2714
2754
|
$(E) "[LD] Linking $@"
|
2715
2755
|
$(Q) mkdir -p `dirname $@`
|
2716
2756
|
ifeq ($(SYSTEM),Darwin)
|
2717
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
|
2757
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2718
2758
|
else
|
2719
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.
|
2720
|
-
$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so.
|
2759
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS)
|
2760
|
+
$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so.38
|
2721
2761
|
$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so
|
2722
2762
|
endif
|
2723
2763
|
endif
|
@@ -2764,8 +2804,8 @@ $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
|
|
2764
2804
|
ifeq ($(SYSTEM),Darwin)
|
2765
2805
|
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS)
|
2766
2806
|
else
|
2767
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libutf8_range_lib.so.
|
2768
|
-
$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so.
|
2807
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libutf8_range_lib.so.38 -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS)
|
2808
|
+
$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so.38
|
2769
2809
|
$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so
|
2770
2810
|
endif
|
2771
2811
|
endif
|
@@ -3366,11 +3406,12 @@ src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc: $(OPENSSL_
|
|
3366
3406
|
src/core/ext/filters/client_channel/lb_policy/xds/cds.cc: $(OPENSSL_DEP)
|
3367
3407
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc: $(OPENSSL_DEP)
|
3368
3408
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc: $(OPENSSL_DEP)
|
3369
|
-
src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc: $(OPENSSL_DEP)
|
3370
3409
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc: $(OPENSSL_DEP)
|
3371
3410
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc: $(OPENSSL_DEP)
|
3372
3411
|
src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc: $(OPENSSL_DEP)
|
3412
|
+
src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc: $(OPENSSL_DEP)
|
3373
3413
|
src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP)
|
3414
|
+
src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc: $(OPENSSL_DEP)
|
3374
3415
|
src/core/ext/filters/rbac/rbac_filter.cc: $(OPENSSL_DEP)
|
3375
3416
|
src/core/ext/filters/rbac/rbac_service_config_parser.cc: $(OPENSSL_DEP)
|
3376
3417
|
src/core/ext/filters/server_config_selector/server_config_selector_filter.cc: $(OPENSSL_DEP)
|
@@ -3460,6 +3501,7 @@ src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minita
|
|
3460
3501
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c: $(OPENSSL_DEP)
|
3461
3502
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c: $(OPENSSL_DEP)
|
3462
3503
|
src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c: $(OPENSSL_DEP)
|
3504
|
+
src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c: $(OPENSSL_DEP)
|
3463
3505
|
src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c: $(OPENSSL_DEP)
|
3464
3506
|
src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c: $(OPENSSL_DEP)
|
3465
3507
|
src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c: $(OPENSSL_DEP)
|
@@ -3599,6 +3641,7 @@ src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdef
|
|
3599
3641
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c: $(OPENSSL_DEP)
|
3600
3642
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c: $(OPENSSL_DEP)
|
3601
3643
|
src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c: $(OPENSSL_DEP)
|
3644
|
+
src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c: $(OPENSSL_DEP)
|
3602
3645
|
src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c: $(OPENSSL_DEP)
|
3603
3646
|
src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c: $(OPENSSL_DEP)
|
3604
3647
|
src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c: $(OPENSSL_DEP)
|