From a8508ec46573cbf009a41c867f74af976aa5514e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 16 Aug 2023 19:13:39 +0200 Subject: [PATCH] [build metadata] Bazel to "other build systems" improvements (#33803) - Extract build metadata for some external dependencies from bazel build. This is achieved by letting extract_metadata_from_bazel_xml.py analyze some external libraries and sources. The logic is basically the same as for internal libraries, I only needed to teach extract_metadata_from_bazel_xml.py which external libraries it is allowed to analyze. * currently, the list of source files is automatically determined for `z`, `upb`, `re2` and `gtest` dependencies (at least for the case where we're building in "embedded" mode - e.g. mostly native extensions for python, php, ruby etc. - cmake has the ability to replace some of these dependencies by actual cmake dependency.) - Eliminate the need for manually written gen_build_yaml.py for some dependencies. - Make the info on target dependencies in build_autogenerated.yaml more accurate and complete. Until now, there were some depdendencies that were allowed to show up in build_autogenerated.yaml and some that were being skipped. This made generating the CMakeLists.txt and Makefile quite confusing (since some dependencies are being explicitly mentioned and some had to be assumed by the build system). - Overhaul the Makefile * the Makefile is currently only used internally (e.g. for ruby and PHP builds) * until now, the makefile wasn't really using the info about which targets depend on what libraries, but it was effectively hardcoding the depedendency data (by magically "knowing" what is the list of all the stuff that e.g. "grpc" depends on). * After the overhaul, the Makefile.template now actually looks at the library dependencies and uses them when generating the makefile. This gives a more correct and easier to maintain makefile. * since csharp is no longer on the master branch, remove all mentions of "csharp" targets in the Makefile. Other notable changes: - make extract_metadata_from_bazel_xml.py capable of resolving workspace bind() rules (so that it knows the real name of the target that is referred to as e.g. `//external:xyz`) TODO: - [DONE] ~~pkgconfig C++ distribtest~~ - [DONE} ~~update third_party/README to reflect changes in how some deps get updated now.~~ Planned followups: - cleanup naming of some targets in build metadata and buildsystem templates: libssl vs boringssl, ares vs cares etc. - further cleanup of Makefile - further cleanup of CMakeLists.txt - remote the need from manually hardcoding extra metadata for targets in build_autogenerated.yaml. Either add logic that determines the properties of targets automatically, or use metadata from bazel BUILD. --- CMakeLists.txt | 2747 ++++++----------- Makefile | 754 +++-- Package.swift | 75 - build_autogenerated.yaml | 1060 ++++++- config.m4 | 1 - config.w32 | 5 - gRPC-C++.podspec | 38 +- gRPC-Core.podspec | 50 +- grpc.gemspec | 11 - grpc.gyp | 328 +- package.xml | 11 - src/python/grpcio/grpc_core_dependencies.py | 5 - src/re2/gen_build_yaml.py | 48 - src/upb/gen_build_yaml.py | 199 -- src/zlib/gen_build_yaml.py | 58 - templates/CMakeLists.txt.template | 174 +- templates/Makefile.template | 299 +- templates/config.m4.template | 9 +- templates/config.w32.template | 8 +- templates/gRPC-C++.podspec.template | 21 +- templates/gRPC-Core.podspec.template | 21 +- templates/grpc.gemspec.template | 5 +- templates/package.xml.template | 9 +- third_party/README.md | 7 +- .../extract_metadata_from_bazel_xml.py | 245 +- tools/buildgen/generate_build_additions.sh | 3 - .../plugins/transitive_dependencies.py | 10 +- 27 files changed, 3314 insertions(+), 2887 deletions(-) delete mode 100755 src/re2/gen_build_yaml.py delete mode 100755 src/upb/gen_build_yaml.py delete mode 100755 src/zlib/gen_build_yaml.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d1b5e4586c..1538417c165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1506,7 +1506,6 @@ target_include_directories(address_sorting ) target_link_libraries(address_sorting ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -1604,7 +1603,6 @@ target_include_directories(gpr ) target_link_libraries(gpr ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::base absl::core_headers @@ -2490,12 +2488,12 @@ target_include_directories(grpc ) target_link_libraries(grpc ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_CARES_LIBRARIES} - ${_gRPC_ADDRESS_SORTING_LIBRARIES} - ${_gRPC_RE2_LIBRARIES} ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + ${_gRPC_RE2_LIBRARIES} + upb_json_lib + upb_textformat_lib + ${_gRPC_ZLIB_LIBRARIES} absl::algorithm_container absl::cleanup absl::flat_hash_map @@ -2508,10 +2506,10 @@ target_link_libraries(grpc absl::statusor absl::span absl::utility + ${_gRPC_CARES_LIBRARIES} gpr ${_gRPC_SSL_LIBRARIES} - address_sorting - upb + ${_gRPC_ADDRESS_SORTING_LIBRARIES} ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") @@ -2654,7 +2652,6 @@ target_include_directories(grpc_test_util ) target_link_libraries(grpc_test_util ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -2714,7 +2711,6 @@ target_include_directories(grpc_test_util_unsecure ) target_link_libraries(grpc_test_util_unsecure ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -3141,12 +3137,11 @@ target_include_directories(grpc_unsecure ) target_link_libraries(grpc_unsecure ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_CARES_LIBRARIES} - ${_gRPC_ADDRESS_SORTING_LIBRARIES} - ${_gRPC_RE2_LIBRARIES} ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + upb_collections_lib + upb + ${_gRPC_ZLIB_LIBRARIES} absl::algorithm_container absl::cleanup absl::flat_hash_map @@ -3159,9 +3154,9 @@ target_link_libraries(grpc_unsecure absl::statusor absl::span absl::utility + ${_gRPC_CARES_LIBRARIES} gpr - address_sorting - upb + ${_gRPC_ADDRESS_SORTING_LIBRARIES} ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") @@ -3239,16 +3234,419 @@ foreach(_hdr include/grpc/support/time.h include/grpc/support/workaround_list.h ) - string(REPLACE "include/" "" _path ${_hdr}) - get_filename_component(_path ${_path} PATH) - install(FILES ${_hdr} - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + string(REPLACE "include/" "" _path ${_hdr}) + get_filename_component(_path ${_path} PATH) + install(FILES ${_hdr} + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) +endforeach() + + +if(gRPC_INSTALL) + install(TARGETS grpc_unsecure EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + +if(gRPC_BUILD_TESTS) + +add_library(gtest + third_party/googletest/googlemock/src/gmock-cardinalities.cc + third_party/googletest/googlemock/src/gmock-internal-utils.cc + third_party/googletest/googlemock/src/gmock-matchers.cc + third_party/googletest/googlemock/src/gmock-spec-builders.cc + third_party/googletest/googlemock/src/gmock.cc + third_party/googletest/googletest/src/gtest-assertion-result.cc + third_party/googletest/googletest/src/gtest-death-test.cc + third_party/googletest/googletest/src/gtest-filepath.cc + third_party/googletest/googletest/src/gtest-matchers.cc + third_party/googletest/googletest/src/gtest-port.cc + third_party/googletest/googletest/src/gtest-printers.cc + third_party/googletest/googletest/src/gtest-test-part.cc + third_party/googletest/googletest/src/gtest-typed-test.cc + third_party/googletest/googletest/src/gtest.cc +) + +target_compile_features(gtest PUBLIC cxx_std_14) + +set_target_properties(gtest PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(gtest PROPERTIES COMPILE_PDB_NAME "gtest" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gtest.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(gtest + 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} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock +) +target_link_libraries(gtest + ${_gRPC_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + absl::failure_signal_handler + absl::stacktrace + absl::symbolize + absl::strings + absl::any + absl::optional + absl::variant +) + + +endif() + +add_library(upb + third_party/upb/upb/base/status.c + third_party/upb/upb/collections/array.c + third_party/upb/upb/collections/map.c + third_party/upb/upb/collections/map_sorter.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/message.c + third_party/upb/upb/mini_table/common.c + third_party/upb/upb/mini_table/decode.c + third_party/upb/upb/mini_table/encode.c + third_party/upb/upb/mini_table/extension_registry.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 PUBLIC cxx_std_14) + +set_target_properties(upb PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(upb + 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 + ${_gRPC_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + utf8_range_lib +) + + + +if(gRPC_INSTALL) + install(TARGETS upb 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_collections_lib + third_party/upb/upb/base/status.c + third_party/upb/upb/collections/array.c + third_party/upb/upb/collections/map.c + third_party/upb/upb/collections/map_sorter.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/message.c + third_party/upb/upb/mini_table/common.c + third_party/upb/upb/mini_table/decode.c + third_party/upb/upb/mini_table/encode.c + third_party/upb/upb/mini_table/extension_registry.c +) + +target_compile_features(upb_collections_lib PUBLIC cxx_std_14) + +set_target_properties(upb_collections_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" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_collections_lib.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(upb_collections_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_collections_lib + ${_gRPC_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} +) + + + +if(gRPC_INSTALL) + install(TARGETS upb_collections_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_json_lib + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c + third_party/upb/upb/json/decode.c + third_party/upb/upb/json/encode.c + third_party/upb/upb/message/accessors.c + third_party/upb/upb/reflection/def_builder.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/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 +) + +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_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + upb_collections_lib + upb +) + + + +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_textformat_lib + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c + third_party/upb/upb/message/accessors.c + third_party/upb/upb/reflection/def_builder.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/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/text/encode.c +) + +target_compile_features(upb_textformat_lib PUBLIC cxx_std_14) + +set_target_properties(upb_textformat_lib PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(upb_textformat_lib PROPERTIES COMPILE_PDB_NAME "upb_textformat_lib" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) -endforeach() + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb_textformat_lib.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(upb_textformat_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_textformat_lib + ${_gRPC_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + upb_collections_lib + upb +) + if(gRPC_INSTALL) - install(TARGETS grpc_unsecure EXPORT gRPCTargets + install(TARGETS upb_textformat_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(utf8_range_lib + third_party/utf8_range/naive.c + third_party/utf8_range/range2-neon.c + third_party/utf8_range/range2-sse.c +) + +target_compile_features(utf8_range_lib PUBLIC cxx_std_14) + +set_target_properties(utf8_range_lib PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(utf8_range_lib PROPERTIES COMPILE_PDB_NAME "utf8_range_lib" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/utf8_range_lib.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(utf8_range_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(utf8_range_lib + ${_gRPC_BASELIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} +) + + + +if(gRPC_INSTALL) + install(TARGETS utf8_range_lib EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3320,16 +3718,11 @@ target_include_directories(benchmark_helpers ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(benchmark_helpers ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_BENCHMARK_LIBRARIES} grpc++_unsecure @@ -3444,9 +3837,9 @@ target_include_directories(grpc++ target_link_libraries(grpc++ ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc + ${_gRPC_PROTOBUF_LIBRARIES} ) foreach(_hdr @@ -3713,7 +4106,6 @@ target_include_directories(grpc++_alts target_link_libraries(grpc++_alts ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3779,7 +4171,6 @@ target_include_directories(grpc++_error_details target_link_libraries(grpc++_error_details ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3851,7 +4242,6 @@ target_include_directories(grpc++_reflection target_link_libraries(grpc++_reflection ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3925,8 +4315,8 @@ target_include_directories(grpc++_test target_link_libraries(grpc++_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ ) @@ -3983,16 +4373,11 @@ target_include_directories(grpc++_test_config ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_test_config ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags_parse gpr @@ -4056,16 +4441,11 @@ target_include_directories(grpc++_test_util ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_test_util ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -4149,9 +4529,9 @@ target_include_directories(grpc++_unsecure target_link_libraries(grpc++_unsecure ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_unsecure + ${_gRPC_PROTOBUF_LIBRARIES} ) foreach(_hdr @@ -4376,6 +4756,7 @@ endif() add_library(grpc_authorization_provider src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c @@ -4669,10 +5050,12 @@ target_include_directories(grpc_authorization_provider target_link_libraries(grpc_authorization_provider ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_CARES_LIBRARIES} ${_gRPC_RE2_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + ${_gRPC_RE2_LIBRARIES} + upb + ${_gRPC_ZLIB_LIBRARIES} absl::cleanup absl::flat_hash_map absl::flat_hash_set @@ -4683,8 +5066,8 @@ target_link_libraries(grpc_authorization_provider absl::statusor absl::span absl::utility + ${_gRPC_CARES_LIBRARIES} gpr - upb ) foreach(_hdr @@ -4823,8 +5206,9 @@ target_link_libraries(grpc_plugin_support ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ) foreach(_hdr @@ -4896,7 +5280,6 @@ target_include_directories(grpcpp_channelz target_link_libraries(grpcpp_channelz ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -4927,104 +5310,6 @@ endif() endif() -add_library(upb - third_party/utf8_range/naive.c - third_party/utf8_range/range2-neon.c - third_party/utf8_range/range2-sse.c - third_party/upb/upb/base/status.c - third_party/upb/upb/collections/array.c - third_party/upb/upb/collections/map_sorter.c - third_party/upb/upb/collections/map.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/message.c - third_party/upb/upb/mini_table/common.c - third_party/upb/upb/mini_table/decode.c - third_party/upb/upb/mini_table/encode.c - third_party/upb/upb/mini_table/extension_registry.c - third_party/upb/upb/reflection/def_builder.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/message_def.c - third_party/upb/upb/reflection/message_reserved_range.c - third_party/upb/upb/reflection/message.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/text/encode.c - third_party/upb/upb/wire/decode_fast.c - third_party/upb/upb/wire/decode.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 - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c -) - -target_compile_features(upb PUBLIC cxx_std_14) - -set_target_properties(upb PROPERTIES - VERSION ${gRPC_CORE_VERSION} - SOVERSION ${gRPC_CORE_SOVERSION} -) - -if(WIN32 AND MSVC) - set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb" - COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" - ) - if(gRPC_INSTALL) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb.pdb - DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL - ) - endif() -endif() - -target_include_directories(upb - 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 - ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} -) - - - -if(gRPC_INSTALL) - install(TARGETS upb EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - - if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -5058,7 +5343,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fd_conservation_posix_test ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5088,7 +5372,6 @@ target_include_directories(multiple_server_queues_test target_link_libraries(multiple_server_queues_test ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5118,7 +5401,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(pollset_windows_starvation_test ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5150,7 +5432,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(static_stride_scheduler_benchmark ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::algorithm_container absl::span @@ -5193,7 +5474,6 @@ target_include_directories(test_core_iomgr_timer_list_test target_link_libraries(test_core_iomgr_timer_list_test ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5205,8 +5485,6 @@ if(gRPC_BUILD_TESTS) add_executable(activity_test src/core/lib/promise/activity.cc test/core/promise/activity_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(activity_test PUBLIC cxx_std_14) target_include_directories(activity_test @@ -5231,8 +5509,8 @@ target_include_directories(activity_test target_link_libraries(activity_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::flat_hash_set absl::hash absl::type_traits @@ -5247,8 +5525,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(address_sorting_test test/cpp/naming/address_sorting_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(address_sorting_test PUBLIC cxx_std_14) target_include_directories(address_sorting_test @@ -5273,8 +5549,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(address_sorting_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -5302,8 +5578,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/util/byte_buffer_proto_helper.cc test/cpp/util/string_ref_helper.cc test/cpp/util/subprocess.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(address_sorting_test_unsecure PUBLIC cxx_std_14) target_include_directories(address_sorting_test_unsecure @@ -5328,8 +5602,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(address_sorting_test_unsecure ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_unsecure grpc_test_util_unsecure grpc++_test_config @@ -5360,8 +5634,6 @@ add_executable(admin_services_end2end_test src/cpp/server/admin/admin_services.cc src/cpp/server/csds/csds.cc test/cpp/end2end/admin_services_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(admin_services_end2end_test PUBLIC cxx_std_14) target_include_directories(admin_services_end2end_test @@ -5386,8 +5658,8 @@ target_include_directories(admin_services_end2end_test target_link_libraries(admin_services_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_reflection grpcpp_channelz grpc++_test_util @@ -5410,8 +5682,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/slice_splitter.cc test/core/util/tracer_util.cc test/cpp/common/alarm_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alarm_test PUBLIC cxx_std_14) target_include_directories(alarm_test @@ -5436,8 +5706,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(alarm_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_unsecure grpc_test_util_unsecure ) @@ -5449,8 +5719,6 @@ if(gRPC_BUILD_TESTS) add_executable(alloc_test test/core/gpr/alloc_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alloc_test PUBLIC cxx_std_14) target_include_directories(alloc_test @@ -5475,8 +5743,8 @@ target_include_directories(alloc_test target_link_libraries(alloc_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5486,8 +5754,6 @@ if(gRPC_BUILD_TESTS) add_executable(alpn_test test/core/transport/chttp2/alpn_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alpn_test PUBLIC cxx_std_14) target_include_directories(alpn_test @@ -5512,8 +5778,8 @@ target_include_directories(alpn_test target_link_libraries(alpn_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5535,8 +5801,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc test/core/util/fake_udp_and_tcp_server.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_concurrent_connectivity_test PUBLIC cxx_std_14) target_include_directories(alts_concurrent_connectivity_test @@ -5561,8 +5825,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(alts_concurrent_connectivity_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -5575,8 +5839,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_counter_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/frame_protector/alts_counter_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_counter_test PUBLIC cxx_std_14) target_include_directories(alts_counter_test @@ -5601,8 +5863,8 @@ target_include_directories(alts_counter_test target_link_libraries(alts_counter_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5613,8 +5875,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_crypt_test test/core/tsi/alts/crypt/aes_gcm_test.cc test/core/tsi/alts/crypt/gsec_test_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_crypt_test PUBLIC cxx_std_14) target_include_directories(alts_crypt_test @@ -5639,8 +5899,8 @@ target_include_directories(alts_crypt_test target_link_libraries(alts_crypt_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5651,8 +5911,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_crypter_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/frame_protector/alts_crypter_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_crypter_test PUBLIC cxx_std_14) target_include_directories(alts_crypter_test @@ -5677,8 +5935,8 @@ target_include_directories(alts_crypter_test target_link_libraries(alts_crypter_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5690,8 +5948,6 @@ add_executable(alts_frame_protector_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc test/core/tsi/transport_security_test_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_frame_protector_test PUBLIC cxx_std_14) target_include_directories(alts_frame_protector_test @@ -5716,8 +5972,8 @@ target_include_directories(alts_frame_protector_test target_link_libraries(alts_frame_protector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5728,8 +5984,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_grpc_record_protocol_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_grpc_record_protocol_test PUBLIC cxx_std_14) target_include_directories(alts_grpc_record_protocol_test @@ -5754,8 +6008,8 @@ target_include_directories(alts_grpc_record_protocol_test target_link_libraries(alts_grpc_record_protocol_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5766,8 +6020,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_handshaker_client_test test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_handshaker_client_test PUBLIC cxx_std_14) target_include_directories(alts_handshaker_client_test @@ -5792,8 +6044,8 @@ target_include_directories(alts_handshaker_client_test target_link_libraries(alts_handshaker_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5804,8 +6056,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_iovec_record_protocol_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_iovec_record_protocol_test PUBLIC cxx_std_14) target_include_directories(alts_iovec_record_protocol_test @@ -5830,8 +6080,8 @@ target_include_directories(alts_iovec_record_protocol_test target_link_libraries(alts_iovec_record_protocol_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5851,8 +6101,6 @@ add_executable(alts_security_connector_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_security_connector_test PUBLIC cxx_std_14) target_include_directories(alts_security_connector_test @@ -5877,8 +6125,8 @@ target_include_directories(alts_security_connector_test target_link_libraries(alts_security_connector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5889,8 +6137,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_tsi_handshaker_test test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_tsi_handshaker_test PUBLIC cxx_std_14) target_include_directories(alts_tsi_handshaker_test @@ -5915,8 +6161,8 @@ target_include_directories(alts_tsi_handshaker_test target_link_libraries(alts_tsi_handshaker_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5927,8 +6173,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_tsi_utils_test test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_tsi_utils_test PUBLIC cxx_std_14) target_include_directories(alts_tsi_utils_test @@ -5953,8 +6197,8 @@ target_include_directories(alts_tsi_utils_test target_link_libraries(alts_tsi_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -5964,8 +6208,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_util_test test/cpp/common/alts_util_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_util_test PUBLIC cxx_std_14) target_include_directories(alts_util_test @@ -5990,8 +6232,8 @@ target_include_directories(alts_util_test target_link_libraries(alts_util_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_alts grpc++_test_util ) @@ -6003,8 +6245,6 @@ if(gRPC_BUILD_TESTS) add_executable(alts_zero_copy_grpc_protector_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(alts_zero_copy_grpc_protector_test PUBLIC cxx_std_14) target_include_directories(alts_zero_copy_grpc_protector_test @@ -6029,8 +6269,8 @@ target_include_directories(alts_zero_copy_grpc_protector_test target_link_libraries(alts_zero_copy_grpc_protector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6040,8 +6280,6 @@ if(gRPC_BUILD_TESTS) add_executable(arena_promise_test test/core/promise/arena_promise_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(arena_promise_test PUBLIC cxx_std_14) target_include_directories(arena_promise_test @@ -6066,8 +6304,8 @@ target_include_directories(arena_promise_test target_link_libraries(arena_promise_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -6077,8 +6315,6 @@ if(gRPC_BUILD_TESTS) add_executable(arena_test test/core/resource_quota/arena_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(arena_test PUBLIC cxx_std_14) target_include_directories(arena_test @@ -6103,8 +6339,8 @@ target_include_directories(arena_test target_link_libraries(arena_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -6138,8 +6374,6 @@ add_executable(async_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/async_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(async_end2end_test PUBLIC cxx_std_14) target_include_directories(async_end2end_test @@ -6164,8 +6398,8 @@ target_include_directories(async_end2end_test target_link_libraries(async_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -6185,8 +6419,6 @@ add_executable(auth_context_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(auth_context_test PUBLIC cxx_std_14) target_include_directories(auth_context_test @@ -6211,8 +6443,8 @@ target_include_directories(auth_context_test target_link_libraries(auth_context_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6222,8 +6454,6 @@ if(gRPC_BUILD_TESTS) add_executable(auth_property_iterator_test test/cpp/common/auth_property_iterator_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(auth_property_iterator_test PUBLIC cxx_std_14) target_include_directories(auth_property_iterator_test @@ -6248,8 +6478,8 @@ target_include_directories(auth_property_iterator_test target_link_libraries(auth_property_iterator_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -6269,8 +6499,6 @@ add_executable(authorization_matchers_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(authorization_matchers_test PUBLIC cxx_std_14) target_include_directories(authorization_matchers_test @@ -6295,8 +6523,8 @@ target_include_directories(authorization_matchers_test target_link_libraries(authorization_matchers_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6307,8 +6535,6 @@ if(gRPC_BUILD_TESTS) add_executable(authorization_policy_provider_test src/cpp/server/authorization_policy_provider.cc test/cpp/server/authorization_policy_provider_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(authorization_policy_provider_test PUBLIC cxx_std_14) target_include_directories(authorization_policy_provider_test @@ -6333,8 +6559,8 @@ target_include_directories(authorization_policy_provider_test target_link_libraries(authorization_policy_provider_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_authorization_provider grpc_test_util @@ -6346,8 +6572,6 @@ if(gRPC_BUILD_TESTS) add_executable(avl_test test/core/avl/avl_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(avl_test PUBLIC cxx_std_14) target_include_directories(avl_test @@ -6372,8 +6596,8 @@ target_include_directories(avl_test target_link_libraries(avl_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -6393,8 +6617,6 @@ add_executable(aws_request_signer_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(aws_request_signer_test PUBLIC cxx_std_14) target_include_directories(aws_request_signer_test @@ -6419,8 +6641,8 @@ target_include_directories(aws_request_signer_test target_link_libraries(aws_request_signer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6430,8 +6652,6 @@ if(gRPC_BUILD_TESTS) add_executable(b64_test test/core/slice/b64_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(b64_test PUBLIC cxx_std_14) target_include_directories(b64_test @@ -6456,8 +6676,8 @@ target_include_directories(b64_test target_link_libraries(b64_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6467,8 +6687,6 @@ if(gRPC_BUILD_TESTS) add_executable(backoff_test test/core/backoff/backoff_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(backoff_test PUBLIC cxx_std_14) target_include_directories(backoff_test @@ -6493,8 +6711,8 @@ target_include_directories(backoff_test target_link_libraries(backoff_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6513,8 +6731,6 @@ add_executable(bad_ping_test test/core/end2end/tests/bad_ping.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bad_ping_test PUBLIC cxx_std_14) target_include_directories(bad_ping_test @@ -6539,8 +6755,8 @@ target_include_directories(bad_ping_test target_link_libraries(bad_ping_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -6553,8 +6769,6 @@ if(gRPC_BUILD_TESTS) add_executable(bad_server_response_test test/core/end2end/bad_server_response_test.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bad_server_response_test PUBLIC cxx_std_14) target_include_directories(bad_server_response_test @@ -6579,8 +6793,8 @@ target_include_directories(bad_server_response_test target_link_libraries(bad_server_response_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6604,8 +6818,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bad_ssl_alpn_test PUBLIC cxx_std_14) target_include_directories(bad_ssl_alpn_test @@ -6630,8 +6842,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(bad_ssl_alpn_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6656,8 +6868,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bad_ssl_cert_test PUBLIC cxx_std_14) target_include_directories(bad_ssl_cert_test @@ -6682,8 +6892,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(bad_ssl_cert_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6696,8 +6906,6 @@ add_executable(bad_streaming_id_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/bad_streaming_id.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bad_streaming_id_bad_client_test PUBLIC cxx_std_14) target_include_directories(bad_streaming_id_bad_client_test @@ -6722,8 +6930,8 @@ target_include_directories(bad_streaming_id_bad_client_test target_link_libraries(bad_streaming_id_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6735,8 +6943,6 @@ add_executable(badreq_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/badreq.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(badreq_bad_client_test PUBLIC cxx_std_14) target_include_directories(badreq_bad_client_test @@ -6761,8 +6967,8 @@ target_include_directories(badreq_bad_client_test target_link_libraries(badreq_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6772,8 +6978,6 @@ if(gRPC_BUILD_TESTS) add_executable(basic_work_queue_test test/core/event_engine/work_queue/basic_work_queue_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(basic_work_queue_test PUBLIC cxx_std_14) target_include_directories(basic_work_queue_test @@ -6798,8 +7002,8 @@ target_include_directories(basic_work_queue_test target_link_libraries(basic_work_queue_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -6810,8 +7014,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(bdp_estimator_test test/core/transport/bdp_estimator_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bdp_estimator_test PUBLIC cxx_std_14) target_include_directories(bdp_estimator_test @@ -6836,8 +7038,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(bdp_estimator_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6848,8 +7050,6 @@ if(gRPC_BUILD_TESTS) add_executable(bin_decoder_test test/core/transport/chttp2/bin_decoder_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bin_decoder_test PUBLIC cxx_std_14) target_include_directories(bin_decoder_test @@ -6874,8 +7074,8 @@ target_include_directories(bin_decoder_test target_link_libraries(bin_decoder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6885,8 +7085,6 @@ if(gRPC_BUILD_TESTS) add_executable(bin_encoder_test test/core/transport/chttp2/bin_encoder_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bin_encoder_test PUBLIC cxx_std_14) target_include_directories(bin_encoder_test @@ -6911,8 +7109,8 @@ target_include_directories(bin_encoder_test target_link_libraries(bin_encoder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -6931,8 +7129,6 @@ add_executable(binary_metadata_test test/core/end2end/tests/binary_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(binary_metadata_test PUBLIC cxx_std_14) target_include_directories(binary_metadata_test @@ -6957,8 +7153,8 @@ target_include_directories(binary_metadata_test target_link_libraries(binary_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -6970,8 +7166,6 @@ if(gRPC_BUILD_TESTS) add_executable(binder_resolver_test test/core/client_channel/resolvers/binder_resolver_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(binder_resolver_test PUBLIC cxx_std_14) target_include_directories(binder_resolver_test @@ -6996,8 +7190,8 @@ target_include_directories(binder_resolver_test target_link_libraries(binder_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -7025,8 +7219,6 @@ add_executable(binder_server_test test/core/transport/binder/end2end/binder_server_test.cc test/core/transport/binder/end2end/fake_binder.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(binder_server_test PUBLIC cxx_std_14) target_include_directories(binder_server_test @@ -7051,8 +7243,8 @@ target_include_directories(binder_server_test target_link_libraries(binder_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -7126,8 +7318,6 @@ add_executable(binder_transport_test src/cpp/util/time_cc.cc test/core/transport/binder/binder_transport_test.cc test/core/transport/binder/mock_objects.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(binder_transport_test PUBLIC cxx_std_14) target_include_directories(binder_transport_test @@ -7152,8 +7342,9 @@ target_include_directories(binder_transport_test target_link_libraries(binder_transport_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -7163,8 +7354,6 @@ if(gRPC_BUILD_TESTS) add_executable(bitset_test test/core/gprpp/bitset_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(bitset_test PUBLIC cxx_std_14) target_include_directories(bitset_test @@ -7189,10 +7378,8 @@ target_include_directories(bitset_test target_link_libraries(bitset_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - absl::strings - absl::variant + gtest ) @@ -7211,8 +7398,6 @@ add_executable(buffer_list_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(buffer_list_test PUBLIC cxx_std_14) target_include_directories(buffer_list_test @@ -7237,8 +7422,8 @@ target_include_directories(buffer_list_test target_link_libraries(buffer_list_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -7248,8 +7433,6 @@ if(gRPC_BUILD_TESTS) add_executable(byte_buffer_test test/cpp/util/byte_buffer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(byte_buffer_test PUBLIC cxx_std_14) target_include_directories(byte_buffer_test @@ -7274,8 +7457,8 @@ target_include_directories(byte_buffer_test target_link_libraries(byte_buffer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -7285,8 +7468,6 @@ if(gRPC_BUILD_TESTS) add_executable(c_slice_buffer_test test/core/slice/c_slice_buffer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(c_slice_buffer_test PUBLIC cxx_std_14) target_include_directories(c_slice_buffer_test @@ -7311,8 +7492,8 @@ target_include_directories(c_slice_buffer_test target_link_libraries(c_slice_buffer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -7331,8 +7512,6 @@ add_executable(call_creds_test test/core/end2end/tests/call_creds.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(call_creds_test PUBLIC cxx_std_14) target_include_directories(call_creds_test @@ -7357,8 +7536,8 @@ target_include_directories(call_creds_test target_link_libraries(call_creds_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7370,8 +7549,6 @@ if(gRPC_BUILD_TESTS) add_executable(call_finalization_test test/core/channel/call_finalization_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(call_finalization_test PUBLIC cxx_std_14) target_include_directories(call_finalization_test @@ -7396,8 +7573,8 @@ target_include_directories(call_finalization_test target_link_libraries(call_finalization_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -7416,8 +7593,6 @@ add_executable(call_host_override_test test/core/end2end/tests/call_host_override.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(call_host_override_test PUBLIC cxx_std_14) target_include_directories(call_host_override_test @@ -7442,8 +7617,8 @@ target_include_directories(call_host_override_test target_link_libraries(call_host_override_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7455,8 +7630,6 @@ if(gRPC_BUILD_TESTS) add_executable(call_tracer_test test/core/channel/call_tracer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(call_tracer_test PUBLIC cxx_std_14) target_include_directories(call_tracer_test @@ -7481,8 +7654,8 @@ target_include_directories(call_tracer_test target_link_libraries(call_tracer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -7501,8 +7674,6 @@ add_executable(cancel_after_accept_test test/core/end2end/tests/cancel_after_accept.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_after_accept_test PUBLIC cxx_std_14) target_include_directories(cancel_after_accept_test @@ -7527,8 +7698,8 @@ target_include_directories(cancel_after_accept_test target_link_libraries(cancel_after_accept_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7549,8 +7720,6 @@ add_executable(cancel_after_client_done_test test/core/end2end/tests/cancel_after_client_done.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_after_client_done_test PUBLIC cxx_std_14) target_include_directories(cancel_after_client_done_test @@ -7575,8 +7744,8 @@ target_include_directories(cancel_after_client_done_test target_link_libraries(cancel_after_client_done_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7597,8 +7766,6 @@ add_executable(cancel_after_invoke_test test/core/end2end/tests/cancel_after_invoke.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_after_invoke_test PUBLIC cxx_std_14) target_include_directories(cancel_after_invoke_test @@ -7623,8 +7790,8 @@ target_include_directories(cancel_after_invoke_test target_link_libraries(cancel_after_invoke_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7645,8 +7812,6 @@ add_executable(cancel_after_round_trip_test test/core/end2end/tests/cancel_after_round_trip.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_after_round_trip_test PUBLIC cxx_std_14) target_include_directories(cancel_after_round_trip_test @@ -7671,8 +7836,8 @@ target_include_directories(cancel_after_round_trip_test target_link_libraries(cancel_after_round_trip_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7687,8 +7852,6 @@ add_executable(cancel_ares_query_test test/core/util/fake_udp_and_tcp_server.cc test/core/util/socket_use_after_close_detector.cc test/cpp/naming/cancel_ares_query_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_ares_query_test PUBLIC cxx_std_14) target_include_directories(cancel_ares_query_test @@ -7713,8 +7876,8 @@ target_include_directories(cancel_ares_query_test target_link_libraries(cancel_ares_query_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -7734,8 +7897,6 @@ add_executable(cancel_before_invoke_test test/core/end2end/tests/cancel_before_invoke.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_before_invoke_test PUBLIC cxx_std_14) target_include_directories(cancel_before_invoke_test @@ -7760,8 +7921,8 @@ target_include_directories(cancel_before_invoke_test target_link_libraries(cancel_before_invoke_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7773,8 +7934,6 @@ if(gRPC_BUILD_TESTS) add_executable(cancel_callback_test test/core/promise/cancel_callback_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_callback_test PUBLIC cxx_std_14) target_include_directories(cancel_callback_test @@ -7799,8 +7958,8 @@ target_include_directories(cancel_callback_test target_link_libraries(cancel_callback_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits gpr ) @@ -7820,8 +7979,6 @@ add_executable(cancel_in_a_vacuum_test test/core/end2end/tests/cancel_in_a_vacuum.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_in_a_vacuum_test PUBLIC cxx_std_14) target_include_directories(cancel_in_a_vacuum_test @@ -7846,8 +8003,8 @@ target_include_directories(cancel_in_a_vacuum_test target_link_libraries(cancel_in_a_vacuum_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -7868,8 +8025,6 @@ add_executable(cancel_with_status_test test/core/end2end/tests/cancel_with_status.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cancel_with_status_test PUBLIC cxx_std_14) target_include_directories(cancel_with_status_test @@ -7894,8 +8049,8 @@ target_include_directories(cancel_with_status_test target_link_libraries(cancel_with_status_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -8005,8 +8160,6 @@ add_executable(cel_authorization_engine_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cel_authorization_engine_test PUBLIC cxx_std_14) target_include_directories(cel_authorization_engine_test @@ -8031,8 +8184,8 @@ target_include_directories(cel_authorization_engine_test target_link_libraries(cel_authorization_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8042,8 +8195,6 @@ if(gRPC_BUILD_TESTS) add_executable(certificate_provider_registry_test test/core/security/certificate_provider_registry_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(certificate_provider_registry_test PUBLIC cxx_std_14) target_include_directories(certificate_provider_registry_test @@ -8068,8 +8219,8 @@ target_include_directories(certificate_provider_registry_test target_link_libraries(certificate_provider_registry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8079,8 +8230,6 @@ if(gRPC_BUILD_TESTS) add_executable(certificate_provider_store_test test/core/xds/certificate_provider_store_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(certificate_provider_store_test PUBLIC cxx_std_14) target_include_directories(certificate_provider_store_test @@ -8105,8 +8254,8 @@ target_include_directories(certificate_provider_store_test target_link_libraries(certificate_provider_store_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8117,8 +8266,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(cf_engine_test test/core/event_engine/cf/cf_engine_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cf_engine_test PUBLIC cxx_std_14) target_include_directories(cf_engine_test @@ -8143,8 +8290,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(cf_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8161,8 +8308,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc test/core/event_engine/test_suite/tests/client_test.cc test/core/event_engine/test_suite/tests/timer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cf_event_engine_test PUBLIC cxx_std_14) target_include_directories(cf_event_engine_test @@ -8187,8 +8332,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(cf_event_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -8217,8 +8362,6 @@ add_executable(cfstream_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/cfstream_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cfstream_test PUBLIC cxx_std_14) target_include_directories(cfstream_test @@ -8243,8 +8386,8 @@ target_include_directories(cfstream_test target_link_libraries(cfstream_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -8254,8 +8397,6 @@ if(gRPC_BUILD_TESTS) add_executable(channel_args_test test/core/channel/channel_args_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_args_test PUBLIC cxx_std_14) target_include_directories(channel_args_test @@ -8280,8 +8421,8 @@ target_include_directories(channel_args_test target_link_libraries(channel_args_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8291,8 +8432,6 @@ if(gRPC_BUILD_TESTS) add_executable(channel_arguments_test test/cpp/common/channel_arguments_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_arguments_test PUBLIC cxx_std_14) target_include_directories(channel_arguments_test @@ -8317,8 +8456,8 @@ target_include_directories(channel_arguments_test target_link_libraries(channel_arguments_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -8339,8 +8478,6 @@ add_executable(channel_creds_registry_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_creds_registry_test PUBLIC cxx_std_14) target_include_directories(channel_creds_registry_test @@ -8365,8 +8502,8 @@ target_include_directories(channel_creds_registry_test target_link_libraries(channel_creds_registry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8376,8 +8513,6 @@ if(gRPC_BUILD_TESTS) add_executable(channel_filter_test test/cpp/common/channel_filter_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_filter_test PUBLIC cxx_std_14) target_include_directories(channel_filter_test @@ -8402,8 +8537,8 @@ target_include_directories(channel_filter_test target_link_libraries(channel_filter_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -8414,8 +8549,6 @@ if(gRPC_BUILD_TESTS) add_executable(channel_stack_builder_test test/core/channel/channel_stack_builder_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_stack_builder_test PUBLIC cxx_std_14) target_include_directories(channel_stack_builder_test @@ -8440,8 +8573,8 @@ target_include_directories(channel_stack_builder_test target_link_libraries(channel_stack_builder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8451,8 +8584,6 @@ if(gRPC_BUILD_TESTS) add_executable(channel_stack_test test/core/channel/channel_stack_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_stack_test PUBLIC cxx_std_14) target_include_directories(channel_stack_test @@ -8477,8 +8608,8 @@ target_include_directories(channel_stack_test target_link_libraries(channel_stack_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8493,8 +8624,6 @@ add_executable(channel_trace_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h test/core/channel/channel_trace_test.cc test/cpp/util/channel_trace_proto_helper.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channel_trace_test PUBLIC cxx_std_14) target_include_directories(channel_trace_test @@ -8519,8 +8648,8 @@ target_include_directories(channel_trace_test target_link_libraries(channel_trace_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -8531,8 +8660,6 @@ if(gRPC_BUILD_TESTS) add_executable(channelz_registry_test test/core/channel/channelz_registry_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channelz_registry_test PUBLIC cxx_std_14) target_include_directories(channelz_registry_test @@ -8557,8 +8684,8 @@ target_include_directories(channelz_registry_test target_link_libraries(channelz_registry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -8586,8 +8713,6 @@ add_executable(channelz_service_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/channelz_service_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(channelz_service_test PUBLIC cxx_std_14) target_include_directories(channelz_service_test @@ -8612,8 +8737,8 @@ target_include_directories(channelz_service_test target_link_libraries(channelz_service_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpcpp_channelz grpc++_test_util ) @@ -8634,8 +8759,6 @@ add_executable(check_gcp_environment_linux_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(check_gcp_environment_linux_test PUBLIC cxx_std_14) target_include_directories(check_gcp_environment_linux_test @@ -8660,8 +8783,8 @@ target_include_directories(check_gcp_environment_linux_test target_link_libraries(check_gcp_environment_linux_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8681,8 +8804,6 @@ add_executable(check_gcp_environment_windows_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(check_gcp_environment_windows_test PUBLIC cxx_std_14) target_include_directories(check_gcp_environment_windows_test @@ -8707,8 +8828,8 @@ target_include_directories(check_gcp_environment_windows_test target_link_libraries(check_gcp_environment_windows_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -8718,6 +8839,7 @@ if(gRPC_BUILD_TESTS) add_executable(chunked_vector_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc @@ -8743,8 +8865,6 @@ add_executable(chunked_vector_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/gprpp/chunked_vector_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(chunked_vector_test PUBLIC cxx_std_14) target_include_directories(chunked_vector_test @@ -8769,15 +8889,15 @@ target_include_directories(chunked_vector_test target_link_libraries(chunked_vector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::flat_hash_set absl::function_ref absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -8812,8 +8932,6 @@ add_executable(cli_call_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cli_call_test PUBLIC cxx_std_14) target_include_directories(cli_call_test @@ -8838,8 +8956,9 @@ target_include_directories(cli_call_test target_link_libraries(cli_call_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc++_test_util ) @@ -8855,8 +8974,6 @@ add_executable(client_auth_filter_test test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc test/core/filters/client_auth_filter_test.cc test/core/filters/filter_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_auth_filter_test PUBLIC cxx_std_14) target_include_directories(client_auth_filter_test @@ -8881,8 +8998,9 @@ target_include_directories(client_auth_filter_test target_link_libraries(client_auth_filter_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -8898,8 +9016,6 @@ add_executable(client_authority_filter_test test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc test/core/filters/client_authority_filter_test.cc test/core/filters/filter_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_authority_filter_test PUBLIC cxx_std_14) target_include_directories(client_authority_filter_test @@ -8924,8 +9040,9 @@ target_include_directories(client_authority_filter_test target_link_libraries(client_authority_filter_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -8953,8 +9070,6 @@ add_executable(client_callback_end2end_test test/cpp/end2end/client_callback_end2end_test.cc test/cpp/end2end/interceptors_util.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_callback_end2end_test PUBLIC cxx_std_14) target_include_directories(client_callback_end2end_test @@ -8979,8 +9094,8 @@ target_include_directories(client_callback_end2end_test target_link_libraries(client_callback_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -8990,8 +9105,6 @@ if(gRPC_BUILD_TESTS) add_executable(client_channel_service_config_test test/core/client_channel/client_channel_service_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_channel_service_config_test PUBLIC cxx_std_14) target_include_directories(client_channel_service_config_test @@ -9016,8 +9129,8 @@ target_include_directories(client_channel_service_config_test target_link_libraries(client_channel_service_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9027,8 +9140,6 @@ if(gRPC_BUILD_TESTS) add_executable(client_channel_test test/core/client_channel/client_channel_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_channel_test PUBLIC cxx_std_14) target_include_directories(client_channel_test @@ -9053,8 +9164,8 @@ target_include_directories(client_channel_test target_link_libraries(client_channel_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9064,8 +9175,6 @@ if(gRPC_BUILD_TESTS) add_executable(client_context_test_peer_test test/cpp/test/client_context_test_peer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_context_test_peer_test PUBLIC cxx_std_14) target_include_directories(client_context_test_peer_test @@ -9090,7 +9199,6 @@ target_include_directories(client_context_test_peer_test target_link_libraries(client_context_test_peer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -9120,8 +9228,6 @@ add_executable(client_interceptors_end2end_test test/cpp/end2end/client_interceptors_end2end_test.cc test/cpp/end2end/interceptors_util.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_interceptors_end2end_test PUBLIC cxx_std_14) target_include_directories(client_interceptors_end2end_test @@ -9146,8 +9252,8 @@ target_include_directories(client_interceptors_end2end_test target_link_libraries(client_interceptors_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -9186,8 +9292,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/client_lb_end2end_test.cc test/cpp/end2end/connection_attempt_injector.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_lb_end2end_test PUBLIC cxx_std_14) target_include_directories(client_lb_end2end_test @@ -9212,8 +9316,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_lb_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -9225,8 +9329,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(client_ssl_test test/core/handshake/client_ssl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_ssl_test PUBLIC cxx_std_14) target_include_directories(client_ssl_test @@ -9251,8 +9353,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_ssl_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9272,8 +9374,6 @@ add_executable(client_streaming_test test/core/end2end/tests/client_streaming.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(client_streaming_test PUBLIC cxx_std_14) target_include_directories(client_streaming_test @@ -9298,8 +9398,8 @@ target_include_directories(client_streaming_test target_link_libraries(client_streaming_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -9321,8 +9421,6 @@ add_executable(cmdline_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cmdline_test PUBLIC cxx_std_14) target_include_directories(cmdline_test @@ -9347,8 +9445,8 @@ target_include_directories(cmdline_test target_link_libraries(cmdline_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9358,8 +9456,6 @@ if(gRPC_BUILD_TESTS) add_executable(codegen_test_full test/cpp/codegen/codegen_test_full.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(codegen_test_full PUBLIC cxx_std_14) target_include_directories(codegen_test_full @@ -9384,8 +9480,8 @@ target_include_directories(codegen_test_full target_link_libraries(codegen_test_full ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -9396,8 +9492,6 @@ if(gRPC_BUILD_TESTS) add_executable(codegen_test_minimal test/cpp/codegen/codegen_test_minimal.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(codegen_test_minimal PUBLIC cxx_std_14) target_include_directories(codegen_test_minimal @@ -9422,8 +9516,8 @@ target_include_directories(codegen_test_minimal target_link_libraries(codegen_test_minimal ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -9445,8 +9539,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(combiner_test PUBLIC cxx_std_14) target_include_directories(combiner_test @@ -9471,8 +9563,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(combiner_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9483,8 +9575,6 @@ if(gRPC_BUILD_TESTS) add_executable(common_closures_test test/core/event_engine/common_closures_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(common_closures_test PUBLIC cxx_std_14) target_include_directories(common_closures_test @@ -9509,8 +9599,8 @@ target_include_directories(common_closures_test target_link_libraries(common_closures_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -9521,8 +9611,6 @@ if(gRPC_BUILD_TESTS) add_executable(completion_queue_threading_test test/core/surface/completion_queue_threading_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(completion_queue_threading_test PUBLIC cxx_std_14) target_include_directories(completion_queue_threading_test @@ -9547,8 +9635,8 @@ target_include_directories(completion_queue_threading_test target_link_libraries(completion_queue_threading_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9567,8 +9655,6 @@ add_executable(compressed_payload_test test/core/end2end/tests/compressed_payload.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(compressed_payload_test PUBLIC cxx_std_14) target_include_directories(compressed_payload_test @@ -9593,8 +9679,8 @@ target_include_directories(compressed_payload_test target_link_libraries(compressed_payload_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -9606,8 +9692,6 @@ if(gRPC_BUILD_TESTS) add_executable(compression_test test/core/compression/compression_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(compression_test PUBLIC cxx_std_14) target_include_directories(compression_test @@ -9632,8 +9716,8 @@ target_include_directories(compression_test target_link_libraries(compression_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9643,8 +9727,6 @@ if(gRPC_BUILD_TESTS) add_executable(concurrent_connectivity_test test/core/surface/concurrent_connectivity_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(concurrent_connectivity_test PUBLIC cxx_std_14) target_include_directories(concurrent_connectivity_test @@ -9669,8 +9751,8 @@ target_include_directories(concurrent_connectivity_test target_link_libraries(concurrent_connectivity_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9682,8 +9764,6 @@ add_executable(connection_prefix_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/connection_prefix.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(connection_prefix_bad_client_test PUBLIC cxx_std_14) target_include_directories(connection_prefix_bad_client_test @@ -9708,8 +9788,8 @@ target_include_directories(connection_prefix_bad_client_test target_link_libraries(connection_prefix_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9720,8 +9800,6 @@ if(gRPC_BUILD_TESTS) add_executable(connection_refused_test test/core/end2end/connection_refused_test.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(connection_refused_test PUBLIC cxx_std_14) target_include_directories(connection_refused_test @@ -9746,8 +9824,8 @@ target_include_directories(connection_refused_test target_link_libraries(connection_refused_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9767,8 +9845,6 @@ add_executable(connectivity_state_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(connectivity_state_test PUBLIC cxx_std_14) target_include_directories(connectivity_state_test @@ -9793,8 +9869,8 @@ target_include_directories(connectivity_state_test target_link_libraries(connectivity_state_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -9813,8 +9889,6 @@ add_executable(connectivity_test test/core/end2end/tests/connectivity.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(connectivity_test PUBLIC cxx_std_14) target_include_directories(connectivity_test @@ -9839,8 +9913,8 @@ target_include_directories(connectivity_test target_link_libraries(connectivity_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -9869,8 +9943,6 @@ add_executable(context_allocator_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/context_allocator_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(context_allocator_end2end_test PUBLIC cxx_std_14) target_include_directories(context_allocator_end2end_test @@ -9895,8 +9967,8 @@ target_include_directories(context_allocator_end2end_test target_link_libraries(context_allocator_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -9906,8 +9978,6 @@ if(gRPC_BUILD_TESTS) add_executable(context_test test/core/promise/context_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(context_test PUBLIC cxx_std_14) target_include_directories(context_test @@ -9932,8 +10002,8 @@ target_include_directories(context_test target_link_libraries(context_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -9943,8 +10013,6 @@ if(gRPC_BUILD_TESTS) add_executable(core_configuration_test test/core/config/core_configuration_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(core_configuration_test PUBLIC cxx_std_14) target_include_directories(core_configuration_test @@ -9969,8 +10037,8 @@ target_include_directories(core_configuration_test target_link_libraries(core_configuration_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -9980,8 +10048,6 @@ if(gRPC_BUILD_TESTS) add_executable(cpp_impl_of_test test/core/gprpp/cpp_impl_of_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cpp_impl_of_test PUBLIC cxx_std_14) target_include_directories(cpp_impl_of_test @@ -10006,8 +10072,8 @@ target_include_directories(cpp_impl_of_test target_link_libraries(cpp_impl_of_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -10016,8 +10082,6 @@ if(gRPC_BUILD_TESTS) add_executable(cpu_test test/core/gpr/cpu_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(cpu_test PUBLIC cxx_std_14) target_include_directories(cpu_test @@ -10042,8 +10106,8 @@ target_include_directories(cpu_test target_link_libraries(cpu_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10055,8 +10119,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(crl_ssl_transport_security_test test/core/tsi/crl_ssl_transport_security_test.cc test/core/tsi/transport_security_test_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(crl_ssl_transport_security_test PUBLIC cxx_std_14) target_include_directories(crl_ssl_transport_security_test @@ -10081,8 +10143,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(crl_ssl_transport_security_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10093,8 +10155,6 @@ if(gRPC_BUILD_TESTS) add_executable(default_engine_methods_test test/core/event_engine/default_engine_methods_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(default_engine_methods_test PUBLIC cxx_std_14) target_include_directories(default_engine_methods_test @@ -10119,8 +10179,8 @@ target_include_directories(default_engine_methods_test target_link_libraries(default_engine_methods_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10139,8 +10199,6 @@ add_executable(default_host_test test/core/end2end/tests/default_host.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(default_host_test PUBLIC cxx_std_14) target_include_directories(default_host_test @@ -10165,8 +10223,8 @@ target_include_directories(default_host_test target_link_libraries(default_host_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -10195,8 +10253,6 @@ add_executable(delegating_channel_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/delegating_channel_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(delegating_channel_test PUBLIC cxx_std_14) target_include_directories(delegating_channel_test @@ -10221,8 +10277,8 @@ target_include_directories(delegating_channel_test target_link_libraries(delegating_channel_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -10232,8 +10288,6 @@ if(gRPC_BUILD_TESTS) add_executable(destroy_grpclb_channel_with_active_connect_stress_test test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(destroy_grpclb_channel_with_active_connect_stress_test PUBLIC cxx_std_14) target_include_directories(destroy_grpclb_channel_with_active_connect_stress_test @@ -10258,8 +10312,8 @@ target_include_directories(destroy_grpclb_channel_with_active_connect_stress_tes target_link_libraries(destroy_grpclb_channel_with_active_connect_stress_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -10278,8 +10332,6 @@ add_executable(disappearing_server_test test/core/end2end/tests/disappearing_server.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(disappearing_server_test PUBLIC cxx_std_14) target_include_directories(disappearing_server_test @@ -10304,8 +10356,8 @@ target_include_directories(disappearing_server_test target_link_libraries(disappearing_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -10317,8 +10369,6 @@ if(gRPC_BUILD_TESTS) add_executable(dns_resolver_cooldown_test test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(dns_resolver_cooldown_test PUBLIC cxx_std_14) target_include_directories(dns_resolver_cooldown_test @@ -10343,8 +10393,8 @@ target_include_directories(dns_resolver_cooldown_test target_link_libraries(dns_resolver_cooldown_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10354,8 +10404,6 @@ if(gRPC_BUILD_TESTS) add_executable(dns_resolver_test test/core/client_channel/resolvers/dns_resolver_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(dns_resolver_test PUBLIC cxx_std_14) target_include_directories(dns_resolver_test @@ -10380,8 +10428,8 @@ target_include_directories(dns_resolver_test target_link_libraries(dns_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10391,8 +10439,6 @@ if(gRPC_BUILD_TESTS) add_executable(dual_ref_counted_test test/core/gprpp/dual_ref_counted_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(dual_ref_counted_test PUBLIC cxx_std_14) target_include_directories(dual_ref_counted_test @@ -10417,8 +10463,8 @@ target_include_directories(dual_ref_counted_test target_link_libraries(dual_ref_counted_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10430,8 +10476,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(dualstack_socket_test test/core/end2end/cq_verifier.cc test/core/end2end/dualstack_socket_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(dualstack_socket_test PUBLIC cxx_std_14) target_include_directories(dualstack_socket_test @@ -10456,8 +10500,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(dualstack_socket_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10470,8 +10514,6 @@ add_executable(duplicate_header_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/duplicate_header.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(duplicate_header_bad_client_test PUBLIC cxx_std_14) target_include_directories(duplicate_header_bad_client_test @@ -10496,8 +10538,8 @@ target_include_directories(duplicate_header_bad_client_test target_link_libraries(duplicate_header_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10516,8 +10558,6 @@ add_executable(empty_batch_test test/core/end2end/tests/empty_batch.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(empty_batch_test PUBLIC cxx_std_14) target_include_directories(empty_batch_test @@ -10542,8 +10582,8 @@ target_include_directories(empty_batch_test target_link_libraries(empty_batch_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -10575,8 +10615,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/transport/binder/end2end/fake_binder.cc test/core/transport/binder/end2end/testing_channel_create.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(end2end_binder_transport_test PUBLIC cxx_std_14) target_include_directories(end2end_binder_transport_test @@ -10601,8 +10639,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(end2end_binder_transport_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -10635,8 +10673,6 @@ add_executable(end2end_test test/cpp/end2end/end2end_test.cc test/cpp/end2end/interceptors_util.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(end2end_test PUBLIC cxx_std_14) target_include_directories(end2end_test @@ -10661,7 +10697,6 @@ target_include_directories(end2end_test target_link_libraries(end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -10737,8 +10772,6 @@ add_executable(endpoint_binder_pool_test src/cpp/util/time_cc.cc test/core/transport/binder/endpoint_binder_pool_test.cc test/core/transport/binder/mock_objects.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(endpoint_binder_pool_test PUBLIC cxx_std_14) target_include_directories(endpoint_binder_pool_test @@ -10763,8 +10796,9 @@ target_include_directories(endpoint_binder_pool_test target_link_libraries(endpoint_binder_pool_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -10778,8 +10812,6 @@ add_executable(endpoint_config_test src/core/lib/gprpp/time.cc src/core/lib/surface/channel_stack_type.cc test/core/event_engine/endpoint_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(endpoint_config_test PUBLIC cxx_std_14) target_include_directories(endpoint_config_test @@ -10804,8 +10836,8 @@ target_include_directories(endpoint_config_test target_link_libraries(endpoint_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor gpr @@ -10828,8 +10860,6 @@ add_executable(endpoint_pair_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(endpoint_pair_test PUBLIC cxx_std_14) target_include_directories(endpoint_pair_test @@ -10854,8 +10884,8 @@ target_include_directories(endpoint_pair_test target_link_libraries(endpoint_pair_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10865,8 +10895,6 @@ if(gRPC_BUILD_TESTS) add_executable(env_test test/core/gpr/env_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(env_test PUBLIC cxx_std_14) target_include_directories(env_test @@ -10891,8 +10919,8 @@ target_include_directories(env_test target_link_libraries(env_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -10914,8 +10942,6 @@ add_executable(error_details_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/util/error_details_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(error_details_test PUBLIC cxx_std_14) target_include_directories(error_details_test @@ -10940,8 +10966,8 @@ target_include_directories(error_details_test target_link_libraries(error_details_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_error_details grpc_test_util ) @@ -10963,8 +10989,6 @@ add_executable(error_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(error_test PUBLIC cxx_std_14) target_include_directories(error_test @@ -10989,8 +11013,8 @@ target_include_directories(error_test target_link_libraries(error_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11010,8 +11034,6 @@ add_executable(error_utils_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(error_utils_test PUBLIC cxx_std_14) target_include_directories(error_utils_test @@ -11036,8 +11058,8 @@ target_include_directories(error_utils_test target_link_libraries(error_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11057,8 +11079,6 @@ add_executable(evaluate_args_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(evaluate_args_test PUBLIC cxx_std_14) target_include_directories(evaluate_args_test @@ -11083,8 +11103,8 @@ target_include_directories(evaluate_args_test target_link_libraries(evaluate_args_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11094,8 +11114,6 @@ if(gRPC_BUILD_TESTS) add_executable(event_engine_wakeup_scheduler_test test/core/promise/event_engine_wakeup_scheduler_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(event_engine_wakeup_scheduler_test PUBLIC cxx_std_14) target_include_directories(event_engine_wakeup_scheduler_test @@ -11120,8 +11138,8 @@ target_include_directories(event_engine_wakeup_scheduler_test target_link_libraries(event_engine_wakeup_scheduler_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -11133,8 +11151,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(event_poller_posix_test test/core/event_engine/posix/event_poller_posix_test.cc test/core/event_engine/posix/posix_engine_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(event_poller_posix_test PUBLIC cxx_std_14) target_include_directories(event_poller_posix_test @@ -11159,8 +11175,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(event_poller_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11172,8 +11188,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(examine_stack_test test/core/gprpp/examine_stack_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(examine_stack_test PUBLIC cxx_std_14) target_include_directories(examine_stack_test @@ -11198,8 +11212,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(examine_stack_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11226,8 +11240,6 @@ add_executable(exception_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/exception_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(exception_test PUBLIC cxx_std_14) target_include_directories(exception_test @@ -11252,8 +11264,8 @@ target_include_directories(exception_test target_link_libraries(exception_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -11263,6 +11275,7 @@ if(gRPC_BUILD_TESTS) add_executable(exec_ctx_wakeup_scheduler_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/gprpp/status_helper.cc @@ -11279,8 +11292,6 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/promise/exec_ctx_wakeup_scheduler_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(exec_ctx_wakeup_scheduler_test PUBLIC cxx_std_14) target_include_directories(exec_ctx_wakeup_scheduler_test @@ -11305,13 +11316,13 @@ target_include_directories(exec_ctx_wakeup_scheduler_test target_link_libraries(exec_ctx_wakeup_scheduler_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -11323,8 +11334,6 @@ add_executable(experiments_tag_test src/core/lib/experiments/experiments.cc test/core/experiments/experiments_tag_test.cc test/core/experiments/fixtures/experiments.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(experiments_tag_test PUBLIC cxx_std_14) target_include_directories(experiments_tag_test @@ -11349,8 +11358,8 @@ target_include_directories(experiments_tag_test target_link_libraries(experiments_tag_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -11364,8 +11373,6 @@ add_executable(experiments_test src/core/lib/experiments/experiments.cc test/core/experiments/experiments_test.cc test/core/experiments/fixtures/experiments.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(experiments_test PUBLIC cxx_std_14) target_include_directories(experiments_test @@ -11390,8 +11397,8 @@ target_include_directories(experiments_test target_link_libraries(experiments_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -11401,8 +11408,6 @@ if(gRPC_BUILD_TESTS) add_executable(factory_test test/core/event_engine/factory_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(factory_test PUBLIC cxx_std_14) target_include_directories(factory_test @@ -11427,8 +11432,8 @@ target_include_directories(factory_test target_link_libraries(factory_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -11502,8 +11507,6 @@ add_executable(fake_binder_test src/cpp/util/time_cc.cc test/core/transport/binder/end2end/fake_binder.cc test/core/transport/binder/end2end/fake_binder_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fake_binder_test PUBLIC cxx_std_14) target_include_directories(fake_binder_test @@ -11528,8 +11531,9 @@ target_include_directories(fake_binder_test target_link_libraries(fake_binder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -11539,8 +11543,6 @@ if(gRPC_BUILD_TESTS) add_executable(fake_resolver_test test/core/client_channel/resolvers/fake_resolver_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fake_resolver_test PUBLIC cxx_std_14) target_include_directories(fake_resolver_test @@ -11565,8 +11567,8 @@ target_include_directories(fake_resolver_test target_link_libraries(fake_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11577,8 +11579,6 @@ if(gRPC_BUILD_TESTS) add_executable(fake_transport_security_test test/core/tsi/fake_transport_security_test.cc test/core/tsi/transport_security_test_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fake_transport_security_test PUBLIC cxx_std_14) target_include_directories(fake_transport_security_test @@ -11603,8 +11603,8 @@ target_include_directories(fake_transport_security_test target_link_libraries(fake_transport_security_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11625,8 +11625,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fd_posix_test PUBLIC cxx_std_14) target_include_directories(fd_posix_test @@ -11651,8 +11649,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fd_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11663,8 +11661,6 @@ if(gRPC_BUILD_TESTS) add_executable(file_watcher_certificate_provider_factory_test test/core/xds/file_watcher_certificate_provider_factory_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(file_watcher_certificate_provider_factory_test PUBLIC cxx_std_14) target_include_directories(file_watcher_certificate_provider_factory_test @@ -11689,8 +11685,8 @@ target_include_directories(file_watcher_certificate_provider_factory_test target_link_libraries(file_watcher_certificate_provider_factory_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -11709,8 +11705,6 @@ add_executable(filter_causes_close_test test/core/end2end/tests/filter_causes_close.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filter_causes_close_test PUBLIC cxx_std_14) target_include_directories(filter_causes_close_test @@ -11735,8 +11729,8 @@ target_include_directories(filter_causes_close_test target_link_libraries(filter_causes_close_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -11757,8 +11751,6 @@ add_executable(filter_context_test test/core/end2end/tests/filter_context.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filter_context_test PUBLIC cxx_std_14) target_include_directories(filter_context_test @@ -11783,8 +11775,8 @@ target_include_directories(filter_context_test target_link_libraries(filter_context_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -11816,8 +11808,6 @@ add_executable(filter_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/filter_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filter_end2end_test PUBLIC cxx_std_14) target_include_directories(filter_end2end_test @@ -11842,8 +11832,8 @@ target_include_directories(filter_end2end_test target_link_libraries(filter_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -11862,8 +11852,6 @@ add_executable(filter_init_fails_test test/core/end2end/tests/filter_init_fails.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filter_init_fails_test PUBLIC cxx_std_14) target_include_directories(filter_init_fails_test @@ -11888,8 +11876,8 @@ target_include_directories(filter_init_fails_test target_link_libraries(filter_init_fails_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -11907,8 +11895,6 @@ add_executable(filter_test_test test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc test/core/filters/filter_test.cc test/core/filters/filter_test_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filter_test_test PUBLIC cxx_std_14) target_include_directories(filter_test_test @@ -11933,9 +11919,10 @@ target_include_directories(filter_test_test target_link_libraries(filter_test_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -11954,8 +11941,6 @@ add_executable(filtered_metadata_test test/core/end2end/tests/filtered_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(filtered_metadata_test PUBLIC cxx_std_14) target_include_directories(filtered_metadata_test @@ -11980,8 +11965,8 @@ target_include_directories(filtered_metadata_test target_link_libraries(filtered_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -12010,8 +11995,6 @@ add_executable(flaky_network_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/flaky_network_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(flaky_network_test PUBLIC cxx_std_14) target_include_directories(flaky_network_test @@ -12036,8 +12019,8 @@ target_include_directories(flaky_network_test target_link_libraries(flaky_network_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -12049,6 +12032,7 @@ add_executable(flow_control_test src/core/ext/transport/chttp2/transport/flow_control.cc src/core/ext/transport/chttp2/transport/http2_settings.cc src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc @@ -12075,8 +12059,6 @@ add_executable(flow_control_test src/core/lib/transport/bdp_estimator.cc src/core/lib/transport/pid_controller.cc test/core/transport/chttp2/flow_control_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(flow_control_test PUBLIC cxx_std_14) target_include_directories(flow_control_test @@ -12101,15 +12083,15 @@ target_include_directories(flow_control_test target_link_libraries(flow_control_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::flat_hash_set absl::function_ref absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -12118,6 +12100,7 @@ if(gRPC_BUILD_TESTS) add_executable(for_each_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc @@ -12144,8 +12127,6 @@ add_executable(for_each_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/promise/for_each_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(for_each_test PUBLIC cxx_std_14) target_include_directories(for_each_test @@ -12170,15 +12151,15 @@ target_include_directories(for_each_test target_link_libraries(for_each_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::flat_hash_set absl::function_ref absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -12188,8 +12169,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(fork_test test/core/gprpp/fork_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fork_test PUBLIC cxx_std_14) target_include_directories(fork_test @@ -12214,8 +12193,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fork_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -12228,8 +12207,6 @@ add_executable(forkable_test src/core/lib/debug/trace.cc src/core/lib/event_engine/forkable.cc test/core/event_engine/forkable_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(forkable_test PUBLIC cxx_std_14) target_include_directories(forkable_test @@ -12254,8 +12231,8 @@ target_include_directories(forkable_test target_link_libraries(forkable_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -12280,8 +12257,6 @@ add_executable(format_request_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(format_request_test PUBLIC cxx_std_14) target_include_directories(format_request_test @@ -12306,8 +12281,8 @@ target_include_directories(format_request_test target_link_libraries(format_request_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -12318,8 +12293,6 @@ if(gRPC_BUILD_TESTS) add_executable(frame_handler_test test/core/tsi/alts/crypt/gsec_test_util.cc test/core/tsi/alts/frame_protector/frame_handler_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(frame_handler_test PUBLIC cxx_std_14) target_include_directories(frame_handler_test @@ -12344,8 +12317,8 @@ target_include_directories(frame_handler_test target_link_libraries(frame_handler_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -12356,8 +12329,6 @@ if(gRPC_BUILD_TESTS) add_executable(frame_header_test src/core/ext/transport/chaotic_good/frame_header.cc test/core/transport/chaotic_good/frame_header_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(frame_header_test PUBLIC cxx_std_14) target_include_directories(frame_header_test @@ -12382,12 +12353,10 @@ target_include_directories(frame_header_test target_link_libraries(frame_header_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::status absl::statusor - absl::strings - absl::variant ) @@ -12408,6 +12377,7 @@ add_executable(frame_test src/core/ext/transport/chttp2/transport/huffsyms.cc src/core/ext/transport/chttp2/transport/varint.cc src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c @@ -12636,8 +12606,6 @@ add_executable(frame_test src/core/lib/uri/uri_parser.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc test/core/transport/chaotic_good/frame_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(frame_test PUBLIC cxx_std_14) target_include_directories(frame_test @@ -12662,9 +12630,11 @@ target_include_directories(frame_test target_link_libraries(frame_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_CARES_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb + ${_gRPC_ZLIB_LIBRARIES} absl::cleanup absl::flat_hash_map absl::flat_hash_set @@ -12675,8 +12645,8 @@ target_link_libraries(frame_test absl::statusor absl::span absl::utility + ${_gRPC_CARES_LIBRARIES} gpr - upb ) @@ -12696,8 +12666,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/event_engine/test_suite/tests/client_test.cc test/core/event_engine/test_suite/tests/server_test.cc test/core/event_engine/test_suite/tests/timer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(fuzzing_event_engine_test PUBLIC cxx_std_14) target_include_directories(fuzzing_event_engine_test @@ -12722,9 +12690,10 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(fuzzing_event_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -12755,8 +12724,6 @@ add_executable(generic_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/generic_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(generic_end2end_test PUBLIC cxx_std_14) target_include_directories(generic_end2end_test @@ -12781,8 +12748,8 @@ target_include_directories(generic_end2end_test target_link_libraries(generic_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -12793,8 +12760,6 @@ if(gRPC_BUILD_TESTS) add_executable(goaway_server_test test/core/end2end/cq_verifier.cc test/core/end2end/goaway_server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(goaway_server_test PUBLIC cxx_std_14) target_include_directories(goaway_server_test @@ -12819,8 +12784,8 @@ target_include_directories(goaway_server_test target_link_libraries(goaway_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -12831,8 +12796,6 @@ if(gRPC_BUILD_TESTS) add_executable(google_c2p_resolver_test test/core/client_channel/resolvers/google_c2p_resolver_test.cc test/core/util/fake_udp_and_tcp_server.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(google_c2p_resolver_test PUBLIC cxx_std_14) target_include_directories(google_c2p_resolver_test @@ -12857,8 +12820,8 @@ target_include_directories(google_c2p_resolver_test target_link_libraries(google_c2p_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -12877,8 +12840,6 @@ add_executable(graceful_server_shutdown_test test/core/end2end/tests/graceful_server_shutdown.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(graceful_server_shutdown_test PUBLIC cxx_std_14) target_include_directories(graceful_server_shutdown_test @@ -12903,8 +12864,8 @@ target_include_directories(graceful_server_shutdown_test target_link_libraries(graceful_server_shutdown_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -12917,8 +12878,6 @@ if(gRPC_BUILD_TESTS) add_executable(graceful_shutdown_test test/core/end2end/cq_verifier.cc test/core/transport/chttp2/graceful_shutdown_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(graceful_shutdown_test PUBLIC cxx_std_14) target_include_directories(graceful_shutdown_test @@ -12943,8 +12902,8 @@ target_include_directories(graceful_shutdown_test target_link_libraries(graceful_shutdown_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -12964,8 +12923,6 @@ add_executable(grpc_alts_credentials_options_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_alts_credentials_options_test PUBLIC cxx_std_14) target_include_directories(grpc_alts_credentials_options_test @@ -12990,8 +12947,8 @@ target_include_directories(grpc_alts_credentials_options_test target_link_libraries(grpc_alts_credentials_options_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13001,8 +12958,6 @@ if(gRPC_BUILD_TESTS) add_executable(grpc_audit_logging_test test/core/security/grpc_audit_logging_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_audit_logging_test PUBLIC cxx_std_14) target_include_directories(grpc_audit_logging_test @@ -13027,8 +12982,8 @@ target_include_directories(grpc_audit_logging_test target_link_libraries(grpc_audit_logging_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13049,8 +13004,6 @@ add_executable(grpc_authorization_engine_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_authorization_engine_test PUBLIC cxx_std_14) target_include_directories(grpc_authorization_engine_test @@ -13075,8 +13028,8 @@ target_include_directories(grpc_authorization_engine_test target_link_libraries(grpc_authorization_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13096,8 +13049,6 @@ add_executable(grpc_authorization_policy_provider_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_authorization_policy_provider_test PUBLIC cxx_std_14) target_include_directories(grpc_authorization_policy_provider_test @@ -13122,8 +13073,8 @@ target_include_directories(grpc_authorization_policy_provider_test target_link_libraries(grpc_authorization_policy_provider_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_test_util ) @@ -13153,8 +13104,6 @@ add_executable(grpc_authz_end2end_test test/core/util/audit_logging_utils.cc test/cpp/end2end/grpc_authz_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_authz_end2end_test PUBLIC cxx_std_14) target_include_directories(grpc_authz_end2end_test @@ -13179,8 +13128,8 @@ target_include_directories(grpc_authz_end2end_test target_link_libraries(grpc_authz_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc++_test_util ) @@ -13200,8 +13149,6 @@ add_executable(grpc_authz_test test/core/end2end/tests/grpc_authz.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_authz_test PUBLIC cxx_std_14) target_include_directories(grpc_authz_test @@ -13226,8 +13173,8 @@ target_include_directories(grpc_authz_test target_link_libraries(grpc_authz_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -13239,8 +13186,6 @@ if(gRPC_BUILD_TESTS) add_executable(grpc_byte_buffer_reader_test test/core/surface/byte_buffer_reader_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_byte_buffer_reader_test PUBLIC cxx_std_14) target_include_directories(grpc_byte_buffer_reader_test @@ -13265,8 +13210,8 @@ target_include_directories(grpc_byte_buffer_reader_test target_link_libraries(grpc_byte_buffer_reader_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13286,8 +13231,6 @@ add_executable(grpc_cli test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_cli PUBLIC cxx_std_14) target_include_directories(grpc_cli @@ -13302,19 +13245,15 @@ target_include_directories(grpc_cli ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_cli ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc++_test_config ) @@ -13324,8 +13263,6 @@ if(gRPC_BUILD_TESTS) add_executable(grpc_completion_queue_test test/core/surface/completion_queue_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_completion_queue_test PUBLIC cxx_std_14) target_include_directories(grpc_completion_queue_test @@ -13350,8 +13287,8 @@ target_include_directories(grpc_completion_queue_test target_link_libraries(grpc_completion_queue_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13382,7 +13319,6 @@ target_link_libraries(grpc_cpp_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13424,7 +13360,6 @@ target_link_libraries(grpc_csharp_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13455,8 +13390,6 @@ add_executable(grpc_ipv6_loopback_available_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_ipv6_loopback_available_test PUBLIC cxx_std_14) target_include_directories(grpc_ipv6_loopback_available_test @@ -13481,8 +13414,8 @@ target_include_directories(grpc_ipv6_loopback_available_test target_link_libraries(grpc_ipv6_loopback_available_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13513,7 +13446,6 @@ target_link_libraries(grpc_node_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13555,7 +13487,6 @@ target_link_libraries(grpc_objective_c_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13597,7 +13528,6 @@ target_link_libraries(grpc_php_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13639,7 +13569,6 @@ target_link_libraries(grpc_python_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13681,7 +13610,6 @@ target_link_libraries(grpc_ruby_plugin ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -13712,8 +13640,6 @@ add_executable(grpc_tls_certificate_distributor_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tls_certificate_distributor_test PUBLIC cxx_std_14) target_include_directories(grpc_tls_certificate_distributor_test @@ -13738,8 +13664,8 @@ target_include_directories(grpc_tls_certificate_distributor_test target_link_libraries(grpc_tls_certificate_distributor_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13759,8 +13685,6 @@ add_executable(grpc_tls_certificate_provider_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tls_certificate_provider_test PUBLIC cxx_std_14) target_include_directories(grpc_tls_certificate_provider_test @@ -13785,8 +13709,8 @@ target_include_directories(grpc_tls_certificate_provider_test target_link_libraries(grpc_tls_certificate_provider_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13806,8 +13730,6 @@ add_executable(grpc_tls_certificate_verifier_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tls_certificate_verifier_test PUBLIC cxx_std_14) target_include_directories(grpc_tls_certificate_verifier_test @@ -13832,8 +13754,8 @@ target_include_directories(grpc_tls_certificate_verifier_test target_link_libraries(grpc_tls_certificate_verifier_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13853,8 +13775,6 @@ add_executable(grpc_tls_credentials_options_comparator_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tls_credentials_options_comparator_test PUBLIC cxx_std_14) target_include_directories(grpc_tls_credentials_options_comparator_test @@ -13879,8 +13799,8 @@ target_include_directories(grpc_tls_credentials_options_comparator_test target_link_libraries(grpc_tls_credentials_options_comparator_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13900,8 +13820,6 @@ add_executable(grpc_tls_credentials_options_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tls_credentials_options_test PUBLIC cxx_std_14) target_include_directories(grpc_tls_credentials_options_test @@ -13926,8 +13844,8 @@ target_include_directories(grpc_tls_credentials_options_test target_link_libraries(grpc_tls_credentials_options_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -13960,8 +13878,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpc_tool_test PUBLIC cxx_std_14) target_include_directories(grpc_tool_test @@ -13986,9 +13902,10 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(grpc_tool_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_reflection + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc++_test_config grpc++_test_util ) @@ -14004,8 +13921,6 @@ add_executable(grpclb_api_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lb/v1/load_balancer.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lb/v1/load_balancer.grpc.pb.h test/cpp/grpclb/grpclb_api_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpclb_api_test PUBLIC cxx_std_14) target_include_directories(grpclb_api_test @@ -14030,8 +13945,8 @@ target_include_directories(grpclb_api_test target_link_libraries(grpclb_api_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -14067,8 +13982,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/grpclb_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(grpclb_end2end_test PUBLIC cxx_std_14) target_include_directories(grpclb_end2end_test @@ -14093,8 +14006,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(grpclb_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -14114,8 +14027,6 @@ add_executable(h2_ssl_cert_test test/core/end2end/fixtures/local_util.cc test/core/end2end/h2_ssl_cert_test.cc test/core/event_engine/event_engine_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(h2_ssl_cert_test PUBLIC cxx_std_14) target_include_directories(h2_ssl_cert_test @@ -14140,8 +14051,8 @@ target_include_directories(h2_ssl_cert_test target_link_libraries(h2_ssl_cert_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -14153,8 +14064,6 @@ if(gRPC_BUILD_TESTS) add_executable(h2_ssl_session_reuse_test test/core/end2end/cq_verifier.cc test/core/end2end/h2_ssl_session_reuse_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(h2_ssl_session_reuse_test PUBLIC cxx_std_14) target_include_directories(h2_ssl_session_reuse_test @@ -14179,8 +14088,8 @@ target_include_directories(h2_ssl_session_reuse_test target_link_libraries(h2_ssl_session_reuse_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14191,8 +14100,6 @@ if(gRPC_BUILD_TESTS) add_executable(h2_tls_peer_property_external_verifier_test test/core/end2end/cq_verifier.cc test/core/end2end/h2_tls_peer_property_external_verifier_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(h2_tls_peer_property_external_verifier_test PUBLIC cxx_std_14) target_include_directories(h2_tls_peer_property_external_verifier_test @@ -14217,8 +14124,8 @@ target_include_directories(h2_tls_peer_property_external_verifier_test target_link_libraries(h2_tls_peer_property_external_verifier_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14228,8 +14135,6 @@ if(gRPC_BUILD_TESTS) add_executable(handle_tests test/core/event_engine/handle_tests.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(handle_tests PUBLIC cxx_std_14) target_include_directories(handle_tests @@ -14254,8 +14159,8 @@ target_include_directories(handle_tests target_link_libraries(handle_tests ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -14267,8 +14172,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(handshake_server_with_readahead_handshaker_test test/core/handshake/readahead_handshaker_server_ssl.cc test/core/handshake/server_ssl_common.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(handshake_server_with_readahead_handshaker_test PUBLIC cxx_std_14) target_include_directories(handshake_server_with_readahead_handshaker_test @@ -14293,8 +14196,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(handshake_server_with_readahead_handshaker_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14307,8 +14210,6 @@ add_executable(head_of_line_blocking_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/head_of_line_blocking.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(head_of_line_blocking_bad_client_test PUBLIC cxx_std_14) target_include_directories(head_of_line_blocking_bad_client_test @@ -14333,8 +14234,8 @@ target_include_directories(head_of_line_blocking_bad_client_test target_link_libraries(head_of_line_blocking_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14346,8 +14247,6 @@ add_executable(headers_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/headers.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(headers_bad_client_test PUBLIC cxx_std_14) target_include_directories(headers_bad_client_test @@ -14372,8 +14271,8 @@ target_include_directories(headers_bad_client_test target_link_libraries(headers_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14409,8 +14308,6 @@ add_executable(health_service_end2end_test test/cpp/end2end/health_service_end2end_test.cc test/cpp/end2end/test_health_check_service_impl.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(health_service_end2end_test PUBLIC cxx_std_14) target_include_directories(health_service_end2end_test @@ -14435,8 +14332,8 @@ target_include_directories(health_service_end2end_test target_link_libraries(health_service_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -14455,8 +14352,6 @@ add_executable(high_initial_seqno_test test/core/end2end/tests/high_initial_seqno.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(high_initial_seqno_test PUBLIC cxx_std_14) target_include_directories(high_initial_seqno_test @@ -14481,8 +14376,8 @@ target_include_directories(high_initial_seqno_test target_link_libraries(high_initial_seqno_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -14504,8 +14399,6 @@ add_executable(histogram_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(histogram_test PUBLIC cxx_std_14) target_include_directories(histogram_test @@ -14530,8 +14423,8 @@ target_include_directories(histogram_test target_link_libraries(histogram_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14541,8 +14434,6 @@ if(gRPC_BUILD_TESTS) add_executable(host_port_test test/core/gprpp/host_port_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(host_port_test PUBLIC cxx_std_14) target_include_directories(host_port_test @@ -14567,8 +14458,8 @@ target_include_directories(host_port_test target_link_libraries(host_port_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14588,8 +14479,6 @@ add_executable(hpack_encoder_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(hpack_encoder_test PUBLIC cxx_std_14) target_include_directories(hpack_encoder_test @@ -14614,8 +14503,8 @@ target_include_directories(hpack_encoder_test target_link_libraries(hpack_encoder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14635,8 +14524,6 @@ add_executable(hpack_parser_table_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(hpack_parser_table_test PUBLIC cxx_std_14) target_include_directories(hpack_parser_table_test @@ -14661,8 +14548,8 @@ target_include_directories(hpack_parser_table_test target_link_libraries(hpack_parser_table_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14682,8 +14569,6 @@ add_executable(hpack_parser_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(hpack_parser_test PUBLIC cxx_std_14) target_include_directories(hpack_parser_test @@ -14708,8 +14593,8 @@ target_include_directories(hpack_parser_test target_link_libraries(hpack_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14728,8 +14613,6 @@ add_executable(hpack_size_test test/core/end2end/tests/hpack_size.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(hpack_size_test PUBLIC cxx_std_14) target_include_directories(hpack_size_test @@ -14754,8 +14637,8 @@ target_include_directories(hpack_size_test target_link_libraries(hpack_size_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -14779,8 +14662,6 @@ add_executable(http2_client ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h test/cpp/interop/http2_client.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(http2_client PUBLIC cxx_std_14) target_include_directories(http2_client @@ -14795,17 +14676,12 @@ target_include_directories(http2_client ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(http2_client ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -14817,8 +14693,6 @@ if(gRPC_BUILD_TESTS) add_executable(http_proxy_mapper_test test/core/client_channel/http_proxy_mapper_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(http_proxy_mapper_test PUBLIC cxx_std_14) target_include_directories(http_proxy_mapper_test @@ -14843,8 +14717,8 @@ target_include_directories(http_proxy_mapper_test target_link_libraries(http_proxy_mapper_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -14857,8 +14731,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/http/httpcli_test.cc test/core/http/httpcli_test_util.cc test/core/util/fake_udp_and_tcp_server.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(httpcli_test PUBLIC cxx_std_14) target_include_directories(httpcli_test @@ -14883,8 +14755,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(httpcli_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -14898,8 +14770,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/http/httpcli_test_util.cc test/core/http/httpscli_test.cc test/core/util/fake_udp_and_tcp_server.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(httpscli_test PUBLIC cxx_std_14) target_include_directories(httpscli_test @@ -14924,8 +14794,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(httpscli_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -14957,8 +14827,6 @@ add_executable(hybrid_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/hybrid_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(hybrid_end2end_test PUBLIC cxx_std_14) target_include_directories(hybrid_end2end_test @@ -14983,8 +14851,8 @@ target_include_directories(hybrid_end2end_test target_link_libraries(hybrid_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -14995,8 +14863,6 @@ if(gRPC_BUILD_TESTS) add_executable(idle_filter_state_test src/core/ext/filters/channel_idle/idle_filter_state.cc test/core/client_idle/idle_filter_state_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(idle_filter_state_test PUBLIC cxx_std_14) target_include_directories(idle_filter_state_test @@ -15021,8 +14887,8 @@ target_include_directories(idle_filter_state_test target_link_libraries(idle_filter_state_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -15031,8 +14897,6 @@ if(gRPC_BUILD_TESTS) add_executable(if_list_test test/core/gprpp/if_list_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(if_list_test PUBLIC cxx_std_14) target_include_directories(if_list_test @@ -15057,8 +14921,8 @@ target_include_directories(if_list_test target_link_libraries(if_list_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -15067,8 +14931,6 @@ if(gRPC_BUILD_TESTS) add_executable(if_test test/core/promise/if_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(if_test PUBLIC cxx_std_14) target_include_directories(if_test @@ -15093,8 +14955,8 @@ target_include_directories(if_test target_link_libraries(if_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor gpr @@ -15106,8 +14968,6 @@ if(gRPC_BUILD_TESTS) add_executable(init_test test/core/surface/init_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(init_test PUBLIC cxx_std_14) target_include_directories(init_test @@ -15132,8 +14992,8 @@ target_include_directories(init_test target_link_libraries(init_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15145,8 +15005,6 @@ add_executable(initial_settings_frame_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/initial_settings_frame.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(initial_settings_frame_bad_client_test PUBLIC cxx_std_14) target_include_directories(initial_settings_frame_bad_client_test @@ -15171,8 +15029,8 @@ target_include_directories(initial_settings_frame_bad_client_test target_link_libraries(initial_settings_frame_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15192,8 +15050,6 @@ add_executable(insecure_security_connector_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(insecure_security_connector_test PUBLIC cxx_std_14) target_include_directories(insecure_security_connector_test @@ -15218,8 +15074,8 @@ target_include_directories(insecure_security_connector_test target_link_libraries(insecure_security_connector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15229,6 +15085,7 @@ if(gRPC_BUILD_TESTS) add_executable(interceptor_list_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc @@ -15255,8 +15112,6 @@ add_executable(interceptor_list_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/promise/interceptor_list_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(interceptor_list_test PUBLIC cxx_std_14) target_include_directories(interceptor_list_test @@ -15281,15 +15136,15 @@ target_include_directories(interceptor_list_test target_link_libraries(interceptor_list_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::flat_hash_set absl::function_ref absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -15314,8 +15169,6 @@ add_executable(interop_client test/cpp/interop/client.cc test/cpp/interop/client_helper.cc test/cpp/interop/interop_client.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(interop_client PUBLIC cxx_std_14) target_include_directories(interop_client @@ -15330,17 +15183,12 @@ target_include_directories(interop_client ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_client ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -15367,8 +15215,6 @@ add_executable(interop_server test/cpp/interop/interop_server.cc test/cpp/interop/interop_server_bootstrap.cc test/cpp/interop/server_helper.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(interop_server PUBLIC cxx_std_14) target_include_directories(interop_server @@ -15383,17 +15229,12 @@ target_include_directories(interop_server ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_server ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -15406,8 +15247,6 @@ if(gRPC_BUILD_TESTS) add_executable(invalid_call_argument_test test/core/end2end/cq_verifier.cc test/core/end2end/invalid_call_argument_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(invalid_call_argument_test PUBLIC cxx_std_14) target_include_directories(invalid_call_argument_test @@ -15432,8 +15271,8 @@ target_include_directories(invalid_call_argument_test target_link_libraries(invalid_call_argument_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15452,8 +15291,6 @@ add_executable(invoke_large_request_test test/core/end2end/tests/invoke_large_request.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(invoke_large_request_test PUBLIC cxx_std_14) target_include_directories(invoke_large_request_test @@ -15478,8 +15315,8 @@ target_include_directories(invoke_large_request_test target_link_libraries(invoke_large_request_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -15493,8 +15330,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) add_executable(iocp_test test/core/event_engine/windows/create_sockpair.cc test/core/event_engine/windows/iocp_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(iocp_test PUBLIC cxx_std_14) target_include_directories(iocp_test @@ -15519,8 +15354,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(iocp_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15536,8 +15371,6 @@ add_executable(istio_echo_server_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/istio_echo.grpc.pb.h test/cpp/interop/istio_echo_server_lib.cc test/cpp/interop/istio_echo_server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(istio_echo_server_test PUBLIC cxx_std_14) target_include_directories(istio_echo_server_test @@ -15562,8 +15395,8 @@ target_include_directories(istio_echo_server_test target_link_libraries(istio_echo_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util grpc++_test_config @@ -15575,8 +15408,6 @@ if(gRPC_BUILD_TESTS) add_executable(join_test test/core/promise/join_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(join_test PUBLIC cxx_std_14) target_include_directories(join_test @@ -15601,8 +15432,8 @@ target_include_directories(join_test target_link_libraries(join_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits gpr ) @@ -15613,8 +15444,6 @@ if(gRPC_BUILD_TESTS) add_executable(json_object_loader_test test/core/json/json_object_loader_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(json_object_loader_test PUBLIC cxx_std_14) target_include_directories(json_object_loader_test @@ -15639,8 +15468,8 @@ target_include_directories(json_object_loader_test target_link_libraries(json_object_loader_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15650,8 +15479,6 @@ if(gRPC_BUILD_TESTS) add_executable(json_test test/core/json/json_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(json_test PUBLIC cxx_std_14) target_include_directories(json_test @@ -15676,8 +15503,8 @@ target_include_directories(json_test target_link_libraries(json_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15697,8 +15524,6 @@ add_executable(json_token_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(json_token_test PUBLIC cxx_std_14) target_include_directories(json_token_test @@ -15723,8 +15548,8 @@ target_include_directories(json_token_test target_link_libraries(json_token_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15744,8 +15569,6 @@ add_executable(jwt_verifier_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(jwt_verifier_test PUBLIC cxx_std_14) target_include_directories(jwt_verifier_test @@ -15770,8 +15593,8 @@ target_include_directories(jwt_verifier_test target_link_libraries(jwt_verifier_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15790,8 +15613,6 @@ add_executable(keepalive_timeout_test test/core/end2end/tests/keepalive_timeout.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(keepalive_timeout_test PUBLIC cxx_std_14) target_include_directories(keepalive_timeout_test @@ -15816,8 +15637,8 @@ target_include_directories(keepalive_timeout_test target_link_libraries(keepalive_timeout_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -15830,8 +15651,6 @@ if(gRPC_BUILD_TESTS) add_executable(lame_client_test test/core/end2end/cq_verifier.cc test/core/surface/lame_client_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(lame_client_test PUBLIC cxx_std_14) target_include_directories(lame_client_test @@ -15856,8 +15675,8 @@ target_include_directories(lame_client_test target_link_libraries(lame_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15876,8 +15695,6 @@ add_executable(large_metadata_test test/core/end2end/tests/large_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(large_metadata_test PUBLIC cxx_std_14) target_include_directories(large_metadata_test @@ -15902,8 +15719,8 @@ target_include_directories(large_metadata_test target_link_libraries(large_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -15918,8 +15735,6 @@ add_executable(latch_test src/core/lib/promise/activity.cc src/core/lib/promise/trace.cc test/core/promise/latch_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(latch_test PUBLIC cxx_std_14) target_include_directories(latch_test @@ -15944,8 +15759,8 @@ target_include_directories(latch_test target_link_libraries(latch_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor gpr @@ -15961,8 +15776,6 @@ add_executable(lb_get_cpu_stats_test src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc src/cpp/server/load_reporter/get_cpu_stats_windows.cc test/cpp/server/load_reporter/get_cpu_stats_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(lb_get_cpu_stats_test PUBLIC cxx_std_14) target_include_directories(lb_get_cpu_stats_test @@ -15987,8 +15800,8 @@ target_include_directories(lb_get_cpu_stats_test target_link_libraries(lb_get_cpu_stats_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -15999,8 +15812,6 @@ if(gRPC_BUILD_TESTS) add_executable(lb_load_data_store_test src/cpp/server/load_reporter/load_data_store.cc test/cpp/server/load_reporter/load_data_store_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(lb_load_data_store_test PUBLIC cxx_std_14) target_include_directories(lb_load_data_store_test @@ -16025,8 +15836,8 @@ target_include_directories(lb_load_data_store_test target_link_libraries(lb_load_data_store_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -16037,8 +15848,6 @@ if(gRPC_BUILD_TESTS) add_executable(load_config_test test/core/config/load_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(load_config_test PUBLIC cxx_std_14) target_include_directories(load_config_test @@ -16063,8 +15872,8 @@ target_include_directories(load_config_test target_link_libraries(load_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -16075,8 +15884,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_executable(lock_free_event_test test/core/event_engine/posix/lock_free_event_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(lock_free_event_test PUBLIC cxx_std_14) target_include_directories(lock_free_event_test @@ -16101,8 +15908,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(lock_free_event_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ${_gRPC_BENCHMARK_LIBRARIES} grpc_test_util ) @@ -16114,8 +15921,6 @@ if(gRPC_BUILD_TESTS) add_executable(log_test test/core/gpr/log_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(log_test PUBLIC cxx_std_14) target_include_directories(log_test @@ -16140,8 +15945,8 @@ target_include_directories(log_test target_link_libraries(log_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16152,8 +15957,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(log_too_many_open_files_test test/core/event_engine/posix/log_too_many_open_files_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(log_too_many_open_files_test PUBLIC cxx_std_14) target_include_directories(log_too_many_open_files_test @@ -16178,8 +15981,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(log_too_many_open_files_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16190,8 +15993,6 @@ if(gRPC_BUILD_TESTS) add_executable(loop_test test/core/promise/loop_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(loop_test PUBLIC cxx_std_14) target_include_directories(loop_test @@ -16216,8 +16017,8 @@ target_include_directories(loop_test target_link_libraries(loop_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor gpr @@ -16229,6 +16030,7 @@ if(gRPC_BUILD_TESTS) add_executable(map_pipe_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/event_engine/memory_allocator.cc @@ -16255,8 +16057,6 @@ add_executable(map_pipe_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/promise/map_pipe_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(map_pipe_test PUBLIC cxx_std_14) target_include_directories(map_pipe_test @@ -16281,15 +16081,15 @@ target_include_directories(map_pipe_test target_link_libraries(map_pipe_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::flat_hash_set absl::function_ref absl::hash absl::type_traits absl::statusor gpr - upb ) @@ -16298,8 +16098,6 @@ if(gRPC_BUILD_TESTS) add_executable(match_test test/core/gprpp/match_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(match_test PUBLIC cxx_std_14) target_include_directories(match_test @@ -16324,9 +16122,8 @@ target_include_directories(match_test target_link_libraries(match_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - absl::variant + gtest ) @@ -16345,8 +16142,6 @@ add_executable(matchers_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(matchers_test PUBLIC cxx_std_14) target_include_directories(matchers_test @@ -16371,8 +16166,8 @@ target_include_directories(matchers_test target_link_libraries(matchers_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16391,8 +16186,6 @@ add_executable(max_concurrent_streams_test test/core/end2end/tests/max_concurrent_streams.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(max_concurrent_streams_test PUBLIC cxx_std_14) target_include_directories(max_concurrent_streams_test @@ -16417,8 +16210,8 @@ target_include_directories(max_concurrent_streams_test target_link_libraries(max_concurrent_streams_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -16439,8 +16232,6 @@ add_executable(max_connection_age_test test/core/end2end/tests/max_connection_age.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(max_connection_age_test PUBLIC cxx_std_14) target_include_directories(max_connection_age_test @@ -16465,8 +16256,8 @@ target_include_directories(max_connection_age_test target_link_libraries(max_connection_age_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -16487,8 +16278,6 @@ add_executable(max_connection_idle_test test/core/end2end/tests/max_connection_idle.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(max_connection_idle_test PUBLIC cxx_std_14) target_include_directories(max_connection_idle_test @@ -16513,8 +16302,8 @@ target_include_directories(max_connection_idle_test target_link_libraries(max_connection_idle_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -16535,8 +16324,6 @@ add_executable(max_message_length_test test/core/end2end/tests/max_message_length.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(max_message_length_test PUBLIC cxx_std_14) target_include_directories(max_message_length_test @@ -16561,8 +16348,8 @@ target_include_directories(max_message_length_test target_link_libraries(max_message_length_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -16575,8 +16362,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_executable(memory_quota_stress_test test/core/resource_quota/memory_quota_stress_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(memory_quota_stress_test PUBLIC cxx_std_14) target_include_directories(memory_quota_stress_test @@ -16601,8 +16386,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(memory_quota_stress_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -16613,8 +16398,6 @@ if(gRPC_BUILD_TESTS) add_executable(memory_quota_test test/core/resource_quota/memory_quota_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(memory_quota_test PUBLIC cxx_std_14) target_include_directories(memory_quota_test @@ -16639,8 +16422,8 @@ target_include_directories(memory_quota_test target_link_libraries(memory_quota_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -16667,8 +16450,6 @@ add_executable(message_allocator_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/message_allocator_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(message_allocator_end2end_test PUBLIC cxx_std_14) target_include_directories(message_allocator_end2end_test @@ -16693,8 +16474,8 @@ target_include_directories(message_allocator_end2end_test target_link_libraries(message_allocator_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -16714,8 +16495,6 @@ add_executable(message_compress_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(message_compress_test PUBLIC cxx_std_14) target_include_directories(message_compress_test @@ -16740,8 +16519,8 @@ target_include_directories(message_compress_test target_link_libraries(message_compress_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16751,8 +16530,6 @@ if(gRPC_BUILD_TESTS) add_executable(message_size_service_config_test test/core/message_size/message_size_service_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(message_size_service_config_test PUBLIC cxx_std_14) target_include_directories(message_size_service_config_test @@ -16777,8 +16554,8 @@ target_include_directories(message_size_service_config_test target_link_libraries(message_size_service_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16798,8 +16575,6 @@ add_executable(metadata_map_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(metadata_map_test PUBLIC cxx_std_14) target_include_directories(metadata_map_test @@ -16824,8 +16599,8 @@ target_include_directories(metadata_map_test target_link_libraries(metadata_map_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16835,8 +16610,6 @@ if(gRPC_BUILD_TESTS) add_executable(minimal_stack_is_minimal_test test/core/channel/minimal_stack_is_minimal_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(minimal_stack_is_minimal_test PUBLIC cxx_std_14) target_include_directories(minimal_stack_is_minimal_test @@ -16861,8 +16634,8 @@ target_include_directories(minimal_stack_is_minimal_test target_link_libraries(minimal_stack_is_minimal_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -16872,8 +16645,6 @@ if(gRPC_BUILD_TESTS) add_executable(miscompile_with_no_unique_address_test test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(miscompile_with_no_unique_address_test PUBLIC cxx_std_14) target_include_directories(miscompile_with_no_unique_address_test @@ -16898,8 +16669,8 @@ target_include_directories(miscompile_with_no_unique_address_test target_link_libraries(miscompile_with_no_unique_address_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -16924,8 +16695,6 @@ add_executable(mock_stream_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/test/mock_stream_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(mock_stream_test PUBLIC cxx_std_14) target_include_directories(mock_stream_test @@ -16950,7 +16719,6 @@ target_include_directories(mock_stream_test target_link_libraries(mock_stream_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -16982,8 +16750,6 @@ add_executable(mock_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/mock_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(mock_test PUBLIC cxx_std_14) target_include_directories(mock_test @@ -17008,7 +16774,6 @@ target_include_directories(mock_test target_link_libraries(mock_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -17021,8 +16786,6 @@ if(gRPC_BUILD_TESTS) add_executable(mpsc_test src/core/lib/promise/activity.cc test/core/promise/mpsc_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(mpsc_test PUBLIC cxx_std_14) target_include_directories(mpsc_test @@ -17047,8 +16810,8 @@ target_include_directories(mpsc_test target_link_libraries(mpsc_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::flat_hash_set absl::hash absl::type_traits @@ -17063,8 +16826,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(mpscq_test test/core/gprpp/mpscq_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(mpscq_test PUBLIC cxx_std_14) target_include_directories(mpscq_test @@ -17089,8 +16850,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(mpscq_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17110,8 +16871,6 @@ add_executable(negative_deadline_test test/core/end2end/tests/negative_deadline.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(negative_deadline_test PUBLIC cxx_std_14) target_include_directories(negative_deadline_test @@ -17136,8 +16895,8 @@ target_include_directories(negative_deadline_test target_link_libraries(negative_deadline_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -17149,8 +16908,6 @@ if(gRPC_BUILD_TESTS) add_executable(no_destruct_test test/core/gprpp/no_destruct_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(no_destruct_test PUBLIC cxx_std_14) target_include_directories(no_destruct_test @@ -17175,8 +16932,8 @@ target_include_directories(no_destruct_test target_link_libraries(no_destruct_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -17194,8 +16951,6 @@ add_executable(no_logging_test test/core/end2end/tests/no_logging.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(no_logging_test PUBLIC cxx_std_14) target_include_directories(no_logging_test @@ -17220,8 +16975,8 @@ target_include_directories(no_logging_test target_link_libraries(no_logging_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -17242,8 +16997,6 @@ add_executable(no_op_test test/core/end2end/tests/no_op.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(no_op_test PUBLIC cxx_std_14) target_include_directories(no_op_test @@ -17268,8 +17021,8 @@ target_include_directories(no_op_test target_link_libraries(no_op_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -17282,8 +17035,6 @@ if(gRPC_BUILD_TESTS) add_executable(no_server_test test/core/end2end/cq_verifier.cc test/core/end2end/no_server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(no_server_test PUBLIC cxx_std_14) target_include_directories(no_server_test @@ -17308,8 +17059,8 @@ target_include_directories(no_server_test target_link_libraries(no_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17335,8 +17086,6 @@ add_executable(nonblocking_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/nonblocking_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(nonblocking_test PUBLIC cxx_std_14) target_include_directories(nonblocking_test @@ -17361,8 +17110,8 @@ target_include_directories(nonblocking_test target_link_libraries(nonblocking_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -17372,8 +17121,6 @@ if(gRPC_BUILD_TESTS) add_executable(notification_test test/core/gprpp/notification_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(notification_test PUBLIC cxx_std_14) target_include_directories(notification_test @@ -17398,8 +17145,8 @@ target_include_directories(notification_test target_link_libraries(notification_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -17409,8 +17156,6 @@ if(gRPC_BUILD_TESTS) add_executable(num_external_connectivity_watchers_test test/core/surface/num_external_connectivity_watchers_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(num_external_connectivity_watchers_test PUBLIC cxx_std_14) target_include_directories(num_external_connectivity_watchers_test @@ -17435,8 +17180,8 @@ target_include_directories(num_external_connectivity_watchers_test target_link_libraries(num_external_connectivity_watchers_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17452,8 +17197,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/event_engine/test_suite/posix/oracle_event_engine_posix_test.cc test/core/event_engine/test_suite/tests/client_test.cc test/core/event_engine/test_suite/tests/server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(oracle_event_engine_posix_test PUBLIC cxx_std_14) target_include_directories(oracle_event_engine_posix_test @@ -17478,8 +17221,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(oracle_event_engine_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -17500,8 +17243,6 @@ add_executable(orca_service_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h src/cpp/server/orca/orca_service.cc test/cpp/end2end/orca_service_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(orca_service_end2end_test PUBLIC cxx_std_14) target_include_directories(orca_service_end2end_test @@ -17526,8 +17267,8 @@ target_include_directories(orca_service_end2end_test target_link_libraries(orca_service_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -17537,8 +17278,6 @@ if(gRPC_BUILD_TESTS) add_executable(orphanable_test test/core/gprpp/orphanable_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(orphanable_test PUBLIC cxx_std_14) target_include_directories(orphanable_test @@ -17563,8 +17302,8 @@ target_include_directories(orphanable_test target_link_libraries(orphanable_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17575,8 +17314,6 @@ if(gRPC_BUILD_TESTS) add_executable(osa_distance_test test/core/util/osa_distance.cc test/core/util/osa_distance_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(osa_distance_test PUBLIC cxx_std_14) target_include_directories(osa_distance_test @@ -17601,9 +17338,8 @@ target_include_directories(osa_distance_test target_link_libraries(osa_distance_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - absl::strings + gtest ) @@ -17614,8 +17350,6 @@ add_executable(out_of_bounds_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/out_of_bounds.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(out_of_bounds_bad_client_test PUBLIC cxx_std_14) target_include_directories(out_of_bounds_bad_client_test @@ -17640,8 +17374,8 @@ target_include_directories(out_of_bounds_bad_client_test target_link_libraries(out_of_bounds_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17651,8 +17385,6 @@ if(gRPC_BUILD_TESTS) add_executable(outlier_detection_lb_config_parser_test test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(outlier_detection_lb_config_parser_test PUBLIC cxx_std_14) target_include_directories(outlier_detection_lb_config_parser_test @@ -17677,8 +17409,8 @@ target_include_directories(outlier_detection_lb_config_parser_test target_link_libraries(outlier_detection_lb_config_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17688,8 +17420,6 @@ if(gRPC_BUILD_TESTS) add_executable(outlier_detection_test test/core/client_channel/lb_policy/outlier_detection_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(outlier_detection_test PUBLIC cxx_std_14) target_include_directories(outlier_detection_test @@ -17714,8 +17444,8 @@ target_include_directories(outlier_detection_test target_link_libraries(outlier_detection_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17725,8 +17455,6 @@ if(gRPC_BUILD_TESTS) add_executable(overload_test test/core/gprpp/overload_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(overload_test PUBLIC cxx_std_14) target_include_directories(overload_test @@ -17751,8 +17479,8 @@ target_include_directories(overload_test target_link_libraries(overload_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -17761,8 +17489,6 @@ if(gRPC_BUILD_TESTS) add_executable(parse_address_test test/core/address_utils/parse_address_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(parse_address_test PUBLIC cxx_std_14) target_include_directories(parse_address_test @@ -17787,8 +17513,8 @@ target_include_directories(parse_address_test target_link_libraries(parse_address_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17799,8 +17525,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(parse_address_with_named_scope_id_test test/core/address_utils/parse_address_with_named_scope_id_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(parse_address_with_named_scope_id_test PUBLIC cxx_std_14) target_include_directories(parse_address_with_named_scope_id_test @@ -17825,8 +17549,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(parse_address_with_named_scope_id_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17837,8 +17561,6 @@ if(gRPC_BUILD_TESTS) add_executable(parsed_metadata_test test/core/transport/parsed_metadata_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(parsed_metadata_test PUBLIC cxx_std_14) target_include_directories(parsed_metadata_test @@ -17863,8 +17585,8 @@ target_include_directories(parsed_metadata_test target_link_libraries(parsed_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17888,8 +17610,6 @@ add_executable(parser_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(parser_test PUBLIC cxx_std_14) target_include_directories(parser_test @@ -17914,8 +17634,8 @@ target_include_directories(parser_test target_link_libraries(parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -17925,8 +17645,6 @@ if(gRPC_BUILD_TESTS) add_executable(party_test test/core/promise/party_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(party_test PUBLIC cxx_std_14) target_include_directories(party_test @@ -17951,8 +17669,8 @@ target_include_directories(party_test target_link_libraries(party_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure ) @@ -17971,8 +17689,6 @@ add_executable(payload_test test/core/end2end/tests/payload.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(payload_test PUBLIC cxx_std_14) target_include_directories(payload_test @@ -17997,8 +17713,8 @@ target_include_directories(payload_test target_link_libraries(payload_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -18010,8 +17726,6 @@ if(gRPC_BUILD_TESTS) add_executable(percent_encoding_test test/core/slice/percent_encoding_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(percent_encoding_test PUBLIC cxx_std_14) target_include_directories(percent_encoding_test @@ -18036,8 +17750,8 @@ target_include_directories(percent_encoding_test target_link_libraries(percent_encoding_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18047,6 +17761,7 @@ if(gRPC_BUILD_TESTS) add_executable(periodic_update_test src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/rpc/status.upb.c src/core/lib/debug/trace.cc src/core/lib/gprpp/status_helper.cc @@ -18063,8 +17778,6 @@ add_executable(periodic_update_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/resource_quota/periodic_update_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(periodic_update_test PUBLIC cxx_std_14) target_include_directories(periodic_update_test @@ -18089,13 +17802,13 @@ target_include_directories(periodic_update_test target_link_libraries(periodic_update_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + upb absl::function_ref absl::hash absl::statusor gpr - upb ) @@ -18104,8 +17817,6 @@ if(gRPC_BUILD_TESTS) add_executable(pick_first_test test/core/client_channel/lb_policy/pick_first_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(pick_first_test PUBLIC cxx_std_14) target_include_directories(pick_first_test @@ -18130,8 +17841,8 @@ target_include_directories(pick_first_test target_link_libraries(pick_first_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18151,8 +17862,6 @@ add_executable(pid_controller_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(pid_controller_test PUBLIC cxx_std_14) target_include_directories(pid_controller_test @@ -18177,8 +17886,8 @@ target_include_directories(pid_controller_test target_link_libraries(pid_controller_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18198,8 +17907,6 @@ add_executable(ping_abuse_policy_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ping_abuse_policy_test PUBLIC cxx_std_14) target_include_directories(ping_abuse_policy_test @@ -18224,8 +17931,8 @@ target_include_directories(ping_abuse_policy_test target_link_libraries(ping_abuse_policy_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18245,8 +17952,6 @@ add_executable(ping_configuration_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ping_configuration_test PUBLIC cxx_std_14) target_include_directories(ping_configuration_test @@ -18271,8 +17976,8 @@ target_include_directories(ping_configuration_test target_link_libraries(ping_configuration_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18291,8 +17996,6 @@ add_executable(ping_pong_streaming_test test/core/end2end/tests/ping_pong_streaming.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ping_pong_streaming_test PUBLIC cxx_std_14) target_include_directories(ping_pong_streaming_test @@ -18317,8 +18020,8 @@ target_include_directories(ping_pong_streaming_test target_link_libraries(ping_pong_streaming_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -18340,8 +18043,6 @@ add_executable(ping_rate_policy_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ping_rate_policy_test PUBLIC cxx_std_14) target_include_directories(ping_rate_policy_test @@ -18366,8 +18067,8 @@ target_include_directories(ping_rate_policy_test target_link_libraries(ping_rate_policy_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18386,8 +18087,6 @@ add_executable(ping_test test/core/end2end/tests/ping.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ping_test PUBLIC cxx_std_14) target_include_directories(ping_test @@ -18412,8 +18111,8 @@ target_include_directories(ping_test target_link_libraries(ping_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -18425,8 +18124,6 @@ if(gRPC_BUILD_TESTS) add_executable(pipe_test test/core/promise/pipe_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(pipe_test PUBLIC cxx_std_14) target_include_directories(pipe_test @@ -18451,8 +18148,8 @@ target_include_directories(pipe_test target_link_libraries(pipe_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -18462,8 +18159,6 @@ if(gRPC_BUILD_TESTS) add_executable(poll_test test/core/promise/poll_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(poll_test PUBLIC cxx_std_14) target_include_directories(poll_test @@ -18488,8 +18183,8 @@ target_include_directories(poll_test target_link_libraries(poll_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -18516,8 +18211,6 @@ add_executable(port_sharing_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/port_sharing_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(port_sharing_end2end_test PUBLIC cxx_std_14) target_include_directories(port_sharing_end2end_test @@ -18542,8 +18235,8 @@ target_include_directories(port_sharing_end2end_test target_link_libraries(port_sharing_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -18558,8 +18251,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/event_engine/posix/posix_engine_test_utils.cc test/core/event_engine/test_suite/event_engine_test_framework.cc test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(posix_endpoint_test PUBLIC cxx_std_14) target_include_directories(posix_endpoint_test @@ -18584,8 +18275,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_endpoint_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -18598,8 +18289,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(posix_engine_listener_utils_test test/core/event_engine/posix/posix_engine_listener_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(posix_engine_listener_utils_test PUBLIC cxx_std_14) target_include_directories(posix_engine_listener_utils_test @@ -18624,8 +18313,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_engine_listener_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -18640,8 +18329,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/event_engine/posix/posix_event_engine_connect_test.cc test/core/event_engine/test_suite/event_engine_test_framework.cc test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(posix_event_engine_connect_test PUBLIC cxx_std_14) target_include_directories(posix_event_engine_connect_test @@ -18666,8 +18353,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_event_engine_connect_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -18689,8 +18376,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/event_engine/test_suite/tests/timer_test.cc test/core/util/fake_udp_and_tcp_server.cc test/cpp/util/get_grpc_test_runfile_dir.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(posix_event_engine_test PUBLIC cxx_std_14) target_include_directories(posix_event_engine_test @@ -18715,8 +18400,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_event_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc++_test_util ) @@ -18728,8 +18413,6 @@ if(gRPC_BUILD_TESTS) add_executable(prioritized_race_test test/core/promise/prioritized_race_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(prioritized_race_test PUBLIC cxx_std_14) target_include_directories(prioritized_race_test @@ -18754,8 +18437,8 @@ target_include_directories(prioritized_race_test target_link_libraries(prioritized_race_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -18766,8 +18449,6 @@ if(gRPC_BUILD_TESTS) add_executable(promise_endpoint_test src/core/lib/transport/promise_endpoint.cc test/core/transport/promise_endpoint_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(promise_endpoint_test PUBLIC cxx_std_14) target_include_directories(promise_endpoint_test @@ -18792,8 +18473,8 @@ target_include_directories(promise_endpoint_test target_link_libraries(promise_endpoint_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -18803,8 +18484,6 @@ if(gRPC_BUILD_TESTS) add_executable(promise_factory_test test/core/promise/promise_factory_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(promise_factory_test PUBLIC cxx_std_14) target_include_directories(promise_factory_test @@ -18829,8 +18508,8 @@ target_include_directories(promise_factory_test target_link_libraries(promise_factory_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::bind_front absl::type_traits gpr @@ -18842,8 +18521,6 @@ if(gRPC_BUILD_TESTS) add_executable(promise_map_test test/core/promise/map_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(promise_map_test PUBLIC cxx_std_14) target_include_directories(promise_map_test @@ -18868,8 +18545,8 @@ target_include_directories(promise_map_test target_link_libraries(promise_map_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits gpr ) @@ -18880,8 +18557,6 @@ if(gRPC_BUILD_TESTS) add_executable(promise_test test/core/promise/promise_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(promise_test PUBLIC cxx_std_14) target_include_directories(promise_test @@ -18906,8 +18581,8 @@ target_include_directories(promise_test target_link_libraries(promise_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits gpr ) @@ -18918,8 +18593,6 @@ if(gRPC_BUILD_TESTS) add_executable(proto_buffer_reader_test test/cpp/util/proto_buffer_reader_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(proto_buffer_reader_test PUBLIC cxx_std_14) target_include_directories(proto_buffer_reader_test @@ -18944,8 +18617,8 @@ target_include_directories(proto_buffer_reader_test target_link_libraries(proto_buffer_reader_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -18955,8 +18628,6 @@ if(gRPC_BUILD_TESTS) add_executable(proto_buffer_writer_test test/cpp/util/proto_buffer_writer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(proto_buffer_writer_test PUBLIC cxx_std_14) target_include_directories(proto_buffer_writer_test @@ -18981,8 +18652,8 @@ target_include_directories(proto_buffer_writer_test target_link_libraries(proto_buffer_writer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -19014,8 +18685,6 @@ add_executable(proto_server_reflection_test test/cpp/end2end/proto_server_reflection_test.cc test/cpp/end2end/test_service_impl.cc test/cpp/util/proto_reflection_descriptor_database.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(proto_server_reflection_test PUBLIC cxx_std_14) target_include_directories(proto_server_reflection_test @@ -19040,8 +18709,8 @@ target_include_directories(proto_server_reflection_test target_link_libraries(proto_server_reflection_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_reflection grpc++_test_util ) @@ -19052,8 +18721,6 @@ if(gRPC_BUILD_TESTS) add_executable(proto_utils_test test/cpp/codegen/proto_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(proto_utils_test PUBLIC cxx_std_14) target_include_directories(proto_utils_test @@ -19078,8 +18745,8 @@ target_include_directories(proto_utils_test target_link_libraries(proto_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -19099,8 +18766,6 @@ add_executable(proxy_auth_test test/core/end2end/tests/proxy_auth.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(proxy_auth_test PUBLIC cxx_std_14) target_include_directories(proxy_auth_test @@ -19125,8 +18790,8 @@ target_include_directories(proxy_auth_test target_link_libraries(proxy_auth_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -19179,8 +18844,6 @@ add_executable(qps_json_driver test/cpp/qps/server_callback.cc test/cpp/qps/server_sync.cc test/cpp/qps/usage_timer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(qps_json_driver PUBLIC cxx_std_14) target_include_directories(qps_json_driver @@ -19195,17 +18858,12 @@ target_include_directories(qps_json_driver ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(qps_json_driver ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -19250,8 +18908,6 @@ add_executable(qps_worker test/cpp/qps/server_sync.cc test/cpp/qps/usage_timer.cc test/cpp/qps/worker.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(qps_worker PUBLIC cxx_std_14) target_include_directories(qps_worker @@ -19266,17 +18922,12 @@ target_include_directories(qps_worker ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(qps_worker ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -19288,8 +18939,6 @@ if(gRPC_BUILD_TESTS) add_executable(race_test test/core/promise/race_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(race_test PUBLIC cxx_std_14) target_include_directories(race_test @@ -19314,8 +18963,8 @@ target_include_directories(race_test target_link_libraries(race_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -19326,8 +18975,6 @@ if(gRPC_BUILD_TESTS) add_executable(random_early_detection_test src/core/lib/backoff/random_early_detection.cc test/core/backoff/random_early_detection_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(random_early_detection_test PUBLIC cxx_std_14) target_include_directories(random_early_detection_test @@ -19352,8 +18999,8 @@ target_include_directories(random_early_detection_test target_link_libraries(random_early_detection_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::random_random ) @@ -19384,8 +19031,6 @@ add_executable(raw_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/raw_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(raw_end2end_test PUBLIC cxx_std_14) target_include_directories(raw_end2end_test @@ -19410,8 +19055,8 @@ target_include_directories(raw_end2end_test target_link_libraries(raw_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -19421,8 +19066,6 @@ if(gRPC_BUILD_TESTS) add_executable(rbac_service_config_parser_test test/core/ext/filters/rbac/rbac_service_config_parser_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(rbac_service_config_parser_test PUBLIC cxx_std_14) target_include_directories(rbac_service_config_parser_test @@ -19447,8 +19090,8 @@ target_include_directories(rbac_service_config_parser_test target_link_libraries(rbac_service_config_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -19468,8 +19111,6 @@ add_executable(rbac_translator_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(rbac_translator_test PUBLIC cxx_std_14) target_include_directories(rbac_translator_test @@ -19494,8 +19135,8 @@ target_include_directories(rbac_translator_test target_link_libraries(rbac_translator_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_test_util ) @@ -19506,8 +19147,6 @@ if(gRPC_BUILD_TESTS) add_executable(ref_counted_ptr_test test/core/gprpp/ref_counted_ptr_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ref_counted_ptr_test PUBLIC cxx_std_14) target_include_directories(ref_counted_ptr_test @@ -19532,8 +19171,8 @@ target_include_directories(ref_counted_ptr_test target_link_libraries(ref_counted_ptr_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -19543,8 +19182,6 @@ if(gRPC_BUILD_TESTS) add_executable(ref_counted_test test/core/gprpp/ref_counted_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ref_counted_test PUBLIC cxx_std_14) target_include_directories(ref_counted_test @@ -19569,8 +19206,8 @@ target_include_directories(ref_counted_test target_link_libraries(ref_counted_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -19589,8 +19226,6 @@ add_executable(registered_call_test test/core/end2end/tests/registered_call.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(registered_call_test PUBLIC cxx_std_14) target_include_directories(registered_call_test @@ -19615,8 +19250,8 @@ target_include_directories(registered_call_test target_link_libraries(registered_call_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -19629,8 +19264,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(remove_stream_from_stalled_lists_test test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(remove_stream_from_stalled_lists_test PUBLIC cxx_std_14) target_include_directories(remove_stream_from_stalled_lists_test @@ -19655,8 +19288,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(remove_stream_from_stalled_lists_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -19676,8 +19309,6 @@ add_executable(request_with_flags_test test/core/end2end/tests/request_with_flags.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(request_with_flags_test PUBLIC cxx_std_14) target_include_directories(request_with_flags_test @@ -19702,8 +19333,8 @@ target_include_directories(request_with_flags_test target_link_libraries(request_with_flags_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -19724,8 +19355,6 @@ add_executable(request_with_payload_test test/core/end2end/tests/request_with_payload.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(request_with_payload_test PUBLIC cxx_std_14) target_include_directories(request_with_payload_test @@ -19750,8 +19379,8 @@ target_include_directories(request_with_payload_test target_link_libraries(request_with_payload_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -19774,8 +19403,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resolve_address_using_ares_resolver_posix_test PUBLIC cxx_std_14) target_include_directories(resolve_address_using_ares_resolver_posix_test @@ -19800,8 +19427,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_ares_resolver_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::flags_parse grpc_test_util ) @@ -19824,8 +19451,6 @@ add_executable(resolve_address_using_ares_resolver_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resolve_address_using_ares_resolver_test PUBLIC cxx_std_14) target_include_directories(resolve_address_using_ares_resolver_test @@ -19850,8 +19475,8 @@ target_include_directories(resolve_address_using_ares_resolver_test target_link_libraries(resolve_address_using_ares_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util grpc++_test_config ) @@ -19873,8 +19498,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resolve_address_using_native_resolver_posix_test PUBLIC cxx_std_14) target_include_directories(resolve_address_using_native_resolver_posix_test @@ -19899,8 +19522,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_native_resolver_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::flags_parse grpc_test_util ) @@ -19923,8 +19546,6 @@ add_executable(resolve_address_using_native_resolver_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resolve_address_using_native_resolver_test PUBLIC cxx_std_14) target_include_directories(resolve_address_using_native_resolver_test @@ -19949,8 +19570,8 @@ target_include_directories(resolve_address_using_native_resolver_test target_link_libraries(resolve_address_using_native_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util grpc++_test_config ) @@ -19977,8 +19598,6 @@ add_executable(resource_quota_end2end_stress_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/resource_quota_end2end_stress_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resource_quota_end2end_stress_test PUBLIC cxx_std_14) target_include_directories(resource_quota_end2end_stress_test @@ -20003,8 +19622,8 @@ target_include_directories(resource_quota_end2end_stress_test target_link_libraries(resource_quota_end2end_stress_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -20023,8 +19642,6 @@ add_executable(resource_quota_server_test test/core/end2end/tests/resource_quota_server.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resource_quota_server_test PUBLIC cxx_std_14) target_include_directories(resource_quota_server_test @@ -20049,8 +19666,8 @@ target_include_directories(resource_quota_server_test target_link_libraries(resource_quota_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20062,8 +19679,6 @@ if(gRPC_BUILD_TESTS) add_executable(resource_quota_test test/core/resource_quota/resource_quota_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(resource_quota_test PUBLIC cxx_std_14) target_include_directories(resource_quota_test @@ -20088,8 +19703,8 @@ target_include_directories(resource_quota_test target_link_libraries(resource_quota_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -20108,8 +19723,6 @@ add_executable(retry_cancel_after_first_attempt_starts_test test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_cancel_after_first_attempt_starts_test PUBLIC cxx_std_14) target_include_directories(retry_cancel_after_first_attempt_starts_test @@ -20134,8 +19747,8 @@ target_include_directories(retry_cancel_after_first_attempt_starts_test target_link_libraries(retry_cancel_after_first_attempt_starts_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20156,8 +19769,6 @@ add_executable(retry_cancel_during_delay_test test/core/end2end/tests/retry_cancel_during_delay.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_cancel_during_delay_test PUBLIC cxx_std_14) target_include_directories(retry_cancel_during_delay_test @@ -20182,8 +19793,8 @@ target_include_directories(retry_cancel_during_delay_test target_link_libraries(retry_cancel_during_delay_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20204,8 +19815,6 @@ add_executable(retry_cancel_with_multiple_send_batches_test test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_cancel_with_multiple_send_batches_test PUBLIC cxx_std_14) target_include_directories(retry_cancel_with_multiple_send_batches_test @@ -20230,8 +19839,8 @@ target_include_directories(retry_cancel_with_multiple_send_batches_test target_link_libraries(retry_cancel_with_multiple_send_batches_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20252,8 +19861,6 @@ add_executable(retry_cancellation_test test/core/end2end/tests/retry_cancellation.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_cancellation_test PUBLIC cxx_std_14) target_include_directories(retry_cancellation_test @@ -20278,8 +19885,8 @@ target_include_directories(retry_cancellation_test target_link_libraries(retry_cancellation_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20300,8 +19907,6 @@ add_executable(retry_disabled_test test/core/end2end/tests/retry_disabled.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_disabled_test PUBLIC cxx_std_14) target_include_directories(retry_disabled_test @@ -20326,8 +19931,8 @@ target_include_directories(retry_disabled_test target_link_libraries(retry_disabled_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20348,8 +19953,6 @@ add_executable(retry_exceeds_buffer_size_in_delay_test test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_exceeds_buffer_size_in_delay_test PUBLIC cxx_std_14) target_include_directories(retry_exceeds_buffer_size_in_delay_test @@ -20374,8 +19977,8 @@ target_include_directories(retry_exceeds_buffer_size_in_delay_test target_link_libraries(retry_exceeds_buffer_size_in_delay_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20396,8 +19999,6 @@ add_executable(retry_exceeds_buffer_size_in_initial_batch_test test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_exceeds_buffer_size_in_initial_batch_test PUBLIC cxx_std_14) target_include_directories(retry_exceeds_buffer_size_in_initial_batch_test @@ -20422,8 +20023,8 @@ target_include_directories(retry_exceeds_buffer_size_in_initial_batch_test target_link_libraries(retry_exceeds_buffer_size_in_initial_batch_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20444,8 +20045,6 @@ add_executable(retry_exceeds_buffer_size_in_subsequent_batch_test test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_exceeds_buffer_size_in_subsequent_batch_test PUBLIC cxx_std_14) target_include_directories(retry_exceeds_buffer_size_in_subsequent_batch_test @@ -20470,8 +20069,8 @@ target_include_directories(retry_exceeds_buffer_size_in_subsequent_batch_test target_link_libraries(retry_exceeds_buffer_size_in_subsequent_batch_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20492,8 +20091,6 @@ add_executable(retry_lb_drop_test test/core/end2end/tests/retry_lb_drop.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_lb_drop_test PUBLIC cxx_std_14) target_include_directories(retry_lb_drop_test @@ -20518,8 +20115,8 @@ target_include_directories(retry_lb_drop_test target_link_libraries(retry_lb_drop_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20540,8 +20137,6 @@ add_executable(retry_lb_fail_test test/core/end2end/tests/retry_lb_fail.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_lb_fail_test PUBLIC cxx_std_14) target_include_directories(retry_lb_fail_test @@ -20566,8 +20161,8 @@ target_include_directories(retry_lb_fail_test target_link_libraries(retry_lb_fail_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20588,8 +20183,6 @@ add_executable(retry_non_retriable_status_before_trailers_test test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_non_retriable_status_before_trailers_test PUBLIC cxx_std_14) target_include_directories(retry_non_retriable_status_before_trailers_test @@ -20614,8 +20207,8 @@ target_include_directories(retry_non_retriable_status_before_trailers_test target_link_libraries(retry_non_retriable_status_before_trailers_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20636,8 +20229,6 @@ add_executable(retry_non_retriable_status_test test/core/end2end/tests/retry_non_retriable_status.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_non_retriable_status_test PUBLIC cxx_std_14) target_include_directories(retry_non_retriable_status_test @@ -20662,8 +20253,8 @@ target_include_directories(retry_non_retriable_status_test target_link_libraries(retry_non_retriable_status_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20684,8 +20275,6 @@ add_executable(retry_per_attempt_recv_timeout_on_last_attempt_test test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_per_attempt_recv_timeout_on_last_attempt_test PUBLIC cxx_std_14) target_include_directories(retry_per_attempt_recv_timeout_on_last_attempt_test @@ -20710,8 +20299,8 @@ target_include_directories(retry_per_attempt_recv_timeout_on_last_attempt_test target_link_libraries(retry_per_attempt_recv_timeout_on_last_attempt_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20732,8 +20321,6 @@ add_executable(retry_per_attempt_recv_timeout_test test/core/end2end/tests/retry_per_attempt_recv_timeout.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_per_attempt_recv_timeout_test PUBLIC cxx_std_14) target_include_directories(retry_per_attempt_recv_timeout_test @@ -20758,8 +20345,8 @@ target_include_directories(retry_per_attempt_recv_timeout_test target_link_libraries(retry_per_attempt_recv_timeout_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20780,8 +20367,6 @@ add_executable(retry_recv_initial_metadata_test test/core/end2end/tests/retry_recv_initial_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_recv_initial_metadata_test PUBLIC cxx_std_14) target_include_directories(retry_recv_initial_metadata_test @@ -20806,8 +20391,8 @@ target_include_directories(retry_recv_initial_metadata_test target_link_libraries(retry_recv_initial_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20828,8 +20413,6 @@ add_executable(retry_recv_message_replay_test test/core/end2end/tests/retry_recv_message_replay.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_recv_message_replay_test PUBLIC cxx_std_14) target_include_directories(retry_recv_message_replay_test @@ -20854,8 +20437,8 @@ target_include_directories(retry_recv_message_replay_test target_link_libraries(retry_recv_message_replay_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20876,8 +20459,6 @@ add_executable(retry_recv_message_test test/core/end2end/tests/retry_recv_message.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_recv_message_test PUBLIC cxx_std_14) target_include_directories(retry_recv_message_test @@ -20902,8 +20483,8 @@ target_include_directories(retry_recv_message_test target_link_libraries(retry_recv_message_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20924,8 +20505,6 @@ add_executable(retry_recv_trailing_metadata_error_test test/core/end2end/tests/retry_recv_trailing_metadata_error.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_recv_trailing_metadata_error_test PUBLIC cxx_std_14) target_include_directories(retry_recv_trailing_metadata_error_test @@ -20950,8 +20529,8 @@ target_include_directories(retry_recv_trailing_metadata_error_test target_link_libraries(retry_recv_trailing_metadata_error_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -20972,8 +20551,6 @@ add_executable(retry_send_initial_metadata_refs_test test/core/end2end/tests/retry_send_initial_metadata_refs.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_send_initial_metadata_refs_test PUBLIC cxx_std_14) target_include_directories(retry_send_initial_metadata_refs_test @@ -20998,8 +20575,8 @@ target_include_directories(retry_send_initial_metadata_refs_test target_link_libraries(retry_send_initial_metadata_refs_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21020,8 +20597,6 @@ add_executable(retry_send_op_fails_test test/core/end2end/tests/retry_send_op_fails.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_send_op_fails_test PUBLIC cxx_std_14) target_include_directories(retry_send_op_fails_test @@ -21046,8 +20621,8 @@ target_include_directories(retry_send_op_fails_test target_link_libraries(retry_send_op_fails_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21068,8 +20643,6 @@ add_executable(retry_send_recv_batch_test test/core/end2end/tests/retry_send_recv_batch.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_send_recv_batch_test PUBLIC cxx_std_14) target_include_directories(retry_send_recv_batch_test @@ -21094,8 +20667,8 @@ target_include_directories(retry_send_recv_batch_test target_link_libraries(retry_send_recv_batch_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21116,8 +20689,6 @@ add_executable(retry_server_pushback_delay_test test/core/end2end/tests/retry_server_pushback_delay.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_server_pushback_delay_test PUBLIC cxx_std_14) target_include_directories(retry_server_pushback_delay_test @@ -21142,8 +20713,8 @@ target_include_directories(retry_server_pushback_delay_test target_link_libraries(retry_server_pushback_delay_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21164,8 +20735,6 @@ add_executable(retry_server_pushback_disabled_test test/core/end2end/tests/retry_server_pushback_disabled.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_server_pushback_disabled_test PUBLIC cxx_std_14) target_include_directories(retry_server_pushback_disabled_test @@ -21190,8 +20759,8 @@ target_include_directories(retry_server_pushback_disabled_test target_link_libraries(retry_server_pushback_disabled_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21203,8 +20772,6 @@ if(gRPC_BUILD_TESTS) add_executable(retry_service_config_test test/core/client_channel/retry_service_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_service_config_test PUBLIC cxx_std_14) target_include_directories(retry_service_config_test @@ -21229,8 +20796,8 @@ target_include_directories(retry_service_config_test target_link_libraries(retry_service_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -21249,8 +20816,6 @@ add_executable(retry_streaming_after_commit_test test/core/end2end/tests/retry_streaming_after_commit.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_streaming_after_commit_test PUBLIC cxx_std_14) target_include_directories(retry_streaming_after_commit_test @@ -21275,8 +20840,8 @@ target_include_directories(retry_streaming_after_commit_test target_link_libraries(retry_streaming_after_commit_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21297,8 +20862,6 @@ add_executable(retry_streaming_succeeds_before_replay_finished_test test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_streaming_succeeds_before_replay_finished_test PUBLIC cxx_std_14) target_include_directories(retry_streaming_succeeds_before_replay_finished_test @@ -21323,8 +20886,8 @@ target_include_directories(retry_streaming_succeeds_before_replay_finished_test target_link_libraries(retry_streaming_succeeds_before_replay_finished_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21345,8 +20908,6 @@ add_executable(retry_streaming_test test/core/end2end/tests/retry_streaming.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_streaming_test PUBLIC cxx_std_14) target_include_directories(retry_streaming_test @@ -21371,8 +20932,8 @@ target_include_directories(retry_streaming_test target_link_libraries(retry_streaming_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21393,8 +20954,6 @@ add_executable(retry_test test/core/end2end/tests/retry.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_test PUBLIC cxx_std_14) target_include_directories(retry_test @@ -21419,8 +20978,8 @@ target_include_directories(retry_test target_link_libraries(retry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21432,8 +20991,6 @@ if(gRPC_BUILD_TESTS) add_executable(retry_throttle_test test/core/client_channel/retry_throttle_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_throttle_test PUBLIC cxx_std_14) target_include_directories(retry_throttle_test @@ -21458,8 +21015,8 @@ target_include_directories(retry_throttle_test target_link_libraries(retry_throttle_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -21478,8 +21035,6 @@ add_executable(retry_throttled_test test/core/end2end/tests/retry_throttled.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_throttled_test PUBLIC cxx_std_14) target_include_directories(retry_throttled_test @@ -21504,8 +21059,8 @@ target_include_directories(retry_throttled_test target_link_libraries(retry_throttled_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21526,8 +21081,6 @@ add_executable(retry_too_many_attempts_test test/core/end2end/tests/retry_too_many_attempts.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_too_many_attempts_test PUBLIC cxx_std_14) target_include_directories(retry_too_many_attempts_test @@ -21552,8 +21105,8 @@ target_include_directories(retry_too_many_attempts_test target_link_libraries(retry_too_many_attempts_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21574,8 +21127,6 @@ add_executable(retry_transparent_goaway_test test/core/end2end/tests/retry_transparent_goaway.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_transparent_goaway_test PUBLIC cxx_std_14) target_include_directories(retry_transparent_goaway_test @@ -21600,8 +21151,8 @@ target_include_directories(retry_transparent_goaway_test target_link_libraries(retry_transparent_goaway_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21622,8 +21173,6 @@ add_executable(retry_transparent_max_concurrent_streams_test test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_transparent_max_concurrent_streams_test PUBLIC cxx_std_14) target_include_directories(retry_transparent_max_concurrent_streams_test @@ -21648,8 +21197,8 @@ target_include_directories(retry_transparent_max_concurrent_streams_test target_link_libraries(retry_transparent_max_concurrent_streams_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21670,8 +21219,6 @@ add_executable(retry_transparent_not_sent_on_wire_test test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_transparent_not_sent_on_wire_test PUBLIC cxx_std_14) target_include_directories(retry_transparent_not_sent_on_wire_test @@ -21696,8 +21243,8 @@ target_include_directories(retry_transparent_not_sent_on_wire_test target_link_libraries(retry_transparent_not_sent_on_wire_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21718,8 +21265,6 @@ add_executable(retry_unref_before_finish_test test/core/end2end/tests/retry_unref_before_finish.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_unref_before_finish_test PUBLIC cxx_std_14) target_include_directories(retry_unref_before_finish_test @@ -21744,8 +21289,8 @@ target_include_directories(retry_unref_before_finish_test target_link_libraries(retry_unref_before_finish_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21766,8 +21311,6 @@ add_executable(retry_unref_before_recv_test test/core/end2end/tests/retry_unref_before_recv.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(retry_unref_before_recv_test PUBLIC cxx_std_14) target_include_directories(retry_unref_before_recv_test @@ -21792,8 +21335,8 @@ target_include_directories(retry_unref_before_recv_test target_link_libraries(retry_unref_before_recv_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -21832,8 +21375,6 @@ add_executable(rls_end2end_test test/cpp/end2end/rls_end2end_test.cc test/cpp/end2end/rls_server.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(rls_end2end_test PUBLIC cxx_std_14) target_include_directories(rls_end2end_test @@ -21858,8 +21399,8 @@ target_include_directories(rls_end2end_test target_link_libraries(rls_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -21870,8 +21411,6 @@ if(gRPC_BUILD_TESTS) add_executable(rls_lb_config_parser_test test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(rls_lb_config_parser_test PUBLIC cxx_std_14) target_include_directories(rls_lb_config_parser_test @@ -21896,8 +21435,8 @@ target_include_directories(rls_lb_config_parser_test target_link_libraries(rls_lb_config_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -21907,8 +21446,6 @@ if(gRPC_BUILD_TESTS) add_executable(round_robin_test test/core/client_channel/lb_policy/round_robin_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(round_robin_test PUBLIC cxx_std_14) target_include_directories(round_robin_test @@ -21933,8 +21470,8 @@ target_include_directories(round_robin_test target_link_libraries(round_robin_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -21944,8 +21481,6 @@ if(gRPC_BUILD_TESTS) add_executable(secure_auth_context_test test/cpp/common/secure_auth_context_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(secure_auth_context_test PUBLIC cxx_std_14) target_include_directories(secure_auth_context_test @@ -21970,8 +21505,8 @@ target_include_directories(secure_auth_context_test target_link_libraries(secure_auth_context_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -21981,8 +21516,6 @@ if(gRPC_BUILD_TESTS) add_executable(secure_channel_create_test test/core/surface/secure_channel_create_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(secure_channel_create_test PUBLIC cxx_std_14) target_include_directories(secure_channel_create_test @@ -22007,8 +21540,8 @@ target_include_directories(secure_channel_create_test target_link_libraries(secure_channel_create_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22029,8 +21562,6 @@ add_executable(secure_endpoint_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(secure_endpoint_test PUBLIC cxx_std_14) target_include_directories(secure_endpoint_test @@ -22055,8 +21586,8 @@ target_include_directories(secure_endpoint_test target_link_libraries(secure_endpoint_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22076,8 +21607,6 @@ add_executable(security_connector_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(security_connector_test PUBLIC cxx_std_14) target_include_directories(security_connector_test @@ -22102,8 +21631,8 @@ target_include_directories(security_connector_test target_link_libraries(security_connector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22113,8 +21642,6 @@ if(gRPC_BUILD_TESTS) add_executable(seq_test test/core/promise/seq_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(seq_test PUBLIC cxx_std_14) target_include_directories(seq_test @@ -22139,8 +21666,8 @@ target_include_directories(seq_test target_link_libraries(seq_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits gpr ) @@ -22151,8 +21678,6 @@ if(gRPC_BUILD_TESTS) add_executable(sequential_connectivity_test test/core/surface/sequential_connectivity_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sequential_connectivity_test PUBLIC cxx_std_14) target_include_directories(sequential_connectivity_test @@ -22177,8 +21702,8 @@ target_include_directories(sequential_connectivity_test target_link_libraries(sequential_connectivity_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22209,8 +21734,6 @@ add_executable(server_builder_plugin_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/server_builder_plugin_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_builder_plugin_test PUBLIC cxx_std_14) target_include_directories(server_builder_plugin_test @@ -22235,8 +21758,8 @@ target_include_directories(server_builder_plugin_test target_link_libraries(server_builder_plugin_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -22273,8 +21796,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/slice_splitter.cc test/core/util/tracer_util.cc test/cpp/server/server_builder_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_builder_test PUBLIC cxx_std_14) target_include_directories(server_builder_test @@ -22299,8 +21820,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_builder_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_unsecure grpc_test_util_unsecure ) @@ -22339,8 +21860,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/slice_splitter.cc test/core/util/tracer_util.cc test/cpp/server/server_builder_with_socket_mutator_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_builder_with_socket_mutator_test PUBLIC cxx_std_14) target_include_directories(server_builder_with_socket_mutator_test @@ -22365,8 +21884,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_builder_with_socket_mutator_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_unsecure grpc_test_util_unsecure ) @@ -22378,8 +21897,6 @@ if(gRPC_BUILD_TESTS) add_executable(server_call_tracer_factory_test test/core/channel/server_call_tracer_factory_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_call_tracer_factory_test PUBLIC cxx_std_14) target_include_directories(server_call_tracer_factory_test @@ -22404,8 +21921,8 @@ target_include_directories(server_call_tracer_factory_test target_link_libraries(server_call_tracer_factory_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22415,8 +21932,6 @@ if(gRPC_BUILD_TESTS) add_executable(server_chttp2_test test/core/surface/server_chttp2_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_chttp2_test PUBLIC cxx_std_14) target_include_directories(server_chttp2_test @@ -22441,8 +21956,8 @@ target_include_directories(server_chttp2_test target_link_libraries(server_chttp2_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22452,8 +21967,6 @@ if(gRPC_BUILD_TESTS) add_executable(server_config_selector_test test/core/server_config_selector/server_config_selector_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_config_selector_test PUBLIC cxx_std_14) target_include_directories(server_config_selector_test @@ -22478,8 +21991,8 @@ target_include_directories(server_config_selector_test target_link_libraries(server_config_selector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22489,8 +22002,6 @@ if(gRPC_BUILD_TESTS) add_executable(server_context_test_spouse_test test/cpp/test/server_context_test_spouse_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_context_test_spouse_test PUBLIC cxx_std_14) target_include_directories(server_context_test_spouse_test @@ -22515,7 +22026,6 @@ target_include_directories(server_context_test_spouse_test target_link_libraries(server_context_test_spouse_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -22543,8 +22053,6 @@ add_executable(server_early_return_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/server_early_return_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_early_return_test PUBLIC cxx_std_14) target_include_directories(server_early_return_test @@ -22569,8 +22077,8 @@ target_include_directories(server_early_return_test target_link_libraries(server_early_return_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -22589,8 +22097,6 @@ add_executable(server_finishes_request_test test/core/end2end/tests/server_finishes_request.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_finishes_request_test PUBLIC cxx_std_14) target_include_directories(server_finishes_request_test @@ -22615,8 +22121,8 @@ target_include_directories(server_finishes_request_test target_link_libraries(server_finishes_request_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -22646,8 +22152,6 @@ add_executable(server_interceptors_end2end_test test/cpp/end2end/interceptors_util.cc test/cpp/end2end/server_interceptors_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_interceptors_end2end_test PUBLIC cxx_std_14) target_include_directories(server_interceptors_end2end_test @@ -22672,8 +22176,8 @@ target_include_directories(server_interceptors_end2end_test target_link_libraries(server_interceptors_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -22685,8 +22189,6 @@ add_executable(server_registered_method_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/server_registered_method.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_registered_method_bad_client_test PUBLIC cxx_std_14) target_include_directories(server_registered_method_bad_client_test @@ -22711,8 +22213,8 @@ target_include_directories(server_registered_method_bad_client_test target_link_libraries(server_registered_method_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22749,8 +22251,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/slice_splitter.cc test/core/util/tracer_util.cc test/cpp/server/server_request_call_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_request_call_test PUBLIC cxx_std_14) target_include_directories(server_request_call_test @@ -22775,8 +22275,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_request_call_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_unsecure grpc_test_util_unsecure ) @@ -22790,8 +22290,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(server_ssl_test test/core/handshake/server_ssl.cc test/core/handshake/server_ssl_common.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_ssl_test PUBLIC cxx_std_14) target_include_directories(server_ssl_test @@ -22816,8 +22314,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_ssl_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22837,8 +22335,6 @@ add_executable(server_streaming_test test/core/end2end/tests/server_streaming.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_streaming_test PUBLIC cxx_std_14) target_include_directories(server_streaming_test @@ -22863,8 +22359,8 @@ target_include_directories(server_streaming_test target_link_libraries(server_streaming_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -22876,8 +22372,6 @@ if(gRPC_BUILD_TESTS) add_executable(server_test test/core/surface/server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(server_test PUBLIC cxx_std_14) target_include_directories(server_test @@ -22902,8 +22396,8 @@ target_include_directories(server_test target_link_libraries(server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -22934,8 +22428,6 @@ add_executable(service_config_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/service_config_end2end_test.cc test/cpp/end2end/test_service_impl.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(service_config_end2end_test PUBLIC cxx_std_14) target_include_directories(service_config_end2end_test @@ -22960,8 +22452,8 @@ target_include_directories(service_config_end2end_test target_link_libraries(service_config_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -22971,8 +22463,6 @@ if(gRPC_BUILD_TESTS) add_executable(service_config_test test/core/service_config/service_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(service_config_test PUBLIC cxx_std_14) target_include_directories(service_config_test @@ -22997,8 +22487,8 @@ target_include_directories(service_config_test target_link_libraries(service_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23018,8 +22508,6 @@ add_executable(settings_timeout_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(settings_timeout_test PUBLIC cxx_std_14) target_include_directories(settings_timeout_test @@ -23044,8 +22532,8 @@ target_include_directories(settings_timeout_test target_link_libraries(settings_timeout_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23064,8 +22552,6 @@ add_executable(shutdown_finishes_calls_test test/core/end2end/tests/shutdown_finishes_calls.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(shutdown_finishes_calls_test PUBLIC cxx_std_14) target_include_directories(shutdown_finishes_calls_test @@ -23090,8 +22576,8 @@ target_include_directories(shutdown_finishes_calls_test target_link_libraries(shutdown_finishes_calls_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -23112,8 +22598,6 @@ add_executable(shutdown_finishes_tags_test test/core/end2end/tests/shutdown_finishes_tags.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(shutdown_finishes_tags_test PUBLIC cxx_std_14) target_include_directories(shutdown_finishes_tags_test @@ -23138,8 +22622,8 @@ target_include_directories(shutdown_finishes_tags_test target_link_libraries(shutdown_finishes_tags_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -23171,8 +22655,6 @@ add_executable(shutdown_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/shutdown_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(shutdown_test PUBLIC cxx_std_14) target_include_directories(shutdown_test @@ -23197,8 +22679,8 @@ target_include_directories(shutdown_test target_link_libraries(shutdown_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -23217,8 +22699,6 @@ add_executable(simple_delayed_request_test test/core/end2end/tests/simple_delayed_request.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(simple_delayed_request_test PUBLIC cxx_std_14) target_include_directories(simple_delayed_request_test @@ -23243,8 +22723,8 @@ target_include_directories(simple_delayed_request_test target_link_libraries(simple_delayed_request_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -23265,8 +22745,6 @@ add_executable(simple_metadata_test test/core/end2end/tests/simple_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(simple_metadata_test PUBLIC cxx_std_14) target_include_directories(simple_metadata_test @@ -23291,8 +22769,8 @@ target_include_directories(simple_metadata_test target_link_libraries(simple_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -23306,8 +22784,6 @@ add_executable(simple_request_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/simple_request.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(simple_request_bad_client_test PUBLIC cxx_std_14) target_include_directories(simple_request_bad_client_test @@ -23332,8 +22808,8 @@ target_include_directories(simple_request_bad_client_test target_link_libraries(simple_request_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23352,8 +22828,6 @@ add_executable(simple_request_test test/core/end2end/tests/simple_request.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(simple_request_test PUBLIC cxx_std_14) target_include_directories(simple_request_test @@ -23378,8 +22852,8 @@ target_include_directories(simple_request_test target_link_libraries(simple_request_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -23391,8 +22865,6 @@ if(gRPC_BUILD_TESTS) add_executable(single_set_ptr_test test/core/gprpp/single_set_ptr_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(single_set_ptr_test PUBLIC cxx_std_14) target_include_directories(single_set_ptr_test @@ -23417,8 +22889,8 @@ target_include_directories(single_set_ptr_test target_link_libraries(single_set_ptr_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -23428,8 +22900,6 @@ if(gRPC_BUILD_TESTS) add_executable(sleep_test test/core/promise/sleep_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sleep_test PUBLIC cxx_std_14) target_include_directories(sleep_test @@ -23454,8 +22924,8 @@ target_include_directories(sleep_test target_link_libraries(sleep_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -23469,8 +22939,6 @@ add_executable(slice_string_helpers_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/slice/slice_string_helpers_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(slice_string_helpers_test PUBLIC cxx_std_14) target_include_directories(slice_string_helpers_test @@ -23495,8 +22963,8 @@ target_include_directories(slice_string_helpers_test target_link_libraries(slice_string_helpers_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::hash absl::statusor gpr @@ -23508,8 +22976,6 @@ if(gRPC_BUILD_TESTS) add_executable(smoke_test test/core/event_engine/smoke_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(smoke_test PUBLIC cxx_std_14) target_include_directories(smoke_test @@ -23534,8 +23000,8 @@ target_include_directories(smoke_test target_link_libraries(smoke_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -23545,8 +23011,6 @@ if(gRPC_BUILD_TESTS) add_executable(sockaddr_resolver_test test/core/client_channel/resolvers/sockaddr_resolver_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sockaddr_resolver_test PUBLIC cxx_std_14) target_include_directories(sockaddr_resolver_test @@ -23571,8 +23035,8 @@ target_include_directories(sockaddr_resolver_test target_link_libraries(sockaddr_resolver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23582,8 +23046,6 @@ if(gRPC_BUILD_TESTS) add_executable(sockaddr_utils_test test/core/address_utils/sockaddr_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sockaddr_utils_test PUBLIC cxx_std_14) target_include_directories(sockaddr_utils_test @@ -23608,8 +23070,8 @@ target_include_directories(sockaddr_utils_test target_link_libraries(sockaddr_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23630,8 +23092,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(socket_utils_test PUBLIC cxx_std_14) target_include_directories(socket_utils_test @@ -23656,8 +23116,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(socket_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23668,8 +23128,6 @@ if(gRPC_BUILD_TESTS) add_executable(sorted_pack_test test/core/gprpp/sorted_pack_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sorted_pack_test PUBLIC cxx_std_14) target_include_directories(sorted_pack_test @@ -23694,8 +23152,8 @@ target_include_directories(sorted_pack_test target_link_libraries(sorted_pack_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest ) @@ -23704,8 +23162,6 @@ if(gRPC_BUILD_TESTS) add_executable(spinlock_test test/core/gpr/spinlock_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(spinlock_test PUBLIC cxx_std_14) target_include_directories(spinlock_test @@ -23730,8 +23186,8 @@ target_include_directories(spinlock_test target_link_libraries(spinlock_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23751,8 +23207,6 @@ add_executable(ssl_credentials_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ssl_credentials_test PUBLIC cxx_std_14) target_include_directories(ssl_credentials_test @@ -23777,8 +23231,8 @@ target_include_directories(ssl_credentials_test target_link_libraries(ssl_credentials_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23790,8 +23244,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(ssl_transport_security_test test/core/tsi/ssl_transport_security_test.cc test/core/tsi/transport_security_test_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ssl_transport_security_test PUBLIC cxx_std_14) target_include_directories(ssl_transport_security_test @@ -23816,8 +23268,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(ssl_transport_security_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23829,8 +23281,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(ssl_transport_security_utils_test test/core/tsi/ssl_transport_security_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(ssl_transport_security_utils_test PUBLIC cxx_std_14) target_include_directories(ssl_transport_security_utils_test @@ -23855,8 +23305,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(ssl_transport_security_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23868,8 +23318,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(stack_tracer_test test/core/util/stack_tracer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(stack_tracer_test PUBLIC cxx_std_14) target_include_directories(stack_tracer_test @@ -23894,8 +23342,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(stack_tracer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23906,8 +23354,6 @@ if(gRPC_BUILD_TESTS) add_executable(stat_test test/core/gprpp/stat_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(stat_test PUBLIC cxx_std_14) target_include_directories(stat_test @@ -23932,8 +23378,8 @@ target_include_directories(stat_test target_link_libraries(stat_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -23944,8 +23390,6 @@ if(gRPC_BUILD_TESTS) add_executable(static_stride_scheduler_test src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc test/core/client_channel/lb_policy/static_stride_scheduler_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(static_stride_scheduler_test PUBLIC cxx_std_14) target_include_directories(static_stride_scheduler_test @@ -23970,8 +23414,8 @@ target_include_directories(static_stride_scheduler_test target_link_libraries(static_stride_scheduler_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::span gpr ) @@ -23982,8 +23426,6 @@ if(gRPC_BUILD_TESTS) add_executable(stats_test test/core/debug/stats_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(stats_test PUBLIC cxx_std_14) target_include_directories(stats_test @@ -24008,8 +23450,8 @@ target_include_directories(stats_test target_link_libraries(stats_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24029,8 +23471,6 @@ add_executable(status_conversion_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(status_conversion_test PUBLIC cxx_std_14) target_include_directories(status_conversion_test @@ -24055,8 +23495,8 @@ target_include_directories(status_conversion_test target_link_libraries(status_conversion_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24066,8 +23506,6 @@ if(gRPC_BUILD_TESTS) add_executable(status_helper_test test/core/gprpp/status_helper_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(status_helper_test PUBLIC cxx_std_14) target_include_directories(status_helper_test @@ -24092,8 +23530,8 @@ target_include_directories(status_helper_test target_link_libraries(status_helper_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24103,8 +23541,6 @@ if(gRPC_BUILD_TESTS) add_executable(status_util_test test/core/channel/status_util_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(status_util_test PUBLIC cxx_std_14) target_include_directories(status_util_test @@ -24129,8 +23565,8 @@ target_include_directories(status_util_test target_link_libraries(status_util_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24152,8 +23588,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(stranded_event_test PUBLIC cxx_std_14) target_include_directories(stranded_event_test @@ -24178,8 +23612,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(stranded_event_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24190,8 +23624,6 @@ if(gRPC_BUILD_TESTS) add_executable(stream_leak_with_queued_flow_control_update_test test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(stream_leak_with_queued_flow_control_update_test PUBLIC cxx_std_14) target_include_directories(stream_leak_with_queued_flow_control_update_test @@ -24216,8 +23648,8 @@ target_include_directories(stream_leak_with_queued_flow_control_update_test target_link_libraries(stream_leak_with_queued_flow_control_update_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24236,8 +23668,6 @@ add_executable(streaming_error_response_test test/core/end2end/tests/streaming_error_response.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(streaming_error_response_test PUBLIC cxx_std_14) target_include_directories(streaming_error_response_test @@ -24262,8 +23692,8 @@ target_include_directories(streaming_error_response_test target_link_libraries(streaming_error_response_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -24296,8 +23726,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/streaming_throughput_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(streaming_throughput_test PUBLIC cxx_std_14) target_include_directories(streaming_throughput_test @@ -24322,8 +23750,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(streaming_throughput_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -24345,8 +23773,6 @@ add_executable(streams_not_seen_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(streams_not_seen_test PUBLIC cxx_std_14) target_include_directories(streams_not_seen_test @@ -24371,8 +23797,8 @@ target_include_directories(streams_not_seen_test target_link_libraries(streams_not_seen_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24382,8 +23808,6 @@ if(gRPC_BUILD_TESTS) add_executable(string_ref_test test/cpp/util/string_ref_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(string_ref_test PUBLIC cxx_std_14) target_include_directories(string_ref_test @@ -24408,8 +23832,8 @@ target_include_directories(string_ref_test target_link_libraries(string_ref_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -24420,8 +23844,6 @@ if(gRPC_BUILD_TESTS) add_executable(string_test test/core/gpr/string_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(string_test PUBLIC cxx_std_14) target_include_directories(string_test @@ -24446,8 +23868,8 @@ target_include_directories(string_test target_link_libraries(string_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24457,8 +23879,6 @@ if(gRPC_BUILD_TESTS) add_executable(sync_test test/core/gpr/sync_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(sync_test PUBLIC cxx_std_14) target_include_directories(sync_test @@ -24483,8 +23903,8 @@ target_include_directories(sync_test target_link_libraries(sync_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24504,8 +23924,6 @@ add_executable(system_roots_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(system_roots_test PUBLIC cxx_std_14) target_include_directories(system_roots_test @@ -24530,8 +23948,8 @@ target_include_directories(system_roots_test target_link_libraries(system_roots_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24541,8 +23959,6 @@ if(gRPC_BUILD_TESTS) add_executable(table_test test/core/gprpp/table_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(table_test PUBLIC cxx_std_14) target_include_directories(table_test @@ -24567,12 +23983,9 @@ target_include_directories(table_test target_link_libraries(table_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits - absl::strings - absl::optional - absl::variant absl::utility ) @@ -24593,8 +24006,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tcp_client_posix_test PUBLIC cxx_std_14) target_include_directories(tcp_client_posix_test @@ -24619,8 +24030,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_client_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24632,8 +24043,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(tcp_posix_socket_utils_test test/core/event_engine/posix/tcp_posix_socket_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tcp_posix_socket_utils_test PUBLIC cxx_std_14) target_include_directories(tcp_posix_socket_utils_test @@ -24658,8 +24067,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_posix_socket_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24682,8 +24091,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tcp_posix_test PUBLIC cxx_std_14) target_include_directories(tcp_posix_test @@ -24708,8 +24115,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24731,8 +24138,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tcp_server_posix_test PUBLIC cxx_std_14) target_include_directories(tcp_server_posix_test @@ -24757,8 +24162,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_server_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -24769,8 +24174,6 @@ if(gRPC_BUILD_TESTS) add_executable(tcp_socket_utils_test test/core/event_engine/tcp_socket_utils_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tcp_socket_utils_test PUBLIC cxx_std_14) target_include_directories(tcp_socket_utils_test @@ -24795,8 +24198,8 @@ target_include_directories(tcp_socket_utils_test target_link_libraries(tcp_socket_utils_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -24811,8 +24214,6 @@ add_executable(test_core_channel_channelz_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h test/core/channel/channelz_test.cc test/cpp/util/channel_trace_proto_helper.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_channel_channelz_test PUBLIC cxx_std_14) target_include_directories(test_core_channel_channelz_test @@ -24837,8 +24238,8 @@ target_include_directories(test_core_channel_channelz_test target_link_libraries(test_core_channel_channelz_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -24858,8 +24259,6 @@ add_executable(test_core_end2end_channelz_test test/core/end2end/tests/channelz.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_end2end_channelz_test PUBLIC cxx_std_14) target_include_directories(test_core_end2end_channelz_test @@ -24884,8 +24283,8 @@ target_include_directories(test_core_end2end_channelz_test target_link_libraries(test_core_end2end_channelz_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -24901,8 +24300,6 @@ add_executable(test_core_event_engine_posix_timer_heap_test src/core/lib/gprpp/time.cc src/core/lib/gprpp/time_averaged_stats.cc test/core/event_engine/posix/timer_heap_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_event_engine_posix_timer_heap_test PUBLIC cxx_std_14) target_include_directories(test_core_event_engine_posix_timer_heap_test @@ -24927,8 +24324,8 @@ target_include_directories(test_core_event_engine_posix_timer_heap_test target_link_libraries(test_core_event_engine_posix_timer_heap_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -24943,8 +24340,6 @@ add_executable(test_core_event_engine_posix_timer_list_test src/core/lib/gprpp/time.cc src/core/lib/gprpp/time_averaged_stats.cc test/core/event_engine/posix/timer_list_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_event_engine_posix_timer_list_test PUBLIC cxx_std_14) target_include_directories(test_core_event_engine_posix_timer_list_test @@ -24969,8 +24364,8 @@ target_include_directories(test_core_event_engine_posix_timer_list_test target_link_libraries(test_core_event_engine_posix_timer_list_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -24990,8 +24385,6 @@ add_executable(test_core_event_engine_slice_buffer_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc test/core/event_engine/slice_buffer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_event_engine_slice_buffer_test PUBLIC cxx_std_14) target_include_directories(test_core_event_engine_slice_buffer_test @@ -25016,8 +24409,8 @@ target_include_directories(test_core_event_engine_slice_buffer_test target_link_libraries(test_core_event_engine_slice_buffer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::flat_hash_set absl::hash absl::statusor @@ -25031,8 +24424,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_gpr_time_test test/core/gpr/time_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_gpr_time_test PUBLIC cxx_std_14) target_include_directories(test_core_gpr_time_test @@ -25057,8 +24448,8 @@ target_include_directories(test_core_gpr_time_test target_link_libraries(test_core_gpr_time_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25068,8 +24459,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_gprpp_load_file_test test/core/gprpp/load_file_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_gprpp_load_file_test PUBLIC cxx_std_14) target_include_directories(test_core_gprpp_load_file_test @@ -25094,8 +24483,8 @@ target_include_directories(test_core_gprpp_load_file_test target_link_libraries(test_core_gprpp_load_file_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25106,8 +24495,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_gprpp_time_test src/core/lib/gprpp/time.cc test/core/gprpp/time_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_gprpp_time_test PUBLIC cxx_std_14) target_include_directories(test_core_gprpp_time_test @@ -25132,8 +24519,8 @@ target_include_directories(test_core_gprpp_time_test target_link_libraries(test_core_gprpp_time_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::statusor gpr ) @@ -25154,8 +24541,6 @@ add_executable(test_core_iomgr_load_file_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_iomgr_load_file_test PUBLIC cxx_std_14) target_include_directories(test_core_iomgr_load_file_test @@ -25180,8 +24565,8 @@ target_include_directories(test_core_iomgr_load_file_test target_link_libraries(test_core_iomgr_load_file_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25201,8 +24586,6 @@ add_executable(test_core_iomgr_timer_heap_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_iomgr_timer_heap_test PUBLIC cxx_std_14) target_include_directories(test_core_iomgr_timer_heap_test @@ -25227,8 +24610,8 @@ target_include_directories(test_core_iomgr_timer_heap_test target_link_libraries(test_core_iomgr_timer_heap_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25248,8 +24631,6 @@ add_executable(test_core_security_credentials_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_security_credentials_test PUBLIC cxx_std_14) target_include_directories(test_core_security_credentials_test @@ -25274,8 +24655,8 @@ target_include_directories(test_core_security_credentials_test target_link_libraries(test_core_security_credentials_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25285,8 +24666,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_slice_slice_buffer_test test/core/slice/slice_buffer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_slice_slice_buffer_test PUBLIC cxx_std_14) target_include_directories(test_core_slice_slice_buffer_test @@ -25311,8 +24690,8 @@ target_include_directories(test_core_slice_slice_buffer_test target_link_libraries(test_core_slice_slice_buffer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25323,8 +24702,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_slice_slice_test test/core/slice/slice_test.cc test/core/util/build.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_core_slice_slice_test PUBLIC cxx_std_14) target_include_directories(test_core_slice_slice_test @@ -25349,8 +24726,8 @@ target_include_directories(test_core_slice_slice_test target_link_libraries(test_core_slice_slice_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -25361,8 +24738,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_cpp_client_credentials_test test/cpp/client/credentials_test.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_cpp_client_credentials_test PUBLIC cxx_std_14) target_include_directories(test_cpp_client_credentials_test @@ -25387,8 +24762,8 @@ target_include_directories(test_cpp_client_credentials_test target_link_libraries(test_cpp_client_credentials_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -25400,8 +24775,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_cpp_server_credentials_test test/cpp/server/credentials_test.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_cpp_server_credentials_test PUBLIC cxx_std_14) target_include_directories(test_cpp_server_credentials_test @@ -25426,8 +24799,8 @@ target_include_directories(test_cpp_server_credentials_test target_link_libraries(test_cpp_server_credentials_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -25438,8 +24811,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_cpp_util_slice_test test/cpp/util/slice_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_cpp_util_slice_test PUBLIC cxx_std_14) target_include_directories(test_cpp_util_slice_test @@ -25464,8 +24835,8 @@ target_include_directories(test_cpp_util_slice_test target_link_libraries(test_cpp_util_slice_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -25475,8 +24846,6 @@ if(gRPC_BUILD_TESTS) add_executable(test_cpp_util_time_test test/cpp/util/time_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(test_cpp_util_time_test PUBLIC cxx_std_14) target_include_directories(test_cpp_util_time_test @@ -25501,8 +24870,8 @@ target_include_directories(test_cpp_util_time_test target_link_libraries(test_cpp_util_time_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -25512,8 +24881,6 @@ if(gRPC_BUILD_TESTS) add_executable(thd_test test/core/gprpp/thd_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thd_test PUBLIC cxx_std_14) target_include_directories(thd_test @@ -25538,8 +24905,8 @@ target_include_directories(thd_test target_link_libraries(thd_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25549,8 +24916,6 @@ if(gRPC_BUILD_TESTS) add_executable(thread_manager_test test/cpp/thread_manager/thread_manager_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thread_manager_test PUBLIC cxx_std_14) target_include_directories(thread_manager_test @@ -25575,8 +24940,8 @@ target_include_directories(thread_manager_test target_link_libraries(thread_manager_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -25587,8 +24952,6 @@ if(gRPC_BUILD_TESTS) add_executable(thread_pool_test test/core/event_engine/thread_pool_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thread_pool_test PUBLIC cxx_std_14) target_include_directories(thread_pool_test @@ -25613,8 +24976,8 @@ target_include_directories(thread_pool_test target_link_libraries(thread_pool_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc grpc_test_util_unsecure ) @@ -25626,8 +24989,6 @@ if(gRPC_BUILD_TESTS) add_executable(thread_quota_test src/core/lib/resource_quota/thread_quota.cc test/core/resource_quota/thread_quota_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thread_quota_test PUBLIC cxx_std_14) target_include_directories(thread_quota_test @@ -25652,8 +25013,8 @@ target_include_directories(thread_quota_test target_link_libraries(thread_quota_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest gpr ) @@ -25684,8 +25045,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/thread_stress_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thread_stress_test PUBLIC cxx_std_14) target_include_directories(thread_stress_test @@ -25710,8 +25069,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(thread_stress_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -25729,8 +25088,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/event_engine/test_suite/tests/server_test.cc test/core/event_engine/test_suite/tests/timer_test.cc test/core/event_engine/test_suite/thready_posix_event_engine_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(thready_posix_event_engine_test PUBLIC cxx_std_14) target_include_directories(thready_posix_event_engine_test @@ -25755,8 +25112,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(thready_posix_event_engine_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_unsecure grpc_test_util ) @@ -25769,8 +25126,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(time_jump_test test/cpp/common/time_jump_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(time_jump_test PUBLIC cxx_std_14) target_include_directories(time_jump_test @@ -25795,8 +25150,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(time_jump_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -25808,8 +25163,6 @@ if(gRPC_BUILD_TESTS) add_executable(time_util_test test/core/gprpp/time_util_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(time_util_test PUBLIC cxx_std_14) target_include_directories(time_util_test @@ -25834,8 +25187,8 @@ target_include_directories(time_util_test target_link_libraries(time_util_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25855,8 +25208,6 @@ add_executable(timeout_encoding_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(timeout_encoding_test PUBLIC cxx_std_14) target_include_directories(timeout_encoding_test @@ -25881,8 +25232,8 @@ target_include_directories(timeout_encoding_test target_link_libraries(timeout_encoding_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25892,8 +25243,6 @@ if(gRPC_BUILD_TESTS) add_executable(timer_manager_test test/core/event_engine/posix/timer_manager_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(timer_manager_test PUBLIC cxx_std_14) target_include_directories(timer_manager_test @@ -25918,8 +25267,8 @@ target_include_directories(timer_manager_test target_link_libraries(timer_manager_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -25929,8 +25278,6 @@ if(gRPC_BUILD_TESTS) add_executable(timer_test test/cpp/common/timer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(timer_test PUBLIC cxx_std_14) target_include_directories(timer_test @@ -25955,8 +25302,8 @@ target_include_directories(timer_test target_link_libraries(timer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -25968,8 +25315,6 @@ if(gRPC_BUILD_TESTS) add_executable(tls_certificate_verifier_test test/cpp/security/tls_certificate_verifier_test.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tls_certificate_verifier_test PUBLIC cxx_std_14) target_include_directories(tls_certificate_verifier_test @@ -25994,8 +25339,8 @@ target_include_directories(tls_certificate_verifier_test target_link_libraries(tls_certificate_verifier_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -26022,8 +25367,6 @@ add_executable(tls_key_export_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/tls_key_export_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tls_key_export_test PUBLIC cxx_std_14) target_include_directories(tls_key_export_test @@ -26048,8 +25391,8 @@ target_include_directories(tls_key_export_test target_link_libraries(tls_key_export_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -26069,8 +25412,6 @@ add_executable(tls_security_connector_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(tls_security_connector_test PUBLIC cxx_std_14) target_include_directories(tls_security_connector_test @@ -26095,8 +25436,8 @@ target_include_directories(tls_security_connector_test target_link_libraries(tls_security_connector_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26107,8 +25448,6 @@ if(gRPC_BUILD_TESTS) add_executable(too_many_pings_test test/core/end2end/cq_verifier.cc test/core/transport/chttp2/too_many_pings_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(too_many_pings_test PUBLIC cxx_std_14) target_include_directories(too_many_pings_test @@ -26133,8 +25472,8 @@ target_include_directories(too_many_pings_test target_link_libraries(too_many_pings_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -26146,8 +25485,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(traced_buffer_list_test test/core/event_engine/posix/traced_buffer_list_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(traced_buffer_list_test PUBLIC cxx_std_14) target_include_directories(traced_buffer_list_test @@ -26172,8 +25509,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(traced_buffer_list_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26193,8 +25530,6 @@ add_executable(trailing_metadata_test test/core/end2end/tests/trailing_metadata.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(trailing_metadata_test PUBLIC cxx_std_14) target_include_directories(trailing_metadata_test @@ -26219,8 +25554,8 @@ target_include_directories(trailing_metadata_test target_link_libraries(trailing_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -26232,8 +25567,6 @@ if(gRPC_BUILD_TESTS) add_executable(transport_security_common_api_test test/core/tsi/alts/handshaker/transport_security_common_api_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(transport_security_common_api_test PUBLIC cxx_std_14) target_include_directories(transport_security_common_api_test @@ -26258,8 +25591,8 @@ target_include_directories(transport_security_common_api_test target_link_libraries(transport_security_common_api_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26269,8 +25602,6 @@ if(gRPC_BUILD_TESTS) add_executable(transport_security_test test/core/tsi/transport_security_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(transport_security_test PUBLIC cxx_std_14) target_include_directories(transport_security_test @@ -26295,8 +25626,8 @@ target_include_directories(transport_security_test target_link_libraries(transport_security_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26369,8 +25700,6 @@ add_executable(transport_stream_receiver_test src/cpp/util/string_ref.cc src/cpp/util/time_cc.cc test/core/transport/binder/transport_stream_receiver_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(transport_stream_receiver_test PUBLIC cxx_std_14) target_include_directories(transport_stream_receiver_test @@ -26395,8 +25724,9 @@ target_include_directories(transport_stream_receiver_test target_link_libraries(transport_stream_receiver_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -26406,8 +25736,6 @@ if(gRPC_BUILD_TESTS) add_executable(try_join_test test/core/promise/try_join_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(try_join_test PUBLIC cxx_std_14) target_include_directories(try_join_test @@ -26432,8 +25760,8 @@ target_include_directories(try_join_test target_link_libraries(try_join_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor absl::utility @@ -26446,8 +25774,6 @@ if(gRPC_BUILD_TESTS) add_executable(try_seq_metadata_test test/core/promise/try_seq_metadata_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(try_seq_metadata_test PUBLIC cxx_std_14) target_include_directories(try_seq_metadata_test @@ -26472,8 +25798,8 @@ target_include_directories(try_seq_metadata_test target_link_libraries(try_seq_metadata_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc ) @@ -26483,8 +25809,6 @@ if(gRPC_BUILD_TESTS) add_executable(try_seq_test test/core/promise/try_seq_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(try_seq_test PUBLIC cxx_std_14) target_include_directories(try_seq_test @@ -26509,8 +25833,8 @@ target_include_directories(try_seq_test target_link_libraries(try_seq_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::type_traits absl::statusor gpr @@ -26522,8 +25846,6 @@ if(gRPC_BUILD_TESTS) add_executable(unique_type_name_test test/core/gprpp/unique_type_name_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(unique_type_name_test PUBLIC cxx_std_14) target_include_directories(unique_type_name_test @@ -26548,11 +25870,9 @@ target_include_directories(unique_type_name_test target_link_libraries(unique_type_name_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest absl::str_format - absl::strings - absl::variant ) @@ -26563,8 +25883,6 @@ add_executable(unknown_frame_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/unknown_frame.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(unknown_frame_bad_client_test PUBLIC cxx_std_14) target_include_directories(unknown_frame_bad_client_test @@ -26589,8 +25907,8 @@ target_include_directories(unknown_frame_bad_client_test target_link_libraries(unknown_frame_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26600,8 +25918,6 @@ if(gRPC_BUILD_TESTS) add_executable(uri_parser_test test/core/uri/uri_parser_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(uri_parser_test PUBLIC cxx_std_14) target_include_directories(uri_parser_test @@ -26626,8 +25942,8 @@ target_include_directories(uri_parser_test target_link_libraries(uri_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util_unsecure ) @@ -26637,8 +25953,6 @@ if(gRPC_BUILD_TESTS) add_executable(useful_test test/core/gpr/useful_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(useful_test PUBLIC cxx_std_14) target_include_directories(useful_test @@ -26663,10 +25977,8 @@ target_include_directories(useful_test target_link_libraries(useful_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - absl::strings - absl::variant + gtest ) @@ -26676,8 +25988,6 @@ if(gRPC_BUILD_TESTS) add_executable(uuid_v4_test src/core/lib/gprpp/uuid_v4.cc test/core/gprpp/uuid_v4_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(uuid_v4_test PUBLIC cxx_std_14) target_include_directories(uuid_v4_test @@ -26702,8 +26012,8 @@ target_include_directories(uuid_v4_test target_link_libraries(uuid_v4_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26713,8 +26023,6 @@ if(gRPC_BUILD_TESTS) add_executable(validation_errors_test test/core/gprpp/validation_errors_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(validation_errors_test PUBLIC cxx_std_14) target_include_directories(validation_errors_test @@ -26739,8 +26047,8 @@ target_include_directories(validation_errors_test target_link_libraries(validation_errors_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26750,8 +26058,6 @@ if(gRPC_BUILD_TESTS) add_executable(varint_test test/core/transport/chttp2/varint_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(varint_test PUBLIC cxx_std_14) target_include_directories(varint_test @@ -26776,8 +26082,8 @@ target_include_directories(varint_test target_link_libraries(varint_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26788,8 +26094,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(wakeup_fd_posix_test test/core/event_engine/posix/wakeup_fd_posix_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(wakeup_fd_posix_test PUBLIC cxx_std_14) target_include_directories(wakeup_fd_posix_test @@ -26814,8 +26118,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(wakeup_fd_posix_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26826,8 +26130,6 @@ if(gRPC_BUILD_TESTS) add_executable(weighted_round_robin_config_test test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(weighted_round_robin_config_test PUBLIC cxx_std_14) target_include_directories(weighted_round_robin_config_test @@ -26852,8 +26154,8 @@ target_include_directories(weighted_round_robin_config_test target_link_libraries(weighted_round_robin_config_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26863,8 +26165,6 @@ if(gRPC_BUILD_TESTS) add_executable(weighted_round_robin_test test/core/client_channel/lb_policy/weighted_round_robin_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(weighted_round_robin_test PUBLIC cxx_std_14) target_include_directories(weighted_round_robin_test @@ -26889,8 +26189,8 @@ target_include_directories(weighted_round_robin_test target_link_libraries(weighted_round_robin_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26902,8 +26202,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) add_executable(win_socket_test test/core/event_engine/windows/create_sockpair.cc test/core/event_engine/windows/win_socket_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(win_socket_test PUBLIC cxx_std_14) target_include_directories(win_socket_test @@ -26928,8 +26226,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(win_socket_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26942,8 +26240,6 @@ add_executable(window_overflow_bad_client_test test/core/bad_client/bad_client.cc test/core/bad_client/tests/window_overflow.cc test/core/end2end/cq_verifier.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(window_overflow_bad_client_test PUBLIC cxx_std_14) target_include_directories(window_overflow_bad_client_test @@ -26968,8 +26264,8 @@ target_include_directories(window_overflow_bad_client_test target_link_libraries(window_overflow_bad_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -26981,8 +26277,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) add_executable(windows_endpoint_test test/core/event_engine/windows/create_sockpair.cc test/core/event_engine/windows/windows_endpoint_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(windows_endpoint_test PUBLIC cxx_std_14) target_include_directories(windows_endpoint_test @@ -27007,8 +26301,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(windows_endpoint_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -27083,8 +26377,6 @@ add_executable(wire_reader_test src/cpp/util/time_cc.cc test/core/transport/binder/mock_objects.cc test/core/transport/binder/wire_reader_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(wire_reader_test PUBLIC cxx_std_14) target_include_directories(wire_reader_test @@ -27109,8 +26401,9 @@ target_include_directories(wire_reader_test target_link_libraries(wire_reader_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -27184,8 +26477,6 @@ add_executable(wire_writer_test src/cpp/util/time_cc.cc test/core/transport/binder/mock_objects.cc test/core/transport/binder/wire_writer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(wire_writer_test PUBLIC cxx_std_14) target_include_directories(wire_writer_test @@ -27210,8 +26501,9 @@ target_include_directories(wire_writer_test target_link_libraries(wire_writer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -27222,8 +26514,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(work_serializer_test test/core/gprpp/work_serializer_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(work_serializer_test PUBLIC cxx_std_14) target_include_directories(work_serializer_test @@ -27248,8 +26538,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(work_serializer_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -27269,8 +26559,6 @@ add_executable(write_buffering_at_end_test test/core/end2end/tests/write_buffering_at_end.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(write_buffering_at_end_test PUBLIC cxx_std_14) target_include_directories(write_buffering_at_end_test @@ -27295,8 +26583,8 @@ target_include_directories(write_buffering_at_end_test target_link_libraries(write_buffering_at_end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -27317,8 +26605,6 @@ add_executable(write_buffering_test test/core/end2end/tests/write_buffering.cc test/core/event_engine/event_engine_test_utils.cc test/core/util/test_lb_policies.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(write_buffering_test PUBLIC cxx_std_14) target_include_directories(write_buffering_test @@ -27343,8 +26629,8 @@ target_include_directories(write_buffering_test target_link_libraries(write_buffering_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_authorization_provider grpc_unsecure grpc_test_util @@ -27383,8 +26669,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/core/util/slice_splitter.cc test/core/util/tracer_util.cc test/cpp/performance/writes_per_rpc_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(writes_per_rpc_test PUBLIC cxx_std_14) target_include_directories(writes_per_rpc_test @@ -27409,8 +26693,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(writes_per_rpc_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ grpc_test_util ) @@ -27487,8 +26771,6 @@ add_executable(xds_audit_logger_registry_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_audit_logger_registry_test PUBLIC cxx_std_14) target_include_directories(xds_audit_logger_registry_test @@ -27513,9 +26795,10 @@ target_include_directories(xds_audit_logger_registry_test target_link_libraries(xds_audit_logger_registry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -27525,8 +26808,6 @@ if(gRPC_BUILD_TESTS) add_executable(xds_bootstrap_test test/core/xds/xds_bootstrap_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_bootstrap_test PUBLIC cxx_std_14) target_include_directories(xds_bootstrap_test @@ -27551,8 +26832,8 @@ target_include_directories(xds_bootstrap_test target_link_libraries(xds_bootstrap_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -27562,8 +26843,6 @@ if(gRPC_BUILD_TESTS) add_executable(xds_certificate_provider_test test/core/xds/xds_certificate_provider_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_certificate_provider_test PUBLIC cxx_std_14) target_include_directories(xds_certificate_provider_test @@ -27588,8 +26867,8 @@ target_include_directories(xds_certificate_provider_test target_link_libraries(xds_certificate_provider_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -27613,8 +26892,6 @@ add_executable(xds_client_test src/cpp/util/status.cc test/core/xds/xds_client_test.cc test/core/xds/xds_transport_fake.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_client_test PUBLIC cxx_std_14) target_include_directories(xds_client_test @@ -27639,8 +26916,9 @@ target_include_directories(xds_client_test target_link_libraries(xds_client_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -27780,8 +27058,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_end2end_test_lib.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_cluster_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_cluster_end2end_test @@ -27806,8 +27082,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_cluster_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -27883,8 +27159,6 @@ add_executable(xds_cluster_resource_type_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/wrr_locality.grpc.pb.h src/cpp/util/status.cc test/core/xds/xds_cluster_resource_type_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_cluster_resource_type_test PUBLIC cxx_std_14) target_include_directories(xds_cluster_resource_type_test @@ -27909,8 +27183,9 @@ target_include_directories(xds_cluster_resource_type_test target_link_libraries(xds_cluster_resource_type_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -28054,8 +27329,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_end2end_test_lib.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_cluster_type_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_cluster_type_end2end_test @@ -28080,8 +27353,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_cluster_type_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -28133,8 +27406,6 @@ add_executable(xds_common_types_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_common_types_test PUBLIC cxx_std_14) target_include_directories(xds_common_types_test @@ -28159,9 +27430,10 @@ target_include_directories(xds_common_types_test target_link_libraries(xds_common_types_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -28300,8 +27572,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_end2end_test_lib.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_core_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_core_end2end_test @@ -28326,8 +27596,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_core_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -28355,8 +27625,6 @@ add_executable(xds_credentials_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h test/cpp/end2end/test_service_impl.cc test/cpp/end2end/xds/xds_credentials_end2end_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_credentials_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_credentials_end2end_test @@ -28381,8 +27649,8 @@ target_include_directories(xds_credentials_end2end_test target_link_libraries(xds_credentials_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -28402,8 +27670,6 @@ add_executable(xds_credentials_test test/core/util/resolve_localhost_ip46.cc test/core/util/slice_splitter.cc test/core/util/tracer_util.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_credentials_test PUBLIC cxx_std_14) target_include_directories(xds_credentials_test @@ -28428,8 +27694,8 @@ target_include_directories(xds_credentials_test target_link_libraries(xds_credentials_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -28577,8 +27843,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_end2end_test_lib.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_csds_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_csds_end2end_test @@ -28603,8 +27867,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_csds_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -28765,8 +28029,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_end2end_test_lib.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_end2end_test @@ -28791,8 +28053,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_config grpc++_test_util ) @@ -28825,8 +28087,6 @@ add_executable(xds_endpoint_resource_type_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.h src/cpp/util/status.cc test/core/xds/xds_endpoint_resource_type_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_endpoint_resource_type_test PUBLIC cxx_std_14) target_include_directories(xds_endpoint_resource_type_test @@ -28851,8 +28111,9 @@ target_include_directories(xds_endpoint_resource_type_test target_link_libraries(xds_endpoint_resource_type_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + ${_gRPC_PROTOBUF_LIBRARIES} grpc_test_util ) @@ -28999,8 +28260,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_fault_injection_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_fault_injection_end2end_test @@ -29025,8 +28284,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_fault_injection_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -29126,8 +28385,6 @@ add_executable(xds_http_filters_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_http_filters_test PUBLIC cxx_std_14) target_include_directories(xds_http_filters_test @@ -29152,9 +28409,10 @@ target_include_directories(xds_http_filters_test target_link_libraries(xds_http_filters_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -29196,8 +28454,6 @@ add_executable(xds_interop_client test/cpp/interop/rpc_behavior_lb_policy.cc test/cpp/interop/xds_interop_client.cc test/cpp/interop/xds_stats_watcher.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_interop_client PUBLIC cxx_std_14) target_include_directories(xds_interop_client @@ -29212,17 +28468,12 @@ target_include_directories(xds_interop_client ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(xds_interop_client ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_reflection grpcpp_channelz @@ -29272,8 +28523,6 @@ add_executable(xds_interop_server test/cpp/end2end/test_health_check_service_impl.cc test/cpp/interop/xds_interop_server.cc test/cpp/interop/xds_interop_server_lib.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_interop_server PUBLIC cxx_std_14) target_include_directories(xds_interop_server @@ -29288,17 +28537,12 @@ target_include_directories(xds_interop_server ${_gRPC_UPB_INCLUDE_DIR} ${_gRPC_XXHASH_INCLUDE_DIR} ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(xds_interop_server ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_reflection grpcpp_channelz @@ -29352,8 +28596,6 @@ add_executable(xds_interop_server_test test/cpp/end2end/test_health_check_service_impl.cc test/cpp/interop/xds_interop_server_lib.cc test/cpp/interop/xds_interop_server_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_interop_server_test PUBLIC cxx_std_14) target_include_directories(xds_interop_server_test @@ -29378,8 +28620,8 @@ target_include_directories(xds_interop_server_test target_link_libraries(xds_interop_server_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_reflection grpcpp_channelz grpc_test_util @@ -29465,8 +28707,6 @@ add_executable(xds_lb_policy_registry_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_lb_policy_registry_test PUBLIC cxx_std_14) target_include_directories(xds_lb_policy_registry_test @@ -29491,9 +28731,10 @@ target_include_directories(xds_lb_policy_registry_test target_link_libraries(xds_lb_policy_registry_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -29600,8 +28841,6 @@ add_executable(xds_listener_resource_type_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_listener_resource_type_test PUBLIC cxx_std_14) target_include_directories(xds_listener_resource_type_test @@ -29626,9 +28865,10 @@ target_include_directories(xds_listener_resource_type_test target_link_libraries(xds_listener_resource_type_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -29775,8 +29015,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_outlier_detection_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_outlier_detection_end2end_test @@ -29801,8 +29039,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_outlier_detection_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -29958,8 +29196,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_override_host_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_override_host_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_override_host_end2end_test @@ -29984,8 +29220,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_override_host_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -29996,8 +29232,6 @@ if(gRPC_BUILD_TESTS) add_executable(xds_override_host_lb_config_parser_test test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_override_host_lb_config_parser_test PUBLIC cxx_std_14) target_include_directories(xds_override_host_lb_config_parser_test @@ -30022,8 +29256,8 @@ target_include_directories(xds_override_host_lb_config_parser_test target_link_libraries(xds_override_host_lb_config_parser_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -30033,8 +29267,6 @@ if(gRPC_BUILD_TESTS) add_executable(xds_override_host_test test/core/client_channel/lb_policy/xds_override_host_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_override_host_test PUBLIC cxx_std_14) target_include_directories(xds_override_host_test @@ -30059,8 +29291,8 @@ target_include_directories(xds_override_host_test target_link_libraries(xds_override_host_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc_test_util ) @@ -30208,8 +29440,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_pick_first_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_pick_first_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_pick_first_end2end_test @@ -30234,8 +29464,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_pick_first_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -30380,8 +29610,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_ring_hash_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_ring_hash_end2end_test @@ -30406,8 +29634,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_ring_hash_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -30556,8 +29784,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_rls_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_rls_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_rls_end2end_test @@ -30582,8 +29808,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_rls_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -30671,8 +29897,6 @@ add_executable(xds_route_config_resource_type_test test/cpp/util/proto_file_parser.cc test/cpp/util/proto_reflection_descriptor_database.cc test/cpp/util/service_describer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_route_config_resource_type_test PUBLIC cxx_std_14) target_include_directories(xds_route_config_resource_type_test @@ -30697,9 +29921,10 @@ target_include_directories(xds_route_config_resource_type_test target_link_libraries(xds_route_config_resource_type_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++ + ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} grpc_test_util ) @@ -30846,8 +30071,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_routing_end2end_test.cc test/cpp/end2end/xds/xds_server.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_routing_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_routing_end2end_test @@ -30872,8 +30095,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_routing_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -30916,8 +30139,6 @@ add_executable(xds_stats_watcher_test test/cpp/interop/rpc_behavior_lb_policy.cc test/cpp/interop/xds_stats_watcher.cc test/cpp/interop/xds_stats_watcher_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_stats_watcher_test PUBLIC cxx_std_14) target_include_directories(xds_stats_watcher_test @@ -30942,8 +30163,8 @@ target_include_directories(xds_stats_watcher_test target_link_libraries(xds_stats_watcher_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_reflection grpcpp_channelz grpc_test_util @@ -31093,8 +30314,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) test/cpp/end2end/xds/xds_server.cc test/cpp/end2end/xds/xds_wrr_end2end_test.cc test/cpp/util/tls_test_utils.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc ) target_compile_features(xds_wrr_end2end_test PUBLIC cxx_std_14) target_include_directories(xds_wrr_end2end_test @@ -31119,8 +30338,8 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_wrr_end2end_test ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + gtest grpc++_test_util ) @@ -31204,10 +30423,10 @@ generate_pkgconfig( "gRPC" "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr 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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "openssl re2 libcares zlib" + "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_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" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb -lutf8_range_lib -lupb_collections_lib" "grpc.pc") # grpc_unsecure .pc file @@ -31215,10 +30434,10 @@ generate_pkgconfig( "gRPC unsecure" "high performance general RPC framework without SSL" "${gRPC_CORE_VERSION}" - "gpr 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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "re2 libcares zlib" + "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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" + "libcares zlib" "-lgrpc_unsecure" - "-laddress_sorting -lupb" + "-laddress_sorting -lupb -lutf8_range_lib -lupb_collections_lib" "grpc_unsecure.pc") # grpc++ .pc file @@ -31226,10 +30445,10 @@ generate_pkgconfig( "gRPC++" "C++ wrapper for gRPC" "${gRPC_CPP_VERSION}" - "grpc 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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "" + "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_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_textformat_lib -lupb_json_lib -lupb -lutf8_range_lib -lupb_collections_lib" "grpc++.pc") # grpc++_unsecure .pc file @@ -31237,8 +30456,8 @@ generate_pkgconfig( "gRPC++ unsecure" "C++ wrapper for gRPC without SSL" "${gRPC_CPP_VERSION}" - "grpc_unsecure 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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "" + "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_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" + "libcares zlib" "-lgrpc++_unsecure" - "" + "-laddress_sorting -lupb -lutf8_range_lib -lupb_collections_lib" "grpc++_unsecure.pc") diff --git a/Makefile b/Makefile index b0aad729c8f..adb04398d6c 100644 --- a/Makefile +++ b/Makefile @@ -412,7 +412,6 @@ endif CORE_VERSION = 34.0.0 CPP_VERSION = 1.58.0-dev -CSHARP_VERSION = 2.58.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) @@ -446,29 +445,24 @@ ifeq ($(SYSTEM),MINGW32) EXECUTABLE_SUFFIX = .exe SHARED_EXT_CORE = dll SHARED_EXT_CPP = dll -SHARED_EXT_CSHARP = dll + SHARED_PREFIX = SHARED_VERSION_CORE = -34 SHARED_VERSION_CPP = -1 -SHARED_VERSION_CSHARP = -2 else ifeq ($(SYSTEM),Darwin) EXECUTABLE_SUFFIX = SHARED_EXT_CORE = dylib SHARED_EXT_CPP = dylib -SHARED_EXT_CSHARP = dylib SHARED_PREFIX = lib SHARED_VERSION_CORE = SHARED_VERSION_CPP = -SHARED_VERSION_CSHARP = else EXECUTABLE_SUFFIX = SHARED_EXT_CORE = so.$(CORE_VERSION) SHARED_EXT_CPP = so.$(CPP_VERSION) -SHARED_EXT_CSHARP = so.$(CSHARP_VERSION) SHARED_PREFIX = lib SHARED_VERSION_CORE = SHARED_VERSION_CPP = -SHARED_VERSION_CSHARP = endif ifeq ($(wildcard .git),) @@ -525,9 +519,7 @@ endif # Setup address_sorting dependency -ADDRESS_SORTING_DEP = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a -ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS) -ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a +# TODO(jtattermusch): should the include be added elsewhere? CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS) # Setup abseil dependency @@ -535,18 +527,6 @@ CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS) GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a -# Setup re2 dependency - -RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a -RE2_MERGE_OBJS = $(LIBRE2_OBJS) -RE2_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libre2.a - -# Setup upb dependency - -UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a -UPB_MERGE_OBJS = $(LIBUPB_OBJS) -UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a - # Setup boringssl dependency ifeq ($(wildcard third_party/boringssl-with-bazel/src/include/openssl/ssl.h),) @@ -663,23 +643,18 @@ 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)/libupb.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.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_cxx: cache.mk -static_csharp: static_c - 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)upb$(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$(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_cxx: cache.mk -shared_csharp: shared_c -grpc_csharp_ext: shared_csharp - privatelibs: privatelibs_c privatelibs_cxx -privatelibs_c: $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a +privatelibs_c: $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a ifeq ($(EMBED_OPENSSL),true) privatelibs_cxx: else @@ -703,8 +678,18 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(E) "[STRIP] Stripping libgrpc_unsecure.a" $(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_json_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a + $(E) "[STRIP] Stripping libupb_textformat_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a + $(E) "[STRIP] Stripping libutf8_range_lib.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a endif strip-static_cxx: static_cxx @@ -721,18 +706,24 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" $(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_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_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)" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) endif strip-shared_cxx: shared_cxx ifeq ($(CONFIG),opt) endif -strip-shared_csharp: shared_csharp -ifeq ($(CONFIG),opt) -endif - cache.mk:: $(E) "[MAKE] Generating $@" $(Q) echo "$(CACHE_MK)" | tr , '\n' >$@ @@ -778,8 +769,6 @@ install_c: install_not_supported_error install_cxx: install_not_supported_error -install_csharp: install_not_supported_error - install-static: install_not_supported_error install-certs: install_not_supported_error @@ -793,6 +782,8 @@ clean: # start of build recipe for library "address_sorting" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] LIBADDRESS_SORTING_SRC = \ third_party/address_sorting/address_sorting.c \ third_party/address_sorting/address_sorting_posix.c \ @@ -803,7 +794,8 @@ PUBLIC_HEADERS_C += \ LIBADDRESS_SORTING_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBADDRESS_SORTING_SRC)))) -$(LIBDIR)/$(CONFIG)/libaddress_sorting.a: $(LIBADDRESS_SORTING_OBJS) +# static library for "address_sorting" +$(LIBDIR)/$(CONFIG)/libaddress_sorting.a: $(LIBADDRESS_SORTING_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libaddress_sorting.a @@ -812,21 +804,20 @@ ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a endif - - +# shared library for "address_sorting" ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) +$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) +$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.34 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.34 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.34 $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so endif @@ -839,6 +830,8 @@ endif # start of build recipe for library "gpr" (generated by makelib(lib) template function) +# deps: ['grpc_abseil'] +# transitive_deps: ['grpc_abseil'] LIBGPR_SRC = \ src/core/lib/config/config_vars.cc \ src/core/lib/config/config_vars_non_generated.cc \ @@ -925,30 +918,30 @@ PUBLIC_HEADERS_C += \ LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC)))) -$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGPR_OBJS) +# static library for "gpr" +$(LIBDIR)/$(CONFIG)/libgpr.a: $(GRPC_ABSEIL_DEP) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS) + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgpr.a endif - - +# shared library for "gpr" ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) +$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) +$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(GRPC_ABSEIL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.34 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.34 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.34 $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so endif @@ -961,6 +954,8 @@ endif # start of build recipe for library "grpc" (generated by makelib(lib) template function) +# deps: ['re2', 'upb_json_lib', 'upb_textformat_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting'] +# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'z', 'upb_textformat_lib', 'upb_json_lib', 'upb', 'utf8_range_lib', 'upb_collections_lib', 're2', 'cares', 'libssl'] LIBGRPC_SRC = \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/census/grpc_context.cc \ @@ -1820,36 +1815,36 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE else -$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(RE2_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) +# static library for "grpc" +$(LIBDIR)/$(CONFIG)/libgrpc.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_DEP) $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LIBRE2_OBJS) $(CARES_MERGE_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) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(RE2_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LIBRE2_OBJS) $(CARES_MERGE_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) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.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) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_DEP) $(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)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_MERGE_LIBS) $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.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) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_DEP) $(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)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_MERGE_LIBS) $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.34 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.34 -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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(CARES_MERGE_LIBS) $(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.34 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif endif -endif +endif # corresponds to the "ifeq ($(NO_SECURE),true)" above ifneq ($(NO_SECURE),true) ifneq ($(NO_DEPS),true) @@ -1860,6 +1855,8 @@ endif # start of build recipe for library "grpc_unsecure" (generated by makelib(lib) template function) +# deps: ['upb_collections_lib', 'upb', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting'] +# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'z', 'upb', 'utf8_range_lib', 'upb_collections_lib', 'cares'] LIBGRPC_UNSECURE_SRC = \ src/core/ext/filters/backend_metrics/backend_metric_filter.cc \ src/core/ext/filters/census/grpc_context.cc \ @@ -2314,30 +2311,30 @@ PUBLIC_HEADERS_C += \ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC)))) -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(RE2_MERGE_OBJS) $(UPB_MERGE_OBJS) +# static library for "grpc_unsecure" +$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(CARES_MERGE_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) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(RE2_MERGE_OBJS) $(UPB_MERGE_OBJS) + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(CARES_MERGE_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) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.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) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_DEP) $(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)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.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) $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_DEP) $(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)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.34 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.34 -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) $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(CARES_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.34 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so endif @@ -2349,7 +2346,417 @@ endif # end of build recipe for library "grpc_unsecure" +# start of build recipe for library "re2" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] +LIBRE2_SRC = \ + third_party/re2/re2/bitstate.cc \ + third_party/re2/re2/compile.cc \ + third_party/re2/re2/dfa.cc \ + third_party/re2/re2/filtered_re2.cc \ + third_party/re2/re2/mimics_pcre.cc \ + third_party/re2/re2/nfa.cc \ + third_party/re2/re2/onepass.cc \ + third_party/re2/re2/parse.cc \ + third_party/re2/re2/perl_groups.cc \ + third_party/re2/re2/prefilter.cc \ + third_party/re2/re2/prefilter_tree.cc \ + third_party/re2/re2/prog.cc \ + third_party/re2/re2/re2.cc \ + third_party/re2/re2/regexp.cc \ + third_party/re2/re2/set.cc \ + third_party/re2/re2/simplify.cc \ + third_party/re2/re2/stringpiece.cc \ + third_party/re2/re2/tostring.cc \ + third_party/re2/re2/unicode_casefold.cc \ + third_party/re2/re2/unicode_groups.cc \ + third_party/re2/util/rune.cc \ + third_party/re2/util/strutil.cc \ + +PUBLIC_HEADERS_C += \ + +LIBRE2_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBRE2_SRC)))) + + +# static library for "re2" +$(LIBDIR)/$(CONFIG)/libre2.a: $(LIBRE2_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libre2.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBRE2_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libre2.a +endif + +# shared library for "re2" +ifeq ($(SYSTEM),MINGW32) +$(LIBDIR)/$(CONFIG)/re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBRE2_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/re2$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBRE2_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libre2.so.34 -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so.34 + $(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBRE2_OBJS:.o=.dep) +endif +# end of build recipe for library "re2" + + +# start of build recipe for library "upb" (generated by makelib(lib) template function) +# deps: ['utf8_range_lib'] +# transitive_deps: ['utf8_range_lib'] +LIBUPB_SRC = \ + third_party/upb/upb/base/status.c \ + third_party/upb/upb/collections/array.c \ + third_party/upb/upb/collections/map.c \ + third_party/upb/upb/collections/map_sorter.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/message.c \ + third_party/upb/upb/mini_table/common.c \ + third_party/upb/upb/mini_table/decode.c \ + third_party/upb/upb/mini_table/encode.c \ + third_party/upb/upb/mini_table/extension_registry.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 \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC)))) + + +# static library for "upb" +$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(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) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.34 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.34 + $(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/collections/array.c \ + third_party/upb/upb/collections/map.c \ + third_party/upb/upb/collections/map_sorter.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/message.c \ + third_party/upb/upb/mini_table/common.c \ + third_party/upb/upb/mini_table/decode.c \ + third_party/upb/upb/mini_table/encode.c \ + third_party/upb/upb/mini_table/extension_registry.c \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_COLLECTIONS_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_COLLECTIONS_LIB_SRC)))) + + +# static library for "upb_collections_lib" +$(LIBDIR)/$(CONFIG)/libupb_collections_lib.a: $(LIBUPB_COLLECTIONS_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) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a +endif + +# shared library for "upb_collections_lib" +ifeq ($(SYSTEM),MINGW32) +$(LIBDIR)/$(CONFIG)/upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_COLLECTIONS_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) +else +$(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_COLLECTIONS_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) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_collections_lib.so.34 -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.34 + $(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_COLLECTIONS_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "upb_collections_lib" + + +# start of build recipe for library "upb_json_lib" (generated by makelib(lib) template function) +# deps: ['upb_collections_lib', 'upb'] +# transitive_deps: ['upb', 'utf8_range_lib', 'upb_collections_lib'] +LIBUPB_JSON_LIB_SRC = \ + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ + third_party/upb/upb/json/decode.c \ + third_party/upb/upb/json/encode.c \ + third_party/upb/upb/message/accessors.c \ + third_party/upb/upb/reflection/def_builder.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/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 \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_JSON_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_JSON_LIB_SRC)))) + + +# static library for "upb_json_lib" +$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_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) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.34 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_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.34 + $(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_JSON_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "upb_json_lib" + + +# start of build recipe for library "upb_textformat_lib" (generated by makelib(lib) template function) +# deps: ['upb_collections_lib', 'upb'] +# transitive_deps: ['upb', 'utf8_range_lib', 'upb_collections_lib'] +LIBUPB_TEXTFORMAT_LIB_SRC = \ + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ + third_party/upb/upb/message/accessors.c \ + third_party/upb/upb/reflection/def_builder.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/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/text/encode.c \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_TEXTFORMAT_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_TEXTFORMAT_LIB_SRC)))) + + +# static library for "upb_textformat_lib" +$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_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) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)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)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.34 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_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.34 + $(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_TEXTFORMAT_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "upb_textformat_lib" + + +# start of build recipe for library "utf8_range_lib" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] +LIBUTF8_RANGE_LIB_SRC = \ + third_party/utf8_range/naive.c \ + third_party/utf8_range/range2-neon.c \ + third_party/utf8_range/range2-sse.c \ + +PUBLIC_HEADERS_C += \ + +LIBUTF8_RANGE_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUTF8_RANGE_LIB_SRC)))) + + +# static library for "utf8_range_lib" +$(LIBDIR)/$(CONFIG)/libutf8_range_lib.a: $(LIBUTF8_RANGE_LIB_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUTF8_RANGE_LIB_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a +endif + +# shared library for "utf8_range_lib" +ifeq ($(SYSTEM),MINGW32) +$(LIBDIR)/$(CONFIG)/utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUTF8_RANGE_LIB_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/utf8_range_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUTF8_RANGE_LIB_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libutf8_range_lib.so.34 -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so.34 + $(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so +endif +endif + +ifneq ($(NO_DEPS),true) +-include $(LIBUTF8_RANGE_LIB_OBJS:.o=.dep) +endif +# end of build recipe for library "utf8_range_lib" + + +# start of build recipe for library "z" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] +LIBZ_SRC = \ + third_party/zlib/adler32.c \ + third_party/zlib/compress.c \ + third_party/zlib/crc32.c \ + third_party/zlib/deflate.c \ + third_party/zlib/infback.c \ + third_party/zlib/inffast.c \ + third_party/zlib/inflate.c \ + third_party/zlib/inftrees.c \ + third_party/zlib/trees.c \ + third_party/zlib/uncompr.c \ + third_party/zlib/zutil.c \ + +PUBLIC_HEADERS_C += \ + +LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC)))) + +$(LIBZ_OBJS): CFLAGS += -fvisibility=hidden +$(LIBZ_OBJS): CPPFLAGS += -DHAVE_UNISTD_H + +# static library for "z" +$(LIBDIR)/$(CONFIG)/libz.a: $(ZLIB_MERGE_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libz.a + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libz.a $(LIBZ_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libz.a +endif + +# shared library for "z" + +ifneq ($(NO_DEPS),true) +-include $(LIBZ_OBJS:.o=.dep) +endif +# end of build recipe for library "z" + + # start of build recipe for library "boringssl" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/err_data.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \ @@ -2624,7 +3031,8 @@ $(LIBBORINGSSL_OBJS): CFLAGS += -g $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl-with-bazel/src/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-exceptions -$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) $(LIBBORINGSSL_OBJS) +# static library for "boringssl" +$(LIBDIR)/$(CONFIG)/libboringssl.a: $(LIBBORINGSSL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a @@ -2633,8 +3041,7 @@ ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libboringssl.a endif - - +# shared library for "boringssl" ifneq ($(NO_DEPS),true) -include $(LIBBORINGSSL_OBJS:.o=.dep) @@ -2642,185 +3049,9 @@ endif # end of build recipe for library "boringssl" -# start of build recipe for library "re2" (generated by makelib(lib) template function) -LIBRE2_SRC = \ - third_party/re2/re2/bitstate.cc \ - third_party/re2/re2/compile.cc \ - third_party/re2/re2/dfa.cc \ - third_party/re2/re2/filtered_re2.cc \ - third_party/re2/re2/mimics_pcre.cc \ - third_party/re2/re2/nfa.cc \ - third_party/re2/re2/onepass.cc \ - third_party/re2/re2/parse.cc \ - third_party/re2/re2/perl_groups.cc \ - third_party/re2/re2/prefilter.cc \ - third_party/re2/re2/prefilter_tree.cc \ - third_party/re2/re2/prog.cc \ - third_party/re2/re2/re2.cc \ - third_party/re2/re2/regexp.cc \ - third_party/re2/re2/set.cc \ - third_party/re2/re2/simplify.cc \ - third_party/re2/re2/stringpiece.cc \ - third_party/re2/re2/tostring.cc \ - third_party/re2/re2/unicode_casefold.cc \ - third_party/re2/re2/unicode_groups.cc \ - third_party/re2/util/pcre.cc \ - third_party/re2/util/rune.cc \ - third_party/re2/util/strutil.cc \ - - -LIBRE2_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBRE2_SRC)))) - - -$(LIBDIR)/$(CONFIG)/libre2.a: $(LIBRE2_OBJS) - $(E) "[AR] Creating $@" - $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libre2.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBRE2_OBJS) -ifeq ($(SYSTEM),Darwin) - $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libre2.a -endif - - - - -ifneq ($(NO_DEPS),true) --include $(LIBRE2_OBJS:.o=.dep) -endif -# end of build recipe for library "re2" - - -# start of build recipe for library "upb" (generated by makelib(lib) template function) -LIBUPB_SRC = \ - third_party/utf8_range/naive.c \ - third_party/utf8_range/range2-neon.c \ - third_party/utf8_range/range2-sse.c \ - third_party/upb/upb/base/status.c \ - third_party/upb/upb/collections/array.c \ - third_party/upb/upb/collections/map_sorter.c \ - third_party/upb/upb/collections/map.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/message.c \ - third_party/upb/upb/mini_table/common.c \ - third_party/upb/upb/mini_table/decode.c \ - third_party/upb/upb/mini_table/encode.c \ - third_party/upb/upb/mini_table/extension_registry.c \ - third_party/upb/upb/reflection/def_builder.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/message_def.c \ - third_party/upb/upb/reflection/message_reserved_range.c \ - third_party/upb/upb/reflection/message.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/text/encode.c \ - third_party/upb/upb/wire/decode_fast.c \ - third_party/upb/upb/wire/decode.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 \ - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \ - - -LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC)))) - - -$(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 - - - -ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) - $(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) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) -else -$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) - $(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) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) -else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.34 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.34 - $(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 "z" (generated by makelib(lib) template function) -LIBZ_SRC = \ - third_party/zlib/adler32.c \ - third_party/zlib/compress.c \ - third_party/zlib/crc32.c \ - third_party/zlib/deflate.c \ - third_party/zlib/gzclose.c \ - third_party/zlib/gzlib.c \ - third_party/zlib/gzread.c \ - third_party/zlib/gzwrite.c \ - third_party/zlib/infback.c \ - third_party/zlib/inffast.c \ - third_party/zlib/inflate.c \ - third_party/zlib/inftrees.c \ - third_party/zlib/trees.c \ - third_party/zlib/uncompr.c \ - third_party/zlib/zutil.c \ - - -LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC)))) - -$(LIBZ_OBJS): CFLAGS += -fvisibility=hidden -$(LIBZ_OBJS): CPPFLAGS += -DHAVE_UNISTD_H - -$(LIBDIR)/$(CONFIG)/libz.a: $(LIBZ_OBJS) - $(E) "[AR] Creating $@" - $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libz.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libz.a $(LIBZ_OBJS) -ifeq ($(SYSTEM),Darwin) - $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libz.a -endif - - - - -ifneq ($(NO_DEPS),true) --include $(LIBZ_OBJS:.o=.dep) -endif -# end of build recipe for library "z" - - # start of build recipe for library "ares" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] LIBARES_SRC = \ third_party/cares/cares/src/lib/ares__read_line.c \ third_party/cares/cares/src/lib/ares__get_hostent.c \ @@ -2889,7 +3120,8 @@ LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LI $(LIBARES_OBJS): CFLAGS += -g $(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,) -$(LIBDIR)/$(CONFIG)/libares.a: $(LIBARES_OBJS) +# static library for "ares" +$(LIBDIR)/$(CONFIG)/libares.a: $(LIBARES_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libares.a @@ -2898,8 +3130,7 @@ ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libares.a endif - - +# shared library for "ares" ifneq ($(NO_DEPS),true) -include $(LIBARES_OBJS:.o=.dep) @@ -2911,6 +3142,8 @@ endif # start of build recipe for library "grpc_abseil" (generated by makelib(lib) template function) +# deps: [] +# transitive_deps: [] LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \ third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \ @@ -3042,7 +3275,8 @@ LIBGRPC_ABSEIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basena $(LIBGRPC_ABSEIL_OBJS): CPPFLAGS += -g -Ithird_party/abseil-cpp -$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(LIBGRPC_ABSEIL_OBJS) +# static library for "grpc_abseil" +$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(LIBGRPC_ABSEIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a @@ -3051,8 +3285,7 @@ ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a endif - - +# shared library for "grpc_abseil" ifneq ($(NO_DEPS),true) -include $(LIBGRPC_ABSEIL_OBJS:.o=.dep) @@ -3338,6 +3571,7 @@ src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c: $(OPEN src/core/ext/upbdefs-generated/google/api/http.upbdefs.c: $(OPENSSL_DEP) src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c: $(OPENSSL_DEP) src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c: $(OPENSSL_DEP) +src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c: $(OPENSSL_DEP) src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c: $(OPENSSL_DEP) src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c: $(OPENSSL_DEP) src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c: $(OPENSSL_DEP) @@ -3464,7 +3698,7 @@ src/core/tsi/ssl_transport_security.cc: $(OPENSSL_DEP) src/core/tsi/ssl_transport_security_utils.cc: $(OPENSSL_DEP) endif -.PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install_csharp install-static install-certs strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean +.PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-static install-certs strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean .PHONY: printvars printvars: diff --git a/Package.swift b/Package.swift index afeb98b7f1c..125f977e25f 100644 --- a/Package.swift +++ b/Package.swift @@ -1803,18 +1803,12 @@ let package = Package( "third_party/re2/re2/unicode_groups.cc", "third_party/re2/re2/unicode_groups.h", "third_party/re2/re2/walker-inl.h", - "third_party/re2/util/benchmark.h", - "third_party/re2/util/flags.h", "third_party/re2/util/logging.h", - "third_party/re2/util/malloc_counter.h", "third_party/re2/util/mix.h", "third_party/re2/util/mutex.h", - "third_party/re2/util/pcre.cc", - "third_party/re2/util/pcre.h", "third_party/re2/util/rune.cc", "third_party/re2/util/strutil.cc", "third_party/re2/util/strutil.h", - "third_party/re2/util/test.h", "third_party/re2/util/utf.h", "third_party/re2/util/util.h", "third_party/upb/upb/alloc.h", @@ -1836,20 +1830,12 @@ let package = Package( "third_party/upb/upb/collections/map_sorter_internal.h", "third_party/upb/upb/collections/message_value.h", "third_party/upb/upb/decode.h", - "third_party/upb/upb/def.h", - "third_party/upb/upb/def.hpp", "third_party/upb/upb/encode.h", "third_party/upb/upb/extension_registry.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", - "third_party/upb/upb/json/encode.h", - "third_party/upb/upb/json_decode.h", - "third_party/upb/upb/json_encode.h", "third_party/upb/upb/lex/atoi.c", "third_party/upb/upb/lex/atoi.h", "third_party/upb/upb/lex/round_trip.c", @@ -1864,14 +1850,10 @@ let package = Package( "third_party/upb/upb/mem/arena.c", "third_party/upb/upb/mem/arena.h", "third_party/upb/upb/mem/arena_internal.h", - "third_party/upb/upb/message/accessors.c", - "third_party/upb/upb/message/accessors.h", - "third_party/upb/upb/message/accessors_internal.h", "third_party/upb/upb/message/extension_internal.h", "third_party/upb/upb/message/internal.h", "third_party/upb/upb/message/message.c", "third_party/upb/upb/message/message.h", - "third_party/upb/upb/mini_table.h", "third_party/upb/upb/mini_table/common.c", "third_party/upb/upb/mini_table/common.h", "third_party/upb/upb/mini_table/common_internal.h", @@ -1894,61 +1876,8 @@ let package = Package( "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.h", - "third_party/upb/upb/reflection.hpp", - "third_party/upb/upb/reflection/common.h", - "third_party/upb/upb/reflection/def.h", - "third_party/upb/upb/reflection/def.hpp", - "third_party/upb/upb/reflection/def_builder.c", - "third_party/upb/upb/reflection/def_builder_internal.h", - "third_party/upb/upb/reflection/def_pool.c", - "third_party/upb/upb/reflection/def_pool.h", - "third_party/upb/upb/reflection/def_pool_internal.h", - "third_party/upb/upb/reflection/def_type.c", - "third_party/upb/upb/reflection/def_type.h", - "third_party/upb/upb/reflection/desc_state.c", - "third_party/upb/upb/reflection/desc_state_internal.h", - "third_party/upb/upb/reflection/enum_def.c", - "third_party/upb/upb/reflection/enum_def.h", - "third_party/upb/upb/reflection/enum_def_internal.h", - "third_party/upb/upb/reflection/enum_reserved_range.c", - "third_party/upb/upb/reflection/enum_reserved_range.h", - "third_party/upb/upb/reflection/enum_reserved_range_internal.h", - "third_party/upb/upb/reflection/enum_value_def.c", - "third_party/upb/upb/reflection/enum_value_def.h", - "third_party/upb/upb/reflection/enum_value_def_internal.h", - "third_party/upb/upb/reflection/extension_range.c", - "third_party/upb/upb/reflection/extension_range.h", - "third_party/upb/upb/reflection/extension_range_internal.h", - "third_party/upb/upb/reflection/field_def.c", - "third_party/upb/upb/reflection/field_def.h", - "third_party/upb/upb/reflection/field_def_internal.h", - "third_party/upb/upb/reflection/file_def.c", - "third_party/upb/upb/reflection/file_def.h", - "third_party/upb/upb/reflection/file_def_internal.h", - "third_party/upb/upb/reflection/message.c", - "third_party/upb/upb/reflection/message.h", - "third_party/upb/upb/reflection/message.hpp", - "third_party/upb/upb/reflection/message_def.c", - "third_party/upb/upb/reflection/message_def.h", - "third_party/upb/upb/reflection/message_def_internal.h", - "third_party/upb/upb/reflection/message_reserved_range.c", - "third_party/upb/upb/reflection/message_reserved_range.h", - "third_party/upb/upb/reflection/message_reserved_range_internal.h", - "third_party/upb/upb/reflection/method_def.c", - "third_party/upb/upb/reflection/method_def.h", - "third_party/upb/upb/reflection/method_def_internal.h", - "third_party/upb/upb/reflection/oneof_def.c", - "third_party/upb/upb/reflection/oneof_def.h", - "third_party/upb/upb/reflection/oneof_def_internal.h", - "third_party/upb/upb/reflection/service_def.c", - "third_party/upb/upb/reflection/service_def.h", - "third_party/upb/upb/reflection/service_def_internal.h", "third_party/upb/upb/status.h", "third_party/upb/upb/string_view.h", - "third_party/upb/upb/text/encode.c", - "third_party/upb/upb/text/encode.h", - "third_party/upb/upb/text_encode.h", "third_party/upb/upb/upb.h", "third_party/upb/upb/upb.hpp", "third_party/upb/upb/wire/common.h", @@ -1966,10 +1895,6 @@ let package = Package( "third_party/upb/upb/wire/reader.h", "third_party/upb/upb/wire/swap_internal.h", "third_party/upb/upb/wire/types.h", - "third_party/utf8_range/naive.c", - "third_party/utf8_range/range2-neon.c", - "third_party/utf8_range/range2-sse.c", - "third_party/utf8_range/utf8_range.h", "third_party/xxhash/xxhash.h", ], publicHeadersPath: "spm-core-include", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index cf33e366894..62be5959cc1 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1797,6 +1797,10 @@ libs: - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc deps: + - re2 + - upb_json_lib + - upb_textformat_lib + - z - absl/algorithm:container - absl/cleanup:cleanup - absl/container:flat_hash_map @@ -1809,10 +1813,10 @@ libs: - absl/status:statusor - absl/types:span - absl/utility:utility + - cares - gpr - libssl - address_sorting - - upb baselib: true generate_plugin_registry: true - name: grpc_test_util @@ -2744,6 +2748,9 @@ libs: - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc deps: + - upb_collections_lib + - upb + - z - absl/algorithm:container - absl/cleanup:cleanup - absl/container:flat_hash_map @@ -2756,11 +2763,459 @@ libs: - absl/status:statusor - absl/types:span - absl/utility:utility + - cares - gpr - address_sorting - - upb baselib: true generate_plugin_registry: true +- name: gtest + build: private + language: c + public_headers: [] + headers: + - third_party/googletest/googlemock/include/gmock/gmock-actions.h + - third_party/googletest/googlemock/include/gmock/gmock-cardinalities.h + - third_party/googletest/googlemock/include/gmock/gmock-function-mocker.h + - third_party/googletest/googlemock/include/gmock/gmock-matchers.h + - third_party/googletest/googlemock/include/gmock/gmock-more-actions.h + - third_party/googletest/googlemock/include/gmock/gmock-more-matchers.h + - third_party/googletest/googlemock/include/gmock/gmock-nice-strict.h + - third_party/googletest/googlemock/include/gmock/gmock-spec-builders.h + - third_party/googletest/googlemock/include/gmock/gmock.h + - third_party/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h + - third_party/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h + - third_party/googletest/googlemock/include/gmock/internal/custom/gmock-port.h + - third_party/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h + - third_party/googletest/googlemock/include/gmock/internal/gmock-port.h + - third_party/googletest/googlemock/include/gmock/internal/gmock-pp.h + - third_party/googletest/googletest/include/gtest/gtest-assertion-result.h + - third_party/googletest/googletest/include/gtest/gtest-death-test.h + - third_party/googletest/googletest/include/gtest/gtest-matchers.h + - third_party/googletest/googletest/include/gtest/gtest-message.h + - third_party/googletest/googletest/include/gtest/gtest-param-test.h + - third_party/googletest/googletest/include/gtest/gtest-printers.h + - third_party/googletest/googletest/include/gtest/gtest-spi.h + - third_party/googletest/googletest/include/gtest/gtest-test-part.h + - third_party/googletest/googletest/include/gtest/gtest-typed-test.h + - third_party/googletest/googletest/include/gtest/gtest.h + - third_party/googletest/googletest/include/gtest/gtest_pred_impl.h + - third_party/googletest/googletest/include/gtest/gtest_prod.h + - third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h + - third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h + - third_party/googletest/googletest/include/gtest/internal/custom/gtest.h + - third_party/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h + - third_party/googletest/googletest/include/gtest/internal/gtest-filepath.h + - third_party/googletest/googletest/include/gtest/internal/gtest-internal.h + - third_party/googletest/googletest/include/gtest/internal/gtest-param-util.h + - third_party/googletest/googletest/include/gtest/internal/gtest-port-arch.h + - third_party/googletest/googletest/include/gtest/internal/gtest-port.h + - third_party/googletest/googletest/include/gtest/internal/gtest-string.h + - third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h + - third_party/googletest/googletest/src/gtest-internal-inl.h + src: + - third_party/googletest/googlemock/src/gmock-cardinalities.cc + - third_party/googletest/googlemock/src/gmock-internal-utils.cc + - third_party/googletest/googlemock/src/gmock-matchers.cc + - third_party/googletest/googlemock/src/gmock-spec-builders.cc + - third_party/googletest/googlemock/src/gmock.cc + - third_party/googletest/googletest/src/gtest-assertion-result.cc + - third_party/googletest/googletest/src/gtest-death-test.cc + - third_party/googletest/googletest/src/gtest-filepath.cc + - third_party/googletest/googletest/src/gtest-matchers.cc + - third_party/googletest/googletest/src/gtest-port.cc + - third_party/googletest/googletest/src/gtest-printers.cc + - third_party/googletest/googletest/src/gtest-test-part.cc + - third_party/googletest/googletest/src/gtest-typed-test.cc + - third_party/googletest/googletest/src/gtest.cc + deps: + - absl/debugging:failure_signal_handler + - absl/debugging:stacktrace + - absl/debugging:symbolize + - absl/strings:strings + - absl/types:any + - absl/types:optional + - absl/types:variant +- name: re2 + build: all + language: c + public_headers: [] + headers: + - third_party/re2/re2/bitmap256.h + - third_party/re2/re2/filtered_re2.h + - third_party/re2/re2/pod_array.h + - third_party/re2/re2/prefilter.h + - third_party/re2/re2/prefilter_tree.h + - third_party/re2/re2/prog.h + - third_party/re2/re2/re2.h + - third_party/re2/re2/regexp.h + - third_party/re2/re2/set.h + - third_party/re2/re2/sparse_array.h + - third_party/re2/re2/sparse_set.h + - third_party/re2/re2/stringpiece.h + - third_party/re2/re2/unicode_casefold.h + - third_party/re2/re2/unicode_groups.h + - third_party/re2/re2/walker-inl.h + - third_party/re2/util/logging.h + - third_party/re2/util/mix.h + - third_party/re2/util/mutex.h + - third_party/re2/util/strutil.h + - third_party/re2/util/utf.h + - third_party/re2/util/util.h + src: + - third_party/re2/re2/bitstate.cc + - third_party/re2/re2/compile.cc + - third_party/re2/re2/dfa.cc + - third_party/re2/re2/filtered_re2.cc + - third_party/re2/re2/mimics_pcre.cc + - third_party/re2/re2/nfa.cc + - third_party/re2/re2/onepass.cc + - third_party/re2/re2/parse.cc + - third_party/re2/re2/perl_groups.cc + - third_party/re2/re2/prefilter.cc + - third_party/re2/re2/prefilter_tree.cc + - third_party/re2/re2/prog.cc + - third_party/re2/re2/re2.cc + - third_party/re2/re2/regexp.cc + - third_party/re2/re2/set.cc + - third_party/re2/re2/simplify.cc + - third_party/re2/re2/stringpiece.cc + - third_party/re2/re2/tostring.cc + - third_party/re2/re2/unicode_casefold.cc + - third_party/re2/re2/unicode_groups.cc + - third_party/re2/util/rune.cc + - third_party/re2/util/strutil.cc + deps: [] +- name: upb + build: all + language: c + public_headers: [] + headers: + - third_party/upb/upb/alloc.h + - third_party/upb/upb/arena.h + - third_party/upb/upb/array.h + - third_party/upb/upb/base/descriptor_constants.h + - third_party/upb/upb/base/log2.h + - third_party/upb/upb/base/status.h + - third_party/upb/upb/base/string_view.h + - third_party/upb/upb/collections/array.h + - third_party/upb/upb/collections/array_internal.h + - third_party/upb/upb/collections/map.h + - third_party/upb/upb/collections/map_gencode_util.h + - third_party/upb/upb/collections/map_internal.h + - third_party/upb/upb/collections/map_sorter_internal.h + - third_party/upb/upb/collections/message_value.h + - third_party/upb/upb/decode.h + - third_party/upb/upb/encode.h + - third_party/upb/upb/extension_registry.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/map.h + - third_party/upb/upb/mem/alloc.h + - third_party/upb/upb/mem/arena.h + - third_party/upb/upb/mem/arena_internal.h + - third_party/upb/upb/message/extension_internal.h + - third_party/upb/upb/message/internal.h + - third_party/upb/upb/message/message.h + - third_party/upb/upb/mini_table/common.h + - third_party/upb/upb/mini_table/common_internal.h + - third_party/upb/upb/mini_table/decode.h + - third_party/upb/upb/mini_table/encode_internal.h + - third_party/upb/upb/mini_table/encode_internal.hpp + - third_party/upb/upb/mini_table/enum_internal.h + - third_party/upb/upb/mini_table/extension_internal.h + - third_party/upb/upb/mini_table/extension_registry.h + - third_party/upb/upb/mini_table/field_internal.h + - third_party/upb/upb/mini_table/file_internal.h + - third_party/upb/upb/mini_table/message_internal.h + - third_party/upb/upb/mini_table/sub_internal.h + - third_party/upb/upb/mini_table/types.h + - third_party/upb/upb/msg.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/status.h + - third_party/upb/upb/string_view.h + - third_party/upb/upb/upb.h + - third_party/upb/upb/upb.hpp + - third_party/upb/upb/wire/common.h + - third_party/upb/upb/wire/common_internal.h + - third_party/upb/upb/wire/decode.h + - third_party/upb/upb/wire/decode_fast.h + - third_party/upb/upb/wire/decode_internal.h + - third_party/upb/upb/wire/encode.h + - third_party/upb/upb/wire/eps_copy_input_stream.h + - third_party/upb/upb/wire/reader.h + - third_party/upb/upb/wire/swap_internal.h + - third_party/upb/upb/wire/types.h + src: + - third_party/upb/upb/base/status.c + - third_party/upb/upb/collections/array.c + - third_party/upb/upb/collections/map.c + - third_party/upb/upb/collections/map_sorter.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/message.c + - third_party/upb/upb/mini_table/common.c + - third_party/upb/upb/mini_table/decode.c + - third_party/upb/upb/mini_table/encode.c + - third_party/upb/upb/mini_table/extension_registry.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: + - utf8_range_lib +- name: upb_collections_lib + build: all + language: c + public_headers: [] + headers: + - third_party/upb/upb/base/descriptor_constants.h + - third_party/upb/upb/base/log2.h + - third_party/upb/upb/base/status.h + - third_party/upb/upb/base/string_view.h + - third_party/upb/upb/collections/array.h + - third_party/upb/upb/collections/array_internal.h + - third_party/upb/upb/collections/map.h + - third_party/upb/upb/collections/map_gencode_util.h + - third_party/upb/upb/collections/map_internal.h + - third_party/upb/upb/collections/map_sorter_internal.h + - third_party/upb/upb/collections/message_value.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_internal.h + - third_party/upb/upb/message/extension_internal.h + - third_party/upb/upb/message/internal.h + - third_party/upb/upb/message/message.h + - third_party/upb/upb/mini_table/common.h + - third_party/upb/upb/mini_table/common_internal.h + - third_party/upb/upb/mini_table/decode.h + - third_party/upb/upb/mini_table/encode_internal.h + - third_party/upb/upb/mini_table/encode_internal.hpp + - third_party/upb/upb/mini_table/enum_internal.h + - third_party/upb/upb/mini_table/extension_internal.h + - third_party/upb/upb/mini_table/extension_registry.h + - third_party/upb/upb/mini_table/field_internal.h + - third_party/upb/upb/mini_table/file_internal.h + - third_party/upb/upb/mini_table/message_internal.h + - third_party/upb/upb/mini_table/sub_internal.h + - third_party/upb/upb/mini_table/types.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/collections/array.c + - third_party/upb/upb/collections/map.c + - third_party/upb/upb/collections/map_sorter.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/message.c + - third_party/upb/upb/mini_table/common.c + - third_party/upb/upb/mini_table/decode.c + - third_party/upb/upb/mini_table/encode.c + - third_party/upb/upb/mini_table/extension_registry.c + deps: [] +- name: upb_json_lib + build: all + language: c + public_headers: [] + headers: + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h + - third_party/upb/upb/def.h + - third_party/upb/upb/def.hpp + - third_party/upb/upb/json/decode.h + - third_party/upb/upb/json/encode.h + - third_party/upb/upb/json_decode.h + - third_party/upb/upb/json_encode.h + - third_party/upb/upb/message/accessors.h + - third_party/upb/upb/message/accessors_internal.h + - third_party/upb/upb/reflection.h + - third_party/upb/upb/reflection.hpp + - third_party/upb/upb/reflection/common.h + - third_party/upb/upb/reflection/def.h + - third_party/upb/upb/reflection/def.hpp + - third_party/upb/upb/reflection/def_builder_internal.h + - third_party/upb/upb/reflection/def_pool.h + - third_party/upb/upb/reflection/def_pool_internal.h + - third_party/upb/upb/reflection/def_type.h + - third_party/upb/upb/reflection/desc_state_internal.h + - third_party/upb/upb/reflection/enum_def.h + - third_party/upb/upb/reflection/enum_def_internal.h + - third_party/upb/upb/reflection/enum_reserved_range.h + - third_party/upb/upb/reflection/enum_reserved_range_internal.h + - third_party/upb/upb/reflection/enum_value_def.h + - third_party/upb/upb/reflection/enum_value_def_internal.h + - third_party/upb/upb/reflection/extension_range.h + - third_party/upb/upb/reflection/extension_range_internal.h + - third_party/upb/upb/reflection/field_def.h + - third_party/upb/upb/reflection/field_def_internal.h + - third_party/upb/upb/reflection/file_def.h + - third_party/upb/upb/reflection/file_def_internal.h + - third_party/upb/upb/reflection/message.h + - third_party/upb/upb/reflection/message.hpp + - third_party/upb/upb/reflection/message_def.h + - third_party/upb/upb/reflection/message_def_internal.h + - third_party/upb/upb/reflection/message_reserved_range.h + - third_party/upb/upb/reflection/message_reserved_range_internal.h + - third_party/upb/upb/reflection/method_def.h + - third_party/upb/upb/reflection/method_def_internal.h + - third_party/upb/upb/reflection/oneof_def.h + - third_party/upb/upb/reflection/oneof_def_internal.h + - third_party/upb/upb/reflection/service_def.h + - third_party/upb/upb/reflection/service_def_internal.h + src: + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c + - third_party/upb/upb/json/decode.c + - third_party/upb/upb/json/encode.c + - third_party/upb/upb/message/accessors.c + - third_party/upb/upb/reflection/def_builder.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/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 + deps: + - upb_collections_lib + - upb +- name: upb_textformat_lib + build: all + language: c + public_headers: [] + headers: + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h + - third_party/upb/upb/def.h + - third_party/upb/upb/def.hpp + - third_party/upb/upb/message/accessors.h + - third_party/upb/upb/message/accessors_internal.h + - third_party/upb/upb/reflection.h + - third_party/upb/upb/reflection.hpp + - third_party/upb/upb/reflection/common.h + - third_party/upb/upb/reflection/def.h + - third_party/upb/upb/reflection/def.hpp + - third_party/upb/upb/reflection/def_builder_internal.h + - third_party/upb/upb/reflection/def_pool.h + - third_party/upb/upb/reflection/def_pool_internal.h + - third_party/upb/upb/reflection/def_type.h + - third_party/upb/upb/reflection/desc_state_internal.h + - third_party/upb/upb/reflection/enum_def.h + - third_party/upb/upb/reflection/enum_def_internal.h + - third_party/upb/upb/reflection/enum_reserved_range.h + - third_party/upb/upb/reflection/enum_reserved_range_internal.h + - third_party/upb/upb/reflection/enum_value_def.h + - third_party/upb/upb/reflection/enum_value_def_internal.h + - third_party/upb/upb/reflection/extension_range.h + - third_party/upb/upb/reflection/extension_range_internal.h + - third_party/upb/upb/reflection/field_def.h + - third_party/upb/upb/reflection/field_def_internal.h + - third_party/upb/upb/reflection/file_def.h + - third_party/upb/upb/reflection/file_def_internal.h + - third_party/upb/upb/reflection/message.h + - third_party/upb/upb/reflection/message.hpp + - third_party/upb/upb/reflection/message_def.h + - third_party/upb/upb/reflection/message_def_internal.h + - third_party/upb/upb/reflection/message_reserved_range.h + - third_party/upb/upb/reflection/message_reserved_range_internal.h + - third_party/upb/upb/reflection/method_def.h + - third_party/upb/upb/reflection/method_def_internal.h + - third_party/upb/upb/reflection/oneof_def.h + - third_party/upb/upb/reflection/oneof_def_internal.h + - third_party/upb/upb/reflection/service_def.h + - third_party/upb/upb/reflection/service_def_internal.h + - third_party/upb/upb/text/encode.h + - third_party/upb/upb/text_encode.h + src: + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c + - third_party/upb/upb/message/accessors.c + - third_party/upb/upb/reflection/def_builder.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/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/text/encode.c + deps: + - upb_collections_lib + - upb +- name: utf8_range_lib + build: all + language: c + public_headers: [] + headers: + - third_party/utf8_range/utf8_range.h + src: + - third_party/utf8_range/naive.c + - third_party/utf8_range/range2-neon.c + - third_party/utf8_range/range2-sse.c + deps: [] +- name: z + build: private + language: c + public_headers: [] + headers: + - third_party/zlib/crc32.h + - third_party/zlib/deflate.h + - third_party/zlib/gzguts.h + - third_party/zlib/inffast.h + - third_party/zlib/inffixed.h + - third_party/zlib/inflate.h + - third_party/zlib/inftrees.h + - third_party/zlib/trees.h + - third_party/zlib/zconf.h + - third_party/zlib/zlib.h + - third_party/zlib/zutil.h + src: + - third_party/zlib/adler32.c + - third_party/zlib/compress.c + - third_party/zlib/crc32.c + - third_party/zlib/deflate.c + - third_party/zlib/infback.c + - third_party/zlib/inffast.c + - third_party/zlib/inflate.c + - third_party/zlib/inftrees.c + - third_party/zlib/trees.c + - third_party/zlib/uncompr.c + - third_party/zlib/zutil.c + deps: [] + defaults: zlib + zlib: true - name: benchmark_helpers build: test language: c++ @@ -3112,6 +3567,7 @@ libs: - src/cpp/util/time_cc.cc deps: - grpc + - protobuf baselib: true - name: grpc++_alts build: all @@ -3166,6 +3622,7 @@ libs: src: - src/cpp/client/channel_test_peer.cc deps: + - gtest - grpc++ - name: grpc++_test_config build: private @@ -3481,6 +3938,7 @@ libs: - src/cpp/util/time_cc.cc deps: - grpc_unsecure + - protobuf baselib: true - name: grpc_authorization_provider build: all @@ -3558,6 +4016,7 @@ libs: headers: - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h @@ -3862,6 +4321,7 @@ libs: - src/core/tsi/transport_security_interface.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c @@ -4119,6 +4579,9 @@ libs: - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc deps: + - re2 + - upb + - z - absl/cleanup:cleanup - absl/container:flat_hash_map - absl/container:flat_hash_set @@ -4129,8 +4592,8 @@ libs: - absl/status:statusor - absl/types:span - absl/utility:utility + - cares - gpr - - upb - name: grpc_plugin_support build: protoc language: c++ @@ -4171,7 +4634,9 @@ libs: - src/compiler/proto_parser_helper.cc - src/compiler/python_generator.cc - src/compiler/ruby_generator.cc - deps: [] + deps: + - protobuf + - protoc - name: grpcpp_channelz build: all language: c++ @@ -4320,6 +4785,7 @@ targets: - src/core/lib/promise/activity.cc - test/core/promise/activity_test.cc deps: + - gtest - absl/container:flat_hash_set - absl/hash:hash - absl/meta:type_traits @@ -4334,6 +4800,7 @@ targets: src: - test/cpp/naming/address_sorting_test.cc deps: + - gtest - grpc++_test_config - grpc++_test_util platforms: @@ -4379,6 +4846,7 @@ targets: - test/cpp/util/string_ref_helper.cc - test/cpp/util/subprocess.cc deps: + - gtest - grpc++_unsecure - grpc_test_util_unsecure - grpc++_test_config @@ -4401,6 +4869,7 @@ targets: - src/cpp/server/csds/csds.cc - test/cpp/end2end/admin_services_end2end_test.cc deps: + - gtest - grpc++_reflection - grpcpp_channelz - grpc++_test_util @@ -4434,6 +4903,7 @@ targets: - test/core/util/tracer_util.cc - test/cpp/common/alarm_test.cc deps: + - gtest - grpc++_unsecure - grpc_test_util_unsecure platforms: @@ -4448,6 +4918,7 @@ targets: src: - test/core/gpr/alloc_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: alpn_test @@ -4458,6 +4929,7 @@ targets: src: - test/core/transport/chttp2/alpn_test.cc deps: + - gtest - grpc_test_util - name: alts_concurrent_connectivity_test gtest: true @@ -4476,6 +4948,7 @@ targets: - test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc - test/core/util/fake_udp_and_tcp_server.cc deps: + - gtest - grpc++ - grpc_test_util platforms: @@ -4491,6 +4964,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/frame_protector/alts_counter_test.cc deps: + - gtest - grpc_test_util - name: alts_crypt_test gtest: true @@ -4502,6 +4976,7 @@ targets: - test/core/tsi/alts/crypt/aes_gcm_test.cc - test/core/tsi/alts/crypt/gsec_test_util.cc deps: + - gtest - grpc_test_util - name: alts_crypter_test gtest: true @@ -4513,6 +4988,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/frame_protector/alts_crypter_test.cc deps: + - gtest - grpc_test_util - name: alts_frame_protector_test gtest: true @@ -4526,6 +5002,7 @@ targets: - test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc - test/core/tsi/transport_security_test_lib.cc deps: + - gtest - grpc_test_util - name: alts_grpc_record_protocol_test gtest: true @@ -4537,6 +5014,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc deps: + - gtest - grpc_test_util - name: alts_handshaker_client_test gtest: true @@ -4548,6 +5026,7 @@ targets: - test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc deps: + - gtest - grpc_test_util - name: alts_iovec_record_protocol_test gtest: true @@ -4559,6 +5038,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc deps: + - gtest - grpc_test_util - name: alts_security_connector_test gtest: true @@ -4590,6 +5070,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: alts_tsi_handshaker_test gtest: true @@ -4601,6 +5082,7 @@ targets: - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc - test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc deps: + - gtest - grpc_test_util - name: alts_tsi_utils_test gtest: true @@ -4612,6 +5094,7 @@ targets: - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc - test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc deps: + - gtest - grpc_test_util - name: alts_util_test gtest: true @@ -4621,6 +5104,7 @@ targets: src: - test/cpp/common/alts_util_test.cc deps: + - gtest - grpc++_alts - grpc++_test_util - name: alts_zero_copy_grpc_protector_test @@ -4633,6 +5117,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc deps: + - gtest - grpc_test_util - name: arena_promise_test gtest: true @@ -4643,6 +5128,7 @@ targets: src: - test/core/promise/arena_promise_test.cc deps: + - gtest - grpc_test_util_unsecure uses_polling: false - name: arena_test @@ -4653,6 +5139,7 @@ targets: src: - test/core/resource_quota/arena_test.cc deps: + - gtest - grpc_test_util_unsecure uses_polling: false - name: async_end2end_test @@ -4669,6 +5156,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/async_end2end_test.cc deps: + - gtest - grpc++_test_util - name: auth_context_test gtest: true @@ -4700,6 +5188,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: auth_property_iterator_test @@ -4710,6 +5199,7 @@ targets: src: - test/cpp/common/auth_property_iterator_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: authorization_matchers_test @@ -4742,6 +5232,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: authorization_policy_provider_test gtest: true @@ -4752,6 +5243,7 @@ targets: - src/cpp/server/authorization_policy_provider.cc - test/cpp/server/authorization_policy_provider_test.cc deps: + - gtest - grpc++ - grpc_authorization_provider - grpc_test_util @@ -4767,6 +5259,7 @@ targets: src: - test/core/avl/avl_test.cc deps: + - gtest - gpr uses_polling: false - name: aws_request_signer_test @@ -4799,6 +5292,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: b64_test gtest: true @@ -4808,6 +5302,7 @@ targets: src: - test/core/slice/b64_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: backoff_test @@ -4818,6 +5313,7 @@ targets: src: - test/core/backoff/backoff_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: bad_ping_test @@ -4852,6 +5348,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -4865,6 +5362,7 @@ targets: - test/core/end2end/bad_server_response_test.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: bad_ssl_alpn_test gtest: true @@ -4901,6 +5399,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -4941,6 +5440,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -4958,6 +5458,7 @@ targets: - test/core/bad_client/tests/bad_streaming_id.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: badreq_bad_client_test gtest: true @@ -4971,6 +5472,7 @@ targets: - test/core/bad_client/tests/badreq.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: basic_work_queue_test gtest: true @@ -4980,6 +5482,7 @@ targets: src: - test/core/event_engine/work_queue/basic_work_queue_test.cc deps: + - gtest - grpc_test_util_unsecure - name: bdp_estimator_test gtest: true @@ -4989,6 +5492,7 @@ targets: src: - test/core/transport/bdp_estimator_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -5003,6 +5507,7 @@ targets: src: - test/core/transport/chttp2/bin_decoder_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: bin_encoder_test @@ -5013,6 +5518,7 @@ targets: src: - test/core/transport/chttp2/bin_encoder_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: binary_metadata_test @@ -5047,6 +5553,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5058,6 +5565,7 @@ targets: src: - test/core/client_channel/resolvers/binder_resolver_test.cc deps: + - gtest - grpc_test_util - name: binder_server_test gtest: true @@ -5075,6 +5583,7 @@ targets: - test/core/transport/binder/end2end/fake_binder.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: binder_transport_test gtest: true @@ -5181,6 +5690,8 @@ targets: - test/core/transport/binder/binder_transport_test.cc - test/core/transport/binder/mock_objects.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: bitset_test @@ -5193,8 +5704,7 @@ targets: src: - test/core/gprpp/bitset_test.cc deps: - - absl/strings:strings - - absl/types:variant + - gtest uses_polling: false - name: buffer_list_test gtest: true @@ -5226,6 +5736,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: byte_buffer_test gtest: true @@ -5235,6 +5746,7 @@ targets: src: - test/cpp/util/byte_buffer_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: c_slice_buffer_test @@ -5245,6 +5757,7 @@ targets: src: - test/core/slice/c_slice_buffer_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: call_creds_test @@ -5279,6 +5792,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5291,6 +5805,7 @@ targets: src: - test/core/channel/call_finalization_test.cc deps: + - gtest - grpc_test_util - name: call_host_override_test gtest: true @@ -5324,6 +5839,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5335,6 +5851,7 @@ targets: src: - test/core/channel/call_tracer_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: cancel_after_accept_test @@ -5369,6 +5886,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5404,6 +5922,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5439,6 +5958,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5474,6 +5994,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5491,6 +6012,7 @@ targets: - test/core/util/socket_use_after_close_detector.cc - test/cpp/naming/cancel_ares_query_test.cc deps: + - gtest - grpc++_test_config - grpc++_test_util - name: cancel_before_invoke_test @@ -5525,6 +6047,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5539,6 +6062,7 @@ targets: src: - test/core/promise/cancel_callback_test.cc deps: + - gtest - absl/meta:type_traits - gpr uses_polling: false @@ -5574,6 +6098,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5609,6 +6134,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -5824,6 +6350,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: certificate_provider_registry_test gtest: true @@ -5833,6 +6360,7 @@ targets: src: - test/core/security/certificate_provider_registry_test.cc deps: + - gtest - grpc_test_util - name: certificate_provider_store_test gtest: true @@ -5842,6 +6370,7 @@ targets: src: - test/core/xds/certificate_provider_store_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: cf_engine_test @@ -5852,6 +6381,7 @@ targets: src: - test/core/event_engine/cf/cf_engine_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -5875,6 +6405,7 @@ targets: - test/core/event_engine/test_suite/tests/client_test.cc - test/core/event_engine/test_suite/tests/timer_test.cc deps: + - gtest - grpc_unsecure - grpc_test_util platforms: @@ -5896,6 +6427,7 @@ targets: - test/cpp/end2end/cfstream_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: channel_args_test gtest: true @@ -5905,6 +6437,7 @@ targets: src: - test/core/channel/channel_args_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: channel_arguments_test @@ -5915,6 +6448,7 @@ targets: src: - test/cpp/common/channel_arguments_test.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -5948,6 +6482,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: channel_filter_test gtest: true @@ -5957,6 +6492,7 @@ targets: src: - test/cpp/common/channel_filter_test.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -5968,6 +6504,7 @@ targets: src: - test/core/channel/channel_stack_builder_test.cc deps: + - gtest - grpc_test_util - name: channel_stack_test gtest: true @@ -5977,6 +6514,7 @@ targets: src: - test/core/channel/channel_stack_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: channel_trace_test @@ -5990,6 +6528,7 @@ targets: - test/core/channel/channel_trace_test.cc - test/cpp/util/channel_trace_proto_helper.cc deps: + - gtest - grpc++ - grpc_test_util - name: channelz_registry_test @@ -6000,6 +6539,7 @@ targets: src: - test/core/channel/channelz_registry_test.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -6017,6 +6557,7 @@ targets: - test/cpp/end2end/channelz_service_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpcpp_channelz - grpc++_test_util - name: check_gcp_environment_linux_test @@ -6049,6 +6590,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: check_gcp_environment_windows_test gtest: true @@ -6080,6 +6622,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: chunked_vector_test gtest: true @@ -6087,6 +6630,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h @@ -6134,6 +6678,7 @@ targets: - src/core/lib/slice/slice_string_helpers.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc @@ -6160,13 +6705,14 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/gprpp/chunked_vector_test.cc deps: + - gtest + - upb - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: cli_call_test gtest: true @@ -6194,6 +6740,8 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest + - protoc - grpc++_test_util - name: client_auth_filter_test gtest: true @@ -6208,6 +6756,8 @@ targets: - test/core/filters/client_auth_filter_test.cc - test/core/filters/filter_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: client_authority_filter_test @@ -6223,6 +6773,8 @@ targets: - test/core/filters/client_authority_filter_test.cc - test/core/filters/filter_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: client_callback_end2end_test @@ -6241,6 +6793,7 @@ targets: - test/cpp/end2end/interceptors_util.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: client_channel_service_config_test gtest: true @@ -6250,6 +6803,7 @@ targets: src: - test/core/client_channel/client_channel_service_config_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: client_channel_test @@ -6260,6 +6814,7 @@ targets: src: - test/core/client_channel/client_channel_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: client_context_test_peer_test @@ -6288,6 +6843,7 @@ targets: - test/cpp/end2end/interceptors_util.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: client_lb_end2end_test gtest: true @@ -6311,6 +6867,7 @@ targets: - test/cpp/end2end/connection_attempt_injector.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -6324,6 +6881,7 @@ targets: src: - test/core/handshake/client_ssl.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -6361,6 +6919,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6394,6 +6953,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: codegen_test_full @@ -6404,6 +6964,7 @@ targets: src: - test/cpp/codegen/codegen_test_full.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -6415,6 +6976,7 @@ targets: src: - test/cpp/codegen/codegen_test_minimal.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -6449,6 +7011,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -6464,6 +7027,7 @@ targets: src: - test/core/event_engine/common_closures_test.cc deps: + - gtest - absl/status:statusor - gpr - name: completion_queue_threading_test @@ -6474,6 +7038,7 @@ targets: src: - test/core/surface/completion_queue_threading_test.cc deps: + - gtest - grpc_test_util - name: compressed_payload_test gtest: true @@ -6507,6 +7072,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6518,6 +7084,7 @@ targets: src: - test/core/compression/compression_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: concurrent_connectivity_test @@ -6528,6 +7095,7 @@ targets: src: - test/core/surface/concurrent_connectivity_test.cc deps: + - gtest - grpc_test_util - name: connection_prefix_bad_client_test gtest: true @@ -6541,6 +7109,7 @@ targets: - test/core/bad_client/tests/connection_prefix.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: connection_refused_test gtest: true @@ -6552,6 +7121,7 @@ targets: - test/core/end2end/connection_refused_test.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: connectivity_state_test gtest: true @@ -6583,6 +7153,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: connectivity_test gtest: true @@ -6616,6 +7187,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6633,6 +7205,7 @@ targets: - test/cpp/end2end/context_allocator_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: context_test gtest: true @@ -6643,6 +7216,7 @@ targets: src: - test/core/promise/context_test.cc deps: + - gtest - gpr uses_polling: false - name: core_configuration_test @@ -6653,6 +7227,7 @@ targets: src: - test/core/config/core_configuration_test.cc deps: + - gtest - grpc uses_polling: false - name: cpp_impl_of_test @@ -6663,7 +7238,8 @@ targets: - src/core/lib/gprpp/cpp_impl_of.h src: - test/core/gprpp/cpp_impl_of_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: cpu_test gtest: true @@ -6673,6 +7249,7 @@ targets: src: - test/core/gpr/cpu_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: crl_ssl_transport_security_test @@ -6685,6 +7262,7 @@ targets: - test/core/tsi/crl_ssl_transport_security_test.cc - test/core/tsi/transport_security_test_lib.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -6698,6 +7276,7 @@ targets: src: - test/core/event_engine/default_engine_methods_test.cc deps: + - gtest - grpc_test_util - name: default_host_test gtest: true @@ -6731,6 +7310,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6748,6 +7328,7 @@ targets: - test/cpp/end2end/delegating_channel_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: destroy_grpclb_channel_with_active_connect_stress_test gtest: true @@ -6757,6 +7338,7 @@ targets: src: - test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc deps: + - gtest - grpc++_test_util - name: disappearing_server_test gtest: true @@ -6790,6 +7372,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6801,6 +7384,7 @@ targets: src: - test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc deps: + - gtest - grpc_test_util - name: dns_resolver_test gtest: true @@ -6810,6 +7394,7 @@ targets: src: - test/core/client_channel/resolvers/dns_resolver_test.cc deps: + - gtest - grpc_test_util - name: dual_ref_counted_test gtest: true @@ -6819,6 +7404,7 @@ targets: src: - test/core/gprpp/dual_ref_counted_test.cc deps: + - gtest - grpc_test_util - name: dualstack_socket_test gtest: true @@ -6830,6 +7416,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/dualstack_socket_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -6847,6 +7434,7 @@ targets: - test/core/bad_client/tests/duplicate_header.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: empty_batch_test gtest: true @@ -6880,6 +7468,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -6902,6 +7491,7 @@ targets: - test/core/transport/binder/end2end/testing_channel_create.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -7031,6 +7621,8 @@ targets: - test/core/transport/binder/endpoint_binder_pool_test.cc - test/core/transport/binder/mock_objects.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: endpoint_config_test @@ -7055,6 +7647,7 @@ targets: - src/core/lib/surface/channel_stack_type.cc - test/core/event_engine/endpoint_config_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - gpr @@ -7091,6 +7684,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: env_test gtest: true @@ -7100,6 +7694,7 @@ targets: src: - test/core/gpr/env_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: error_details_test @@ -7113,6 +7708,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/util/error_details_test.cc deps: + - gtest - grpc++_error_details - grpc_test_util - name: error_test @@ -7147,6 +7743,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: error_utils_test @@ -7179,6 +7776,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: evaluate_args_test gtest: true @@ -7210,6 +7808,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: event_engine_wakeup_scheduler_test gtest: true @@ -7220,6 +7819,7 @@ targets: src: - test/core/promise/event_engine_wakeup_scheduler_test.cc deps: + - gtest - grpc uses_polling: false - name: event_poller_posix_test @@ -7232,6 +7832,7 @@ targets: - test/core/event_engine/posix/event_poller_posix_test.cc - test/core/event_engine/posix/posix_engine_test_utils.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -7245,6 +7846,7 @@ targets: src: - test/core/gprpp/examine_stack_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -7263,6 +7865,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/exception_test.cc deps: + - gtest - grpc++_test_util - name: exec_ctx_wakeup_scheduler_test gtest: true @@ -7270,6 +7873,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gpr/spinlock.h @@ -7301,6 +7905,7 @@ targets: - src/core/lib/slice/slice_string_helpers.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/gprpp/status_helper.cc @@ -7318,11 +7923,12 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/exec_ctx_wakeup_scheduler_test.cc deps: + - gtest + - upb - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: experiments_tag_test gtest: true @@ -7338,6 +7944,7 @@ targets: - test/core/experiments/experiments_tag_test.cc - test/core/experiments/fixtures/experiments.cc deps: + - gtest - absl/status:statusor - gpr uses_polling: false @@ -7355,6 +7962,7 @@ targets: - test/core/experiments/experiments_test.cc - test/core/experiments/fixtures/experiments.cc deps: + - gtest - gpr uses_polling: false - name: factory_test @@ -7366,6 +7974,7 @@ targets: src: - test/core/event_engine/factory_test.cc deps: + - gtest - grpc_test_util_unsecure - name: fake_binder_test gtest: true @@ -7472,6 +8081,8 @@ targets: - test/core/transport/binder/end2end/fake_binder.cc - test/core/transport/binder/end2end/fake_binder_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: fake_resolver_test @@ -7482,6 +8093,7 @@ targets: src: - test/core/client_channel/resolvers/fake_resolver_test.cc deps: + - gtest - grpc_test_util - name: fake_transport_security_test gtest: true @@ -7493,6 +8105,7 @@ targets: - test/core/tsi/fake_transport_security_test.cc - test/core/tsi/transport_security_test_lib.cc deps: + - gtest - grpc_test_util - name: fd_posix_test gtest: true @@ -7524,6 +8137,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -7537,6 +8151,7 @@ targets: src: - test/core/xds/file_watcher_certificate_provider_factory_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: filter_causes_close_test @@ -7571,6 +8186,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -7606,6 +8222,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -7622,6 +8239,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/filter_end2end_test.cc deps: + - gtest - grpc++_test_util - name: filter_init_fails_test gtest: true @@ -7655,6 +8273,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -7671,7 +8290,9 @@ targets: - test/core/filters/filter_test.cc - test/core/filters/filter_test_test.cc deps: + - gtest - grpc_unsecure + - protobuf - grpc_test_util uses_polling: false - name: filtered_metadata_test @@ -7706,6 +8327,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -7724,6 +8346,7 @@ targets: - test/cpp/end2end/flaky_network_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: flow_control_test gtest: true @@ -7733,6 +8356,7 @@ targets: - src/core/ext/transport/chttp2/transport/flow_control.h - src/core/ext/transport/chttp2/transport/http2_settings.h - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h @@ -7783,6 +8407,7 @@ targets: - src/core/ext/transport/chttp2/transport/flow_control.cc - src/core/ext/transport/chttp2/transport/http2_settings.cc - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc @@ -7810,13 +8435,14 @@ targets: - src/core/lib/transport/pid_controller.cc - test/core/transport/chttp2/flow_control_test.cc deps: + - gtest + - upb - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: for_each_test gtest: true @@ -7824,6 +8450,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h @@ -7879,6 +8506,7 @@ targets: - test/core/promise/test_wakeup_schedulers.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc @@ -7906,13 +8534,14 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/for_each_test.cc deps: + - gtest + - upb - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: fork_test gtest: true @@ -7922,6 +8551,7 @@ targets: src: - test/core/gprpp/fork_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -7940,6 +8570,7 @@ targets: - src/core/lib/event_engine/forkable.cc - test/core/event_engine/forkable_test.cc deps: + - gtest - absl/status:statusor - gpr - name: format_request_test @@ -7977,6 +8608,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: frame_handler_test gtest: true @@ -7988,6 +8620,7 @@ targets: - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/frame_protector/frame_handler_test.cc deps: + - gtest - grpc_test_util - name: frame_header_test gtest: true @@ -8001,10 +8634,9 @@ targets: - src/core/ext/transport/chaotic_good/frame_header.cc - test/core/transport/chaotic_good/frame_header_test.cc deps: + - gtest - absl/status:status - absl/status:statusor - - absl/strings:strings - - absl/types:variant - name: frame_test gtest: true build: test @@ -8026,6 +8658,7 @@ targets: - src/core/ext/transport/chttp2/transport/huffsyms.h - src/core/ext/transport/chttp2/transport/varint.h - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h @@ -8312,6 +8945,7 @@ targets: - src/core/ext/transport/chttp2/transport/huffsyms.cc - src/core/ext/transport/chttp2/transport/varint.cc - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c @@ -8541,6 +9175,9 @@ targets: - src/core/tsi/alts/handshaker/transport_security_common_api.cc - test/core/transport/chaotic_good/frame_test.cc deps: + - gtest + - upb + - z - absl/cleanup:cleanup - absl/container:flat_hash_map - absl/container:flat_hash_set @@ -8551,8 +9188,8 @@ targets: - absl/status:statusor - absl/types:span - absl/utility:utility + - cares - gpr - - upb - name: fuzzing_event_engine_test gtest: true build: test @@ -8574,7 +9211,9 @@ targets: - test/core/event_engine/test_suite/tests/server_test.cc - test/core/event_engine/test_suite/tests/timer_test.cc deps: + - gtest - grpc_unsecure + - protobuf - grpc_test_util platforms: - linux @@ -8593,6 +9232,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/generic_end2end_test.cc deps: + - gtest - grpc++_test_util - name: goaway_server_test gtest: true @@ -8604,6 +9244,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/goaway_server_test.cc deps: + - gtest - grpc_test_util - name: google_c2p_resolver_test gtest: true @@ -8615,6 +9256,7 @@ targets: - test/core/client_channel/resolvers/google_c2p_resolver_test.cc - test/core/util/fake_udp_and_tcp_server.cc deps: + - gtest - grpc++_test_util - name: graceful_server_shutdown_test gtest: true @@ -8648,6 +9290,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -8661,6 +9304,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/transport/chttp2/graceful_shutdown_test.cc deps: + - gtest - grpc_test_util - name: grpc_alts_credentials_options_test gtest: true @@ -8692,6 +9336,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_audit_logging_test gtest: true @@ -8701,6 +9346,7 @@ targets: src: - test/core/security/grpc_audit_logging_test.cc deps: + - gtest - grpc_test_util - name: grpc_authorization_engine_test gtest: true @@ -8734,6 +9380,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_authorization_policy_provider_test gtest: true @@ -8765,6 +9412,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_authorization_provider - grpc_test_util - name: grpc_authz_end2end_test @@ -8784,6 +9432,7 @@ targets: - test/cpp/end2end/grpc_authz_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc_authorization_provider - grpc++_test_util - name: grpc_authz_test @@ -8818,6 +9467,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -8829,6 +9479,7 @@ targets: src: - test/core/surface/byte_buffer_reader_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: grpc_cli @@ -8854,6 +9505,7 @@ targets: - test/cpp/util/service_describer.cc deps: - grpc++ + - protoc - grpc++_test_config - name: grpc_completion_queue_test gtest: true @@ -8863,6 +9515,7 @@ targets: src: - test/core/surface/completion_queue_test.cc deps: + - gtest - grpc_test_util - name: grpc_cpp_plugin build: protoc @@ -8910,6 +9563,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_node_plugin build: protoc @@ -8981,6 +9635,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_tls_certificate_provider_test gtest: true @@ -9012,6 +9667,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_tls_certificate_verifier_test gtest: true @@ -9043,6 +9699,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_tls_credentials_options_comparator_test gtest: true @@ -9074,6 +9731,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_tls_credentials_options_test gtest: true @@ -9105,6 +9763,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: grpc_tool_test gtest: true @@ -9131,7 +9790,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++_reflection + - protoc - grpc++_test_config - grpc++_test_util platforms: @@ -9146,6 +9807,7 @@ targets: - src/proto/grpc/lb/v1/load_balancer.proto - test/cpp/grpclb/grpclb_api_test.cc deps: + - gtest - grpc++_test_util - name: grpclb_end2end_test gtest: true @@ -9165,6 +9827,7 @@ targets: - test/cpp/end2end/grpclb_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_config - grpc++_test_util platforms: @@ -9200,6 +9863,7 @@ targets: - test/core/end2end/h2_ssl_cert_test.cc - test/core/event_engine/event_engine_test_utils.cc deps: + - gtest - grpc_unsecure - grpc_test_util - name: h2_ssl_session_reuse_test @@ -9212,6 +9876,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/h2_ssl_session_reuse_test.cc deps: + - gtest - grpc_test_util - name: h2_tls_peer_property_external_verifier_test gtest: true @@ -9223,6 +9888,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/h2_tls_peer_property_external_verifier_test.cc deps: + - gtest - grpc_test_util - name: handle_tests gtest: true @@ -9232,6 +9898,7 @@ targets: src: - test/core/event_engine/handle_tests.cc deps: + - gtest - grpc uses_polling: false - name: handshake_server_with_readahead_handshaker_test @@ -9244,6 +9911,7 @@ targets: - test/core/handshake/readahead_handshaker_server_ssl.cc - test/core/handshake/server_ssl_common.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -9261,6 +9929,7 @@ targets: - test/core/bad_client/tests/head_of_line_blocking.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: headers_bad_client_test gtest: true @@ -9274,6 +9943,7 @@ targets: - test/core/bad_client/tests/headers.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: health_service_end2end_test gtest: true @@ -9293,6 +9963,7 @@ targets: - test/cpp/end2end/test_health_check_service_impl.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: high_initial_seqno_test gtest: true @@ -9326,6 +9997,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -9359,6 +10031,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: host_port_test @@ -9369,6 +10042,7 @@ targets: src: - test/core/gprpp/host_port_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: hpack_encoder_test @@ -9401,6 +10075,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: hpack_parser_table_test @@ -9433,6 +10108,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: hpack_parser_test @@ -9465,6 +10141,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: hpack_size_test @@ -9499,6 +10176,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -9506,7 +10184,8 @@ targets: build: test run: false language: c++ - headers: [] + headers: + - test/cpp/interop/http2_client.h src: - src/proto/grpc/testing/empty.proto - src/proto/grpc/testing/messages.proto @@ -9523,6 +10202,7 @@ targets: src: - test/core/client_channel/http_proxy_mapper_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: httpcli_test @@ -9537,6 +10217,7 @@ targets: - test/core/http/httpcli_test_util.cc - test/core/util/fake_udp_and_tcp_server.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -9554,6 +10235,7 @@ targets: - test/core/http/httpscli_test.cc - test/core/util/fake_udp_and_tcp_server.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -9574,6 +10256,7 @@ targets: - test/cpp/end2end/hybrid_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: idle_filter_state_test gtest: true @@ -9584,7 +10267,8 @@ targets: src: - src/core/ext/filters/channel_idle/idle_filter_state.cc - test/core/client_idle/idle_filter_state_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: if_list_test gtest: true @@ -9594,7 +10278,8 @@ targets: - src/core/lib/gprpp/if_list.h src: - test/core/gprpp/if_list_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: if_test gtest: true @@ -9608,6 +10293,7 @@ targets: src: - test/core/promise/if_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - gpr @@ -9620,6 +10306,7 @@ targets: src: - test/core/surface/init_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: initial_settings_frame_bad_client_test @@ -9634,6 +10321,7 @@ targets: - test/core/bad_client/tests/initial_settings_frame.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: insecure_security_connector_test gtest: true @@ -9665,6 +10353,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: interceptor_list_test gtest: true @@ -9672,6 +10361,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h @@ -9721,6 +10411,7 @@ targets: - test/core/promise/test_context.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc @@ -9748,13 +10439,14 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/interceptor_list_test.cc deps: + - gtest + - upb - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: interop_client build: test @@ -9804,6 +10496,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/invalid_call_argument_test.cc deps: + - gtest - grpc_test_util - name: invoke_large_request_test gtest: true @@ -9837,6 +10530,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -9850,6 +10544,7 @@ targets: - test/core/event_engine/windows/create_sockpair.cc - test/core/event_engine/windows/iocp_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -9867,6 +10562,7 @@ targets: - test/cpp/interop/istio_echo_server_lib.cc - test/cpp/interop/istio_echo_server_test.cc deps: + - gtest - grpc++ - grpc_test_util - grpc++_test_config @@ -9884,6 +10580,7 @@ targets: src: - test/core/promise/join_test.cc deps: + - gtest - absl/meta:type_traits - gpr uses_polling: false @@ -9895,6 +10592,7 @@ targets: src: - test/core/json/json_object_loader_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: json_test @@ -9905,6 +10603,7 @@ targets: src: - test/core/json/json_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: json_token_test @@ -9937,6 +10636,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: jwt_verifier_test @@ -9969,6 +10669,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: keepalive_timeout_test @@ -10003,6 +10704,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10016,6 +10718,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/surface/lame_client_test.cc deps: + - gtest - grpc_test_util - name: large_metadata_test gtest: true @@ -10049,6 +10752,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10084,6 +10788,7 @@ targets: - src/core/lib/promise/trace.cc - test/core/promise/latch_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - gpr @@ -10101,6 +10806,7 @@ targets: - src/cpp/server/load_reporter/get_cpu_stats_windows.cc - test/cpp/server/load_reporter/get_cpu_stats_test.cc deps: + - gtest - grpc_test_util - name: lb_load_data_store_test gtest: true @@ -10113,6 +10819,7 @@ targets: - src/cpp/server/load_reporter/load_data_store.cc - test/cpp/server/load_reporter/load_data_store_test.cc deps: + - gtest - grpc++ - grpc_test_util - name: load_config_test @@ -10123,6 +10830,7 @@ targets: src: - test/core/config/load_config_test.cc deps: + - gtest - grpc uses_polling: false - name: lock_free_event_test @@ -10133,6 +10841,7 @@ targets: src: - test/core/event_engine/posix/lock_free_event_test.cc deps: + - gtest - benchmark - grpc_test_util benchmark: true @@ -10149,6 +10858,7 @@ targets: src: - test/core/gpr/log_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: log_too_many_open_files_test @@ -10159,6 +10869,7 @@ targets: src: - test/core/event_engine/posix/log_too_many_open_files_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -10180,6 +10891,7 @@ targets: src: - test/core/promise/loop_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - gpr @@ -10190,6 +10902,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h @@ -10246,6 +10959,7 @@ targets: - test/core/promise/test_wakeup_schedulers.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/event_engine/memory_allocator.cc @@ -10273,13 +10987,14 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/map_pipe_test.cc deps: + - gtest + - upb - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits - absl/status:statusor - gpr - - upb uses_polling: false - name: match_test gtest: true @@ -10291,7 +11006,7 @@ targets: src: - test/core/gprpp/match_test.cc deps: - - absl/types:variant + - gtest uses_polling: false - name: matchers_test gtest: true @@ -10323,6 +11038,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: max_concurrent_streams_test gtest: true @@ -10356,6 +11072,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10391,6 +11108,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10426,6 +11144,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10461,6 +11180,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10472,6 +11192,7 @@ targets: src: - test/core/resource_quota/memory_quota_stress_test.cc deps: + - gtest - grpc_test_util_unsecure platforms: - linux @@ -10486,6 +11207,7 @@ targets: src: - test/core/resource_quota/memory_quota_test.cc deps: + - gtest - grpc_test_util_unsecure uses_polling: false - name: message_allocator_end2end_test @@ -10502,6 +11224,7 @@ targets: - test/cpp/end2end/message_allocator_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: message_compress_test gtest: true @@ -10533,6 +11256,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: message_size_service_config_test @@ -10543,6 +11267,7 @@ targets: src: - test/core/message_size/message_size_service_config_test.cc deps: + - gtest - grpc_test_util - name: metadata_map_test gtest: true @@ -10574,6 +11299,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: minimal_stack_is_minimal_test gtest: true @@ -10583,6 +11309,7 @@ targets: src: - test/core/channel/minimal_stack_is_minimal_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: miscompile_with_no_unique_address_test @@ -10592,7 +11319,8 @@ targets: headers: [] src: - test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: mock_stream_test gtest: true @@ -10645,6 +11373,7 @@ targets: - src/core/lib/promise/activity.cc - test/core/promise/mpsc_test.cc deps: + - gtest - absl/container:flat_hash_set - absl/hash:hash - absl/meta:type_traits @@ -10659,6 +11388,7 @@ targets: src: - test/core/gprpp/mpscq_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -10697,6 +11427,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10709,7 +11440,8 @@ targets: - src/core/lib/gprpp/no_destruct.h src: - test/core/gprpp/no_destruct_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: no_logging_test gtest: true @@ -10743,6 +11475,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10778,6 +11511,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -10791,6 +11525,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/end2end/no_server_test.cc deps: + - gtest - grpc_test_util - name: nonblocking_test gtest: true @@ -10804,6 +11539,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/nonblocking_test.cc deps: + - gtest - grpc++_test_util - name: notification_test gtest: true @@ -10814,6 +11550,7 @@ targets: src: - test/core/gprpp/notification_test.cc deps: + - gtest - gpr uses_polling: false - name: num_external_connectivity_watchers_test @@ -10824,6 +11561,7 @@ targets: src: - test/core/surface/num_external_connectivity_watchers_test.cc deps: + - gtest - grpc_test_util - name: oracle_event_engine_posix_test gtest: true @@ -10843,6 +11581,7 @@ targets: - test/core/event_engine/test_suite/tests/client_test.cc - test/core/event_engine/test_suite/tests/server_test.cc deps: + - gtest - grpc_unsecure - grpc_test_util platforms: @@ -10860,6 +11599,7 @@ targets: - src/cpp/server/orca/orca_service.cc - test/cpp/end2end/orca_service_end2end_test.cc deps: + - gtest - grpc++_test_util - name: orphanable_test gtest: true @@ -10869,6 +11609,7 @@ targets: src: - test/core/gprpp/orphanable_test.cc deps: + - gtest - grpc_test_util - name: osa_distance_test gtest: true @@ -10880,7 +11621,7 @@ targets: - test/core/util/osa_distance.cc - test/core/util/osa_distance_test.cc deps: - - absl/strings:strings + - gtest - name: out_of_bounds_bad_client_test gtest: true build: test @@ -10893,6 +11634,7 @@ targets: - test/core/bad_client/tests/out_of_bounds.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: outlier_detection_lb_config_parser_test gtest: true @@ -10903,6 +11645,7 @@ targets: src: - test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: outlier_detection_test @@ -10915,6 +11658,7 @@ targets: src: - test/core/client_channel/lb_policy/outlier_detection_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: overload_test @@ -10925,7 +11669,8 @@ targets: - src/core/lib/gprpp/overload.h src: - test/core/gprpp/overload_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: parse_address_test gtest: true @@ -10935,6 +11680,7 @@ targets: src: - test/core/address_utils/parse_address_test.cc deps: + - gtest - grpc_test_util - name: parse_address_with_named_scope_id_test gtest: true @@ -10944,6 +11690,7 @@ targets: src: - test/core/address_utils/parse_address_with_named_scope_id_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -10958,6 +11705,7 @@ targets: src: - test/core/transport/parsed_metadata_test.cc deps: + - gtest - grpc_test_util - name: parser_test gtest: true @@ -10994,6 +11742,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: party_test @@ -11004,6 +11753,7 @@ targets: src: - test/core/promise/party_test.cc deps: + - gtest - grpc_unsecure uses_polling: false - name: payload_test @@ -11038,6 +11788,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11049,6 +11800,7 @@ targets: src: - test/core/slice/percent_encoding_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: periodic_update_test @@ -11058,6 +11810,7 @@ targets: language: c++ headers: - src/core/ext/upb-generated/google/protobuf/any.upb.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/rpc/status.upb.h - src/core/lib/debug/trace.h - src/core/lib/gpr/spinlock.h @@ -11079,6 +11832,7 @@ targets: - src/core/lib/slice/slice_string_helpers.h src: - src/core/ext/upb-generated/google/protobuf/any.upb.c + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/lib/debug/trace.cc - src/core/lib/gprpp/status_helper.cc @@ -11096,11 +11850,12 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/resource_quota/periodic_update_test.cc deps: + - gtest + - upb - absl/functional:function_ref - absl/hash:hash - absl/status:statusor - gpr - - upb uses_polling: false - name: pick_first_test gtest: true @@ -11113,6 +11868,7 @@ targets: src: - test/core/client_channel/lb_policy/pick_first_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: pid_controller_test @@ -11145,6 +11901,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: ping_abuse_policy_test gtest: true @@ -11176,6 +11933,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: ping_configuration_test @@ -11208,6 +11966,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: ping_pong_streaming_test @@ -11242,6 +12001,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11275,6 +12035,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: ping_test @@ -11309,6 +12070,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11323,6 +12085,7 @@ targets: src: - test/core/promise/pipe_test.cc deps: + - gtest - grpc uses_polling: false - name: poll_test @@ -11334,6 +12097,7 @@ targets: src: - test/core/promise/poll_test.cc deps: + - gtest - gpr uses_polling: false - name: port_sharing_end2end_test @@ -11350,6 +12114,7 @@ targets: - test/cpp/end2end/port_sharing_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: posix_endpoint_test gtest: true @@ -11367,6 +12132,7 @@ targets: - test/core/event_engine/test_suite/event_engine_test_framework.cc - test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc deps: + - gtest - grpc_unsecure - grpc_test_util platforms: @@ -11381,6 +12147,7 @@ targets: src: - test/core/event_engine/posix/posix_engine_listener_utils_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -11400,6 +12167,7 @@ targets: - test/core/event_engine/test_suite/event_engine_test_framework.cc - test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc deps: + - gtest - grpc_unsecure - grpc_test_util platforms: @@ -11431,6 +12199,7 @@ targets: - test/core/util/fake_udp_and_tcp_server.cc - test/cpp/util/get_grpc_test_runfile_dir.cc deps: + - gtest - grpc_unsecure - grpc++_test_util platforms: @@ -11446,6 +12215,7 @@ targets: src: - test/core/promise/prioritized_race_test.cc deps: + - gtest - gpr uses_polling: false - name: promise_endpoint_test @@ -11461,6 +12231,7 @@ targets: - src/core/lib/transport/promise_endpoint.cc - test/core/transport/promise_endpoint_test.cc deps: + - gtest - grpc - name: promise_factory_test gtest: true @@ -11473,6 +12244,7 @@ targets: src: - test/core/promise/promise_factory_test.cc deps: + - gtest - absl/functional:bind_front - absl/meta:type_traits - gpr @@ -11489,6 +12261,7 @@ targets: src: - test/core/promise/map_test.cc deps: + - gtest - absl/meta:type_traits - gpr uses_polling: false @@ -11503,6 +12276,7 @@ targets: src: - test/core/promise/promise_test.cc deps: + - gtest - absl/meta:type_traits - gpr uses_polling: false @@ -11514,6 +12288,7 @@ targets: src: - test/cpp/util/proto_buffer_reader_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: proto_buffer_writer_test @@ -11524,6 +12299,7 @@ targets: src: - test/cpp/util/proto_buffer_writer_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: proto_server_reflection_test @@ -11543,6 +12319,7 @@ targets: - test/cpp/end2end/test_service_impl.cc - test/cpp/util/proto_reflection_descriptor_database.cc deps: + - gtest - grpc++_reflection - grpc++_test_util - name: proto_utils_test @@ -11553,6 +12330,7 @@ targets: src: - test/cpp/codegen/proto_utils_test.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -11588,6 +12366,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11676,6 +12455,7 @@ targets: src: - test/core/promise/race_test.cc deps: + - gtest - gpr uses_polling: false - name: random_early_detection_test @@ -11688,6 +12468,7 @@ targets: - src/core/lib/backoff/random_early_detection.cc - test/core/backoff/random_early_detection_test.cc deps: + - gtest - absl/random:random uses_polling: false - name: raw_end2end_test @@ -11705,6 +12486,7 @@ targets: - test/cpp/end2end/raw_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: rbac_service_config_parser_test gtest: true @@ -11714,6 +12496,7 @@ targets: src: - test/core/ext/filters/rbac/rbac_service_config_parser_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: rbac_translator_test @@ -11746,6 +12529,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_authorization_provider - grpc_test_util - name: ref_counted_ptr_test @@ -11756,6 +12540,7 @@ targets: src: - test/core/gprpp/ref_counted_ptr_test.cc deps: + - gtest - grpc_test_util - name: ref_counted_test gtest: true @@ -11765,6 +12550,7 @@ targets: src: - test/core/gprpp/ref_counted_test.cc deps: + - gtest - grpc_test_util - name: registered_call_test gtest: true @@ -11798,6 +12584,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11809,6 +12596,7 @@ targets: src: - test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -11846,6 +12634,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11881,6 +12670,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -11914,6 +12704,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - absl/flags:parse - grpc_test_util args: @@ -11954,6 +12745,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - grpc++_test_config - name: resolve_address_using_native_resolver_posix_test @@ -11986,6 +12778,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - absl/flags:parse - grpc_test_util args: @@ -12026,6 +12819,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - grpc++_test_config - name: resource_quota_end2end_stress_test @@ -12040,6 +12834,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/resource_quota_end2end_stress_test.cc deps: + - gtest - grpc++_test_util - name: resource_quota_server_test gtest: true @@ -12073,6 +12868,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12084,6 +12880,7 @@ targets: src: - test/core/resource_quota/resource_quota_test.cc deps: + - gtest - grpc_test_util_unsecure uses_polling: false - name: retry_cancel_after_first_attempt_starts_test @@ -12118,6 +12915,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12153,6 +12951,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12188,6 +12987,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12223,6 +13023,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12258,6 +13059,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12293,6 +13095,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12328,6 +13131,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12363,6 +13167,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12398,6 +13203,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12433,6 +13239,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12468,6 +13275,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12503,6 +13311,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12538,6 +13347,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12573,6 +13383,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12608,6 +13419,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12643,6 +13455,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12678,6 +13491,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12713,6 +13527,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12748,6 +13563,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12783,6 +13599,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12818,6 +13635,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12853,6 +13671,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12888,6 +13707,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12899,6 +13719,7 @@ targets: src: - test/core/client_channel/retry_service_config_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: retry_streaming_after_commit_test @@ -12933,6 +13754,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -12968,6 +13790,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13003,6 +13826,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13038,6 +13862,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13049,6 +13874,7 @@ targets: src: - test/core/client_channel/retry_throttle_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: retry_throttled_test @@ -13083,6 +13909,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13118,6 +13945,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13153,6 +13981,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13188,6 +14017,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13223,6 +14053,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13258,6 +14089,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13293,6 +14125,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13318,6 +14151,7 @@ targets: - test/cpp/end2end/rls_server.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_config - grpc++_test_util - name: rls_lb_config_parser_test @@ -13328,6 +14162,7 @@ targets: src: - test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: round_robin_test @@ -13340,6 +14175,7 @@ targets: src: - test/core/client_channel/lb_policy/round_robin_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: secure_auth_context_test @@ -13350,6 +14186,7 @@ targets: src: - test/cpp/common/secure_auth_context_test.cc deps: + - gtest - grpc++_test_util - name: secure_channel_create_test gtest: true @@ -13359,6 +14196,7 @@ targets: src: - test/core/surface/secure_channel_create_test.cc deps: + - gtest - grpc_test_util - name: secure_endpoint_test gtest: true @@ -13393,6 +14231,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: security_connector_test gtest: true @@ -13424,6 +14263,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: seq_test gtest: true @@ -13439,6 +14279,7 @@ targets: src: - test/core/promise/seq_test.cc deps: + - gtest - absl/meta:type_traits - gpr uses_polling: false @@ -13450,6 +14291,7 @@ targets: src: - test/core/surface/sequential_connectivity_test.cc deps: + - gtest - grpc_test_util - name: server_builder_plugin_test gtest: true @@ -13466,6 +14308,7 @@ targets: - test/cpp/end2end/server_builder_plugin_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: server_builder_test gtest: true @@ -13501,6 +14344,7 @@ targets: - test/core/util/tracer_util.cc - test/cpp/server/server_builder_test.cc deps: + - gtest - grpc++_unsecure - grpc_test_util_unsecure platforms: @@ -13541,6 +14385,7 @@ targets: - test/core/util/tracer_util.cc - test/cpp/server/server_builder_with_socket_mutator_test.cc deps: + - gtest - grpc++_unsecure - grpc_test_util_unsecure platforms: @@ -13555,6 +14400,7 @@ targets: src: - test/core/channel/server_call_tracer_factory_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: server_chttp2_test @@ -13565,6 +14411,7 @@ targets: src: - test/core/surface/server_chttp2_test.cc deps: + - gtest - grpc_test_util - name: server_config_selector_test gtest: true @@ -13574,6 +14421,7 @@ targets: src: - test/core/server_config_selector/server_config_selector_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: server_context_test_spouse_test @@ -13598,6 +14446,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/server_early_return_test.cc deps: + - gtest - grpc++_test_util - name: server_finishes_request_test gtest: true @@ -13631,6 +14480,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13650,6 +14500,7 @@ targets: - test/cpp/end2end/server_interceptors_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: server_registered_method_bad_client_test gtest: true @@ -13663,6 +14514,7 @@ targets: - test/core/bad_client/tests/server_registered_method.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: server_request_call_test gtest: true @@ -13698,6 +14550,7 @@ targets: - test/core/util/tracer_util.cc - test/cpp/server/server_request_call_test.cc deps: + - gtest - grpc++_unsecure - grpc_test_util_unsecure platforms: @@ -13714,6 +14567,7 @@ targets: - test/core/handshake/server_ssl.cc - test/core/handshake/server_ssl_common.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -13751,6 +14605,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13762,6 +14617,7 @@ targets: src: - test/core/surface/server_test.cc deps: + - gtest - grpc_test_util - name: service_config_end2end_test gtest: true @@ -13778,6 +14634,7 @@ targets: - test/cpp/end2end/service_config_end2end_test.cc - test/cpp/end2end/test_service_impl.cc deps: + - gtest - grpc++_test_util - name: service_config_test gtest: true @@ -13787,6 +14644,7 @@ targets: src: - test/core/service_config/service_config_test.cc deps: + - gtest - grpc_test_util - name: settings_timeout_test gtest: true @@ -13818,6 +14676,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: shutdown_finishes_calls_test gtest: true @@ -13851,6 +14710,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13886,6 +14746,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13902,6 +14763,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/shutdown_test.cc deps: + - gtest - grpc++_test_util - name: simple_delayed_request_test gtest: true @@ -13935,6 +14797,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13970,6 +14833,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -13985,6 +14849,7 @@ targets: - test/core/bad_client/tests/simple_request.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: simple_request_test gtest: true @@ -14018,6 +14883,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -14030,6 +14896,7 @@ targets: src: - test/core/gprpp/single_set_ptr_test.cc deps: + - gtest - gpr uses_polling: false - name: sleep_test @@ -14042,6 +14909,7 @@ targets: src: - test/core/promise/sleep_test.cc deps: + - gtest - grpc uses_polling: false - name: slice_string_helpers_test @@ -14061,6 +14929,7 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/slice/slice_string_helpers_test.cc deps: + - gtest - absl/hash:hash - absl/status:statusor - gpr @@ -14073,6 +14942,7 @@ targets: src: - test/core/event_engine/smoke_test.cc deps: + - gtest - grpc_test_util_unsecure - name: sockaddr_resolver_test gtest: true @@ -14082,6 +14952,7 @@ targets: src: - test/core/client_channel/resolvers/sockaddr_resolver_test.cc deps: + - gtest - grpc_test_util - name: sockaddr_utils_test gtest: true @@ -14091,6 +14962,7 @@ targets: src: - test/core/address_utils/sockaddr_utils_test.cc deps: + - gtest - grpc_test_util - name: socket_utils_test gtest: true @@ -14122,6 +14994,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14136,7 +15009,8 @@ targets: - src/core/lib/gprpp/type_list.h src: - test/core/gprpp/sorted_pack_test.cc - deps: [] + deps: + - gtest uses_polling: false - name: spinlock_test gtest: true @@ -14146,6 +15020,7 @@ targets: src: - test/core/gpr/spinlock_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: ssl_credentials_test @@ -14178,6 +15053,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: ssl_transport_security_test gtest: true @@ -14189,6 +15065,7 @@ targets: - test/core/tsi/ssl_transport_security_test.cc - test/core/tsi/transport_security_test_lib.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14202,6 +15079,7 @@ targets: src: - test/core/tsi/ssl_transport_security_utils_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14215,6 +15093,7 @@ targets: src: - test/core/util/stack_tracer_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14229,6 +15108,7 @@ targets: src: - test/core/gprpp/stat_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: static_stride_scheduler_test @@ -14241,6 +15121,7 @@ targets: - src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/static_stride_scheduler.cc - test/core/client_channel/lb_policy/static_stride_scheduler_test.cc deps: + - gtest - absl/types:span - gpr uses_polling: false @@ -14252,6 +15133,7 @@ targets: src: - test/core/debug/stats_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: status_conversion_test @@ -14284,6 +15166,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: status_helper_test @@ -14294,6 +15177,7 @@ targets: src: - test/core/gprpp/status_helper_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: status_util_test @@ -14304,6 +15188,7 @@ targets: src: - test/core/channel/status_util_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: stranded_event_test @@ -14338,6 +15223,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14351,6 +15237,7 @@ targets: src: - test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc deps: + - gtest - grpc_test_util - name: streaming_error_response_test gtest: true @@ -14384,6 +15271,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -14400,6 +15288,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/streaming_throughput_test.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -14437,6 +15326,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: string_ref_test gtest: true @@ -14446,6 +15336,7 @@ targets: src: - test/cpp/util/string_ref_test.cc deps: + - gtest - grpc++ - grpc_test_util uses_polling: false @@ -14457,6 +15348,7 @@ targets: src: - test/core/gpr/string_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: sync_test @@ -14467,6 +15359,7 @@ targets: src: - test/core/gpr/sync_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: system_roots_test @@ -14499,6 +15392,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: table_test gtest: true @@ -14511,10 +15405,8 @@ targets: src: - test/core/gprpp/table_test.cc deps: + - gtest - absl/meta:type_traits - - absl/strings:strings - - absl/types:optional - - absl/types:variant - absl/utility:utility uses_polling: false - name: tcp_client_posix_test @@ -14547,6 +15439,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14560,6 +15453,7 @@ targets: src: - test/core/event_engine/posix/tcp_posix_socket_utils_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14598,6 +15492,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14632,6 +15527,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -14645,6 +15541,7 @@ targets: src: - test/core/event_engine/tcp_socket_utils_test.cc deps: + - gtest - grpc uses_polling: false - name: test_core_channel_channelz_test @@ -14658,6 +15555,7 @@ targets: - test/core/channel/channelz_test.cc - test/cpp/util/channel_trace_proto_helper.cc deps: + - gtest - grpc++ - grpc_test_util - name: test_core_end2end_channelz_test @@ -14692,6 +15590,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -14712,6 +15611,7 @@ targets: - src/core/lib/gprpp/time_averaged_stats.cc - test/core/event_engine/posix/timer_heap_test.cc deps: + - gtest - absl/status:statusor - gpr uses_polling: false @@ -14731,6 +15631,7 @@ targets: - src/core/lib/gprpp/time_averaged_stats.cc - test/core/event_engine/posix/timer_list_test.cc deps: + - gtest - absl/status:statusor - gpr uses_polling: false @@ -14761,6 +15662,7 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/event_engine/slice_buffer_test.cc deps: + - gtest - absl/container:flat_hash_set - absl/hash:hash - absl/status:statusor @@ -14774,6 +15676,7 @@ targets: src: - test/core/gpr/time_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: test_core_gprpp_load_file_test @@ -14784,6 +15687,7 @@ targets: src: - test/core/gprpp/load_file_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: test_core_gprpp_time_test @@ -14796,6 +15700,7 @@ targets: - src/core/lib/gprpp/time.cc - test/core/gprpp/time_test.cc deps: + - gtest - absl/status:statusor - gpr uses_polling: false @@ -14829,6 +15734,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: test_core_iomgr_timer_heap_test @@ -14861,6 +15767,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: test_core_security_credentials_test @@ -14893,6 +15800,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: test_core_slice_slice_buffer_test gtest: true @@ -14902,6 +15810,7 @@ targets: src: - test/core/slice/slice_buffer_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: test_core_slice_slice_test @@ -14914,6 +15823,7 @@ targets: - test/core/slice/slice_test.cc - test/core/util/build.cc deps: + - gtest - grpc uses_polling: false - name: test_cpp_client_credentials_test @@ -14926,6 +15836,7 @@ targets: - test/cpp/client/credentials_test.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++ - grpc_test_util - name: test_cpp_server_credentials_test @@ -14938,6 +15849,7 @@ targets: - test/cpp/server/credentials_test.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++ - grpc_test_util - name: test_cpp_util_slice_test @@ -14948,6 +15860,7 @@ targets: src: - test/cpp/util/slice_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: test_cpp_util_time_test @@ -14958,6 +15871,7 @@ targets: src: - test/cpp/util/time_test.cc deps: + - gtest - grpc++_test_util uses_polling: false - name: thd_test @@ -14968,6 +15882,7 @@ targets: src: - test/core/gprpp/thd_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: thread_manager_test @@ -14978,6 +15893,7 @@ targets: src: - test/cpp/thread_manager/thread_manager_test.cc deps: + - gtest - grpc++_test_config - grpc++_test_util - name: thread_pool_test @@ -14988,6 +15904,7 @@ targets: src: - test/core/event_engine/thread_pool_test.cc deps: + - gtest - grpc - grpc_test_util_unsecure - name: thread_quota_test @@ -15003,6 +15920,7 @@ targets: - src/core/lib/resource_quota/thread_quota.cc - test/core/resource_quota/thread_quota_test.cc deps: + - gtest - gpr uses_polling: false - name: thread_stress_test @@ -15018,6 +15936,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/thread_stress_test.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -15043,6 +15962,7 @@ targets: - test/core/event_engine/test_suite/tests/timer_test.cc - test/core/event_engine/test_suite/thready_posix_event_engine_test.cc deps: + - gtest - grpc_unsecure - grpc_test_util platforms: @@ -15058,6 +15978,7 @@ targets: src: - test/cpp/common/time_jump_test.cc deps: + - gtest - grpc++ - grpc_test_util platforms: @@ -15072,6 +15993,7 @@ targets: src: - test/core/gprpp/time_util_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: timeout_encoding_test @@ -15104,6 +16026,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util uses_polling: false - name: timer_manager_test @@ -15114,6 +16037,7 @@ targets: src: - test/core/event_engine/posix/timer_manager_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: timer_test @@ -15125,6 +16049,7 @@ targets: src: - test/cpp/common/timer_test.cc deps: + - gtest - grpc++ - grpc_test_util - name: tls_certificate_verifier_test @@ -15137,6 +16062,7 @@ targets: - test/cpp/security/tls_certificate_verifier_test.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++ - grpc_test_util - name: tls_key_export_test @@ -15151,6 +16077,7 @@ targets: - src/proto/grpc/testing/xds/v3/orca_load_report.proto - test/cpp/end2end/tls_key_export_test.cc deps: + - gtest - grpc++_test_util - name: tls_security_connector_test gtest: true @@ -15182,6 +16109,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: too_many_pings_test gtest: true @@ -15194,6 +16122,7 @@ targets: - test/core/end2end/cq_verifier.cc - test/core/transport/chttp2/too_many_pings_test.cc deps: + - gtest - grpc++_test_config - grpc++_test_util - name: traced_buffer_list_test @@ -15204,6 +16133,7 @@ targets: src: - test/core/event_engine/posix/traced_buffer_list_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -15242,6 +16172,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -15253,6 +16184,7 @@ targets: src: - test/core/tsi/alts/handshaker/transport_security_common_api_test.cc deps: + - gtest - grpc_test_util - name: transport_security_test gtest: true @@ -15262,6 +16194,7 @@ targets: src: - test/core/tsi/transport_security_test.cc deps: + - gtest - grpc_test_util - name: transport_stream_receiver_test gtest: true @@ -15366,6 +16299,8 @@ targets: - src/cpp/util/time_cc.cc - test/core/transport/binder/transport_stream_receiver_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: try_join_test @@ -15382,6 +16317,7 @@ targets: src: - test/core/promise/try_join_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - absl/utility:utility @@ -15395,6 +16331,7 @@ targets: src: - test/core/promise/try_seq_metadata_test.cc deps: + - gtest - grpc uses_polling: false - name: try_seq_test @@ -15412,6 +16349,7 @@ targets: src: - test/core/promise/try_seq_test.cc deps: + - gtest - absl/meta:type_traits - absl/status:statusor - gpr @@ -15426,9 +16364,8 @@ targets: src: - test/core/gprpp/unique_type_name_test.cc deps: + - gtest - absl/strings:str_format - - absl/strings:strings - - absl/types:variant uses_polling: false - name: unknown_frame_bad_client_test gtest: true @@ -15442,6 +16379,7 @@ targets: - test/core/bad_client/tests/unknown_frame.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: uri_parser_test gtest: true @@ -15451,6 +16389,7 @@ targets: src: - test/core/uri/uri_parser_test.cc deps: + - gtest - grpc_test_util_unsecure - name: useful_test gtest: true @@ -15461,8 +16400,7 @@ targets: src: - test/core/gpr/useful_test.cc deps: - - absl/strings:strings - - absl/types:variant + - gtest uses_polling: false - name: uuid_v4_test gtest: true @@ -15474,6 +16412,7 @@ targets: - src/core/lib/gprpp/uuid_v4.cc - test/core/gprpp/uuid_v4_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: validation_errors_test @@ -15484,6 +16423,7 @@ targets: src: - test/core/gprpp/validation_errors_test.cc deps: + - gtest - grpc_test_util - name: varint_test gtest: true @@ -15493,6 +16433,7 @@ targets: src: - test/core/transport/chttp2/varint_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: wakeup_fd_posix_test @@ -15503,6 +16444,7 @@ targets: src: - test/core/event_engine/posix/wakeup_fd_posix_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -15516,6 +16458,7 @@ targets: src: - test/core/client_channel/lb_policy/weighted_round_robin_config_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: weighted_round_robin_test @@ -15528,6 +16471,7 @@ targets: src: - test/core/client_channel/lb_policy/weighted_round_robin_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: win_socket_test @@ -15540,6 +16484,7 @@ targets: - test/core/event_engine/windows/create_sockpair.cc - test/core/event_engine/windows/win_socket_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -15558,6 +16503,7 @@ targets: - test/core/bad_client/tests/window_overflow.cc - test/core/end2end/cq_verifier.cc deps: + - gtest - grpc_test_util - name: windows_endpoint_test gtest: true @@ -15569,6 +16515,7 @@ targets: - test/core/event_engine/windows/create_sockpair.cc - test/core/event_engine/windows/windows_endpoint_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -15680,6 +16627,8 @@ targets: - test/core/transport/binder/mock_objects.cc - test/core/transport/binder/wire_reader_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: wire_writer_test @@ -15787,6 +16736,8 @@ targets: - test/core/transport/binder/mock_objects.cc - test/core/transport/binder/wire_writer_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: work_serializer_test @@ -15798,6 +16749,7 @@ targets: src: - test/core/gprpp/work_serializer_test.cc deps: + - gtest - grpc_test_util platforms: - linux @@ -15835,6 +16787,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -15870,6 +16823,7 @@ targets: - test/core/event_engine/event_engine_test_utils.cc - test/core/util/test_lb_policies.cc deps: + - gtest - grpc_authorization_provider - grpc_unsecure - grpc_test_util @@ -15907,6 +16861,7 @@ targets: - test/core/util/tracer_util.cc - test/cpp/performance/writes_per_rpc_test.cc deps: + - gtest - grpc++ - grpc_test_util platforms: @@ -15947,7 +16902,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_bootstrap_test @@ -15958,6 +16915,7 @@ targets: src: - test/core/xds/xds_bootstrap_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: xds_certificate_provider_test @@ -15968,6 +16926,7 @@ targets: src: - test/core/xds/xds_certificate_provider_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: xds_client_test @@ -15985,6 +16944,8 @@ targets: - test/core/xds/xds_client_test.cc - test/core/xds/xds_transport_fake.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: xds_cluster_end2end_test @@ -16038,6 +16999,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16069,6 +17031,8 @@ targets: - src/cpp/util/status.cc - test/core/xds/xds_cluster_resource_type_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: xds_cluster_type_end2end_test @@ -16123,6 +17087,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16156,7 +17121,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_core_end2end_test @@ -16209,6 +17176,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16228,6 +17196,7 @@ targets: - test/cpp/end2end/test_service_impl.cc - test/cpp/end2end/xds/xds_credentials_end2end_test.cc deps: + - gtest - grpc++_test_util - name: xds_credentials_test gtest: true @@ -16259,6 +17228,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - gtest - grpc_test_util - name: xds_csds_end2end_test gtest: true @@ -16312,6 +17282,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16374,6 +17345,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_config - grpc++_test_util platforms: @@ -16395,6 +17367,8 @@ targets: - src/cpp/util/status.cc - test/core/xds/xds_endpoint_resource_type_test.cc deps: + - gtest + - protobuf - grpc_test_util uses_polling: false - name: xds_fault_injection_end2end_test @@ -16448,6 +17422,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16494,7 +17469,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_interop_client @@ -16574,6 +17551,7 @@ targets: - test/cpp/interop/xds_interop_server_lib.cc - test/cpp/interop/xds_interop_server_test.cc deps: + - gtest - grpc++_reflection - grpcpp_channelz - grpc_test_util @@ -16615,7 +17593,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_listener_resource_type_test @@ -16660,7 +17640,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_outlier_detection_end2end_test @@ -16714,6 +17696,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16772,6 +17755,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16785,6 +17769,7 @@ targets: src: - test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: xds_override_host_test @@ -16797,6 +17782,7 @@ targets: src: - test/core/client_channel/lb_policy/xds_override_host_test.cc deps: + - gtest - grpc_test_util uses_polling: false - name: xds_pick_first_end2end_test @@ -16852,6 +17838,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16909,6 +17896,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -16967,6 +17955,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -17010,7 +17999,9 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc - test/cpp/util/service_describer.cc deps: + - gtest - grpc++ + - protoc - grpc_test_util uses_polling: false - name: xds_routing_end2end_test @@ -17064,6 +18055,7 @@ targets: - test/cpp/end2end/xds/xds_server.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux @@ -17091,6 +18083,7 @@ targets: - test/cpp/interop/xds_stats_watcher.cc - test/cpp/interop/xds_stats_watcher_test.cc deps: + - gtest - grpc++_reflection - grpcpp_channelz - grpc_test_util @@ -17146,6 +18139,7 @@ targets: - test/cpp/end2end/xds/xds_wrr_end2end_test.cc - test/cpp/util/tls_test_utils.cc deps: + - gtest - grpc++_test_util platforms: - linux diff --git a/config.m4 b/config.m4 index 0d2298b7afa..d3a08e8442b 100644 --- a/config.m4 +++ b/config.m4 @@ -1281,7 +1281,6 @@ if test "$PHP_GRPC" != "no"; then third_party/re2/re2/tostring.cc \ third_party/re2/re2/unicode_casefold.cc \ third_party/re2/re2/unicode_groups.cc \ - third_party/re2/util/pcre.cc \ third_party/re2/util/rune.cc \ third_party/re2/util/strutil.cc \ third_party/upb/upb/base/status.c \ diff --git a/config.w32 b/config.w32 index 3003fd2529d..627e303923d 100644 --- a/config.w32 +++ b/config.w32 @@ -1246,7 +1246,6 @@ if (PHP_GRPC != "no") { "third_party\\re2\\re2\\tostring.cc " + "third_party\\re2\\re2\\unicode_casefold.cc " + "third_party\\re2\\re2\\unicode_groups.cc " + - "third_party\\re2\\util\\pcre.cc " + "third_party\\re2\\util\\rune.cc " + "third_party\\re2\\util\\strutil.cc " + "third_party\\upb\\upb\\base\\status.c " + @@ -1297,10 +1296,6 @@ if (PHP_GRPC != "no") { "third_party\\zlib\\compress.c " + "third_party\\zlib\\crc32.c " + "third_party\\zlib\\deflate.c " + - "third_party\\zlib\\gzclose.c " + - "third_party\\zlib\\gzlib.c " + - "third_party\\zlib\\gzread.c " + - "third_party\\zlib\\gzwrite.c " + "third_party\\zlib\\infback.c " + "third_party\\zlib\\inffast.c " + "third_party\\zlib\\inflate.c " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index e967f69630d..e76768e6457 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1190,15 +1190,10 @@ Pod::Spec.new do |s| 'third_party/re2/re2/unicode_casefold.h', 'third_party/re2/re2/unicode_groups.h', 'third_party/re2/re2/walker-inl.h', - 'third_party/re2/util/benchmark.h', - 'third_party/re2/util/flags.h', 'third_party/re2/util/logging.h', - 'third_party/re2/util/malloc_counter.h', 'third_party/re2/util/mix.h', 'third_party/re2/util/mutex.h', - 'third_party/re2/util/pcre.h', 'third_party/re2/util/strutil.h', - 'third_party/re2/util/test.h', 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/alloc.h', @@ -1240,7 +1235,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/extension_internal.h', 'third_party/upb/upb/message/internal.h', 'third_party/upb/upb/message/message.h', - 'third_party/upb/upb/mini_table.h', 'third_party/upb/upb/mini_table/common.h', 'third_party/upb/upb/mini_table/common_internal.h', 'third_party/upb/upb/mini_table/decode.h', @@ -1310,7 +1304,18 @@ Pod::Spec.new do |s| 'third_party/upb/upb/wire/swap_internal.h', 'third_party/upb/upb/wire/types.h', 'third_party/utf8_range/utf8_range.h', - 'third_party/xxhash/xxhash.h' + 'third_party/xxhash/xxhash.h', + 'third_party/zlib/crc32.h', + 'third_party/zlib/deflate.h', + 'third_party/zlib/gzguts.h', + 'third_party/zlib/inffast.h', + 'third_party/zlib/inffixed.h', + 'third_party/zlib/inflate.h', + 'third_party/zlib/inftrees.h', + 'third_party/zlib/trees.h', + 'third_party/zlib/zconf.h', + 'third_party/zlib/zlib.h', + 'third_party/zlib/zutil.h' ss.private_header_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', @@ -2193,15 +2198,10 @@ Pod::Spec.new do |s| 'third_party/re2/re2/unicode_casefold.h', 'third_party/re2/re2/unicode_groups.h', 'third_party/re2/re2/walker-inl.h', - 'third_party/re2/util/benchmark.h', - 'third_party/re2/util/flags.h', 'third_party/re2/util/logging.h', - 'third_party/re2/util/malloc_counter.h', 'third_party/re2/util/mix.h', 'third_party/re2/util/mutex.h', - 'third_party/re2/util/pcre.h', 'third_party/re2/util/strutil.h', - 'third_party/re2/util/test.h', 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/alloc.h', @@ -2243,7 +2243,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/extension_internal.h', 'third_party/upb/upb/message/internal.h', 'third_party/upb/upb/message/message.h', - 'third_party/upb/upb/mini_table.h', 'third_party/upb/upb/mini_table/common.h', 'third_party/upb/upb/mini_table/common_internal.h', 'third_party/upb/upb/mini_table/decode.h', @@ -2313,7 +2312,18 @@ Pod::Spec.new do |s| 'third_party/upb/upb/wire/swap_internal.h', 'third_party/upb/upb/wire/types.h', 'third_party/utf8_range/utf8_range.h', - 'third_party/xxhash/xxhash.h' + 'third_party/xxhash/xxhash.h', + 'third_party/zlib/crc32.h', + 'third_party/zlib/deflate.h', + 'third_party/zlib/gzguts.h', + 'third_party/zlib/inffast.h', + 'third_party/zlib/inffixed.h', + 'third_party/zlib/inflate.h', + 'third_party/zlib/inftrees.h', + 'third_party/zlib/trees.h', + 'third_party/zlib/zconf.h', + 'third_party/zlib/zlib.h', + 'third_party/zlib/zutil.h' end s.subspec 'Protobuf' do |ss| diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index bb75892edf6..3d539352b5c 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1900,18 +1900,12 @@ Pod::Spec.new do |s| 'third_party/re2/re2/unicode_groups.cc', 'third_party/re2/re2/unicode_groups.h', 'third_party/re2/re2/walker-inl.h', - 'third_party/re2/util/benchmark.h', - 'third_party/re2/util/flags.h', 'third_party/re2/util/logging.h', - 'third_party/re2/util/malloc_counter.h', 'third_party/re2/util/mix.h', 'third_party/re2/util/mutex.h', - 'third_party/re2/util/pcre.cc', - 'third_party/re2/util/pcre.h', 'third_party/re2/util/rune.cc', 'third_party/re2/util/strutil.cc', 'third_party/re2/util/strutil.h', - 'third_party/re2/util/test.h', 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/alloc.h', @@ -1968,7 +1962,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/internal.h', 'third_party/upb/upb/message/message.c', 'third_party/upb/upb/message/message.h', - 'third_party/upb/upb/mini_table.h', 'third_party/upb/upb/mini_table/common.c', 'third_party/upb/upb/mini_table/common.h', 'third_party/upb/upb/mini_table/common_internal.h', @@ -2067,7 +2060,29 @@ Pod::Spec.new do |s| 'third_party/utf8_range/range2-neon.c', 'third_party/utf8_range/range2-sse.c', 'third_party/utf8_range/utf8_range.h', - 'third_party/xxhash/xxhash.h' + 'third_party/xxhash/xxhash.h', + 'third_party/zlib/adler32.c', + 'third_party/zlib/compress.c', + 'third_party/zlib/crc32.c', + 'third_party/zlib/crc32.h', + 'third_party/zlib/deflate.c', + 'third_party/zlib/deflate.h', + 'third_party/zlib/gzguts.h', + 'third_party/zlib/infback.c', + 'third_party/zlib/inffast.c', + 'third_party/zlib/inffast.h', + 'third_party/zlib/inffixed.h', + 'third_party/zlib/inflate.c', + 'third_party/zlib/inflate.h', + 'third_party/zlib/inftrees.c', + 'third_party/zlib/inftrees.h', + 'third_party/zlib/trees.c', + 'third_party/zlib/trees.h', + 'third_party/zlib/uncompr.c', + 'third_party/zlib/zconf.h', + 'third_party/zlib/zlib.h', + 'third_party/zlib/zutil.c', + 'third_party/zlib/zutil.h' ss.private_header_files = 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/channel_idle/channel_idle_filter.h', @@ -2917,15 +2932,10 @@ Pod::Spec.new do |s| 'third_party/re2/re2/unicode_casefold.h', 'third_party/re2/re2/unicode_groups.h', 'third_party/re2/re2/walker-inl.h', - 'third_party/re2/util/benchmark.h', - 'third_party/re2/util/flags.h', 'third_party/re2/util/logging.h', - 'third_party/re2/util/malloc_counter.h', 'third_party/re2/util/mix.h', 'third_party/re2/util/mutex.h', - 'third_party/re2/util/pcre.h', 'third_party/re2/util/strutil.h', - 'third_party/re2/util/test.h', 'third_party/re2/util/utf.h', 'third_party/re2/util/util.h', 'third_party/upb/upb/alloc.h', @@ -2967,7 +2977,6 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/extension_internal.h', 'third_party/upb/upb/message/internal.h', 'third_party/upb/upb/message/message.h', - 'third_party/upb/upb/mini_table.h', 'third_party/upb/upb/mini_table/common.h', 'third_party/upb/upb/mini_table/common_internal.h', 'third_party/upb/upb/mini_table/decode.h', @@ -3037,7 +3046,18 @@ Pod::Spec.new do |s| 'third_party/upb/upb/wire/swap_internal.h', 'third_party/upb/upb/wire/types.h', 'third_party/utf8_range/utf8_range.h', - 'third_party/xxhash/xxhash.h' + 'third_party/xxhash/xxhash.h', + 'third_party/zlib/crc32.h', + 'third_party/zlib/deflate.h', + 'third_party/zlib/gzguts.h', + 'third_party/zlib/inffast.h', + 'third_party/zlib/inffixed.h', + 'third_party/zlib/inflate.h', + 'third_party/zlib/inftrees.h', + 'third_party/zlib/trees.h', + 'third_party/zlib/zconf.h', + 'third_party/zlib/zlib.h', + 'third_party/zlib/zutil.h' end # CFStream is now default. Leaving this subspec only for compatibility purpose. diff --git a/grpc.gemspec b/grpc.gemspec index 751e2dca64e..9816b9f87b5 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2781,18 +2781,12 @@ Gem::Specification.new do |s| s.files += %w( third_party/re2/re2/unicode_groups.cc ) s.files += %w( third_party/re2/re2/unicode_groups.h ) s.files += %w( third_party/re2/re2/walker-inl.h ) - s.files += %w( third_party/re2/util/benchmark.h ) - s.files += %w( third_party/re2/util/flags.h ) s.files += %w( third_party/re2/util/logging.h ) - s.files += %w( third_party/re2/util/malloc_counter.h ) s.files += %w( third_party/re2/util/mix.h ) s.files += %w( third_party/re2/util/mutex.h ) - s.files += %w( third_party/re2/util/pcre.cc ) - s.files += %w( third_party/re2/util/pcre.h ) s.files += %w( third_party/re2/util/rune.cc ) s.files += %w( third_party/re2/util/strutil.cc ) s.files += %w( third_party/re2/util/strutil.h ) - s.files += %w( third_party/re2/util/test.h ) s.files += %w( third_party/re2/util/utf.h ) s.files += %w( third_party/re2/util/util.h ) s.files += %w( third_party/upb/upb/alloc.h ) @@ -2849,7 +2843,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/upb/upb/message/internal.h ) s.files += %w( third_party/upb/upb/message/message.c ) s.files += %w( third_party/upb/upb/message/message.h ) - s.files += %w( third_party/upb/upb/mini_table.h ) s.files += %w( third_party/upb/upb/mini_table/common.c ) s.files += %w( third_party/upb/upb/mini_table/common.h ) s.files += %w( third_party/upb/upb/mini_table/common_internal.h ) @@ -2955,11 +2948,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/zlib/crc32.h ) s.files += %w( third_party/zlib/deflate.c ) s.files += %w( third_party/zlib/deflate.h ) - s.files += %w( third_party/zlib/gzclose.c ) s.files += %w( third_party/zlib/gzguts.h ) - s.files += %w( third_party/zlib/gzlib.c ) - s.files += %w( third_party/zlib/gzread.c ) - s.files += %w( third_party/zlib/gzwrite.c ) s.files += %w( third_party/zlib/infback.c ) s.files += %w( third_party/zlib/inffast.c ) s.files += %w( third_party/zlib/inffast.h ) diff --git a/grpc.gyp b/grpc.gyp index 05ca749063c..1be2679b357 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -249,6 +249,10 @@ 'target_name': 'grpc', 'type': 'static_library', 'dependencies': [ + 're2', + 'upb_json_lib', + 'upb_textformat_lib', + 'z', 'absl/algorithm:container', 'absl/cleanup:cleanup', 'absl/container:flat_hash_map', @@ -261,9 +265,9 @@ 'absl/status:statusor', 'absl/types:span', 'absl/utility:utility', + 'cares', 'gpr', 'address_sorting', - 'upb', ], 'sources': [ 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', @@ -1087,6 +1091,9 @@ 'target_name': 'grpc_unsecure', 'type': 'static_library', 'dependencies': [ + 'upb_collections_lib', + 'upb', + 'z', 'absl/algorithm:container', 'absl/cleanup:cleanup', 'absl/container:flat_hash_map', @@ -1099,9 +1106,9 @@ 'absl/status:statusor', 'absl/types:span', 'absl/utility:utility', + 'cares', 'gpr', 'address_sorting', - 'upb', ], 'sources': [ 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', @@ -1483,6 +1490,204 @@ 'src/core/tsi/transport_security_grpc.cc', ], }, + { + 'target_name': 'gtest', + 'type': 'static_library', + 'dependencies': [ + 'absl/debugging:failure_signal_handler', + 'absl/debugging:stacktrace', + 'absl/debugging:symbolize', + 'absl/strings:strings', + 'absl/types:any', + 'absl/types:optional', + 'absl/types:variant', + ], + 'sources': [ + 'third_party/googletest/googlemock/src/gmock-cardinalities.cc', + 'third_party/googletest/googlemock/src/gmock-internal-utils.cc', + 'third_party/googletest/googlemock/src/gmock-matchers.cc', + 'third_party/googletest/googlemock/src/gmock-spec-builders.cc', + 'third_party/googletest/googlemock/src/gmock.cc', + 'third_party/googletest/googletest/src/gtest-assertion-result.cc', + 'third_party/googletest/googletest/src/gtest-death-test.cc', + 'third_party/googletest/googletest/src/gtest-filepath.cc', + 'third_party/googletest/googletest/src/gtest-matchers.cc', + 'third_party/googletest/googletest/src/gtest-port.cc', + 'third_party/googletest/googletest/src/gtest-printers.cc', + 'third_party/googletest/googletest/src/gtest-test-part.cc', + 'third_party/googletest/googletest/src/gtest-typed-test.cc', + 'third_party/googletest/googletest/src/gtest.cc', + ], + }, + { + 'target_name': 're2', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/re2/re2/bitstate.cc', + 'third_party/re2/re2/compile.cc', + 'third_party/re2/re2/dfa.cc', + 'third_party/re2/re2/filtered_re2.cc', + 'third_party/re2/re2/mimics_pcre.cc', + 'third_party/re2/re2/nfa.cc', + 'third_party/re2/re2/onepass.cc', + 'third_party/re2/re2/parse.cc', + 'third_party/re2/re2/perl_groups.cc', + 'third_party/re2/re2/prefilter.cc', + 'third_party/re2/re2/prefilter_tree.cc', + 'third_party/re2/re2/prog.cc', + 'third_party/re2/re2/re2.cc', + 'third_party/re2/re2/regexp.cc', + 'third_party/re2/re2/set.cc', + 'third_party/re2/re2/simplify.cc', + 'third_party/re2/re2/stringpiece.cc', + 'third_party/re2/re2/tostring.cc', + 'third_party/re2/re2/unicode_casefold.cc', + 'third_party/re2/re2/unicode_groups.cc', + 'third_party/re2/util/rune.cc', + 'third_party/re2/util/strutil.cc', + ], + }, + { + 'target_name': 'upb', + 'type': 'static_library', + 'dependencies': [ + 'utf8_range_lib', + ], + 'sources': [ + 'third_party/upb/upb/base/status.c', + 'third_party/upb/upb/collections/array.c', + 'third_party/upb/upb/collections/map.c', + 'third_party/upb/upb/collections/map_sorter.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/message.c', + 'third_party/upb/upb/mini_table/common.c', + 'third_party/upb/upb/mini_table/decode.c', + 'third_party/upb/upb/mini_table/encode.c', + 'third_party/upb/upb/mini_table/extension_registry.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_name': 'upb_collections_lib', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/upb/upb/base/status.c', + 'third_party/upb/upb/collections/array.c', + 'third_party/upb/upb/collections/map.c', + 'third_party/upb/upb/collections/map_sorter.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/message.c', + 'third_party/upb/upb/mini_table/common.c', + 'third_party/upb/upb/mini_table/decode.c', + 'third_party/upb/upb/mini_table/encode.c', + 'third_party/upb/upb/mini_table/extension_registry.c', + ], + }, + { + 'target_name': 'upb_json_lib', + 'type': 'static_library', + 'dependencies': [ + 'upb_collections_lib', + 'upb', + ], + 'sources': [ + 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', + 'third_party/upb/upb/json/decode.c', + 'third_party/upb/upb/json/encode.c', + 'third_party/upb/upb/message/accessors.c', + 'third_party/upb/upb/reflection/def_builder.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/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', + ], + }, + { + 'target_name': 'upb_textformat_lib', + 'type': 'static_library', + 'dependencies': [ + 'upb_collections_lib', + 'upb', + ], + 'sources': [ + 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', + 'third_party/upb/upb/message/accessors.c', + 'third_party/upb/upb/reflection/def_builder.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/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/text/encode.c', + ], + }, + { + 'target_name': 'utf8_range_lib', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/utf8_range/naive.c', + 'third_party/utf8_range/range2-neon.c', + 'third_party/utf8_range/range2-sse.c', + ], + }, + { + 'target_name': 'z', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/zlib/adler32.c', + 'third_party/zlib/compress.c', + 'third_party/zlib/crc32.c', + 'third_party/zlib/deflate.c', + 'third_party/zlib/infback.c', + 'third_party/zlib/inffast.c', + 'third_party/zlib/inflate.c', + 'third_party/zlib/inftrees.c', + 'third_party/zlib/trees.c', + 'third_party/zlib/uncompr.c', + 'third_party/zlib/zutil.c', + ], + }, { 'target_name': 'benchmark_helpers', 'type': 'static_library', @@ -1515,6 +1720,7 @@ 'type': 'static_library', 'dependencies': [ 'grpc', + 'protobuf', ], 'sources': [ 'src/core/ext/transport/binder/client/binder_connector.cc', @@ -1621,6 +1827,7 @@ 'target_name': 'grpc++_test', 'type': 'static_library', 'dependencies': [ + 'gtest', 'grpc++', ], 'sources': [ @@ -1674,6 +1881,7 @@ 'type': 'static_library', 'dependencies': [ 'grpc_unsecure', + 'protobuf', ], 'sources': [ 'src/cpp/client/channel_cc.cc', @@ -1719,6 +1927,9 @@ 'target_name': 'grpc_authorization_provider', 'type': 'static_library', 'dependencies': [ + 're2', + 'upb', + 'z', 'absl/cleanup:cleanup', 'absl/container:flat_hash_map', 'absl/container:flat_hash_set', @@ -1729,11 +1940,12 @@ 'absl/status:statusor', 'absl/types:span', 'absl/utility:utility', + 'cares', 'gpr', - 'upb', ], 'sources': [ 'src/core/ext/upb-generated/google/protobuf/any.upb.c', + 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', 'src/core/ext/upb-generated/google/rpc/status.upb.c', 'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c', 'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c', @@ -1996,6 +2208,8 @@ 'target_name': 'grpc_plugin_support', 'type': 'static_library', 'dependencies': [ + 'protobuf', + 'protoc', ], 'sources': [ 'src/compiler/cpp_generator.cc', @@ -2333,113 +2547,5 @@ 'third_party/benchmark/src/timers.cc', ], }, - { - 'target_name': 're2', - 'type': 'static_library', - 'dependencies': [ - ], - 'sources': [ - 'third_party/re2/re2/bitstate.cc', - 'third_party/re2/re2/compile.cc', - 'third_party/re2/re2/dfa.cc', - 'third_party/re2/re2/filtered_re2.cc', - 'third_party/re2/re2/mimics_pcre.cc', - 'third_party/re2/re2/nfa.cc', - 'third_party/re2/re2/onepass.cc', - 'third_party/re2/re2/parse.cc', - 'third_party/re2/re2/perl_groups.cc', - 'third_party/re2/re2/prefilter.cc', - 'third_party/re2/re2/prefilter_tree.cc', - 'third_party/re2/re2/prog.cc', - 'third_party/re2/re2/re2.cc', - 'third_party/re2/re2/regexp.cc', - 'third_party/re2/re2/set.cc', - 'third_party/re2/re2/simplify.cc', - 'third_party/re2/re2/stringpiece.cc', - 'third_party/re2/re2/tostring.cc', - 'third_party/re2/re2/unicode_casefold.cc', - 'third_party/re2/re2/unicode_groups.cc', - 'third_party/re2/util/pcre.cc', - 'third_party/re2/util/rune.cc', - 'third_party/re2/util/strutil.cc', - ], - }, - { - 'target_name': 'upb', - 'type': 'static_library', - 'dependencies': [ - ], - 'sources': [ - 'third_party/utf8_range/naive.c', - 'third_party/utf8_range/range2-neon.c', - 'third_party/utf8_range/range2-sse.c', - 'third_party/upb/upb/base/status.c', - 'third_party/upb/upb/collections/array.c', - 'third_party/upb/upb/collections/map_sorter.c', - 'third_party/upb/upb/collections/map.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/message.c', - 'third_party/upb/upb/mini_table/common.c', - 'third_party/upb/upb/mini_table/decode.c', - 'third_party/upb/upb/mini_table/encode.c', - 'third_party/upb/upb/mini_table/extension_registry.c', - 'third_party/upb/upb/reflection/def_builder.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/message_def.c', - 'third_party/upb/upb/reflection/message_reserved_range.c', - 'third_party/upb/upb/reflection/message.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/text/encode.c', - 'third_party/upb/upb/wire/decode_fast.c', - 'third_party/upb/upb/wire/decode.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', - 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', - 'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c', - ], - }, - { - 'target_name': 'z', - 'type': 'static_library', - 'dependencies': [ - ], - 'sources': [ - 'third_party/zlib/adler32.c', - 'third_party/zlib/compress.c', - 'third_party/zlib/crc32.c', - 'third_party/zlib/deflate.c', - 'third_party/zlib/gzclose.c', - 'third_party/zlib/gzlib.c', - 'third_party/zlib/gzread.c', - 'third_party/zlib/gzwrite.c', - 'third_party/zlib/infback.c', - 'third_party/zlib/inffast.c', - 'third_party/zlib/inflate.c', - 'third_party/zlib/inftrees.c', - 'third_party/zlib/trees.c', - 'third_party/zlib/uncompr.c', - 'third_party/zlib/zutil.c', - ], - }, ] } diff --git a/package.xml b/package.xml index b4fd075885e..457bd3d0489 100644 --- a/package.xml +++ b/package.xml @@ -2695,18 +2695,12 @@ - - - - - - @@ -2763,7 +2757,6 @@ - @@ -2869,11 +2862,7 @@ - - - - diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 9888c329476..85eb99bbeba 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -1305,7 +1305,6 @@ CORE_SOURCE_FILES = [ 'third_party/re2/re2/tostring.cc', 'third_party/re2/re2/unicode_casefold.cc', 'third_party/re2/re2/unicode_groups.cc', - 'third_party/re2/util/pcre.cc', 'third_party/re2/util/rune.cc', 'third_party/re2/util/strutil.cc', 'third_party/upb/upb/base/status.c', @@ -1356,10 +1355,6 @@ CORE_SOURCE_FILES = [ 'third_party/zlib/compress.c', 'third_party/zlib/crc32.c', 'third_party/zlib/deflate.c', - 'third_party/zlib/gzclose.c', - 'third_party/zlib/gzlib.c', - 'third_party/zlib/gzread.c', - 'third_party/zlib/gzwrite.c', 'third_party/zlib/infback.c', 'third_party/zlib/inffast.c', 'third_party/zlib/inflate.c', diff --git a/src/re2/gen_build_yaml.py b/src/re2/gen_build_yaml.py deleted file mode 100755 index 063bb4fa58e..00000000000 --- a/src/re2/gen_build_yaml.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python2.7 - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import sys -import glob -import yaml - -os.chdir(os.path.dirname(sys.argv[0]) + "/../..") - -out = {} - -out["libs"] = [ - { - # TODO @donnadionne: extracting the list of source files from bazel build to reduce duplication - "name": "re2", - "build": "private", - "language": "c", - "secure": False, - "src": sorted( - glob.glob("third_party/re2/re2/*.cc") - + [ - "third_party/re2/util/pcre.cc", - "third_party/re2/util/rune.cc", - "third_party/re2/util/strutil.cc", - ] - ), - "headers": sorted( - glob.glob("third_party/re2/re2/*.h") - + glob.glob("third_party/re2/util/*.h") - ), - } -] - -print(yaml.dump(out)) diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py deleted file mode 100755 index b7824001bdb..00000000000 --- a/src/upb/gen_build_yaml.py +++ /dev/null @@ -1,199 +0,0 @@ -#!/usr/bin/env python2.7 - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# TODO: This should ideally be in upb submodule to avoid hardcoding this here. - -import re -import os -import sys -import yaml - -out = {} - -try: - out["libs"] = [ - { - "name": "upb", - "build": "all", - "language": "c", - "src": [ - "third_party/utf8_range/naive.c", - "third_party/utf8_range/range2-neon.c", - "third_party/utf8_range/range2-sse.c", - "third_party/upb/upb/base/status.c", - "third_party/upb/upb/collections/array.c", - "third_party/upb/upb/collections/map_sorter.c", - "third_party/upb/upb/collections/map.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/message.c", - "third_party/upb/upb/mini_table/common.c", - "third_party/upb/upb/mini_table/decode.c", - "third_party/upb/upb/mini_table/encode.c", - "third_party/upb/upb/mini_table/extension_registry.c", - "third_party/upb/upb/reflection/def_builder.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/message_def.c", - "third_party/upb/upb/reflection/message_reserved_range.c", - "third_party/upb/upb/reflection/message.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/text/encode.c", - "third_party/upb/upb/wire/decode_fast.c", - "third_party/upb/upb/wire/decode.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", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", - ], - "headers": [ - "third_party/utf8_range/utf8_range.h", - "third_party/upb/upb/alloc.h", - "third_party/upb/upb/arena.h", - "third_party/upb/upb/array.h", - "third_party/upb/upb/base/descriptor_constants.h", - "third_party/upb/upb/base/log2.h", - "third_party/upb/upb/base/status.h", - "third_party/upb/upb/base/string_view.h", - "third_party/upb/upb/collections/array_internal.h", - "third_party/upb/upb/collections/array.h", - "third_party/upb/upb/collections/map_gencode_util.h", - "third_party/upb/upb/collections/map_internal.h", - "third_party/upb/upb/collections/map_sorter_internal.h", - "third_party/upb/upb/collections/map.h", - "third_party/upb/upb/collections/message_value.h", - "third_party/upb/upb/decode.h", - "third_party/upb/upb/def.h", - "third_party/upb/upb/def.hpp", - "third_party/upb/upb/encode.h", - "third_party/upb/upb/extension_registry.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/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/map.h", - "third_party/upb/upb/mem/alloc.h", - "third_party/upb/upb/mem/arena_internal.h", - "third_party/upb/upb/mem/arena.h", - "third_party/upb/upb/message/accessors_internal.h", - "third_party/upb/upb/message/accessors.h", - "third_party/upb/upb/message/extension_internal.h", - "third_party/upb/upb/message/internal.h", - "third_party/upb/upb/message/message.h", - "third_party/upb/upb/mini_table.h", - "third_party/upb/upb/mini_table/common_internal.h", - "third_party/upb/upb/mini_table/common.h", - "third_party/upb/upb/mini_table/decode.h", - "third_party/upb/upb/mini_table/encode_internal.h", - "third_party/upb/upb/mini_table/encode_internal.hpp", - "third_party/upb/upb/mini_table/enum_internal.h", - "third_party/upb/upb/mini_table/extension_internal.h", - "third_party/upb/upb/mini_table/extension_registry.h", - "third_party/upb/upb/mini_table/field_internal.h", - "third_party/upb/upb/mini_table/file_internal.h", - "third_party/upb/upb/mini_table/message_internal.h", - "third_party/upb/upb/mini_table/sub_internal.h", - "third_party/upb/upb/mini_table/types.h", - "third_party/upb/upb/msg.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.h", - "third_party/upb/upb/reflection.hpp", - "third_party/upb/upb/reflection/common.h", - "third_party/upb/upb/reflection/def_builder_internal.h", - "third_party/upb/upb/reflection/def_pool_internal.h", - "third_party/upb/upb/reflection/def_pool.h", - "third_party/upb/upb/reflection/def_type.h", - "third_party/upb/upb/reflection/def.h", - "third_party/upb/upb/reflection/def.hpp", - "third_party/upb/upb/reflection/desc_state_internal.h", - "third_party/upb/upb/reflection/enum_def_internal.h", - "third_party/upb/upb/reflection/enum_def.h", - "third_party/upb/upb/reflection/enum_reserved_range_internal.h", - "third_party/upb/upb/reflection/enum_reserved_range.h", - "third_party/upb/upb/reflection/enum_value_def_internal.h", - "third_party/upb/upb/reflection/enum_value_def.h", - "third_party/upb/upb/reflection/extension_range_internal.h", - "third_party/upb/upb/reflection/extension_range.h", - "third_party/upb/upb/reflection/field_def_internal.h", - "third_party/upb/upb/reflection/field_def.h", - "third_party/upb/upb/reflection/file_def_internal.h", - "third_party/upb/upb/reflection/file_def.h", - "third_party/upb/upb/reflection/message_def_internal.h", - "third_party/upb/upb/reflection/message_def.h", - "third_party/upb/upb/reflection/message_reserved_range_internal.h", - "third_party/upb/upb/reflection/message_reserved_range.h", - "third_party/upb/upb/reflection/message.h", - "third_party/upb/upb/reflection/message.hpp", - "third_party/upb/upb/reflection/method_def_internal.h", - "third_party/upb/upb/reflection/method_def.h", - "third_party/upb/upb/reflection/oneof_def_internal.h", - "third_party/upb/upb/reflection/oneof_def.h", - "third_party/upb/upb/reflection/service_def_internal.h", - "third_party/upb/upb/reflection/service_def.h", - "third_party/upb/upb/status.h", - "third_party/upb/upb/string_view.h", - "third_party/upb/upb/text_encode.h", - "third_party/upb/upb/text/encode.h", - "third_party/upb/upb/upb.h", - "third_party/upb/upb/upb.hpp", - "third_party/upb/upb/wire/common_internal.h", - "third_party/upb/upb/wire/common.h", - "third_party/upb/upb/wire/decode_fast.h", - "third_party/upb/upb/wire/decode_internal.h", - "third_party/upb/upb/wire/decode.h", - "third_party/upb/upb/wire/encode.h", - "third_party/upb/upb/wire/eps_copy_input_stream.h", - "third_party/upb/upb/wire/reader.h", - "third_party/upb/upb/wire/swap_internal.h", - "third_party/upb/upb/wire/types.h", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", - "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", - ], - "secure": False, - } - ] -except: - pass - -print(yaml.dump(out)) diff --git a/src/zlib/gen_build_yaml.py b/src/zlib/gen_build_yaml.py deleted file mode 100755 index fdd0ccee0af..00000000000 --- a/src/zlib/gen_build_yaml.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python2.7 - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import re -import os -import sys -import yaml - -os.chdir(os.path.dirname(sys.argv[0]) + "/../..") - -out = {} - -try: - with open("third_party/zlib/CMakeLists.txt") as f: - cmake = f.read() - - def cmpath(x): - return "third_party/zlib/%s" % x.replace( - "${CMAKE_CURRENT_BINARY_DIR}/", "" - ) - - def cmvar(name): - regex = r"set\(\s*" - regex += name - regex += r"([^)]*)\)" - return [cmpath(x) for x in re.search(regex, cmake).group(1).split()] - - out["libs"] = [ - { - "name": "z", - "zlib": True, - "defaults": "zlib", - "build": "private", - "language": "c", - "secure": False, - "src": sorted(cmvar("ZLIB_SRCS")), - "headers": sorted( - cmvar("ZLIB_PUBLIC_HDRS") + cmvar("ZLIB_PRIVATE_HDRS") - ), - } - ] -except: - pass - -print(yaml.dump(out)) diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 4f058f20ece..999cb8d244a 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -37,32 +37,117 @@ return path def proto_replace_ext(filename, ext): - m = proto_re.match(filename) - if not m: - return filename - return '${_gRPC_PROTO_GENS_DIR}/' + third_party_proto_import_path(m.group(1)) + ext + """Replace the .proto extension with given extension.""" + m = proto_re.match(filename) + if not m: + return filename + return '${_gRPC_PROTO_GENS_DIR}/' + third_party_proto_import_path(m.group(1)) + ext def is_absl_lib(lib_name): - return lib_name.startswith("absl/") + """Returns True if the library is one of the abseil libraries.""" + return lib_name.startswith("absl/") def get_absl_dep(lib_name): return lib_map[lib_name].cmake_target - def lib_and_transitive_deps(lib): - return list(sorted(set({lib} | set(lib_map[lib].transitive_deps)))) + def get_transitive_deps(lib_name): + """Get list of transitive deps for given library.""" + transitive_deps = [] + lib_metadata = lib_map.get(lib_name, None) + if lib_metadata: + transitive_deps = lib_metadata.transitive_deps + return list(transitive_deps) def list_abseil_pkg_targets(lib): + # TODO(jtattermusch): this function is odd, try to eliminate it. # This returns a list of abseil pkg targets which the given lib and # its non-abseil transitive dependencies depend on. # As a result, internal abseil libraries are excluded from the result. absl_specs = set() - for lib_name in lib_and_transitive_deps(lib): + transitive_deps_and_self = [lib] + get_transitive_deps(lib) + for lib_name in transitive_deps_and_self: if is_absl_lib(lib_name): continue - for dep in lib_map[lib_name].deps: - if is_absl_lib(dep): - absl_specs.add(get_absl_dep(dep).replace("::", "_")) + lib_metadata = lib_map.get(lib_name, None) + if lib_metadata: + for dep in lib_metadata.deps: + if is_absl_lib(dep): + absl_specs.add(get_absl_dep(dep).replace("::", "_")) return list(sorted(absl_specs)) + def lib_name_to_pkgconfig_requires_private_name(lib_name): + """If library belongs to pkgconfig Requires.private section, return the name under which to include it.""" + # TODO(jtattermusch): extract the metadata to a centralized location. + deps_to_pkgconfig_requires_private = { + "cares": "libcares", + "libssl": "openssl", + "re2": "re2", + "z": "zlib", + } + return deps_to_pkgconfig_requires_private.get(lib_name, None) + + def is_pkgconfig_package(lib_name): + """Returns True if a pkgconfig package exists for a given library.""" + # TODO(jtattermusch): extract the metadata to a centralized location. + if lib_name in ["address_sorting", "utf8_range_lib"]: + return False + if lib_name == "upb" or lib_name.startswith("upb_"): + # TODO(jtattermusch): Add better detection for what are the "upb" libs. + return False + return True + + def get_pkgconfig_requires(lib): + """Returns "Requires" list for generating the pkgconfig .pc file for given library.""" + requires = set() + requires.update(list_abseil_pkg_targets(lib)) + for lib_name in get_transitive_deps(lib): + if not is_pkgconfig_package(lib_name): + # these deps go into Libs or Libs.Private + continue + if is_absl_lib(lib_name): + # absl libs have special handling + continue + if lib_name_to_pkgconfig_requires_private_name(lib_name) is not None: + # these deps go into Requires.private + continue + if lib_name == 'protobuf': + # TODO(jtattermusch): add better way of excluding explicit protobuf dependency. + continue + requires.add(lib_name) + return list(sorted(requires)) + + def get_pkgconfig_requires_private(lib): + """Returns the "Requires.private" list for generating the pkgconfig .pc file for given library.""" + private_requires = set() + for lib_name in get_transitive_deps(lib): + if is_absl_lib(lib_name): + # absl deps to into Requires + continue + require_name = lib_name_to_pkgconfig_requires_private_name(lib_name) + if require_name: + private_requires.add(require_name) + return list(sorted(private_requires)) + + def get_pkgconfig_libs(lib): + """The "Libs" list for generating the pkgconfig .pc file for given library.""" + libs = set() + # add self + libs.add("-l" + lib) + return list(sorted(libs)) + + def get_pkgconfig_libs_private(lib): + """The "Libs.private" list for generating the pkgconfig .pc file for given library.""" + private_libs = [] + for lib_name in get_transitive_deps(lib): + if is_absl_lib(lib_name): + # absl deps to into Requires + continue + if is_pkgconfig_package(lib_name): + continue + # Transitive deps are pre-sorted in topological order. + # We must maintain that order to prevent linkage errors. + private_libs.append("-l" + lib_name) + return private_libs + def is_shared_only_lib(lib_name): """Returns True if only shared library should be generated.""" # grpc_csharp_ext is loaded by C# runtime and it @@ -76,11 +161,7 @@ deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}") if target_dict.language == 'c++': deps.append("${_gRPC_PROTOBUF_LIBRARIES}") - deps.append("${_gRPC_ZLIB_LIBRARIES}") if target_dict['name'] in ['grpc', 'grpc_cronet', 'grpc_unsecure']: - deps.append("${_gRPC_CARES_LIBRARIES}") - deps.append("${_gRPC_ADDRESS_SORTING_LIBRARIES}") - deps.append("${_gRPC_RE2_LIBRARIES}") deps.append("${_gRPC_UPB_LIBRARIES}") # TODO(yijiem): These targets depend on grpc_base instead of grpc. Since we don't populate grpc_base as a cmake target, the sources all get collapsed into these targets. This workaround adds c-ares and/or re2 dependencies to these targets. We should clean this up. if target_dict['name'] in ['frame_test']: @@ -90,12 +171,25 @@ deps.append("${_gRPC_RE2_LIBRARIES}") deps.append("${_gRPC_ALLTARGETS_LIBRARIES}") for d in target_dict.get('deps', []): - if d == 'benchmark': + if d == 'z': + deps.append("${_gRPC_ZLIB_LIBRARIES}") + elif d == 'address_sorting': + deps.append("${_gRPC_ADDRESS_SORTING_LIBRARIES}") + elif d == 'benchmark': deps.append("${_gRPC_BENCHMARK_LIBRARIES}") elif d == 'libssl': deps.append("${_gRPC_SSL_LIBRARIES}") + elif d == 're2': + deps.append("${_gRPC_RE2_LIBRARIES}") + elif d == 'cares': + deps.append("${_gRPC_CARES_LIBRARIES}") + elif d == 'protobuf': + deps.append("${_gRPC_PROTOBUF_LIBRARIES}") + elif d == 'protoc': + deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}") elif is_absl_lib(d): deps.append(get_absl_dep(d)) + # TODO(jtattermusch): add handling for upb libraries else: deps.append(d) return deps @@ -685,7 +779,7 @@ <%text>${_gRPC_UPB_INCLUDE_DIR} <%text>${_gRPC_XXHASH_INCLUDE_DIR} <%text>${_gRPC_ZLIB_INCLUDE_DIR} - % if (lib.build in ['test', 'private'] and lib.language == 'c++') or lib.name == 'end2end_tests': + % if 'gtest' in lib.transitive_deps or lib.name == 'gtest': third_party/googletest/googletest/include third_party/googletest/googletest third_party/googletest/googlemock/include @@ -748,10 +842,6 @@ ${proto_replace_ext(src, '.grpc.pb.h')} % endif % endfor - % if tgt.build == 'test' and tgt.language == 'c++': - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc - % endif ) target_compile_features(${tgt.name} PUBLIC cxx_std_14) target_include_directories(${tgt.name} @@ -766,7 +856,7 @@ <%text>${_gRPC_UPB_INCLUDE_DIR} <%text>${_gRPC_XXHASH_INCLUDE_DIR} <%text>${_gRPC_ZLIB_INCLUDE_DIR} - % if tgt.build in ['test', 'private'] and tgt.language == 'c++': + % if 'gtest' in tgt.transitive_deps: third_party/googletest/googletest/include third_party/googletest/googletest third_party/googletest/googlemock/include @@ -867,10 +957,10 @@ "gpr" "gRPC platform support library" "<%text>${gRPC_CORE_VERSION}" - "${" ".join(list_abseil_pkg_targets("gpr"))}" - "" - "${" ".join(("-l" + l) for l in ["gpr"])}" - "" + "${" ".join(get_pkgconfig_requires("gpr"))}" + "${" ".join(get_pkgconfig_requires_private("gpr"))}" + "${" ".join(get_pkgconfig_libs("gpr"))}" + "${" ".join(get_pkgconfig_libs_private("gpr"))}" "gpr.pc") # grpc .pc file @@ -878,10 +968,10 @@ "gRPC" "high performance general RPC framework" "<%text>${gRPC_CORE_VERSION}" - "${" ".join(["gpr"] + list_abseil_pkg_targets("grpc"))}" - "${" ".join(["openssl", "re2", "libcares", "zlib"])}" - "${" ".join(("-l" + l) for l in ["grpc",])}" - "${" ".join(("-l" + l) for l in ["address_sorting", "upb"])}" + "${" ".join(get_pkgconfig_requires("grpc"))}" + "${" ".join(get_pkgconfig_requires_private("grpc"))}" + "${" ".join(get_pkgconfig_libs("grpc"))}" + "${" ".join(get_pkgconfig_libs_private("grpc"))}" "grpc.pc") # grpc_unsecure .pc file @@ -889,10 +979,10 @@ "gRPC unsecure" "high performance general RPC framework without SSL" "<%text>${gRPC_CORE_VERSION}" - "${" ".join(["gpr"] + list_abseil_pkg_targets("grpc_unsecure"))}" - "${" ".join(["re2", "libcares", "zlib"])}" - "${" ".join(("-l" + l) for l in ["grpc_unsecure"])}" - "${" ".join(("-l" + l) for l in ["address_sorting", "upb"])}" + "${" ".join(get_pkgconfig_requires("grpc_unsecure"))}" + "${" ".join(get_pkgconfig_requires_private("grpc_unsecure"))}" + "${" ".join(get_pkgconfig_libs("grpc_unsecure"))}" + "${" ".join(get_pkgconfig_libs_private("grpc_unsecure"))}" "grpc_unsecure.pc") # grpc++ .pc file @@ -900,10 +990,10 @@ "gRPC++" "C++ wrapper for gRPC" "<%text>${gRPC_CPP_VERSION}" - "${" ".join(["grpc"] + list_abseil_pkg_targets("grpc++"))}" - "" - "${" ".join(("-l" + l) for l in ["grpc++"])}" - "" + "${" ".join(get_pkgconfig_requires("grpc++"))}" + "${" ".join(get_pkgconfig_requires_private("grpc++"))}" + "${" ".join(get_pkgconfig_libs("grpc++"))}" + "${" ".join(get_pkgconfig_libs_private("grpc++"))}" "grpc++.pc") # grpc++_unsecure .pc file @@ -911,8 +1001,8 @@ "gRPC++ unsecure" "C++ wrapper for gRPC without SSL" "<%text>${gRPC_CPP_VERSION}" - "${" ".join(["grpc_unsecure"] + list_abseil_pkg_targets("grpc++_unsecure"))}" - "" - "${" ".join(("-l" + l) for l in ["grpc++_unsecure"])}" - "" + "${" ".join(get_pkgconfig_requires("grpc++_unsecure"))}" + "${" ".join(get_pkgconfig_requires_private("grpc++_unsecure"))}" + "${" ".join(get_pkgconfig_libs("grpc++_unsecure"))}" + "${" ".join(get_pkgconfig_libs_private("grpc++_unsecure"))}" "grpc++_unsecure.pc") diff --git a/templates/Makefile.template b/templates/Makefile.template index aed99b1f312..e2d0b94f2bf 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -25,7 +25,134 @@ import os def is_absl_lib(target_name): - return target_name.startswith("absl/"); + """Returns True if the target name is one of the abseil libraries.""" + return target_name.startswith("absl/") + + + def collapse_absl_deps(deps): + """Replace first occurrence of absl dependency with grpc_abseil and remove the remaining absl dependencies.""" + result = [] + absl_dep_added = False + for dep in deps: + if is_absl_lib(dep): + if not absl_dep_added: + result.append('grpc_abseil') + absl_dep_added = True + else: + result.append(dep) + return result + + + def get_dep_expression(dep): + """For given dependency, return the expression to be used in Makefile rule dependencies.""" + if dep == 'z': + return "$(ZLIB_DEP)" + elif dep == 'cares': + return "$(CARES_DEP)" + elif dep == 'grpc_abseil': + return "$(GRPC_ABSEIL_DEP)" + elif dep == 'libssl': + return "$(OPENSSL_DEP)" + else: + return "$(LIBDIR)/$(CONFIG)/lib%s.a" % dep + + + def get_merge_libs_expression(dep): + """For given dependency, return the lib archive expression to be used when linking.""" + if dep == 'z': + return "$(ZLIB_MERGE_LIBS)" + elif dep == 'cares': + return "$(CARES_MERGE_LIBS)" + elif dep == 'grpc_abseil': + return "$(GRPC_ABSEIL_MERGE_LIBS)" + elif dep == 'libssl': + return "$(OPENSSL_MERGE_LIBS)" + else: + return "$(LIBDIR)/$(CONFIG)/lib%s.a" % dep + + + def get_objs_expression(dep): + """For given dependency, return the expression with variable that has list of all object files.""" + if dep == 'z': + return "$(ZLIB_MERGE_OBJS)" + elif dep == 'cares': + return "$(CARES_MERGE_OBJS)" + elif dep == 'grpc_abseil': + return "$(LIBGRPC_ABSEIL_OBJS)" + elif dep == 'libssl': + return "$(OPENSSL_MERGE_OBJS)" + else: + return "$(LIB%s_OBJS)" % dep.upper() + + + def get_make_rule_static_lib_deps(lib): + """Generate make rule dependency list for given library, when building as static.""" + + make_rule_deps = [] + + collapsed_deps = collapse_absl_deps(lib.get('transitive_deps', [])) + + # depend on static libraries + for dep in collapsed_deps: + make_rule_deps.append(get_dep_expression(dep)) + + # depend of obj files of this library itself + make_rule_deps.append(get_objs_expression(lib.name)) + + # depend on obj files of dependencies + for dep in collapsed_deps: + make_rule_deps.append(get_objs_expression(dep)) + + return " ".join(make_rule_deps) + + + def get_merge_objs_for_deps(lib): + """Get list of merge objs for all deps of a given library.""" + result = [] + collapsed_deps = collapse_absl_deps(lib.get('transitive_deps', [])) + + for dep in collapsed_deps: + result.append(get_objs_expression(dep)) + + return " ".join(result) + + + def get_make_rule_shared_lib_deps(lib): + """Generate make rule dependency list given library, when built as shared.""" + make_rule_deps = [] + + collapsed_deps = collapse_absl_deps(lib.get('transitive_deps', [])) + + # depend of obj files of this library itself + make_rule_deps.append(get_objs_expression(lib.name)) + + # depend on static libraries + for dep in collapsed_deps: + make_rule_deps.append(get_dep_expression(dep)) + + return " ".join(make_rule_deps) + + + def get_shared_lib_linklibs(lib): + """Generate list of libraries to link given library, when built as shared.""" + result = [] + + collapsed_deps = collapse_absl_deps(lib.get('transitive_deps', [])) + + # depend of obj files of this library itself + result.append(get_objs_expression(lib.name)) + + # depend on static libraries + for dep in collapsed_deps: + result.append(get_merge_libs_expression(dep)) + + if 'libssl' in collapsed_deps: + result.append("$(LDLIBS_SECURE)") + + result.append("$(LDLIBS)") + + return " ".join(result) + sources_that_need_openssl = set() sources_that_don_t_need_openssl = set() @@ -46,7 +173,6 @@ lang_to_var = { 'c': 'CORE', 'c++': 'CPP', - 'csharp': 'CSHARP' } %> <% @@ -320,7 +446,6 @@ CORE_VERSION = ${settings.core_version} CPP_VERSION = ${settings.cpp_version} - CSHARP_VERSION = ${settings.csharp_version} CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) @@ -351,29 +476,24 @@ EXECUTABLE_SUFFIX = .exe SHARED_EXT_CORE = dll SHARED_EXT_CPP = dll - SHARED_EXT_CSHARP = dll + SHARED_PREFIX = SHARED_VERSION_CORE = -${settings.core_version.major} SHARED_VERSION_CPP = -${settings.cpp_version.major} - SHARED_VERSION_CSHARP = -${settings.csharp_version.major} else ifeq ($(SYSTEM),Darwin) EXECUTABLE_SUFFIX = SHARED_EXT_CORE = dylib SHARED_EXT_CPP = dylib - SHARED_EXT_CSHARP = dylib SHARED_PREFIX = lib SHARED_VERSION_CORE = SHARED_VERSION_CPP = - SHARED_VERSION_CSHARP = else EXECUTABLE_SUFFIX = SHARED_EXT_CORE = so.$(CORE_VERSION) SHARED_EXT_CPP = so.$(CPP_VERSION) - SHARED_EXT_CSHARP = so.$(CSHARP_VERSION) SHARED_PREFIX = lib SHARED_VERSION_CORE = SHARED_VERSION_CPP = - SHARED_VERSION_CSHARP = endif ifeq ($(wildcard .git),) @@ -430,9 +550,7 @@ # Setup address_sorting dependency - ADDRESS_SORTING_DEP = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a - ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS) - ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a + # TODO(jtattermusch): should the include be added elsewhere? CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS) # Setup abseil dependency @@ -440,18 +558,6 @@ GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a - # Setup re2 dependency - - RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a - RE2_MERGE_OBJS = $(LIBRE2_OBJS) - RE2_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libre2.a - - # Setup upb dependency - - UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a - UPB_MERGE_OBJS = $(LIBUPB_OBJS) - UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a - # Setup boringssl dependency ifeq ($(wildcard third_party/boringssl-with-bazel/src/include/openssl/ssl.h),) @@ -597,16 +703,6 @@ % endfor - static_csharp: static_c \ - % for lib in filtered_libs: - % if 'Makefile' in lib.get('build_system', ['Makefile']): - % if lib.build == 'all' and lib.language == 'csharp': - $(LIBDIR)/$(CONFIG)/lib${lib.name}.a\ - % endif - % endif - % endfor - - shared: shared_c shared_cxx shared_c: cache.mk\ @@ -628,17 +724,6 @@ % endfor - shared_csharp: shared_c \ - % for lib in filtered_libs: - % if 'Makefile' in lib.get('build_system', ['Makefile']): - % if lib.build == 'all' and lib.language == 'csharp': - $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)\ - % endif - % endif - % endfor - - grpc_csharp_ext: shared_csharp - privatelibs: privatelibs_c privatelibs_cxx privatelibs_c: \ @@ -739,20 +824,6 @@ % endfor endif - strip-shared_csharp: shared_csharp - ifeq ($(CONFIG),opt) - % for lib in filtered_libs: - % if 'Makefile' in lib.get('build_system', ['Makefile']): - % if lib.language == "csharp": - % if lib.build == "all": - $(E) "[STRIP] Stripping $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)" - $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) - % endif - % endif - % endif - % endfor - endif - cache.mk:: $(E) "[MAKE] Generating $@" $(Q) echo "$(CACHE_MK)" | tr , '\n' >$@ @@ -798,8 +869,6 @@ install_cxx: install_not_supported_error - install_csharp: install_not_supported_error - install-static: install_not_supported_error install-certs: install_not_supported_error @@ -847,6 +916,8 @@ <%def name="makelib(lib)"> # start of build recipe for library "${lib.name}" (generated by makelib(lib) template function) + # deps: ${collapse_absl_deps(lib.get('deps', []))} + # transitive_deps: ${collapse_absl_deps(lib.get('transitive_deps', []))} LIB${lib.name.upper()}_SRC = \\ % for src in lib.src: @@ -877,7 +948,7 @@ % endif ## If the library requires OpenSSL, let's add some restrictions. - % if 'libssl' in lib.get('deps', []): + % if 'libssl' in lib.get('transitive_deps', []): ifeq ($(NO_SECURE),true) # You can't build secure libraries if you don't have OpenSSL. @@ -890,130 +961,68 @@ else - $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP) \ - ## The else here corresponds to the if secure earlier. - % else: - $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: \ - % if lib.name not in ['z', 'ares', 'address_sorting', 're2', 'upb', 'grpc_abseil']: - $(ZLIB_DEP) \ - $(CARES_DEP) \ - $(ADDRESS_SORTING_DEP) \ - $(RE2_DEP) \ - $(UPB_DEP) \ - $(GRPC_ABSEIL_DEP) \ - % endif - % endif - $(LIB${lib.name.upper()}_OBJS) \ - % if lib.get('baselib', False): - $(LIBGPR_OBJS) \ - $(LIBGRPC_ABSEIL_OBJS) \ - $(ZLIB_MERGE_OBJS) \ - $(CARES_MERGE_OBJS) \ - $(ADDRESS_SORTING_MERGE_OBJS) \ - $(RE2_MERGE_OBJS) \ - $(UPB_MERGE_OBJS) \ - % if 'libssl' in lib.get('deps', []): - $(OPENSSL_MERGE_OBJS) \ + ## The following endif corresponds to the "If the library requires OpenSSL" above % endif - % endif - + # static library for "${lib.name}" + $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: ${get_make_rule_static_lib_deps(lib)} $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a - $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) \ - % if lib.get('baselib', False): - $(LIBGPR_OBJS) \ - $(LIBGRPC_ABSEIL_OBJS) \ - $(ZLIB_MERGE_OBJS) \ - $(CARES_MERGE_OBJS) \ - $(ADDRESS_SORTING_MERGE_OBJS) \ - $(RE2_MERGE_OBJS) \ - $(UPB_MERGE_OBJS) \ - % if 'libssl' in lib.get('deps', []): - $(OPENSSL_MERGE_OBJS) \ - % endif - % endif - + $(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) ${get_merge_objs_for_deps(lib)} ifeq ($(SYSTEM),Darwin) $(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a endif - <% ld = '$(LDXX)' out_mingbase = '$(LIBDIR)/$(CONFIG)/' + lib.name + '$(SHARED_VERSION_' + lang_to_var[lib.language] + ')' out_libbase = '$(LIBDIR)/$(CONFIG)/lib' + lib.name + '$(SHARED_VERSION_' + lang_to_var[lib.language] + ')' - common = '$(LIB' + lib.name.upper() + '_OBJS)' - - link_libs = '' - lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)' - mingw_libs = '' - mingw_lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(RE2_DEP) $(UPB_DEP) $(GRPC_ABSEIL_DEP)' - for dep in lib.get('deps', []): - if is_absl_lib(dep): continue - if 'libssl' == dep: continue - lib_archive = '$(LIBDIR)/$(CONFIG)/lib' + dep + '.a' - common = common + ' ' + lib_archive - lib_deps = lib_deps + ' ' + lib_archive - mingw_lib_deps = mingw_lib_deps + ' ' + lib_archive - - security = 'libssl' in lib.get('deps', []) - if security == True: - common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)' - common = common + ' $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS)' - - if security in [True, 'check']: + ldflags = '$(LDFLAGS)' + if lib.get('LDFLAGS', None): + ldflags += ' ' + lib['LDFLAGS'] + + if 'libssl' in lib.get('transitive_deps', []): for src in lib.src: sources_that_need_openssl.add(src) else: for src in lib.src: sources_that_don_t_need_openssl.add(src) - - if 'libssl' in lib.get('deps', []): - lib_deps = lib_deps + ' $(OPENSSL_DEP)' - mingw_lib_deps = mingw_lib_deps + ' $(OPENSSL_DEP)' - - ldflags = '$(LDFLAGS)' - if lib.get('LDFLAGS', None): - ldflags += ' ' + lib['LDFLAGS'] - - common = common + ' $(LDLIBS)' %> - + # shared library for "${lib.name}" % if lib.build == "all": ifeq ($(SYSTEM),MINGW32) - ${out_mingbase}.$(SHARED_EXT_${lang_to_var[lib.language]}): $(LIB${lib.name.upper()}_OBJS) ${mingw_lib_deps} + ${out_mingbase}.$(SHARED_EXT_${lang_to_var[lib.language]}): ${get_make_rule_shared_lib_deps(lib)} $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=${out_mingbase}.def -Wl,--out-implib=${out_libbase}-dll.a -o ${out_mingbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${mingw_libs} + $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=${out_mingbase}.def -Wl,--out-implib=${out_libbase}-dll.a -o ${out_mingbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${get_shared_lib_linklibs(lib)} else - ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}): $(LIB${lib.name.upper()}_OBJS) ${lib_deps} + ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}): ${get_make_rule_shared_lib_deps(lib)} $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) -dynamiclib -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${link_libs} + $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) -dynamiclib -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${get_shared_lib_linklibs(lib)} else - $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${common}${link_libs} + $(Q) ${ld} ${ldflags} -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,lib${lib.name}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} -o ${out_libbase}.$(SHARED_EXT_${lang_to_var[lib.language]}) ${get_shared_lib_linklibs(lib)} $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) ${out_libbase}.so.${settings.get(lang_to_var[lib.language].lower() + '_version').major} $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) ${out_libbase}.so endif endif % endif - % if 'libssl' in lib.get('deps', []): - ## If the lib was secure, we have to close the Makefile's if that tested + % if 'libssl' in lib.get('transitive_deps', []): + ## If the lib was secure, we have to close the Makefile's ifeq that tested ## the presence of OpenSSL. - endif + endif # corresponds to the "ifeq ($(NO_SECURE),true)" above % endif - % if 'libssl' in lib.get('deps', []): + % if 'libssl' in lib.get('transitive_deps', []): ifneq ($(NO_SECURE),true) % endif ifneq ($(NO_DEPS),true) -include $(LIB${lib.name.upper()}_OBJS:.o=.dep) endif - % if 'libssl' in lib.get('deps', []): + % if 'libssl' in lib.get('transitive_deps', []): endif % endif # end of build recipe for library "${lib.name}" @@ -1035,7 +1044,7 @@ dep_error openssl_dep_error openssl_dep_message git_update stop \ buildtests buildtests_c buildtests_cxx \ test test_c test_cxx \ - install install_c install_cxx install_csharp install-static install-certs \ + install install_c install_cxx install-static install-certs \ strip strip-shared strip-static \ strip_c strip-shared_c strip-static_c \ strip_cxx strip-shared_cxx strip-static_cxx \ diff --git a/templates/config.m4.template b/templates/config.m4.template index d581911334b..e242c486d4f 100644 --- a/templates/config.m4.template +++ b/templates/config.m4.template @@ -49,9 +49,14 @@ php_full_deps = [] for dep in php_deps: php_full_deps.append(dep) - php_full_deps.extend(lib_maps[dep].transitive_deps) + lib = lib_maps.get(dep, None) + if lib: + php_full_deps.extend(lib.transitive_deps) + # construct list of all source files, but explicitly exclude zlib for dep in set(php_full_deps) - set({'z'}): - srcs.extend(lib_maps[dep].src) + lib = lib_maps.get(dep, None) + if lib: + srcs.extend(lib.src) srcs = sorted(set(srcs)) %> PHP_NEW_EXTENSION(grpc, diff --git a/templates/config.w32.template b/templates/config.w32.template index 05f7a00c771..787b1fc73fe 100644 --- a/templates/config.w32.template +++ b/templates/config.w32.template @@ -14,9 +14,13 @@ php_full_deps = [] for dep in php_deps: php_full_deps.append(dep) - php_full_deps.extend(lib_maps[dep].transitive_deps) + lib = lib_maps.get(dep, None) + if lib: + php_full_deps.extend(lib.transitive_deps) for dep in php_full_deps: - srcs.extend(lib_maps[dep].src) + lib = lib_maps.get(dep, None) + if lib: + srcs.extend(lib.src) srcs = sorted(set(srcs)) %> EXTENSION("grpc", diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 4740ef78190..743f2e932c2 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -35,7 +35,11 @@ return "abseil/" + label[5:].replace(":", "/") def lib_and_transitive_deps(lib): - return list(sorted(set({lib} | set(lib_maps[lib].transitive_deps)))) + transitive_deps = [] + lib_metadata = lib_maps.get(lib, None) + if lib_metadata: + transitive_deps = lib_metadata.transitive_deps + return list(sorted(set({lib} | set(transitive_deps)))) def non_abseil_lib_and_transitive_deps(lib): return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)] @@ -47,17 +51,20 @@ absl_specs = set() for lib_name in lib_and_transitive_deps(lib): if is_absl_lib(lib_name): continue - for dep in lib_maps[lib_name].deps: - if is_absl_lib(dep): - absl_specs.add(get_absl_spec_name(dep)) + lib_metadata = lib_maps.get(lib_name, None) + if lib_metadata: + for dep in lib_metadata.deps: + if is_absl_lib(dep): + absl_specs.add(get_absl_spec_name(dep)) return list(sorted(absl_specs)) def list_lib_files(lib, fields): files = set() for lib_name in non_abseil_lib_and_transitive_deps(lib): - lib = lib_maps[lib_name] - for field in fields: - files.update(lib.get(field, [])) + lib_metadata = lib_maps.get(lib_name, None) + if lib_metadata: + for field in fields: + files.update(lib_metadata.get(field, [])) return list(sorted(files)) def filter_grpcpp(files): diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 0bf57ae8db7..9269769db6b 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -34,7 +34,11 @@ return "abseil/" + label[5:].replace(":", "/") def lib_and_transitive_deps(lib): - return list(sorted(set({lib} | set(lib_maps[lib].transitive_deps)))) + transitive_deps = [] + lib_metadata = lib_maps.get(lib, None) + if lib_metadata: + transitive_deps = lib_metadata.transitive_deps + return list(sorted(set({lib} | set(transitive_deps)))) def non_abseil_lib_and_transitive_deps(lib): return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)] @@ -46,17 +50,20 @@ absl_specs = set() for lib_name in lib_and_transitive_deps(lib): if is_absl_lib(lib_name): continue - for dep in lib_maps[lib_name].deps: - if is_absl_lib(dep): - absl_specs.add(get_absl_spec_name(dep)) + lib_metadata = lib_maps.get(lib_name, None) + if lib_metadata: + for dep in lib_metadata.deps: + if is_absl_lib(dep): + absl_specs.add(get_absl_spec_name(dep)) return list(sorted(absl_specs)) def list_lib_files(lib, fields): files = set() for lib_name in non_abseil_lib_and_transitive_deps(lib): - lib = lib_maps[lib_name] - for field in fields: - files.update(lib.get(field, [])) + lib = lib_maps.get(lib_name, None) + if lib: + for field in fields: + files.update(lib.get(field, [])) return list(sorted(files)) # ObjectiveC doesn't use c-ares so we don't need address_sorting files at all diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index e15bb18f971..61467c2c355 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -55,8 +55,9 @@ for dep in ruby_deps[:]: ruby_deps.extend(lib_maps[dep].transitive_deps) for dep in ruby_deps: - lib = lib_maps[dep] - files.extend(lib.get('public_headers', []) + lib.headers + lib.src) + lib = lib_maps.get(dep, None) + if lib: + files.extend(lib.get('public_headers', []) + lib.headers + lib.src) files = sorted(set(files)) %> % for file in files: diff --git a/templates/package.xml.template b/templates/package.xml.template index de76abd03bf..2d072864b16 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -37,10 +37,13 @@ php_deps = php_config_m4.get('deps', []) lib_maps = {lib.name: lib for lib in libs} for dep in php_deps[:]: - php_deps.extend(lib_maps[dep].transitive_deps) + lib = lib_maps.get(dep, None) + if lib: + php_deps.extend(lib.transitive_deps) for dep in php_deps: - lib = lib_maps[dep] - srcs.extend(lib.get('public_headers', []) + lib.headers + lib.src) + lib = lib_maps.get(dep, None) + if lib: + srcs.extend(lib.get('public_headers', []) + lib.headers + lib.src) srcs = sorted(set(srcs)) %> % for src in srcs: diff --git a/third_party/README.md b/third_party/README.md index e452c78b470..43a954f309e 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -130,11 +130,8 @@ Since upb is vendored in the gRPC repo, you cannot use submodule to update it. P - `mv $GRPC_ROOT/third_party/upb-main $GRPC_ROOT/third_party/upb` 2. Update the dependency in `grpc_deps.bzl` to the same commit 3. Populate the bazel download mirror by running `bazel/update_mirror.sh` -4. Inspect `src/upb/gen_build_yaml.py` and update it with added or removed upb files - - Running `cd third_party/upb; bazel query "deps(upb) union deps(json) union deps(textformat)"` - would give some idea on what needs to be included. -5. Run `tools/buildgen/generate_projects.sh` to regenerate the generated files -6. Run `tools/codegen/core/gen_upb_api.sh` to regenerate upb files. +4. Run `tools/buildgen/generate_projects.sh` to regenerate the generated files +5. Run `tools/codegen/core/gen_upb_api.sh` to regenerate upb files. ### Updating third_party/utf8_range diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py index 348a81c2bba..2c1eaa91e04 100755 --- a/tools/buildgen/extract_metadata_from_bazel_xml.py +++ b/tools/buildgen/extract_metadata_from_bazel_xml.py @@ -94,12 +94,17 @@ EXTERNAL_PROTO_LIBRARIES = { ), } - -def _maybe_get_internal_path(name: str) -> Optional[str]: - for key in EXTERNAL_PROTO_LIBRARIES: - if name.startswith("@" + key): - return key - return None +# We want to get a list of source files for some external libraries +# to be able to include them in a non-bazel (e.g. make/cmake) build. +# For that we need mapping from external repo name to a corresponding +# path to a git submodule. +EXTERNAL_SOURCE_PREFIXES = { + "@upb": "third_party/upb", + "@utf8_range": "third_party/utf8_range", + "@com_googlesource_code_re2": "third_party/re2", + "@com_google_googletest": "third_party/googletest", + "@zlib": "third_party/zlib", +} def _bazel_query_xml_tree(query: str) -> ET.Element: @@ -117,6 +122,7 @@ def _rule_dict_from_xml_node(rule_xml_node): "name": rule_xml_node.attrib.get("name"), "srcs": [], "hdrs": [], + "textual_hdrs": [], "deps": [], "data": [], "tags": [], @@ -130,7 +136,15 @@ def _rule_dict_from_xml_node(rule_xml_node): # all the metadata we want is stored under "list" tags if child.tag == "list": list_name = child.attrib["name"] - if list_name in ["srcs", "hdrs", "deps", "data", "tags", "args"]: + if list_name in [ + "srcs", + "hdrs", + "textual_hdrs", + "deps", + "data", + "tags", + "args", + ]: result[list_name] += [item.attrib["value"] for item in child] if child.tag == "string": string_name = child.attrib["name"] @@ -141,14 +155,14 @@ def _rule_dict_from_xml_node(rule_xml_node): if bool_name in ["flaky"]: result[bool_name] = child.attrib["value"] == "true" if child.tag == "label": - # extract actual name for alias rules + # extract actual name for alias and bind rules label_name = child.attrib["name"] if label_name in ["actual"]: actual_name = child.attrib.get("value", None) if actual_name: result["actual"] = actual_name # HACK: since we do a lot of transitive dependency scanning, - # make it seem that the actual name is a dependency of the alias rule + # make it seem that the actual name is a dependency of the alias or bind rule # (aliases don't have dependencies themselves) result["deps"].append(actual_name) return result @@ -172,6 +186,7 @@ def _extract_rules_from_bazel_xml(xml_tree): "upb_proto_library", "upb_proto_reflection_library", "alias", + "bind", ]: if rule_name in result: raise Exception("Rule %s already present" % rule_name) @@ -188,37 +203,73 @@ def _get_bazel_label(target_name: str) -> str: return "//:%s" % target_name -def _extract_source_file_path(label: str) -> str: +def _try_extract_source_file_path(label: str) -> str: """Gets relative path to source file from bazel deps listing""" - if label.startswith("//"): - label = label[len("//") :] - # labels in form //:src/core/lib/surface/call_test_only.h - if label.startswith(":"): - label = label[len(":") :] - # labels in form //test/core/util:port.cc - label = label.replace(":", "/") - return label + if label.startswith("@"): + # This is an external source file. We are only interested in sources + # for some of the external libraries. + for lib_name, prefix in EXTERNAL_SOURCE_PREFIXES.items(): + if label.startswith(lib_name + "//"): + return ( + label.replace("%s//" % lib_name, prefix + "/") + .replace(":", "/") + .replace("//", "/") + ) + + # This source file is external, and we need to translate the + # @REPO_NAME to a valid path prefix. At this stage, we need + # to check repo name, since the label/path mapping is not + # available in BUILD files. + for lib_name, external_proto_lib in EXTERNAL_PROTO_LIBRARIES.items(): + if label.startswith("@" + lib_name + "//"): + return label.replace( + "@%s//" % lib_name, + external_proto_lib.proto_prefix, + ).replace(":", "/") + + # No external library match found + return None + else: + if label.startswith("//"): + label = label[len("//") :] + # labels in form //:src/core/lib/surface/call_test_only.h + if label.startswith(":"): + label = label[len(":") :] + # labels in form //test/core/util:port.cc + return label.replace(":", "/") + + +def _has_header_suffix(label: str) -> bool: + """Returns True if the label has a suffix that looks like a C/C++ include file""" + return ( + label.endswith(".h") + or label.endswith(".h") + or label.endswith(".hpp") + or label.endswith(".inc") + ) def _extract_public_headers(bazel_rule: BuildMetadata) -> List[str]: """Gets list of public headers from a bazel rule""" result = [] for dep in bazel_rule["hdrs"]: - if dep.startswith("//:include/") and dep.endswith(".h"): - result.append(_extract_source_file_path(dep)) + if dep.startswith("//:include/") and _has_header_suffix(dep): + source_file_maybe = _try_extract_source_file_path(dep) + if source_file_maybe: + result.append(source_file_maybe) return list(sorted(result)) def _extract_nonpublic_headers(bazel_rule: BuildMetadata) -> List[str]: """Gets list of non-public headers from a bazel rule""" result = [] - for dep in bazel_rule["hdrs"]: - if ( - dep.startswith("//") - and not dep.startswith("//:include/") - and dep.endswith(".h") - ): - result.append(_extract_source_file_path(dep)) + for dep in list( + bazel_rule["hdrs"] + bazel_rule["textual_hdrs"] + bazel_rule["srcs"] + ): + if not dep.startswith("//:include/") and _has_header_suffix(dep): + source_file_maybe = _try_extract_source_file_path(dep) + if source_file_maybe: + result.append(source_file_maybe) return list(sorted(result)) @@ -227,24 +278,9 @@ def _extract_sources(bazel_rule: BuildMetadata) -> List[str]: result = [] for src in bazel_rule["srcs"]: if src.endswith(".cc") or src.endswith(".c") or src.endswith(".proto"): - if src.startswith("//"): - # This source file is local to gRPC - result.append(_extract_source_file_path(src)) - else: - # This source file is external, and we need to translate the - # @REPO_NAME to a valid path prefix. At this stage, we need - # to check repo name, since the label/path mapping is not - # available in BUILD files. - external_proto_library_name = _maybe_get_internal_path(src) - if external_proto_library_name is not None: - result.append( - src.replace( - "@%s//" % external_proto_library_name, - EXTERNAL_PROTO_LIBRARIES[ - external_proto_library_name - ].proto_prefix, - ).replace(":", "/") - ) + source_file_maybe = _try_extract_source_file_path(src) + if source_file_maybe: + result.append(source_file_maybe) return list(sorted(result)) @@ -297,16 +333,24 @@ def _external_dep_name_from_bazel_dependency(bazel_dep: str) -> Optional[str]: # special case for add dependency on one of the absl libraries (there is not just one absl library) prefixlen = len("@com_google_absl//") return bazel_dep[prefixlen:] - elif bazel_dep == "//external:upb_lib": - return "upb" - elif bazel_dep == "//external:benchmark": + elif bazel_dep == "@com_github_google_benchmark//:benchmark": return "benchmark" - elif bazel_dep == "//external:libssl": + elif bazel_dep == "@boringssl//:ssl": return "libssl" + elif bazel_dep == "@com_github_cares_cares//:ares": + return "cares" + elif ( + bazel_dep == "@com_google_protobuf//:protobuf" + or bazel_dep == "@com_google_protobuf//:protobuf_headers" + ): + return "protobuf" + elif bazel_dep == "@com_google_protobuf//:protoc_lib": + return "protoc" else: - # all the other external deps such as protobuf, cares, zlib - # don't need to be listed explicitly, they are handled automatically - # by the build system (make, cmake) + # Two options here: + # * either this is not external dependency at all (which is fine, we will treat it as internal library) + # * this is external dependency, but we don't want to make the dependency explicit in the build metadata + # for other build systems. return None @@ -493,7 +537,9 @@ def update_test_metadata_with_transitive_metadata( lib_dict["defaults"] = "benchmark" if "//external:gtest" in bazel_rule["_TRANSITIVE_DEPS"]: + # run_tests.py checks the "gtest" property to see if test should be run via gtest. lib_dict["gtest"] = True + # TODO: this might be incorrect categorization of the test... lib_dict["language"] = "c++" @@ -576,7 +622,14 @@ def _expand_upb_proto_library_rules(bazel_rules): break if proto_src.startswith("@"): raise Exception('"{0}" is unknown workspace.'.format(name)) - proto_src = _extract_source_file_path(proto_src) + proto_src_file = _try_extract_source_file_path(proto_src) + if not proto_src_file: + raise Exception( + 'Failed to get source file for "{0}" in upb rule "{1}".'.format( + proto_src, name + ) + ) + ext = ( ".upb" if gen_func == "grpc_upb_proto_library" @@ -587,12 +640,41 @@ def _expand_upb_proto_library_rules(bazel_rules): if gen_func == "grpc_upb_proto_library" else GEN_UPBDEFS_ROOT ) - srcs.append(root + proto_src.replace(".proto", ext + ".c")) - hdrs.append(root + proto_src.replace(".proto", ext + ".h")) + srcs.append(root + proto_src_file.replace(".proto", ext + ".c")) + hdrs.append(root + proto_src_file.replace(".proto", ext + ".h")) bazel_rule["srcs"] = srcs bazel_rule["hdrs"] = hdrs +def _patch_grpc_proto_library_rules(bazel_rules): + for name, bazel_rule in bazel_rules.items(): + contains_proto = any( + src.endswith(".proto") for src in bazel_rule.get("srcs", []) + ) + generator_func = bazel_rule.get("generator_function", None) + + if ( + name.startswith("//") + and contains_proto + and generator_func == "grpc_proto_library" + ): + # Add explicit protobuf dependency for internal c++ proto targets. + bazel_rule["deps"].append("//external:protobuf") + + +def _patch_descriptor_upb_proto_library(bazel_rules): + # The upb's descriptor_upb_proto library doesn't reference the generated descriptor.proto + # sources explicitly, so we add them manually. + bazel_rule = bazel_rules.get("@upb//:descriptor_upb_proto", None) + if bazel_rule: + bazel_rule["srcs"].append( + ":src/core/ext/upb-generated/google/protobuf/descriptor.upb.c" + ) + bazel_rule["hdrs"].append( + ":src/core/ext/upb-generated/google/protobuf/descriptor.upb.h" + ) + + def _generate_build_metadata( build_extra_metadata: BuildDict, bazel_rules: BuildDict ) -> BuildDict: @@ -880,7 +962,7 @@ def _generate_build_extra_metadata_for_tests( # short test name without the path. # There can be name collisions, but we will resolve them later - simple_test_name = os.path.basename(_extract_source_file_path(test)) + simple_test_name = os.path.basename(_try_extract_source_file_path(test)) test_dict["_RENAME"] = simple_test_name test_metadata[test] = test_dict @@ -977,6 +1059,49 @@ _BUILD_EXTRA_METADATA = { "build": "all", "_RENAME": "address_sorting", }, + "@upb//:upb": { + "language": "c", + "build": "all", + "_RENAME": "upb", + }, + "@upb//:collections": { + "language": "c", + "build": "all", + "_RENAME": "upb_collections_lib", + }, + "@upb//:json": { + "language": "c", + "build": "all", + "_RENAME": "upb_json_lib", + }, + "@upb//:textformat": { + "language": "c", + "build": "all", + "_RENAME": "upb_textformat_lib", + }, + "@utf8_range//:utf8_range": { + "language": "c", + "build": "all", + # rename to utf8_range_lib is necessary for now to avoid clash with utf8_range target in protobuf's cmake + "_RENAME": "utf8_range_lib", + }, + "@com_googlesource_code_re2//:re2": { + "language": "c", + "build": "all", + "_RENAME": "re2", + }, + "@com_google_googletest//:gtest": { + "language": "c", + "build": "private", + "_RENAME": "gtest", + }, + "@zlib//:zlib": { + "language": "c", + "zlib": True, + "build": "private", + "defaults": "zlib", + "_RENAME": "z", + }, "gpr": { "language": "c", "build": "all", @@ -1165,6 +1290,8 @@ _BAZEL_DEPS_QUERIES = [ 'deps("//test/...")', 'deps("//:all")', 'deps("//src/compiler/...")', + # allow resolving bind() workspace rules to the actual targets they point to + 'kind(bind, "//external:*")', # The ^ is needed to differentiate proto_library from go_proto_library 'deps(kind("^proto_library", @envoy_api//envoy/...))', ] @@ -1192,6 +1319,12 @@ for query in _BAZEL_DEPS_QUERIES: # .upb.h and .upb.c files. _expand_upb_proto_library_rules(bazel_rules) +# Step 1.6: Add explicit protobuf dependency to grpc_proto_library rules +_patch_grpc_proto_library_rules(bazel_rules) + +# Step 1.7: Make sure upb descriptor.proto library uses the pre-generated sources. +_patch_descriptor_upb_proto_library(bazel_rules) + # Step 2: Extract the known bazel cc_test tests. While most tests # will be buildable with other build systems just fine, some of these tests # would be too difficult to build and run with other build systems, diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh index c890b5372fd..3e4c6c2e6ea 100755 --- a/tools/buildgen/generate_build_additions.sh +++ b/tools/buildgen/generate_build_additions.sh @@ -20,9 +20,6 @@ gen_build_yaml_dirs=" \ src/boringssl \ src/benchmark \ src/proto \ - src/re2 \ - src/upb \ - src/zlib \ src/c-ares \ test/cpp/naming" diff --git a/tools/buildgen/plugins/transitive_dependencies.py b/tools/buildgen/plugins/transitive_dependencies.py index 1cb8a134217..4a28921cbfa 100644 --- a/tools/buildgen/plugins/transitive_dependencies.py +++ b/tools/buildgen/plugins/transitive_dependencies.py @@ -30,13 +30,17 @@ def transitive_deps(lib_map, node): start = node def recursive_helper(node): - if node is None: - return for dep in node.get("deps", []): if dep not in seen: seen.add(dep) next_node = lib_map.get(dep) - recursive_helper(next_node) + if next_node: + recursive_helper(next_node) + else: + # For some deps, the corrensponding library entry doesn't exist, + # but we still want to preserve the dependency so that the build + # system can provide custom handling for that depdendency. + result.append(dep) if node is not start: result.insert(0, node["name"])