From a6823b6e970e7feb2c7ae967048f2d4554ebbe40 Mon Sep 17 00:00:00 2001 From: ericsalo <93227906+ericsalo@users.noreply.github.com> Date: Fri, 12 Jan 2024 10:05:22 -0800 Subject: [PATCH] Fix deprecation warnings from upb (#35510) Replace "upb:collections" with "upb:message" Replace "upb/collections" with "upb/message" Replace "upb:upb" with "upb:mem" and/or "upb:base" Replace "upb/upb.hpp" with "upb/mem/arena.hpp" and/or "upb/base/status.hpp" Closes #35510 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35510 from ericsalo:master 112392a050489f59f91aa6db78e14408db75d98e PiperOrigin-RevId: 597872730 --- BUILD | 30 +- CMakeLists.txt | 293 ++++----- Makefile | 312 +++++----- Package.swift | 40 -- bazel/grpc_deps.bzl | 9 +- build_autogenerated.yaml | 554 ++---------------- build_handwritten.yaml | 3 +- gRPC-C++.podspec | 6 - gRPC-Core.podspec | 6 - grpc.gemspec | 3 - grpc.gyp | 90 ++- package.xml | 3 - src/core/BUILD | 11 +- .../backend_metrics/backend_metric_filter.cc | 2 +- .../filters/client_channel/backend_metric.cc | 4 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 2 +- .../lb_policy/health_check_client.cc | 2 +- .../lb_policy/oob_backend_metric.cc | 2 +- .../client_channel/lb_policy/rls/rls.cc | 2 +- src/core/ext/xds/xds_api.cc | 2 +- .../ext/xds/xds_cluster_specifier_plugin.cc | 4 +- src/core/ext/xds/xds_common_types.cc | 3 +- src/core/ext/xds/xds_http_rbac_filter.cc | 2 +- src/core/ext/xds/xds_route_config.cc | 2 +- src/core/lib/gprpp/status_helper.cc | 3 +- .../authorization/cel_authorization_engine.cc | 2 +- .../authorization/cel_authorization_engine.h | 2 +- .../alts/handshaker/alts_handshaker_client.cc | 2 +- .../alts/handshaker/alts_tsi_handshaker.cc | 2 +- .../transport_security_common_api.cc | 2 +- src/cpp/common/alts_context.cc | 2 +- src/cpp/common/alts_util.cc | 2 +- src/cpp/ext/csm/BUILD | 1 - src/cpp/ext/csm/metadata_exchange.cc | 3 +- .../health/default_health_check_service.cc | 2 +- src/cpp/server/orca/orca_service.cc | 2 +- test/core/gprpp/status_helper_test.cc | 2 +- .../handshaker/alts_handshaker_client_test.cc | 2 +- .../handshaker/alts_tsi_handshaker_test.cc | 2 +- .../alts/handshaker/alts_tsi_utils_test.cc | 2 +- .../xds/xds_audit_logger_registry_test.cc | 2 +- .../xds/xds_cluster_resource_type_test.cc | 2 +- test/core/xds/xds_common_types_test.cc | 2 +- .../xds/xds_endpoint_resource_type_test.cc | 2 +- test/core/xds/xds_http_filters_test.cc | 2 +- test/core/xds/xds_lb_policy_registry_test.cc | 2 +- .../xds/xds_listener_resource_type_test.cc | 2 +- .../xds_route_config_resource_type_test.cc | 2 +- test/cpp/common/alts_util_test.cc | 2 +- test/cpp/grpclb/grpclb_api_test.cc | 2 +- .../extract_metadata_from_bazel_xml.py | 13 +- tools/distrib/fix_build_deps.py | 5 +- 52 files changed, 468 insertions(+), 990 deletions(-) diff --git a/BUILD b/BUILD index ffd68ab9b8d..f96930947a3 100644 --- a/BUILD +++ b/BUILD @@ -1010,8 +1010,8 @@ grpc_cc_library( "absl/types:optional", "absl/types:span", "upb_base_lib", - "upb_collections_lib", - "upb_lib", + "upb_mem_lib", + "upb_message_lib", ], language = "c++", deps = [ @@ -1217,8 +1217,8 @@ grpc_cc_library( ], external_deps = [ "upb_base_lib", - "upb_collections_lib", - "upb_lib", + "upb_mem_lib", + "upb_message_lib", ], language = "c++", standalone = True, @@ -1863,7 +1863,10 @@ grpc_cc_library( "//src/core:lib/security/credentials/alts/grpc_alts_credentials_options.h", "//src/core:tsi/alts/handshaker/transport_security_common_api.h", ], - external_deps = ["upb_lib"], + external_deps = [ + "upb_base_lib", + "upb_mem_lib", + ], language = "c++", visibility = ["@grpc:tsi"], deps = [ @@ -1879,7 +1882,8 @@ grpc_cc_library( "libssl", "libcrypto", "absl/strings", - "upb_lib", + "upb_base_lib", + "upb_mem_lib", ], language = "c++", tags = ["nofixdeps"], @@ -1924,7 +1928,7 @@ grpc_cc_library( "absl/memory", "absl/types:optional", "upb_base_lib", - "upb_lib", + "upb_mem_lib", "protobuf_headers", "absl/container:inlined_vector", ], @@ -1999,7 +2003,7 @@ grpc_cc_library( "absl/types:optional", "absl/memory", "upb_base_lib", - "upb_lib", + "upb_mem_lib", "absl/strings:str_format", "protobuf_headers", ], @@ -2169,7 +2173,7 @@ grpc_cc_library( "absl/time", "absl/types:optional", "upb_base_lib", - "upb_lib", + "upb_mem_lib", ], language = "c++", public_hdrs = [ @@ -3052,8 +3056,8 @@ grpc_cc_library( "absl/types:optional", "absl/types:variant", "upb_base_lib", - "upb_collections_lib", - "upb_lib", + "upb_mem_lib", + "upb_message_lib", ], language = "c++", visibility = ["@grpc:client_channel"], @@ -3429,7 +3433,8 @@ grpc_cc_library( ], external_deps = [ "absl/strings", - "upb_lib", + "upb_base_lib", + "upb_mem_lib", ], language = "c++", visibility = ["@grpc:public"], @@ -3676,7 +3681,6 @@ grpc_cc_library( "absl/strings:str_format", "absl/types:optional", "upb_base_lib", - "upb_lib", "upb_mem_lib", "upb_textformat_lib", "upb_json_lib", diff --git a/CMakeLists.txt b/CMakeLists.txt index 92234187bb7..36bd85d7849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2584,10 +2584,8 @@ target_include_directories(grpc ) target_link_libraries(grpc ${_gRPC_ALLTARGETS_LIBRARIES} - upb_collections_lib upb_json_lib upb_textformat_lib - upb ${_gRPC_RE2_LIBRARIES} ${_gRPC_ZLIB_LIBRARIES} absl::algorithm_container @@ -3266,8 +3264,7 @@ target_include_directories(grpc_unsecure ) target_link_libraries(grpc_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} - upb_collections_lib - upb + upb_message_lib utf8_range_lib ${_gRPC_ZLIB_LIBRARIES} absl::algorithm_container @@ -3459,31 +3456,29 @@ target_link_libraries(gtest endif() -add_library(upb ${_gRPC_STATIC_WIN32} +add_library(upb_base_lib third_party/upb/upb/base/status.c - third_party/upb/upb/mem/alloc.c - third_party/upb/upb/mem/arena.c ) -target_compile_features(upb PUBLIC cxx_std_14) +target_compile_features(upb_base_lib PUBLIC cxx_std_14) -set_target_properties(upb PROPERTIES +set_target_properties(upb_base_lib PROPERTIES VERSION ${gRPC_CORE_VERSION} SOVERSION ${gRPC_CORE_SOVERSION} ) if(WIN32 AND MSVC) - set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb" + set_target_properties(upb_base_lib PROPERTIES COMPILE_PDB_NAME "upb_base_lib" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(gRPC_INSTALL) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb.pdb + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_base_lib.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() endif() -target_include_directories(upb +target_include_directories(upb_base_lib PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} @@ -3496,14 +3491,14 @@ target_include_directories(upb ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} ) -target_link_libraries(upb +target_link_libraries(upb_base_lib ${_gRPC_ALLTARGETS_LIBRARIES} ) if(gRPC_INSTALL) - install(TARGETS upb EXPORT gRPCTargets + install(TARGETS upb_base_lib EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3513,39 +3508,118 @@ endif() -add_library(upb_collections_lib ${_gRPC_STATIC_WIN32} - third_party/upb/upb/base/status.c - third_party/upb/upb/hash/common.c +add_library(upb_json_lib ${_gRPC_STATIC_WIN32} + src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c + third_party/upb/upb/json/decode.c + third_party/upb/upb/json/encode.c + third_party/upb/upb/lex/atoi.c + third_party/upb/upb/lex/round_trip.c + third_party/upb/upb/lex/strtod.c + third_party/upb/upb/lex/unicode.c + third_party/upb/upb/message/accessors.c + third_party/upb/upb/mini_descriptor/build_enum.c + third_party/upb/upb/mini_descriptor/decode.c + third_party/upb/upb/mini_descriptor/internal/base92.c + third_party/upb/upb/mini_descriptor/internal/encode.c + third_party/upb/upb/mini_descriptor/link.c + third_party/upb/upb/reflection/def_pool.c + third_party/upb/upb/reflection/def_type.c + third_party/upb/upb/reflection/desc_state.c + third_party/upb/upb/reflection/enum_def.c + third_party/upb/upb/reflection/enum_reserved_range.c + third_party/upb/upb/reflection/enum_value_def.c + third_party/upb/upb/reflection/extension_range.c + third_party/upb/upb/reflection/field_def.c + third_party/upb/upb/reflection/file_def.c + third_party/upb/upb/reflection/internal/def_builder.c + third_party/upb/upb/reflection/internal/strdup2.c + third_party/upb/upb/reflection/message.c + third_party/upb/upb/reflection/message_def.c + third_party/upb/upb/reflection/message_reserved_range.c + third_party/upb/upb/reflection/method_def.c + third_party/upb/upb/reflection/oneof_def.c + third_party/upb/upb/reflection/service_def.c + third_party/upb/upb/wire/decode.c + third_party/upb/upb/wire/decode_fast.c + third_party/upb/upb/wire/encode.c + third_party/upb/upb/wire/eps_copy_input_stream.c + third_party/upb/upb/wire/reader.c +) + +target_compile_features(upb_json_lib PUBLIC cxx_std_14) + +set_target_properties(upb_json_lib PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(upb_json_lib PROPERTIES COMPILE_PDB_NAME "upb_json_lib" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_json_lib.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(upb_json_lib + PUBLIC $ $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} +) +target_link_libraries(upb_json_lib + ${_gRPC_ALLTARGETS_LIBRARIES} + upb_message_lib + utf8_range_lib +) + + + +if(gRPC_INSTALL) + install(TARGETS upb_json_lib EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + + + +add_library(upb_mem_lib third_party/upb/upb/mem/alloc.c third_party/upb/upb/mem/arena.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c ) -target_compile_features(upb_collections_lib PUBLIC cxx_std_14) +target_compile_features(upb_mem_lib PUBLIC cxx_std_14) -set_target_properties(upb_collections_lib PROPERTIES +set_target_properties(upb_mem_lib PROPERTIES VERSION ${gRPC_CORE_VERSION} SOVERSION ${gRPC_CORE_SOVERSION} ) if(WIN32 AND MSVC) - set_target_properties(upb_collections_lib PROPERTIES COMPILE_PDB_NAME "upb_collections_lib" + set_target_properties(upb_mem_lib PROPERTIES COMPILE_PDB_NAME "upb_mem_lib" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(gRPC_INSTALL) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_collections_lib.pdb + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_mem_lib.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() endif() -target_include_directories(upb_collections_lib +target_include_directories(upb_mem_lib PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} @@ -3558,14 +3632,14 @@ target_include_directories(upb_collections_lib ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} ) -target_link_libraries(upb_collections_lib +target_link_libraries(upb_mem_lib ${_gRPC_ALLTARGETS_LIBRARIES} ) if(gRPC_INSTALL) - install(TARGETS upb_collections_lib EXPORT gRPCTargets + install(TARGETS upb_mem_lib EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3575,74 +3649,36 @@ endif() -add_library(upb_json_lib ${_gRPC_STATIC_WIN32} - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c - third_party/upb/upb/base/status.c +add_library(upb_message_lib third_party/upb/upb/hash/common.c - third_party/upb/upb/json/decode.c - third_party/upb/upb/json/encode.c - third_party/upb/upb/lex/atoi.c - third_party/upb/upb/lex/round_trip.c - third_party/upb/upb/lex/strtod.c - third_party/upb/upb/lex/unicode.c - third_party/upb/upb/mem/alloc.c - third_party/upb/upb/mem/arena.c - third_party/upb/upb/message/accessors.c third_party/upb/upb/message/array.c third_party/upb/upb/message/map.c third_party/upb/upb/message/map_sorter.c third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c third_party/upb/upb/mini_table/extension_registry.c third_party/upb/upb/mini_table/internal/message.c third_party/upb/upb/mini_table/message.c - third_party/upb/upb/reflection/def_pool.c - third_party/upb/upb/reflection/def_type.c - third_party/upb/upb/reflection/desc_state.c - third_party/upb/upb/reflection/enum_def.c - third_party/upb/upb/reflection/enum_reserved_range.c - third_party/upb/upb/reflection/enum_value_def.c - third_party/upb/upb/reflection/extension_range.c - third_party/upb/upb/reflection/field_def.c - third_party/upb/upb/reflection/file_def.c - third_party/upb/upb/reflection/internal/def_builder.c - third_party/upb/upb/reflection/internal/strdup2.c - third_party/upb/upb/reflection/message.c - third_party/upb/upb/reflection/message_def.c - third_party/upb/upb/reflection/message_reserved_range.c - third_party/upb/upb/reflection/method_def.c - third_party/upb/upb/reflection/oneof_def.c - third_party/upb/upb/reflection/service_def.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/reader.c ) -target_compile_features(upb_json_lib PUBLIC cxx_std_14) +target_compile_features(upb_message_lib PUBLIC cxx_std_14) -set_target_properties(upb_json_lib PROPERTIES +set_target_properties(upb_message_lib PROPERTIES VERSION ${gRPC_CORE_VERSION} SOVERSION ${gRPC_CORE_SOVERSION} ) if(WIN32 AND MSVC) - set_target_properties(upb_json_lib PROPERTIES COMPILE_PDB_NAME "upb_json_lib" + set_target_properties(upb_message_lib PROPERTIES COMPILE_PDB_NAME "upb_message_lib" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) if(gRPC_INSTALL) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_json_lib.pdb + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_message_lib.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) endif() endif() -target_include_directories(upb_json_lib +target_include_directories(upb_message_lib PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} @@ -3655,15 +3691,16 @@ target_include_directories(upb_json_lib ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} ) -target_link_libraries(upb_json_lib +target_link_libraries(upb_message_lib ${_gRPC_ALLTARGETS_LIBRARIES} - utf8_range_lib + upb_base_lib + upb_mem_lib ) if(gRPC_INSTALL) - install(TARGETS upb_json_lib EXPORT gRPCTargets + install(TARGETS upb_message_lib EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3675,27 +3712,16 @@ endif() add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32} src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c - third_party/upb/upb/base/status.c - third_party/upb/upb/hash/common.c third_party/upb/upb/lex/atoi.c third_party/upb/upb/lex/round_trip.c third_party/upb/upb/lex/strtod.c third_party/upb/upb/lex/unicode.c - third_party/upb/upb/mem/alloc.c - third_party/upb/upb/mem/arena.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/reflection/def_pool.c third_party/upb/upb/reflection/def_type.c third_party/upb/upb/reflection/desc_state.c @@ -3754,6 +3780,7 @@ target_include_directories(upb_textformat_lib ) target_link_libraries(upb_textformat_lib ${_gRPC_ALLTARGETS_LIBRARIES} + upb_message_lib utf8_range_lib ) @@ -5196,20 +5223,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -5251,7 +5270,7 @@ target_include_directories(grpc_authorization_provider ) target_link_libraries(grpc_authorization_provider ${_gRPC_ALLTARGETS_LIBRARIES} - upb + upb_message_lib ${_gRPC_RE2_LIBRARIES} utf8_range_lib ${_gRPC_ZLIB_LIBRARIES} @@ -8990,20 +9009,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -9033,7 +9044,7 @@ target_include_directories(chunked_vector_test target_link_libraries(chunked_vector_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -11500,20 +11511,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -11543,7 +11546,7 @@ target_include_directories(exec_ctx_wakeup_scheduler_test target_link_libraries(exec_ctx_wakeup_scheduler_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::hash absl::type_traits @@ -12200,20 +12203,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -12243,7 +12238,7 @@ target_include_directories(flow_control_test target_link_libraries(flow_control_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -12284,20 +12279,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -12327,7 +12314,7 @@ target_include_directories(for_each_test target_link_libraries(for_each_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -15068,20 +15055,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -15111,7 +15090,7 @@ target_include_directories(interceptor_list_test target_link_libraries(interceptor_list_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -15991,20 +15970,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -16034,7 +16005,7 @@ target_include_directories(map_pipe_test target_link_libraries(map_pipe_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -17688,20 +17659,12 @@ 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/upb/upb/hash/common.c third_party/upb/upb/message/accessors.c - third_party/upb/upb/message/array.c - third_party/upb/upb/message/map.c - third_party/upb/upb/message/map_sorter.c - third_party/upb/upb/message/message.c third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c third_party/upb/upb/mini_descriptor/internal/encode.c third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/mini_table/internal/message.c - third_party/upb/upb/mini_table/message.c third_party/upb/upb/wire/decode.c third_party/upb/upb/wire/decode_fast.c third_party/upb/upb/wire/encode.c @@ -17731,7 +17694,7 @@ target_include_directories(periodic_update_test target_link_libraries(periodic_update_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - upb + upb_message_lib utf8_range_lib absl::function_ref absl::hash @@ -30181,7 +30144,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 -lutf8_range_lib -lupb_collections_lib" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" "grpc.pc") # grpc_unsecure .pc file @@ -30192,7 +30155,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 -lutf8_range_lib -lupb -lupb_collections_lib" + "-laddress_sorting -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" "grpc_unsecure.pc") # grpc++ .pc file @@ -30203,7 +30166,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 -lutf8_range_lib -lupb_collections_lib" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" "grpc++.pc") # grpc++_unsecure .pc file @@ -30214,5 +30177,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 -lutf8_range_lib -lupb -lupb_collections_lib" + "-laddress_sorting -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" "grpc++_unsecure.pc") diff --git a/Makefile b/Makefile index 9f76d67a533..fe3e7eb6442 100644 --- a/Makefile +++ b/Makefile @@ -640,13 +640,13 @@ run_dep_checks: static: static_c static_cxx -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.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a +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 static_cxx: cache.mk shared: shared_c shared_cxx -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$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_collections_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_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) +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) shared_cxx: cache.mk privatelibs: privatelibs_c privatelibs_cxx @@ -677,12 +677,14 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(E) "[STRIP] Stripping libre2.a" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libre2.a - $(E) "[STRIP] Stripping libupb.a" - $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb.a - $(E) "[STRIP] Stripping libupb_collections_lib.a" - $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(E) "[STRIP] Stripping libupb_base_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(E) "[STRIP] Stripping libupb_json_lib.a" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a + $(E) "[STRIP] Stripping libupb_mem_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a + $(E) "[STRIP] Stripping libupb_message_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(E) "[STRIP] Stripping libupb_textformat_lib.a" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(E) "[STRIP] Stripping libutf8_range_lib.a" @@ -705,12 +707,14 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) - $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" - $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) - $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" - $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) + $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) + $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) + $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" @@ -952,8 +956,8 @@ 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', 'utf8_range_lib', 'upb_collections_lib', 'libssl'] +# deps: ['upb_json_lib', 'upb_textformat_lib', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting'] +# 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'] LIBGRPC_SRC = \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/census/grpc_context.cc \ @@ -1835,29 +1839,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)/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) +$(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) $(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) $(LIBUTF8_RANGE_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_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) 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)/libutf8_range_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_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) $(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)/libutf8_range_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_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) 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)/libutf8_range_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_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) $(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)/libutf8_range_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_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) 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)/libutf8_range_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_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) $(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 @@ -1874,8 +1878,8 @@ endif # start of build recipe for library "grpc_unsecure" (generated by makelib(lib) template function) -# 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'] +# deps: ['upb_message_lib', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting'] +# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib'] LIBGRPC_UNSECURE_SRC = \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/census/grpc_context.cc \ @@ -2356,29 +2360,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)/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) +$(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) $(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) $(LIBUTF8_RANGE_LIB_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_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_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)/libutf8_range_lib.a $(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_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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)/libutf8_range_lib.a $(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_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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)/libutf8_range_lib.a $(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_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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)/libutf8_range_lib.a $(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_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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)/libutf8_range_lib.a $(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_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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 @@ -2457,138 +2461,69 @@ endif # end of build recipe for library "re2" -# start of build recipe for library "upb" (generated by makelib(lib) template function) +# start of build recipe for library "upb_base_lib" (generated by makelib(lib) template function) # deps: [] # transitive_deps: [] -LIBUPB_SRC = \ +LIBUPB_BASE_LIB_SRC = \ third_party/upb/upb/base/status.c \ - third_party/upb/upb/mem/alloc.c \ - third_party/upb/upb/mem/arena.c \ - -PUBLIC_HEADERS_C += \ - -LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC)))) - - -# static library for "upb" -$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBUPB_OBJS) - $(E) "[AR] Creating $@" - $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) -ifeq ($(SYSTEM),Darwin) - $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a -endif - -# shared library for "upb" -ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(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) -else -$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` -ifeq ($(SYSTEM),Darwin) - $(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) -else - $(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) - $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.37 - $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so -endif -endif - -ifneq ($(NO_DEPS),true) --include $(LIBUPB_OBJS:.o=.dep) -endif -# end of build recipe for library "upb" - - -# start of build recipe for library "upb_collections_lib" (generated by makelib(lib) template function) -# deps: [] -# transitive_deps: [] -LIBUPB_COLLECTIONS_LIB_SRC = \ - third_party/upb/upb/base/status.c \ - third_party/upb/upb/hash/common.c \ - third_party/upb/upb/mem/alloc.c \ - third_party/upb/upb/mem/arena.c \ - third_party/upb/upb/message/array.c \ - third_party/upb/upb/message/map.c \ - third_party/upb/upb/message/map_sorter.c \ - third_party/upb/upb/message/message.c \ - third_party/upb/upb/mini_table/extension_registry.c \ - third_party/upb/upb/mini_table/internal/message.c \ - third_party/upb/upb/mini_table/message.c \ PUBLIC_HEADERS_C += \ -LIBUPB_COLLECTIONS_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_COLLECTIONS_LIB_SRC)))) +LIBUPB_BASE_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_BASE_LIB_SRC)))) -# static library for "upb_collections_lib" -$(LIBDIR)/$(CONFIG)/libupb_collections_lib.a: $(LIBUPB_COLLECTIONS_LIB_OBJS) +# static library for "upb_base_lib" +$(LIBDIR)/$(CONFIG)/libupb_base_lib.a: $(LIBUPB_BASE_LIB_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBUPB_COLLECTIONS_LIB_OBJS) + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_base_lib.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LIBUPB_BASE_LIB_OBJS) ifeq ($(SYSTEM),Darwin) - $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_base_lib.a endif -# shared library for "upb_collections_lib" +# shared library for "upb_base_lib" ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_COLLECTIONS_LIB_OBJS) +$(LIBDIR)/$(CONFIG)/upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_BASE_LIB_OBJS) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_collections_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS) + $(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) else -$(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_COLLECTIONS_LIB_OBJS) +$(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_BASE_LIB_OBJS) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS) + $(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) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_collections_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so.37 - $(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_base_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_BASE_LIB_OBJS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).so.37 + $(Q) ln -sf $(SHARED_PREFIX)upb_base_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_base_lib$(SHARED_VERSION_CORE).so endif endif ifneq ($(NO_DEPS),true) --include $(LIBUPB_COLLECTIONS_LIB_OBJS:.o=.dep) +-include $(LIBUPB_BASE_LIB_OBJS:.o=.dep) endif -# end of build recipe for library "upb_collections_lib" +# end of build recipe for library "upb_base_lib" # start of build recipe for library "upb_json_lib" (generated by makelib(lib) template function) -# deps: ['utf8_range_lib'] -# transitive_deps: ['utf8_range_lib'] +# deps: ['upb_message_lib', 'utf8_range_lib'] +# transitive_deps: ['utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib'] LIBUPB_JSON_LIB_SRC = \ src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \ - third_party/upb/upb/base/status.c \ - third_party/upb/upb/hash/common.c \ third_party/upb/upb/json/decode.c \ third_party/upb/upb/json/encode.c \ third_party/upb/upb/lex/atoi.c \ third_party/upb/upb/lex/round_trip.c \ third_party/upb/upb/lex/strtod.c \ third_party/upb/upb/lex/unicode.c \ - third_party/upb/upb/mem/alloc.c \ - third_party/upb/upb/mem/arena.c \ third_party/upb/upb/message/accessors.c \ - third_party/upb/upb/message/array.c \ - third_party/upb/upb/message/map.c \ - third_party/upb/upb/message/map_sorter.c \ - third_party/upb/upb/message/message.c \ third_party/upb/upb/mini_descriptor/build_enum.c \ third_party/upb/upb/mini_descriptor/decode.c \ third_party/upb/upb/mini_descriptor/internal/base92.c \ third_party/upb/upb/mini_descriptor/internal/encode.c \ third_party/upb/upb/mini_descriptor/link.c \ - third_party/upb/upb/mini_table/extension_registry.c \ - third_party/upb/upb/mini_table/internal/message.c \ - third_party/upb/upb/mini_table/message.c \ third_party/upb/upb/reflection/def_pool.c \ third_party/upb/upb/reflection/def_type.c \ third_party/upb/upb/reflection/desc_state.c \ @@ -2618,29 +2553,29 @@ LIBUPB_JSON_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basen # static library for "upb_json_lib" -$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) +$(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) $(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) $(LIBUTF8_RANGE_LIB_OBJS) + $(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) 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)/libutf8_range_lib.a +$(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 $(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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a +$(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 $(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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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 @@ -2652,32 +2587,121 @@ endif # end of build recipe for library "upb_json_lib" +# start of build recipe for library "upb_mem_lib" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] +LIBUPB_MEM_LIB_SRC = \ + third_party/upb/upb/mem/alloc.c \ + third_party/upb/upb/mem/arena.c \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_MEM_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_MEM_LIB_SRC)))) + + +# static library for "upb_mem_lib" +$(LIBDIR)/$(CONFIG)/libupb_mem_lib.a: $(LIBUPB_MEM_LIB_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBUPB_MEM_LIB_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a +endif + +# shared library for "upb_mem_lib" +ifeq ($(SYSTEM),MINGW32) +$(LIBDIR)/$(CONFIG)/upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MEM_LIB_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(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) +else +$(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_MEM_LIB_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(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) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_mem_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_MEM_LIB_OBJS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).so.37 + $(Q) ln -sf $(SHARED_PREFIX)upb_mem_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_mem_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_MEM_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "upb_mem_lib" + + +# start of build recipe for library "upb_message_lib" (generated by makelib(lib) template function) +# deps: ['upb_base_lib', 'upb_mem_lib'] +# transitive_deps: ['upb_mem_lib', 'upb_base_lib'] +LIBUPB_MESSAGE_LIB_SRC = \ + third_party/upb/upb/hash/common.c \ + third_party/upb/upb/message/array.c \ + third_party/upb/upb/message/map.c \ + third_party/upb/upb/message/map_sorter.c \ + third_party/upb/upb/message/message.c \ + third_party/upb/upb/mini_table/extension_registry.c \ + third_party/upb/upb/mini_table/internal/message.c \ + third_party/upb/upb/mini_table/message.c \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_MESSAGE_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_MESSAGE_LIB_SRC)))) + + +# static library for "upb_message_lib" +$(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) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_message_lib.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBUPB_MESSAGE_LIB_OBJS) $(LIBUPB_MEM_LIB_OBJS) $(LIBUPB_BASE_LIB_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_message_lib.a +endif + +# shared library for "upb_message_lib" +ifeq ($(SYSTEM),MINGW32) +$(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 + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(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) +else +$(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 + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(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) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_message_lib.so.37 -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) + $(Q) ln -sf $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).so.37 + $(Q) ln -sf $(SHARED_PREFIX)upb_message_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_message_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_MESSAGE_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "upb_message_lib" + + # start of build recipe for library "upb_textformat_lib" (generated by makelib(lib) template function) -# deps: ['utf8_range_lib'] -# transitive_deps: ['utf8_range_lib'] +# deps: ['upb_message_lib', 'utf8_range_lib'] +# transitive_deps: ['utf8_range_lib', 'upb_message_lib', 'upb_mem_lib', 'upb_base_lib'] LIBUPB_TEXTFORMAT_LIB_SRC = \ src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \ - third_party/upb/upb/base/status.c \ - third_party/upb/upb/hash/common.c \ third_party/upb/upb/lex/atoi.c \ third_party/upb/upb/lex/round_trip.c \ third_party/upb/upb/lex/strtod.c \ third_party/upb/upb/lex/unicode.c \ - third_party/upb/upb/mem/alloc.c \ - third_party/upb/upb/mem/arena.c \ third_party/upb/upb/message/accessors.c \ - third_party/upb/upb/message/array.c \ - third_party/upb/upb/message/map.c \ - third_party/upb/upb/message/map_sorter.c \ - third_party/upb/upb/message/message.c \ third_party/upb/upb/mini_descriptor/build_enum.c \ third_party/upb/upb/mini_descriptor/decode.c \ third_party/upb/upb/mini_descriptor/internal/base92.c \ third_party/upb/upb/mini_descriptor/internal/encode.c \ third_party/upb/upb/mini_descriptor/link.c \ - third_party/upb/upb/mini_table/extension_registry.c \ - third_party/upb/upb/mini_table/internal/message.c \ - third_party/upb/upb/mini_table/message.c \ third_party/upb/upb/reflection/def_pool.c \ third_party/upb/upb/reflection/def_type.c \ third_party/upb/upb/reflection/desc_state.c \ @@ -2708,29 +2732,29 @@ LIBUPB_TEXTFORMAT_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $ # static library for "upb_textformat_lib" -$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) +$(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) $(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) $(LIBUTF8_RANGE_LIB_OBJS) + $(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) 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)/libutf8_range_lib.a +$(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 $(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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_lib.a $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a +$(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 $(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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(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 $(LIBDIR)/$(CONFIG)/libupb_message_lib.a $(LIBDIR)/$(CONFIG)/libupb_mem_lib.a $(LIBDIR)/$(CONFIG)/libupb_base_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 diff --git a/Package.swift b/Package.swift index 5bf0a78e600..4b7c86cfa7a 100644 --- a/Package.swift +++ b/Package.swift @@ -2024,16 +2024,11 @@ let package = Package( "third_party/re2/util/utf.h", "third_party/re2/util/util.h", "third_party/upb/upb/base/descriptor_constants.h", - "third_party/upb/upb/base/internal/log2.h", "third_party/upb/upb/base/status.c", "third_party/upb/upb/base/status.h", "third_party/upb/upb/base/status.hpp", "third_party/upb/upb/base/string_view.h", "third_party/upb/upb/generated_code_support.h", - "third_party/upb/upb/hash/common.c", - "third_party/upb/upb/hash/common.h", - "third_party/upb/upb/hash/int_table.h", - "third_party/upb/upb/hash/str_table.h", "third_party/upb/upb/json/decode.c", "third_party/upb/upb/json/decode.h", "third_party/upb/upb/json/encode.c", @@ -2054,25 +2049,7 @@ let package = Package( "third_party/upb/upb/mem/internal/arena.h", "third_party/upb/upb/message/accessors.c", "third_party/upb/upb/message/accessors.h", - "third_party/upb/upb/message/array.c", - "third_party/upb/upb/message/array.h", "third_party/upb/upb/message/internal/accessors.h", - "third_party/upb/upb/message/internal/array.h", - "third_party/upb/upb/message/internal/extension.h", - "third_party/upb/upb/message/internal/map.h", - "third_party/upb/upb/message/internal/map_entry.h", - "third_party/upb/upb/message/internal/map_sorter.h", - "third_party/upb/upb/message/internal/message.h", - "third_party/upb/upb/message/internal/types.h", - "third_party/upb/upb/message/map.c", - "third_party/upb/upb/message/map.h", - "third_party/upb/upb/message/map_gencode_util.h", - "third_party/upb/upb/message/map_sorter.c", - "third_party/upb/upb/message/message.c", - "third_party/upb/upb/message/message.h", - "third_party/upb/upb/message/tagged_ptr.h", - "third_party/upb/upb/message/types.h", - "third_party/upb/upb/message/value.h", "third_party/upb/upb/mini_descriptor/build_enum.c", "third_party/upb/upb/mini_descriptor/build_enum.h", "third_party/upb/upb/mini_descriptor/decode.c", @@ -2087,22 +2064,6 @@ let package = Package( "third_party/upb/upb/mini_descriptor/internal/wire_constants.h", "third_party/upb/upb/mini_descriptor/link.c", "third_party/upb/upb/mini_descriptor/link.h", - "third_party/upb/upb/mini_table/enum.h", - "third_party/upb/upb/mini_table/extension.h", - "third_party/upb/upb/mini_table/extension_registry.c", - "third_party/upb/upb/mini_table/extension_registry.h", - "third_party/upb/upb/mini_table/field.h", - "third_party/upb/upb/mini_table/file.h", - "third_party/upb/upb/mini_table/internal/enum.h", - "third_party/upb/upb/mini_table/internal/extension.h", - "third_party/upb/upb/mini_table/internal/field.h", - "third_party/upb/upb/mini_table/internal/file.h", - "third_party/upb/upb/mini_table/internal/message.c", - "third_party/upb/upb/mini_table/internal/message.h", - "third_party/upb/upb/mini_table/internal/sub.h", - "third_party/upb/upb/mini_table/message.c", - "third_party/upb/upb/mini_table/message.h", - "third_party/upb/upb/mini_table/sub.h", "third_party/upb/upb/port/atomic.h", "third_party/upb/upb/port/def.inc", "third_party/upb/upb/port/undef.inc", @@ -2159,7 +2120,6 @@ let package = Package( "third_party/upb/upb/reflection/service_def.h", "third_party/upb/upb/text/encode.c", "third_party/upb/upb/text/encode.h", - "third_party/upb/upb/upb.hpp", "third_party/upb/upb/wire/decode.c", "third_party/upb/upb/wire/decode.h", "third_party/upb/upb/wire/decode_fast.c", diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index dc2500fe63c..4740bbd98e1 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -20,11 +20,6 @@ load("@com_github_grpc_grpc//bazel:grpc_python_deps.bzl", "grpc_python_deps") def grpc_deps(): """Loads dependencies need to compile and test the grpc library.""" - native.bind( - name = "upb_lib", - actual = "@com_google_protobuf//upb", - ) - native.bind( name = "upb_amalgamation_lib", actual = "@com_google_protobuf//upb:amalgamation", @@ -36,8 +31,8 @@ def grpc_deps(): ) native.bind( - name = "upb_collections_lib", - actual = "@com_google_protobuf//upb/collections", + name = "upb_message_lib", + actual = "@com_google_protobuf//upb:message", ) native.bind( diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 33c211723ad..81b264232eb 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -2011,10 +2011,8 @@ libs: - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc deps: - - upb_collections_lib - upb_json_lib - upb_textformat_lib - - upb - re2 - z - absl/algorithm:container @@ -3051,8 +3049,7 @@ libs: - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/reader.c deps: - - upb_collections_lib - - upb + - upb_message_lib - utf8_range_lib - z - absl/algorithm:container @@ -3197,7 +3194,7 @@ libs: - third_party/re2/util/rune.cc - third_party/re2/util/strutil.cc deps: [] -- name: upb +- name: upb_base_lib build: all language: c public_headers: [] @@ -3206,82 +3203,12 @@ libs: - third_party/upb/upb/base/status.h - third_party/upb/upb/base/status.hpp - third_party/upb/upb/base/string_view.h - - third_party/upb/upb/mem/alloc.h - - third_party/upb/upb/mem/arena.h - - third_party/upb/upb/mem/arena.hpp - - third_party/upb/upb/mem/internal/arena.h - third_party/upb/upb/port/atomic.h - third_party/upb/upb/port/def.inc - third_party/upb/upb/port/undef.inc - third_party/upb/upb/port/vsnprintf_compat.h - - third_party/upb/upb/upb.hpp src: - third_party/upb/upb/base/status.c - - third_party/upb/upb/mem/alloc.c - - third_party/upb/upb/mem/arena.c - deps: [] -- name: upb_collections_lib - build: all - language: c - public_headers: [] - headers: - - third_party/upb/upb/base/descriptor_constants.h - - third_party/upb/upb/base/internal/log2.h - - third_party/upb/upb/base/status.h - - third_party/upb/upb/base/status.hpp - - third_party/upb/upb/base/string_view.h - - third_party/upb/upb/collections/array.h - - third_party/upb/upb/collections/map.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - - third_party/upb/upb/mem/alloc.h - - third_party/upb/upb/mem/arena.h - - third_party/upb/upb/mem/arena.hpp - - third_party/upb/upb/mem/internal/arena.h - - third_party/upb/upb/message/array.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - - third_party/upb/upb/port/atomic.h - - third_party/upb/upb/port/def.inc - - third_party/upb/upb/port/undef.inc - - third_party/upb/upb/port/vsnprintf_compat.h - src: - - third_party/upb/upb/base/status.c - - third_party/upb/upb/hash/common.c - - third_party/upb/upb/mem/alloc.c - - third_party/upb/upb/mem/arena.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c deps: [] - name: upb_json_lib build: all @@ -3289,40 +3216,14 @@ libs: public_headers: [] headers: - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h - - third_party/upb/upb/base/descriptor_constants.h - - third_party/upb/upb/base/internal/log2.h - - third_party/upb/upb/base/status.h - - third_party/upb/upb/base/status.hpp - - third_party/upb/upb/base/string_view.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/json/decode.h - third_party/upb/upb/json/encode.h - third_party/upb/upb/lex/atoi.h - third_party/upb/upb/lex/round_trip.h - third_party/upb/upb/lex/strtod.h - third_party/upb/upb/lex/unicode.h - - third_party/upb/upb/mem/alloc.h - - third_party/upb/upb/mem/arena.h - - third_party/upb/upb/mem/arena.hpp - - third_party/upb/upb/mem/internal/arena.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -3332,23 +3233,6 @@ libs: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - - third_party/upb/upb/port/atomic.h - - third_party/upb/upb/port/def.inc - - third_party/upb/upb/port/undef.inc - - third_party/upb/upb/port/vsnprintf_compat.h - third_party/upb/upb/reflection/common.h - third_party/upb/upb/reflection/def.h - third_party/upb/upb/reflection/def.hpp @@ -3393,29 +3277,18 @@ libs: - third_party/upb/upb/wire/types.h src: - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c - - third_party/upb/upb/base/status.c - - third_party/upb/upb/hash/common.c - third_party/upb/upb/json/decode.c - third_party/upb/upb/json/encode.c - third_party/upb/upb/lex/atoi.c - third_party/upb/upb/lex/round_trip.c - third_party/upb/upb/lex/strtod.c - third_party/upb/upb/lex/unicode.c - - third_party/upb/upb/mem/alloc.c - - third_party/upb/upb/mem/arena.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/reflection/def_pool.c - third_party/upb/upb/reflection/def_type.c - third_party/upb/upb/reflection/desc_state.c @@ -3439,32 +3312,35 @@ libs: - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/reader.c deps: + - upb_message_lib - utf8_range_lib -- name: upb_textformat_lib +- name: upb_mem_lib build: all language: c public_headers: [] headers: - - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h - - third_party/upb/upb/base/descriptor_constants.h - - third_party/upb/upb/base/internal/log2.h - - third_party/upb/upb/base/status.h - - third_party/upb/upb/base/status.hpp - - third_party/upb/upb/base/string_view.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - - third_party/upb/upb/lex/atoi.h - - third_party/upb/upb/lex/round_trip.h - - third_party/upb/upb/lex/strtod.h - - third_party/upb/upb/lex/unicode.h - third_party/upb/upb/mem/alloc.h - third_party/upb/upb/mem/arena.h - third_party/upb/upb/mem/arena.hpp - third_party/upb/upb/mem/internal/arena.h - - third_party/upb/upb/message/accessors.h + - third_party/upb/upb/port/atomic.h + - third_party/upb/upb/port/def.inc + - third_party/upb/upb/port/undef.inc + - third_party/upb/upb/port/vsnprintf_compat.h + src: + - third_party/upb/upb/mem/alloc.c + - third_party/upb/upb/mem/arena.c + deps: [] +- name: upb_message_lib + build: all + language: c + public_headers: [] + headers: + - third_party/upb/upb/base/internal/log2.h + - third_party/upb/upb/hash/common.h + - third_party/upb/upb/hash/int_table.h + - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/array.h - - third_party/upb/upb/message/internal/accessors.h - third_party/upb/upb/message/internal/array.h - third_party/upb/upb/message/internal/extension.h - third_party/upb/upb/message/internal/map.h @@ -3478,15 +3354,6 @@ libs: - third_party/upb/upb/message/tagged_ptr.h - third_party/upb/upb/message/types.h - third_party/upb/upb/message/value.h - - third_party/upb/upb/mini_descriptor/build_enum.h - - third_party/upb/upb/mini_descriptor/decode.h - - third_party/upb/upb/mini_descriptor/internal/base92.h - - third_party/upb/upb/mini_descriptor/internal/decoder.h - - third_party/upb/upb/mini_descriptor/internal/encode.h - - third_party/upb/upb/mini_descriptor/internal/encode.hpp - - third_party/upb/upb/mini_descriptor/internal/modifiers.h - - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - - third_party/upb/upb/mini_descriptor/link.h - third_party/upb/upb/mini_table/enum.h - third_party/upb/upb/mini_table/extension.h - third_party/upb/upb/mini_table/extension_registry.h @@ -3500,10 +3367,39 @@ libs: - third_party/upb/upb/mini_table/internal/sub.h - third_party/upb/upb/mini_table/message.h - third_party/upb/upb/mini_table/sub.h - - third_party/upb/upb/port/atomic.h - - third_party/upb/upb/port/def.inc - - third_party/upb/upb/port/undef.inc - - third_party/upb/upb/port/vsnprintf_compat.h + src: + - third_party/upb/upb/hash/common.c + - third_party/upb/upb/message/array.c + - third_party/upb/upb/message/map.c + - third_party/upb/upb/message/map_sorter.c + - third_party/upb/upb/message/message.c + - third_party/upb/upb/mini_table/extension_registry.c + - third_party/upb/upb/mini_table/internal/message.c + - third_party/upb/upb/mini_table/message.c + deps: + - upb_base_lib + - upb_mem_lib +- name: upb_textformat_lib + build: all + language: c + public_headers: [] + headers: + - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h + - third_party/upb/upb/lex/atoi.h + - third_party/upb/upb/lex/round_trip.h + - third_party/upb/upb/lex/strtod.h + - third_party/upb/upb/lex/unicode.h + - third_party/upb/upb/message/accessors.h + - third_party/upb/upb/message/internal/accessors.h + - third_party/upb/upb/mini_descriptor/build_enum.h + - third_party/upb/upb/mini_descriptor/decode.h + - third_party/upb/upb/mini_descriptor/internal/base92.h + - third_party/upb/upb/mini_descriptor/internal/decoder.h + - third_party/upb/upb/mini_descriptor/internal/encode.h + - third_party/upb/upb/mini_descriptor/internal/encode.hpp + - third_party/upb/upb/mini_descriptor/internal/modifiers.h + - third_party/upb/upb/mini_descriptor/internal/wire_constants.h + - third_party/upb/upb/mini_descriptor/link.h - third_party/upb/upb/reflection/common.h - third_party/upb/upb/reflection/def.h - third_party/upb/upb/reflection/def.hpp @@ -3549,27 +3445,16 @@ libs: - third_party/upb/upb/wire/types.h src: - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c - - third_party/upb/upb/base/status.c - - third_party/upb/upb/hash/common.c - third_party/upb/upb/lex/atoi.c - third_party/upb/upb/lex/round_trip.c - third_party/upb/upb/lex/strtod.c - third_party/upb/upb/lex/unicode.c - - third_party/upb/upb/mem/alloc.c - - third_party/upb/upb/mem/arena.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/reflection/def_pool.c - third_party/upb/upb/reflection/def_type.c - third_party/upb/upb/reflection/desc_state.c @@ -3594,6 +3479,7 @@ libs: - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/reader.c deps: + - upb_message_lib - utf8_range_lib - name: utf8_range_lib build: all @@ -4763,27 +4649,9 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h - - third_party/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -4793,19 +4661,6 @@ libs: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -5081,27 +4936,19 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/reader.c deps: - - upb + - upb_message_lib - re2 - utf8_range_lib - z @@ -7339,27 +7186,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h + - third_party/upb/upb/message/internal/accessors.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -7369,19 +7198,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -7419,20 +7235,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -7440,7 +7248,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash @@ -8701,27 +8509,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -8731,19 +8521,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -8774,20 +8551,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -8795,7 +8564,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/hash:hash - absl/meta:type_traits @@ -9260,27 +9029,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -9290,19 +9041,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -9342,20 +9080,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -9363,7 +9093,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash @@ -9435,27 +9165,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -9465,19 +9177,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -9515,20 +9214,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -9536,7 +9227,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash @@ -10986,27 +10677,9 @@ targets: - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h - test/core/promise/test_context.h - - third_party/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -11016,19 +10689,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -11066,20 +10726,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -11087,7 +10739,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash @@ -11617,27 +11269,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -11647,19 +11281,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -11697,20 +11318,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -11718,7 +11331,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash @@ -12581,27 +12194,9 @@ 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/upb/upb/base/internal/log2.h - third_party/upb/upb/generated_code_support.h - - third_party/upb/upb/hash/common.h - - third_party/upb/upb/hash/int_table.h - - third_party/upb/upb/hash/str_table.h - third_party/upb/upb/message/accessors.h - - third_party/upb/upb/message/array.h - third_party/upb/upb/message/internal/accessors.h - - third_party/upb/upb/message/internal/array.h - - third_party/upb/upb/message/internal/extension.h - - third_party/upb/upb/message/internal/map.h - - third_party/upb/upb/message/internal/map_entry.h - - third_party/upb/upb/message/internal/map_sorter.h - - third_party/upb/upb/message/internal/message.h - - third_party/upb/upb/message/internal/types.h - - third_party/upb/upb/message/map.h - - third_party/upb/upb/message/map_gencode_util.h - - third_party/upb/upb/message/message.h - - third_party/upb/upb/message/tagged_ptr.h - - third_party/upb/upb/message/types.h - - third_party/upb/upb/message/value.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h - third_party/upb/upb/mini_descriptor/internal/base92.h @@ -12611,19 +12206,6 @@ targets: - third_party/upb/upb/mini_descriptor/internal/modifiers.h - third_party/upb/upb/mini_descriptor/internal/wire_constants.h - third_party/upb/upb/mini_descriptor/link.h - - third_party/upb/upb/mini_table/enum.h - - third_party/upb/upb/mini_table/extension.h - - third_party/upb/upb/mini_table/extension_registry.h - - third_party/upb/upb/mini_table/field.h - - third_party/upb/upb/mini_table/file.h - - third_party/upb/upb/mini_table/internal/enum.h - - third_party/upb/upb/mini_table/internal/extension.h - - third_party/upb/upb/mini_table/internal/field.h - - third_party/upb/upb/mini_table/internal/file.h - - third_party/upb/upb/mini_table/internal/message.h - - third_party/upb/upb/mini_table/internal/sub.h - - third_party/upb/upb/mini_table/message.h - - third_party/upb/upb/mini_table/sub.h - third_party/upb/upb/wire/decode.h - third_party/upb/upb/wire/decode_fast.h - third_party/upb/upb/wire/encode.h @@ -12654,20 +12236,12 @@ 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/upb/upb/hash/common.c - third_party/upb/upb/message/accessors.c - - third_party/upb/upb/message/array.c - - third_party/upb/upb/message/map.c - - third_party/upb/upb/message/map_sorter.c - - third_party/upb/upb/message/message.c - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - - third_party/upb/upb/mini_table/extension_registry.c - - third_party/upb/upb/mini_table/internal/message.c - - third_party/upb/upb/mini_table/message.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/encode.c @@ -12675,7 +12249,7 @@ targets: - third_party/upb/upb/wire/reader.c deps: - gtest - - upb + - upb_message_lib - utf8_range_lib - absl/functional:function_ref - absl/hash:hash diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 137a70eeabf..10356ca094d 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -207,7 +207,8 @@ swift_package: - grpc - grpc_authorization_provider - gpr - - upb + - upb_base_lib + - upb_mem_lib - upb_json_lib - upb_textformat_lib - utf8_range_lib diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 4b54894cee7..3656484f5bd 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1395,8 +1395,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/base/status.h', 'third_party/upb/upb/base/status.hpp', 'third_party/upb/upb/base/string_view.h', - 'third_party/upb/upb/collections/array.h', - 'third_party/upb/upb/collections/map.h', 'third_party/upb/upb/generated_code_support.h', 'third_party/upb/upb/hash/common.h', 'third_party/upb/upb/hash/int_table.h', @@ -1487,7 +1485,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', - 'third_party/upb/upb/upb.hpp', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/decode_fast.h', 'third_party/upb/upb/wire/encode.h', @@ -2594,8 +2591,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/base/status.h', 'third_party/upb/upb/base/status.hpp', 'third_party/upb/upb/base/string_view.h', - 'third_party/upb/upb/collections/array.h', - 'third_party/upb/upb/collections/map.h', 'third_party/upb/upb/generated_code_support.h', 'third_party/upb/upb/hash/common.h', 'third_party/upb/upb/hash/int_table.h', @@ -2686,7 +2681,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', - 'third_party/upb/upb/upb.hpp', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/decode_fast.h', 'third_party/upb/upb/wire/encode.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index f6e9adef455..ae204f1fb08 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2128,8 +2128,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/base/status.h', 'third_party/upb/upb/base/status.hpp', 'third_party/upb/upb/base/string_view.h', - 'third_party/upb/upb/collections/array.h', - 'third_party/upb/upb/collections/map.h', 'third_party/upb/upb/generated_code_support.h', 'third_party/upb/upb/hash/common.c', 'third_party/upb/upb/hash/common.h', @@ -2260,7 +2258,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.c', 'third_party/upb/upb/text/encode.h', - 'third_party/upb/upb/upb.hpp', 'third_party/upb/upb/wire/decode.c', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/decode_fast.c', @@ -3353,8 +3350,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/base/status.h', 'third_party/upb/upb/base/status.hpp', 'third_party/upb/upb/base/string_view.h', - 'third_party/upb/upb/collections/array.h', - 'third_party/upb/upb/collections/map.h', 'third_party/upb/upb/generated_code_support.h', 'third_party/upb/upb/hash/common.h', 'third_party/upb/upb/hash/int_table.h', @@ -3445,7 +3440,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/oneof_def.h', 'third_party/upb/upb/reflection/service_def.h', 'third_party/upb/upb/text/encode.h', - 'third_party/upb/upb/upb.hpp', 'third_party/upb/upb/wire/decode.h', 'third_party/upb/upb/wire/decode_fast.h', 'third_party/upb/upb/wire/encode.h', diff --git a/grpc.gemspec b/grpc.gemspec index 88f659135d9..8e10a8c324c 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -3007,8 +3007,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/base/status.h ) s.files += %w( third_party/upb/upb/base/status.hpp ) s.files += %w( third_party/upb/upb/base/string_view.h ) - s.files += %w( third_party/upb/upb/collections/array.h ) - s.files += %w( third_party/upb/upb/collections/map.h ) s.files += %w( third_party/upb/upb/generated_code_support.h ) s.files += %w( third_party/upb/upb/hash/common.c ) s.files += %w( third_party/upb/upb/hash/common.h ) @@ -3139,7 +3137,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/reflection/service_def.h ) s.files += %w( third_party/upb/upb/text/encode.c ) s.files += %w( third_party/upb/upb/text/encode.h ) - s.files += %w( third_party/upb/upb/upb.hpp ) s.files += %w( third_party/upb/upb/wire/decode.c ) s.files += %w( third_party/upb/upb/wire/decode.h ) s.files += %w( third_party/upb/upb/wire/decode_fast.c ) diff --git a/grpc.gyp b/grpc.gyp index c528adf8120..1b520b09692 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -249,10 +249,8 @@ 'target_name': 'grpc', 'type': 'static_library', 'dependencies': [ - 'upb_collections_lib', 'upb_json_lib', 'upb_textformat_lib', - 'upb', 're2', 'z', 'absl/algorithm:container', @@ -1114,8 +1112,7 @@ 'target_name': 'grpc_unsecure', 'type': 'static_library', 'dependencies': [ - 'upb_collections_lib', - 'upb', + 'upb_message_lib', 'utf8_range_lib', 'z', 'absl/algorithm:container', @@ -1605,66 +1602,35 @@ ], }, { - 'target_name': 'upb', + 'target_name': 'upb_base_lib', 'type': 'static_library', 'dependencies': [ ], 'sources': [ 'third_party/upb/upb/base/status.c', - 'third_party/upb/upb/mem/alloc.c', - 'third_party/upb/upb/mem/arena.c', - ], - }, - { - 'target_name': 'upb_collections_lib', - 'type': 'static_library', - 'dependencies': [ - ], - 'sources': [ - 'third_party/upb/upb/base/status.c', - 'third_party/upb/upb/hash/common.c', - 'third_party/upb/upb/mem/alloc.c', - 'third_party/upb/upb/mem/arena.c', - 'third_party/upb/upb/message/array.c', - 'third_party/upb/upb/message/map.c', - 'third_party/upb/upb/message/map_sorter.c', - 'third_party/upb/upb/message/message.c', - 'third_party/upb/upb/mini_table/extension_registry.c', - 'third_party/upb/upb/mini_table/internal/message.c', - 'third_party/upb/upb/mini_table/message.c', ], }, { 'target_name': 'upb_json_lib', 'type': 'static_library', 'dependencies': [ + 'upb_message_lib', 'utf8_range_lib', ], 'sources': [ 'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c', - 'third_party/upb/upb/base/status.c', - 'third_party/upb/upb/hash/common.c', 'third_party/upb/upb/json/decode.c', 'third_party/upb/upb/json/encode.c', 'third_party/upb/upb/lex/atoi.c', 'third_party/upb/upb/lex/round_trip.c', 'third_party/upb/upb/lex/strtod.c', 'third_party/upb/upb/lex/unicode.c', - 'third_party/upb/upb/mem/alloc.c', - 'third_party/upb/upb/mem/arena.c', 'third_party/upb/upb/message/accessors.c', - 'third_party/upb/upb/message/array.c', - 'third_party/upb/upb/message/map.c', - 'third_party/upb/upb/message/map_sorter.c', - 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/mini_descriptor/build_enum.c', 'third_party/upb/upb/mini_descriptor/decode.c', 'third_party/upb/upb/mini_descriptor/internal/base92.c', 'third_party/upb/upb/mini_descriptor/internal/encode.c', 'third_party/upb/upb/mini_descriptor/link.c', - 'third_party/upb/upb/mini_table/extension_registry.c', - 'third_party/upb/upb/mini_table/internal/message.c', - 'third_party/upb/upb/mini_table/message.c', 'third_party/upb/upb/reflection/def_pool.c', 'third_party/upb/upb/reflection/def_type.c', 'third_party/upb/upb/reflection/desc_state.c', @@ -1689,35 +1655,53 @@ 'third_party/upb/upb/wire/reader.c', ], }, + { + 'target_name': 'upb_mem_lib', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/upb/upb/mem/alloc.c', + 'third_party/upb/upb/mem/arena.c', + ], + }, + { + 'target_name': 'upb_message_lib', + 'type': 'static_library', + 'dependencies': [ + 'upb_base_lib', + 'upb_mem_lib', + ], + 'sources': [ + 'third_party/upb/upb/hash/common.c', + 'third_party/upb/upb/message/array.c', + 'third_party/upb/upb/message/map.c', + 'third_party/upb/upb/message/map_sorter.c', + 'third_party/upb/upb/message/message.c', + 'third_party/upb/upb/mini_table/extension_registry.c', + 'third_party/upb/upb/mini_table/internal/message.c', + 'third_party/upb/upb/mini_table/message.c', + ], + }, { 'target_name': 'upb_textformat_lib', 'type': 'static_library', 'dependencies': [ + 'upb_message_lib', 'utf8_range_lib', ], 'sources': [ 'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c', - 'third_party/upb/upb/base/status.c', - 'third_party/upb/upb/hash/common.c', 'third_party/upb/upb/lex/atoi.c', 'third_party/upb/upb/lex/round_trip.c', 'third_party/upb/upb/lex/strtod.c', 'third_party/upb/upb/lex/unicode.c', - 'third_party/upb/upb/mem/alloc.c', - 'third_party/upb/upb/mem/arena.c', 'third_party/upb/upb/message/accessors.c', - 'third_party/upb/upb/message/array.c', - 'third_party/upb/upb/message/map.c', - 'third_party/upb/upb/message/map_sorter.c', - 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/mini_descriptor/build_enum.c', 'third_party/upb/upb/mini_descriptor/decode.c', 'third_party/upb/upb/mini_descriptor/internal/base92.c', 'third_party/upb/upb/mini_descriptor/internal/encode.c', 'third_party/upb/upb/mini_descriptor/link.c', - 'third_party/upb/upb/mini_table/extension_registry.c', - 'third_party/upb/upb/mini_table/internal/message.c', - 'third_party/upb/upb/mini_table/message.c', 'third_party/upb/upb/reflection/def_pool.c', 'third_party/upb/upb/reflection/def_type.c', 'third_party/upb/upb/reflection/desc_state.c', @@ -2012,7 +1996,7 @@ 'target_name': 'grpc_authorization_provider', 'type': 'static_library', 'dependencies': [ - 'upb', + 'upb_message_lib', 're2', 'utf8_range_lib', 'z', @@ -2297,20 +2281,12 @@ '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/upb/upb/hash/common.c', 'third_party/upb/upb/message/accessors.c', - 'third_party/upb/upb/message/array.c', - 'third_party/upb/upb/message/map.c', - 'third_party/upb/upb/message/map_sorter.c', - 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/mini_descriptor/build_enum.c', 'third_party/upb/upb/mini_descriptor/decode.c', 'third_party/upb/upb/mini_descriptor/internal/base92.c', 'third_party/upb/upb/mini_descriptor/internal/encode.c', 'third_party/upb/upb/mini_descriptor/link.c', - 'third_party/upb/upb/mini_table/extension_registry.c', - 'third_party/upb/upb/mini_table/internal/message.c', - 'third_party/upb/upb/mini_table/message.c', 'third_party/upb/upb/wire/decode.c', 'third_party/upb/upb/wire/decode_fast.c', 'third_party/upb/upb/wire/encode.c', diff --git a/package.xml b/package.xml index 8bfc9459ed8..7059b0c8054 100644 --- a/package.xml +++ b/package.xml @@ -2921,8 +2921,6 @@ - - @@ -3053,7 +3051,6 @@ - diff --git a/src/core/BUILD b/src/core/BUILD index 389d2ed5dcf..65a64fc5e51 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -298,7 +298,6 @@ grpc_cc_library( "absl/time", "absl/types:optional", "upb_base_lib", - "upb_lib", "upb_mem_lib", ], language = "c++", @@ -4252,7 +4251,6 @@ grpc_cc_library( "absl/types:optional", "absl/types:variant", "upb_base_lib", - "upb_lib", "upb_mem_lib", ], language = "c++", @@ -4361,7 +4359,7 @@ grpc_cc_library( "absl/strings:str_format", "absl/types:optional", "upb_base_lib", - "upb_lib", + "upb_mem_lib", ], language = "c++", deps = [ @@ -4491,13 +4489,12 @@ grpc_cc_library( "absl/types:span", "absl/types:variant", "upb_base_lib", - "upb_lib", "upb_mem_lib", "upb_textformat_lib", "upb_json_lib", "re2", "upb_reflection", - "upb_collections_lib", + "upb_message_lib", ], language = "c++", tags = ["nofixdeps"], @@ -4947,7 +4944,7 @@ grpc_cc_library( "absl/strings", "absl/types:optional", "upb_base_lib", - "upb_lib", + "upb_mem_lib", ], language = "c++", deps = [ @@ -5575,7 +5572,7 @@ grpc_cc_library( "absl/strings", "absl/types:optional", "upb_base_lib", - "upb_lib", + "upb_mem_lib", ], language = "c++", deps = [ diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index 185825cb91d..f7ad5b4ce32 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -26,7 +26,7 @@ #include "absl/strings/string_view.h" #include "upb/base/string_view.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include "xds/data/orca/v3/orca_load_report.upb.h" #include diff --git a/src/core/ext/filters/client_channel/backend_metric.cc b/src/core/ext/filters/client_channel/backend_metric.cc index 0d8b13ff2e8..14f65dd298d 100644 --- a/src/core/ext/filters/client_channel/backend_metric.cc +++ b/src/core/ext/filters/client_channel/backend_metric.cc @@ -24,8 +24,8 @@ #include "absl/strings/string_view.h" #include "upb/base/string_view.h" -#include "upb/collections/map.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" +#include "upb/message/map.h" #include "xds/data/orca/v3/orca_load_report.upb.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 8cec2474e55..1ae17ff0620 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -81,7 +81,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc b/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc index 32576adabd8..f6e7e8c5903 100644 --- a/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc +++ b/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc @@ -32,7 +32,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "upb/base/string_view.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc index 4c64afe53e1..36f149adf60 100644 --- a/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +++ b/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc @@ -28,7 +28,7 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "google/protobuf/duration.upb.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include "xds/service/orca/v3/orca.upb.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc index 6c8436aa8d9..382c579488e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +++ b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc @@ -49,7 +49,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "upb/base/string_view.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index a7cf2fab00a..a4233a959a2 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -40,9 +40,9 @@ #include "google/protobuf/timestamp.upb.h" #include "google/rpc/status.upb.h" #include "upb/base/string_view.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.h" #include "upb/text/encode.h" -#include "upb/upb.hpp" #include #include diff --git a/src/core/ext/xds/xds_cluster_specifier_plugin.cc b/src/core/ext/xds/xds_cluster_specifier_plugin.cc index 4df11a40088..08e1ceb894d 100644 --- a/src/core/ext/xds/xds_cluster_specifier_plugin.cc +++ b/src/core/ext/xds/xds_cluster_specifier_plugin.cc @@ -26,9 +26,9 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/types/variant.h" -#include "upb/base/status.h" +#include "upb/base/status.hpp" #include "upb/json/encode.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/ext/xds/xds_common_types.cc b/src/core/ext/xds/xds_common_types.cc index 0e518a556b9..d91e19d569d 100644 --- a/src/core/ext/xds/xds_common_types.cc +++ b/src/core/ext/xds/xds_common_types.cc @@ -38,10 +38,9 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/struct.upbdefs.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/base/status.h" +#include "upb/base/status.hpp" #include "upb/json/encode.h" #include "upb/mem/arena.h" -#include "upb/upb.hpp" #include "xds/type/v3/typed_struct.upb.h" #include diff --git a/src/core/ext/xds/xds_http_rbac_filter.cc b/src/core/ext/xds/xds_http_rbac_filter.cc index 9cc8d1890d6..7ceb4a13e6e 100644 --- a/src/core/ext/xds/xds_http_rbac_filter.cc +++ b/src/core/ext/xds/xds_http_rbac_filter.cc @@ -40,7 +40,7 @@ #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/v3/range.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "upb/collections/map.h" +#include "upb/message/map.h" #include diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc index 4f349682fab..e4191d1ea3e 100644 --- a/src/core/ext/xds/xds_route_config.cc +++ b/src/core/ext/xds/xds_route_config.cc @@ -52,7 +52,7 @@ #include "google/protobuf/wrappers.upb.h" #include "re2/re2.h" #include "upb/base/string_view.h" -#include "upb/collections/map.h" +#include "upb/message/map.h" #include "upb/text/encode.h" #include diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc index a7b7dda8eca..85302a985b9 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/lib/gprpp/status_helper.cc @@ -34,8 +34,7 @@ #include "google/protobuf/any.upb.h" #include "google/rpc/status.upb.h" #include "upb/base/string_view.h" -#include "upb/mem/arena.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index b69effbad6d..591d7421134 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -25,7 +25,7 @@ #include "absl/types/optional.h" #include "absl/types/span.h" #include "upb/base/string_view.h" -#include "upb/collections/map.h" +#include "upb/message/map.h" #include diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h index f765d160ee9..f402a26aa78 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.h +++ b/src/core/lib/security/authorization/cel_authorization_engine.h @@ -26,7 +26,7 @@ #include "absl/container/flat_hash_set.h" #include "envoy/config/rbac/v3/rbac.upb.h" #include "google/api/expr/v1alpha1/syntax.upb.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/mock_cel/activation.h" diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 4f71701c9be..3dd3d218398 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -23,7 +23,7 @@ #include #include "absl/strings/numbers.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index a9efb89c9cc..612fea591da 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -24,7 +24,7 @@ #include #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/src/core/tsi/alts/handshaker/transport_security_common_api.cc index 126ea996f9f..a5c117e07e6 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.cc +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -20,7 +20,7 @@ #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" bool grpc_gcp_rpc_protocol_versions_set_max( grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major, diff --git a/src/cpp/common/alts_context.cc b/src/cpp/common/alts_context.cc index e9fa2c194dc..b8fed615a42 100644 --- a/src/cpp/common/alts_context.cc +++ b/src/cpp/common/alts_context.cc @@ -22,7 +22,7 @@ #include #include "upb/base/string_view.h" -#include "upb/collections/map.h" +#include "upb/message/map.h" #include #include diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc index 100e4c5cf49..784b0157c42 100644 --- a/src/cpp/common/alts_util.cc +++ b/src/cpp/common/alts_util.cc @@ -21,7 +21,7 @@ #include #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/cpp/ext/csm/BUILD b/src/cpp/ext/csm/BUILD index 63533a40518..f6599816485 100644 --- a/src/cpp/ext/csm/BUILD +++ b/src/cpp/ext/csm/BUILD @@ -49,7 +49,6 @@ grpc_cc_library( "otel/sdk/src/metrics", "otel/sdk:headers", "upb_base_lib", - "upb_lib", "upb_mem_lib", ], language = "c++", diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 459a03a15a5..870818161c3 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -37,8 +37,7 @@ #include "google/protobuf/struct.upb.h" #include "opentelemetry/sdk/resource/semantic_conventions.h" #include "upb/base/string_view.h" -#include "upb/mem/arena.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc index 092e40a8e2e..685317d6333 100644 --- a/src/cpp/server/health/default_health_check_service.cc +++ b/src/cpp/server/health/default_health_check_service.cc @@ -24,7 +24,7 @@ #include #include "upb/base/string_view.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 985f1ca8006..58a605e18e8 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -26,7 +26,7 @@ #include "absl/types/optional.h" #include "google/protobuf/duration.upb.h" #include "upb/base/string_view.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include "xds/data/orca/v3/orca_load_report.upb.h" #include "xds/service/orca/v3/orca.upb.h" diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc index 60c257f4a17..fd967742a2d 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/gprpp/status_helper_test.cc @@ -25,7 +25,7 @@ #include "gmock/gmock.h" #include "google/rpc/status.upb.h" #include "gtest/gtest.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" namespace grpc_core { namespace { diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc index 37bd1859ed7..bbacdcfe45f 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -20,7 +20,7 @@ #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 10e5341c0fc..889069e5d24 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -23,7 +23,7 @@ #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc index 5e6e2e331f3..008f62627cb 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc @@ -20,7 +20,7 @@ #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index 7249b1c8b1b..1a02a037fdd 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -30,8 +30,8 @@ #include "envoy/config/rbac/v3/rbac.upb.h" #include "google/protobuf/struct.pb.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include #include diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index ed8744fa467..d59690dfe18 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -30,8 +30,8 @@ #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index c5b0fbdef3b..4eaf702092f 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -33,8 +33,8 @@ #include "google/protobuf/duration.upb.h" #include "gtest/gtest.h" #include "re2/re2.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index da9bb1cb888..b3939099304 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -30,8 +30,8 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index 85c0fcfcd4e..b8585d319d6 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -29,8 +29,8 @@ #include "absl/strings/strip.h" #include "absl/types/variant.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include #include diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index d139d6005e3..4da93246e3b 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -29,8 +29,8 @@ #include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 9d0459baf2e..60f3996d7cb 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -33,8 +33,8 @@ #include "absl/types/variant.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc index a53b5012e7f..013b69b0b3e 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -37,8 +37,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "re2/re2.h" +#include "upb/mem/arena.hpp" #include "upb/reflection/def.hpp" -#include "upb/upb.hpp" #include #include diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc index 597d44e2f9f..74a3fe7fe98 100644 --- a/test/cpp/common/alts_util_test.cc +++ b/test/cpp/common/alts_util_test.cc @@ -18,7 +18,7 @@ #include -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 5309eca9756..aba646ec55b 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -19,7 +19,7 @@ #include #include "google/protobuf/duration.upb.h" -#include "upb/upb.hpp" +#include "upb/mem/arena.hpp" #include #include diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py index 18471eb1d8b..e080a115f7b 100755 --- a/tools/buildgen/extract_metadata_from_bazel_xml.py +++ b/tools/buildgen/extract_metadata_from_bazel_xml.py @@ -1074,15 +1074,20 @@ _BUILD_EXTRA_METADATA = { "build": "all", "_RENAME": "address_sorting", }, - "@com_google_protobuf//upb:upb": { + "@com_google_protobuf//upb:base": { "language": "c", "build": "all", - "_RENAME": "upb", + "_RENAME": "upb_base_lib", }, - "@com_google_protobuf//upb/collections:collections": { + "@com_google_protobuf//upb:mem": { "language": "c", "build": "all", - "_RENAME": "upb_collections_lib", + "_RENAME": "upb_mem_lib", + }, + "@com_google_protobuf//upb:message": { + "language": "c", + "build": "all", + "_RENAME": "upb_message_lib", }, "@com_google_protobuf//upb/json:json": { "language": "c", diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 52e6eb3595b..165cf0f0e4d 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -160,15 +160,16 @@ EXTERNAL_DEPS = { "openssl/x509.h": "libcrypto", "openssl/x509v3.h": "libcrypto", "re2/re2.h": "re2", + "upb/base/status.hpp": "upb_base_lib", "upb/base/string_view.h": "upb_base_lib", - "upb/collections/map.h": "upb_collections_lib", + "upb/message/map.h": "upb_message_lib", "upb/reflection/def.h": "upb_reflection", "upb/json/encode.h": "upb_json_lib", "upb/mem/arena.h": "upb_mem_lib", + "upb/mem/arena.hpp": "upb_mem_lib", "upb/text/encode.h": "upb_textformat_lib", "upb/reflection/def.hpp": "upb_reflection", "upb/upb.h": "upb_amalgamation_lib", - "upb/upb.hpp": "upb_lib", "xxhash.h": "xxhash", "zlib.h": "madler_zlib", }