natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Depend on utf8_range as a library rather than individual files. 

This required collapsing references to both @com_google_protobuf//third_party/utf8_range
and @utf8_range//:utf8_range into just third_party/protobuf/third_party/utf8_range since
the protobuf Bazel build mixes these two references.
This commit is contained in:
Richard Belleville 2024-01-09 15:53:08 -08:00
parent 15e95ad2a3
commit 4fa5a3daab
5 changed files with 90 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
CMakeLists.txt generated
View File

@ -3209,9 +3209,6 @@ add_library(grpc_unsecure
src/core/tsi/local_transport_security.cc
src/core/tsi/transport_security.cc
src/core/tsi/transport_security_grpc.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/mini_descriptor/build_enum.c
third_party/protobuf/upb/mini_descriptor/decode.c
@ -3265,6 +3262,7 @@ target_link_libraries(grpc_unsecure
${_gRPC_ALLTARGETS_LIBRARIES}
upb_collections_lib
upb
utf8_range_lib
${_gRPC_ZLIB_LIBRARIES}
absl::algorithm_container
absl::cleanup
@ -3573,9 +3571,6 @@ endif()
add_library(upb_json_lib ${_gRPC_STATIC_WIN32}
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/base/status.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/json/decode.c
@ -3656,6 +3651,7 @@ target_include_directories(upb_json_lib
)
target_link_libraries(upb_json_lib
${_gRPC_ALLTARGETS_LIBRARIES}
utf8_range_lib
)
@ -3673,9 +3669,6 @@ endif()
add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32}
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/base/status.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/lex/atoi.c
@ -3755,6 +3748,7 @@ target_include_directories(upb_textformat_lib
)
target_link_libraries(upb_textformat_lib
${_gRPC_ALLTARGETS_LIBRARIES}
utf8_range_lib
)
@ -5194,9 +5188,6 @@ add_library(grpc_authorization_provider
src/core/tsi/alts/handshaker/transport_security_common_api.cc
src/core/tsi/transport_security.cc
src/core/tsi/transport_security_grpc.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -5254,6 +5245,7 @@ target_link_libraries(grpc_authorization_provider
${_gRPC_ALLTARGETS_LIBRARIES}
upb
${_gRPC_RE2_LIBRARIES}
utf8_range_lib
${_gRPC_ZLIB_LIBRARIES}
absl::cleanup
absl::flat_hash_map
@ -8940,9 +8932,6 @@ add_executable(chunked_vector_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/gprpp/chunked_vector_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -8987,6 +8976,7 @@ target_link_libraries(chunked_vector_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::type_traits
@ -11538,9 +11528,6 @@ add_executable(exec_ctx_wakeup_scheduler_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/promise/exec_ctx_wakeup_scheduler_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -11585,6 +11572,7 @@ target_link_libraries(exec_ctx_wakeup_scheduler_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::hash
absl::type_traits
absl::statusor
@ -12240,9 +12228,6 @@ add_executable(flow_control_test
src/core/lib/slice/slice_string_helpers.cc
src/core/lib/transport/bdp_estimator.cc
test/core/transport/chttp2/flow_control_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -12287,6 +12272,7 @@ target_link_libraries(flow_control_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::type_traits
@ -12326,9 +12312,6 @@ add_executable(for_each_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/promise/for_each_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -12373,6 +12356,7 @@ target_link_libraries(for_each_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::type_traits
@ -15105,9 +15089,6 @@ add_executable(interceptor_list_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/promise/interceptor_list_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -15152,6 +15133,7 @@ target_link_libraries(interceptor_list_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::type_traits
@ -16030,9 +16012,6 @@ add_executable(map_pipe_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/promise/map_pipe_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -16077,6 +16056,7 @@ target_link_libraries(map_pipe_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::type_traits
@ -17729,9 +17709,6 @@ add_executable(periodic_update_test
src/core/lib/slice/slice_refcount.cc
src/core/lib/slice/slice_string_helpers.cc
test/core/resource_quota/periodic_update_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -17776,6 +17753,7 @@ target_link_libraries(periodic_update_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
absl::function_ref
absl::hash
absl::statusor
@ -24890,9 +24868,6 @@ add_executable(test_core_transport_chaotic_good_frame_test
src/core/lib/uri/uri_parser.cc
src/core/tsi/alts/handshaker/transport_security_common_api.cc
test/core/transport/chaotic_good/frame_test.cc
third_party/protobuf/third_party/utf8_range/naive.c
third_party/protobuf/third_party/utf8_range/range2-neon.c
third_party/protobuf/third_party/utf8_range/range2-sse.c
third_party/protobuf/upb/hash/common.c
third_party/protobuf/upb/message/accessors.c
third_party/protobuf/upb/message/array.c
@ -24937,6 +24912,7 @@ target_link_libraries(test_core_transport_chaotic_good_frame_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
upb
utf8_range_lib
${_gRPC_ZLIB_LIBRARIES}
absl::cleanup
absl::flat_hash_map
@ -30570,7 +30546,7 @@ generate_pkgconfig(
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
"libcares openssl re2 zlib"
"-lgrpc"
"-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lupb_collections_lib"
"-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib"
"grpc.pc")
# grpc_unsecure .pc file
@ -30581,7 +30557,7 @@ generate_pkgconfig(
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
"libcares zlib"
"-lgrpc_unsecure"
"-laddress_sorting -lupb -lupb_collections_lib"
"-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib"
"grpc_unsecure.pc")
# grpc++ .pc file
@ -30592,7 +30568,7 @@ generate_pkgconfig(
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc"
"libcares openssl re2 zlib"
"-lgrpc++"
"-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lupb_collections_lib"
"-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib"
"grpc++.pc")
# grpc++_unsecure .pc file
@ -30603,5 +30579,5 @@ generate_pkgconfig(
"absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure"
"libcares zlib"
"-lgrpc++_unsecure"
"-laddress_sorting -lupb -lupb_collections_lib"
"-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib"
"grpc++_unsecure.pc")

79
Makefile generated
View File

@ -953,7 +953,7 @@ endif
# start of build recipe for library "grpc" (generated by makelib(lib) template function)
# deps: ['upb_collections_lib', 'upb_json_lib', 'upb_textformat_lib', 'upb', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb', 'upb_textformat_lib', 'upb_json_lib', 'upb_collections_lib', 'libssl']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb', 'upb_textformat_lib', 'upb_json_lib', 'utf8_range_lib', 'upb_collections_lib', 'libssl']
LIBGRPC_SRC = \
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
src/core/ext/filters/census/grpc_context.cc \
@ -1831,29 +1831,29 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE
else
# static library for "grpc"
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
$(E) "[AR] Creating $@"
$(Q) mkdir -p `dirname $@`
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
$(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_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
$(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_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
ifeq ($(SYSTEM),Darwin)
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a
endif
# shared library for "grpc"
ifeq ($(SYSTEM),MINGW32)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
else
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
ifeq ($(SYSTEM),Darwin)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
else
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.37 -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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.37 -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.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.37
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
endif
@ -1870,8 +1870,8 @@ endif
# start of build recipe for library "grpc_unsecure" (generated by makelib(lib) template function)
# deps: ['upb_collections_lib', 'upb', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'upb', 'upb_collections_lib']
# deps: ['upb_collections_lib', 'upb', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb', 'upb_collections_lib']
LIBGRPC_UNSECURE_SRC = \
src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
src/core/ext/filters/census/grpc_context.cc \
@ -2260,9 +2260,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/tsi/local_transport_security.cc \
src/core/tsi/transport_security.cc \
src/core/tsi/transport_security_grpc.cc \
third_party/protobuf/third_party/utf8_range/naive.c \
third_party/protobuf/third_party/utf8_range/range2-neon.c \
third_party/protobuf/third_party/utf8_range/range2-sse.c \
third_party/protobuf/upb/message/accessors.c \
third_party/protobuf/upb/mini_descriptor/build_enum.c \
third_party/protobuf/upb/mini_descriptor/decode.c \
@ -2353,29 +2350,29 @@ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(base
# static library for "grpc_unsecure"
$(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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
$(E) "[AR] Creating $@"
$(Q) mkdir -p `dirname $@`
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
$(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_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
ifeq ($(SYSTEM),Darwin)
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
endif
# shared library for "grpc_unsecure"
ifeq ($(SYSTEM),MINGW32)
$(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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
$(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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
else
$(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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
$(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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
ifeq ($(SYSTEM),Darwin)
$(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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
$(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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
else
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.37 -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)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.37 -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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.37
$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
endif
@ -2559,13 +2556,10 @@ endif
# start of build recipe for library "upb_json_lib" (generated by makelib(lib) template function)
# deps: []
# transitive_deps: []
# deps: ['utf8_range_lib']
# transitive_deps: ['utf8_range_lib']
LIBUPB_JSON_LIB_SRC = \
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
third_party/protobuf/third_party/utf8_range/naive.c \
third_party/protobuf/third_party/utf8_range/range2-neon.c \
third_party/protobuf/third_party/utf8_range/range2-sse.c \
third_party/protobuf/upb/base/status.c \
third_party/protobuf/upb/hash/common.c \
third_party/protobuf/upb/json/decode.c \
@ -2618,29 +2612,29 @@ LIBUPB_JSON_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basen
# static library for "upb_json_lib"
$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBUPB_JSON_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
$(E) "[AR] Creating $@"
$(Q) mkdir -p `dirname $@`
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS)
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
ifeq ($(SYSTEM),Darwin)
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
endif
# shared library for "upb_json_lib"
ifeq ($(SYSTEM),MINGW32)
$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(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) $(LDLIBS)
$(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)
else
$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
ifeq ($(SYSTEM),Darwin)
$(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) $(LDLIBS)
$(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)
else
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LDLIBS)
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so.37
$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so
endif
@ -2653,13 +2647,10 @@ endif
# start of build recipe for library "upb_textformat_lib" (generated by makelib(lib) template function)
# deps: []
# transitive_deps: []
# deps: ['utf8_range_lib']
# transitive_deps: ['utf8_range_lib']
LIBUPB_TEXTFORMAT_LIB_SRC = \
src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
third_party/protobuf/third_party/utf8_range/naive.c \
third_party/protobuf/third_party/utf8_range/range2-neon.c \
third_party/protobuf/third_party/utf8_range/range2-sse.c \
third_party/protobuf/upb/base/status.c \
third_party/protobuf/upb/hash/common.c \
third_party/protobuf/upb/lex/atoi.c \
@ -2711,29 +2702,29 @@ LIBUPB_TEXTFORMAT_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $
# static library for "upb_textformat_lib"
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBUPB_TEXTFORMAT_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
$(E) "[AR] Creating $@"
$(Q) mkdir -p `dirname $@`
$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS)
$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
ifeq ($(SYSTEM),Darwin)
$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
endif
# shared library for "upb_textformat_lib"
ifeq ($(SYSTEM),MINGW32)
$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(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) $(LDLIBS)
$(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)
else
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS)
$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
ifeq ($(SYSTEM),Darwin)
$(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) $(LDLIBS)
$(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)
else
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LDLIBS)
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so.37
$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so
endif

64
build_autogenerated.yaml generated
View File

@ -2617,7 +2617,6 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/message/accessors.h
- third_party/protobuf/upb/message/internal/accessors.h
@ -3027,9 +3026,6 @@ libs:
- src/core/tsi/local_transport_security.cc
- src/core/tsi/transport_security.cc
- src/core/tsi/transport_security_grpc.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/mini_descriptor/build_enum.c
- third_party/protobuf/upb/mini_descriptor/decode.c
@ -3044,6 +3040,7 @@ libs:
deps:
- upb_collections_lib
- upb
- utf8_range_lib
- z
- absl/algorithm:container
- absl/cleanup:cleanup
@ -3279,7 +3276,6 @@ libs:
public_headers: []
headers:
- src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/descriptor_constants.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/base/status.h
@ -3384,9 +3380,6 @@ libs:
- third_party/protobuf/upb/wire/types.h
src:
- src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/base/status.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/json/decode.c
@ -3432,14 +3425,14 @@ libs:
- third_party/protobuf/upb/wire/encode.c
- third_party/protobuf/upb/wire/eps_copy_input_stream.c
- third_party/protobuf/upb/wire/reader.c
deps: []
deps:
- utf8_range_lib
- name: upb_textformat_lib
build: all
language: c
public_headers: []
headers:
- src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/descriptor_constants.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/base/status.h
@ -3543,9 +3536,6 @@ libs:
- third_party/protobuf/upb/wire/types.h
src:
- src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/base/status.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/lex/atoi.c
@ -3590,7 +3580,8 @@ libs:
- third_party/protobuf/upb/wire/encode.c
- third_party/protobuf/upb/wire/eps_copy_input_stream.c
- third_party/protobuf/upb/wire/reader.c
deps: []
deps:
- utf8_range_lib
- name: utf8_range_lib
build: all
language: c
@ -4757,7 +4748,6 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -5074,9 +5064,6 @@ libs:
- src/core/tsi/alts/handshaker/transport_security_common_api.cc
- src/core/tsi/transport_security.cc
- src/core/tsi/transport_security_grpc.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -5099,6 +5086,7 @@ libs:
deps:
- upb
- re2
- utf8_range_lib
- z
- absl/cleanup:cleanup
- absl/container:flat_hash_map
@ -7314,7 +7302,6 @@ targets:
- src/core/lib/slice/slice_internal.h
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -7395,9 +7382,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/gprpp/chunked_vector_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -7420,6 +7404,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/meta:type_traits
@ -8735,7 +8720,6 @@ targets:
- src/core/lib/slice/slice_internal.h
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -8809,9 +8793,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/promise/exec_ctx_wakeup_scheduler_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -8834,6 +8815,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/hash:hash
- absl/meta:type_traits
- absl/status:statusor
@ -9297,7 +9279,6 @@ targets:
- src/core/lib/slice/slice_string_helpers.h
- src/core/lib/transport/bdp_estimator.h
- src/core/lib/transport/http2_errors.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -9380,9 +9361,6 @@ targets:
- src/core/lib/slice/slice_string_helpers.cc
- src/core/lib/transport/bdp_estimator.cc
- test/core/transport/chttp2/flow_control_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -9405,6 +9383,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/meta:type_traits
@ -9475,7 +9454,6 @@ targets:
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- test/core/promise/test_wakeup_schedulers.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -9556,9 +9534,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/promise/for_each_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -9581,6 +9556,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/meta:type_traits
@ -11015,7 +10991,6 @@ targets:
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- test/core/promise/test_context.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -11096,9 +11071,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/promise/interceptor_list_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -11121,6 +11093,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/meta:type_traits
@ -11649,7 +11622,6 @@ targets:
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- test/core/promise/test_wakeup_schedulers.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -11730,9 +11702,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/promise/map_pipe_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -11755,6 +11724,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/meta:type_traits
@ -12616,7 +12586,6 @@ targets:
- src/core/lib/slice/slice_internal.h
- src/core/lib/slice/slice_refcount.h
- src/core/lib/slice/slice_string_helpers.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -12690,9 +12659,6 @@ targets:
- src/core/lib/slice/slice_refcount.cc
- src/core/lib/slice/slice_string_helpers.cc
- test/core/resource_quota/periodic_update_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -12715,6 +12681,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- absl/functional:function_ref
- absl/hash:hash
- absl/status:statusor
@ -17114,7 +17081,6 @@ targets:
- src/core/lib/transport/transport_fwd.h
- src/core/lib/uri/uri_parser.h
- src/core/tsi/alts/handshaker/transport_security_common_api.h
- third_party/protobuf/third_party/utf8_range/utf8_range.h
- third_party/protobuf/upb/base/internal/log2.h
- third_party/protobuf/upb/generated_code_support.h
- third_party/protobuf/upb/hash/common.h
@ -17413,9 +17379,6 @@ targets:
- src/core/lib/uri/uri_parser.cc
- src/core/tsi/alts/handshaker/transport_security_common_api.cc
- test/core/transport/chaotic_good/frame_test.cc
- third_party/protobuf/third_party/utf8_range/naive.c
- third_party/protobuf/third_party/utf8_range/range2-neon.c
- third_party/protobuf/third_party/utf8_range/range2-sse.c
- third_party/protobuf/upb/hash/common.c
- third_party/protobuf/upb/message/accessors.c
- third_party/protobuf/upb/message/array.c
@ -17438,6 +17401,7 @@ targets:
deps:
- gtest
- upb
- utf8_range_lib
- z
- absl/cleanup:cleanup
- absl/container:flat_hash_map

16
grpc.gyp generated
View File

@ -1112,6 +1112,7 @@
'dependencies': [
'upb_collections_lib',
'upb',
'utf8_range_lib',
'z',
'absl/algorithm:container',
'absl/cleanup:cleanup',
@ -1519,9 +1520,6 @@
'src/core/tsi/local_transport_security.cc',
'src/core/tsi/transport_security.cc',
'src/core/tsi/transport_security_grpc.cc',
'third_party/protobuf/third_party/utf8_range/naive.c',
'third_party/protobuf/third_party/utf8_range/range2-neon.c',
'third_party/protobuf/third_party/utf8_range/range2-sse.c',
'third_party/protobuf/upb/message/accessors.c',
'third_party/protobuf/upb/mini_descriptor/build_enum.c',
'third_party/protobuf/upb/mini_descriptor/decode.c',
@ -1634,12 +1632,10 @@
'target_name': 'upb_json_lib',
'type': 'static_library',
'dependencies': [
'utf8_range_lib',
],
'sources': [
'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
'third_party/protobuf/third_party/utf8_range/naive.c',
'third_party/protobuf/third_party/utf8_range/range2-neon.c',
'third_party/protobuf/third_party/utf8_range/range2-sse.c',
'third_party/protobuf/upb/base/status.c',
'third_party/protobuf/upb/hash/common.c',
'third_party/protobuf/upb/json/decode.c',
@ -1691,12 +1687,10 @@
'target_name': 'upb_textformat_lib',
'type': 'static_library',
'dependencies': [
'utf8_range_lib',
],
'sources': [
'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
'third_party/protobuf/third_party/utf8_range/naive.c',
'third_party/protobuf/third_party/utf8_range/range2-neon.c',
'third_party/protobuf/third_party/utf8_range/range2-sse.c',
'third_party/protobuf/upb/base/status.c',
'third_party/protobuf/upb/hash/common.c',
'third_party/protobuf/upb/lex/atoi.c',
@ -2014,6 +2008,7 @@
'dependencies': [
'upb',
're2',
'utf8_range_lib',
'z',
'absl/cleanup:cleanup',
'absl/container:flat_hash_map',
@ -2294,9 +2289,6 @@
'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
'src/core/tsi/transport_security.cc',
'src/core/tsi/transport_security_grpc.cc',
'third_party/protobuf/third_party/utf8_range/naive.c',
'third_party/protobuf/third_party/utf8_range/range2-neon.c',
'third_party/protobuf/third_party/utf8_range/range2-sse.c',
'third_party/protobuf/upb/hash/common.c',
'third_party/protobuf/upb/message/accessors.c',
'third_party/protobuf/upb/message/array.c',

22
tools/buildgen/extract_metadata_from_bazel_xml.py
View File

@ -349,6 +349,10 @@ def _external_dep_name_from_bazel_dependency(bazel_dep: str) -> Optional[str]:
return "protobuf"
elif bazel_dep == "@com_google_protobuf//:protoc_lib":
return "protoc"
elif bazel_dep == "@utf8_range//:utf8_range":
return "utf8_range_lib"
elif bazel_dep == "@com_google_protobuf//third_party/utf8_range:utf8_range":
return "utf8_range_lib"
else:
# Two options here:
# * either this is not external dependency at all (which is fine, we will treat it as internal library)
@ -433,7 +437,7 @@ def _compute_transitive_metadata(
# Add all the transitive deps of our every public dep to exclude
# list since we want to avoid building sources that are already
# built by our dependencies
exclude_deps.update(bazel_rules[dep]["_TRANSITIVE_DEPS"])
exclude_deps.update(bazel_rules[dep].get("_TRANSITIVE_DEPS", []))
continue
# This dep is an external target, add it as a dependency
@ -728,6 +732,17 @@ def _generate_build_metadata(
]
)
merge_name = build_extra_metadata.get(lib_name, {}).get("_MERGE", None)
if merge_name:
for lib_dict_to_update in list(result.values()):
lib_dict_to_update["deps"] = list(
[
merge_name if dep == lib_name else dep
for dep in lib_dict_to_update["deps"]
]
)
result.pop(lib_name)
return result
@ -1093,6 +1108,11 @@ _BUILD_EXTRA_METADATA = {
# rename to utf8_range_lib is necessary for now to avoid clash with utf8_range target in protobuf's cmake
"_RENAME": "utf8_range_lib",
},
"@utf8_range//:utf8_range": {
"language": "c",
"build": "all",
"_MERGE": "utf8_range_lib",
},
"@com_googlesource_code_re2//:re2": {
"language": "c",
"build": "all",