From e04128ad1dce4575b69d9facf42c8750d620911f Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Fri, 11 Aug 2023 15:29:24 -0700 Subject: [PATCH] [Deps] Update abseil to 20230802 (#33974) --- CMakeLists.txt | 1 + Makefile | 8 ++- bazel/grpc_deps.bzl | 8 +-- config.m4 | 8 ++- config.w32 | 8 ++- gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 15 ++++- package.xml | 15 ++++- src/abseil-cpp/preprocessed_builds.yaml | 65 +++++++++++++++++-- src/python/grpcio/grpc_core_dependencies.py | 8 ++- templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 8 ++- tools/run_tests/sanity/check_submodules.sh | 2 +- 16 files changed, 135 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e281c5c561..74de92e4610 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,6 +204,7 @@ set(gRPC_ABSL_USED_TARGETS absl_str_format absl_str_format_internal absl_strerror + absl_string_view absl_strings absl_strings_internal absl_symbolize diff --git a/Makefile b/Makefile index 7e39779d5a1..b0aad729c8f 100644 --- a/Makefile +++ b/Makefile @@ -3008,9 +3008,15 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/synchronization/barrier.cc \ third_party/abseil-cpp/absl/synchronization/blocking_counter.cc \ third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc \ + third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc \ third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc \ + third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc \ third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc \ - third_party/abseil-cpp/absl/synchronization/internal/waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc \ + third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc \ third_party/abseil-cpp/absl/synchronization/mutex.cc \ third_party/abseil-cpp/absl/synchronization/notification.cc \ third_party/abseil-cpp/absl/time/civil_time.cc \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 417aa8e5262..042ab612041 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -328,11 +328,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36", - strip_prefix = "abseil-cpp-20230125.3", + sha256 = "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5", + strip_prefix = "abseil-cpp-20230802.0", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz", ], ) diff --git a/config.m4 b/config.m4 index 93a4b2c5b50..0d2298b7afa 100644 --- a/config.m4 +++ b/config.m4 @@ -965,9 +965,15 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/synchronization/barrier.cc \ third_party/abseil-cpp/absl/synchronization/blocking_counter.cc \ third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc \ + third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc \ third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc \ + third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc \ third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc \ - third_party/abseil-cpp/absl/synchronization/internal/waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc \ + third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc \ + third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc \ third_party/abseil-cpp/absl/synchronization/mutex.cc \ third_party/abseil-cpp/absl/synchronization/notification.cc \ third_party/abseil-cpp/absl/time/civil_time.cc \ diff --git a/config.w32 b/config.w32 index 6de00278ef0..3003fd2529d 100644 --- a/config.w32 +++ b/config.w32 @@ -930,9 +930,15 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\synchronization\\barrier.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\blocking_counter.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\create_thread_identity.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\futex_waiter.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\graphcycles.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\kernel_timeout.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\per_thread_sem.cc " + - "third_party\\abseil-cpp\\absl\\synchronization\\internal\\waiter.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\pthread_waiter.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\sem_waiter.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\stdcpp_waiter.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\waiter_base.cc " + + "third_party\\abseil-cpp\\absl\\synchronization\\internal\\win32_waiter.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\mutex.cc " + "third_party\\abseil-cpp\\absl\\synchronization\\notification.cc " + "third_party\\abseil-cpp\\absl\\time\\civil_time.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index a9ad7359874..e967f69630d 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -215,7 +215,7 @@ Pod::Spec.new do |s| ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230125.3' + abseil_version = '1.20230802.0' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 8a59d4bd0ae..bb75892edf6 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '1.20230125.3' + abseil_version = '1.20230802.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/grpc.gemspec b/grpc.gemspec index c14953000cb..751e2dca64e 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1828,6 +1828,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/options.h ) s.files += %w( third_party/abseil-cpp/absl/base/policy_checks.h ) s.files += %w( third_party/abseil-cpp/absl/base/port.h ) + s.files += %w( third_party/abseil-cpp/absl/base/prefetch.h ) s.files += %w( third_party/abseil-cpp/absl/base/thread_annotations.h ) s.files += %w( third_party/abseil-cpp/absl/cleanup/cleanup.h ) s.files += %w( third_party/abseil-cpp/absl/cleanup/internal/cleanup.h ) @@ -2098,13 +2099,25 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/futex.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h ) - s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter_base.h ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc ) + s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/mutex.cc ) s.files += %w( third_party/abseil-cpp/absl/synchronization/mutex.h ) s.files += %w( third_party/abseil-cpp/absl/synchronization/notification.cc ) diff --git a/package.xml b/package.xml index e0cd73dc383..b4fd075885e 100644 --- a/package.xml +++ b/package.xml @@ -1832,6 +1832,7 @@ + @@ -2102,13 +2103,25 @@ + + + - + + + + + + + + + + diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml index f5575e79fb1..d9354f889d5 100644 --- a/src/abseil-cpp/preprocessed_builds.yaml +++ b/src/abseil-cpp/preprocessed_builds.yaml @@ -150,11 +150,22 @@ name: absl/base:malloc_internal src: - third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc +- cmake_target: absl::nullability + deps: + - absl/base:core_headers + - absl/meta:type_traits + headers: + - third_party/abseil-cpp/absl/base/internal/nullability_impl.h + - third_party/abseil-cpp/absl/base/nullability.h + name: absl/base:nullability + src: [] - cmake_target: absl::prefetch deps: - absl/base:config + - absl/base:core_headers headers: - third_party/abseil-cpp/absl/base/internal/prefetch.h + - third_party/abseil-cpp/absl/base/prefetch.h name: absl/base:prefetch src: [] - cmake_target: absl::pretty_function @@ -355,11 +366,13 @@ - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:raw_logging_internal - absl/debugging:stacktrace - absl/memory:memory - absl/profiling:exponential_biased - absl/profiling:sample_recorder - absl/synchronization:synchronization + - absl/time:time - absl/utility:utility headers: - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h @@ -447,6 +460,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/base:dynamic_annotations - absl/base:endian - absl/base:prefetch - absl/base:raw_logging_internal @@ -456,6 +470,7 @@ - absl/container:hash_policy_traits - absl/container:hashtable_debug_hooks - absl/container:hashtablez_sampler + - absl/hash:hash - absl/memory:memory - absl/meta:type_traits - absl/numeric:bits @@ -484,6 +499,7 @@ - absl/crc:cpu_detect - absl/crc:crc_internal - absl/crc:non_temporal_memcpy + - absl/strings:str_format - absl/strings:strings headers: - third_party/abseil-cpp/absl/crc/crc32c.h @@ -607,6 +623,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/base:dynamic_annotations - absl/base:raw_logging_internal - absl/debugging:debugging_internal headers: @@ -724,6 +741,7 @@ - absl/base:config - absl/base:core_headers - absl/base:log_severity + - absl/numeric:int128 - absl/strings:str_format - absl/strings:strings - absl/types:optional @@ -807,6 +825,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/base:raw_logging_internal - absl/flags:usage_internal - absl/strings:strings - absl/synchronization:synchronization @@ -861,6 +880,7 @@ deps: - absl/base:base_internal - absl/base:core_headers + - absl/functional:any_invocable - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/functional/function_ref.h @@ -903,6 +923,7 @@ deps: - absl/base:config - absl/base:endian + - absl/base:prefetch - absl/numeric:int128 headers: - third_party/abseil-cpp/absl/hash/internal/low_level_hash.h @@ -1172,6 +1193,7 @@ - absl/base:config - absl/base:core_headers - absl/base:log_severity + - absl/base:raw_logging_internal - absl/hash:hash - absl/strings:strings headers: @@ -1262,6 +1284,7 @@ - cmake_target: absl::type_traits deps: - absl/base:config + - absl/base:core_headers headers: - third_party/abseil-cpp/absl/meta/type_traits.h name: absl/meta:type_traits @@ -1680,7 +1703,6 @@ - absl/strings:cordz_update_scope - absl/strings:cordz_update_tracker - absl/strings:internal - - absl/strings:str_format - absl/strings:strings - absl/types:optional - absl/types:span @@ -1766,6 +1788,7 @@ - absl/strings:cordz_statistics - absl/strings:cordz_update_tracker - absl/synchronization:synchronization + - absl/time:time - absl/types:span headers: - third_party/abseil-cpp/absl/strings/internal/cordz_info.h @@ -1837,6 +1860,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/container:inlined_vector - absl/functional:function_ref - absl/meta:type_traits - absl/numeric:bits @@ -1863,6 +1887,17 @@ - third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc - third_party/abseil-cpp/absl/strings/internal/str_format/output.cc - third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc +- cmake_target: absl::string_view + deps: + - absl/base:base + - absl/base:config + - absl/base:core_headers + - absl/base:throw_delegate + headers: + - third_party/abseil-cpp/absl/strings/string_view.h + name: absl/strings:string_view + src: + - third_party/abseil-cpp/absl/strings/string_view.cc - cmake_target: absl::strings deps: - absl/base:base @@ -1876,6 +1911,7 @@ - absl/numeric:bits - absl/numeric:int128 - absl/strings:internal + - absl/strings:string_view headers: - third_party/abseil-cpp/absl/strings/ascii.h - third_party/abseil-cpp/absl/strings/charconv.h @@ -1897,6 +1933,7 @@ - third_party/abseil-cpp/absl/strings/str_replace.h - third_party/abseil-cpp/absl/strings/str_split.h - third_party/abseil-cpp/absl/strings/string_view.h + - third_party/abseil-cpp/absl/strings/string_view.h - third_party/abseil-cpp/absl/strings/strip.h - third_party/abseil-cpp/absl/strings/substitute.h name: absl/strings:strings @@ -1914,7 +1951,6 @@ - third_party/abseil-cpp/absl/strings/str_cat.cc - third_party/abseil-cpp/absl/strings/str_replace.cc - third_party/abseil-cpp/absl/strings/str_split.cc - - third_party/abseil-cpp/absl/strings/string_view.cc - third_party/abseil-cpp/absl/strings/substitute.cc - cmake_target: absl::graphcycles_internal deps: @@ -1931,13 +1967,16 @@ - third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc - cmake_target: absl::kernel_timeout_internal deps: + - absl/base:base + - absl/base:config - absl/base:core_headers - absl/base:raw_logging_internal - absl/time:time headers: - third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h name: absl/synchronization:kernel_timeout_internal - src: [] + src: + - third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc - cmake_target: absl::synchronization deps: - absl/base:atomic_hook @@ -1958,8 +1997,14 @@ - third_party/abseil-cpp/absl/synchronization/blocking_counter.h - third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h - third_party/abseil-cpp/absl/synchronization/internal/futex.h + - third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.h - third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h + - third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.h + - third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.h + - third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.h - third_party/abseil-cpp/absl/synchronization/internal/waiter.h + - third_party/abseil-cpp/absl/synchronization/internal/waiter_base.h + - third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.h - third_party/abseil-cpp/absl/synchronization/mutex.h - third_party/abseil-cpp/absl/synchronization/notification.h name: absl/synchronization:synchronization @@ -1967,8 +2012,13 @@ - third_party/abseil-cpp/absl/synchronization/barrier.cc - third_party/abseil-cpp/absl/synchronization/blocking_counter.cc - third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc + - third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc - third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc - - third_party/abseil-cpp/absl/synchronization/internal/waiter.cc + - third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc + - third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc + - third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc + - third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc + - third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc - third_party/abseil-cpp/absl/synchronization/mutex.cc - third_party/abseil-cpp/absl/synchronization/notification.cc - cmake_target: absl::civil_time @@ -2122,6 +2172,13 @@ - third_party/abseil-cpp/absl/types/variant.h name: absl/types:variant src: [] +- cmake_target: absl::if_constexpr + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/utility/internal/if_constexpr.h + name: absl/utility:if_constexpr + src: [] - cmake_target: absl::utility deps: - absl/base:base_internal diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 76fbcce089e..9888c329476 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -929,9 +929,15 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/synchronization/barrier.cc', 'third_party/abseil-cpp/absl/synchronization/blocking_counter.cc', 'third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc', 'third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc', 'third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc', - 'third_party/abseil-cpp/absl/synchronization/internal/waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc', 'third_party/abseil-cpp/absl/synchronization/mutex.cc', 'third_party/abseil-cpp/absl/synchronization/notification.cc', 'third_party/abseil-cpp/absl/time/civil_time.cc', diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index ce849c00545..4740ef78190 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -172,7 +172,7 @@ ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230125.3' + abseil_version = '1.20230802.0' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 9da64132d9e..0bf57ae8db7 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -122,7 +122,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '1.20230125.3' + abseil_version = '1.20230802.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index c2435f8342c..29bf8085f3b 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit c2435f8342c2d0ed8101cb43adfd605fdc52dca2 +Subproject commit 29bf8085f3bf17b84d30e34b3d7ff8248fda404e diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 30fe241d15c..446b6ce7db6 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -104,9 +104,15 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/synchronization/barrier.cc', 'third_party/abseil-cpp/absl/synchronization/blocking_counter.cc', 'third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc', 'third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc', 'third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc', - 'third_party/abseil-cpp/absl/synchronization/internal/waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc', + 'third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc', 'third_party/abseil-cpp/absl/synchronization/mutex.cc', 'third_party/abseil-cpp/absl/synchronization/notification.cc', 'third_party/abseil-cpp/absl/time/civil_time.cc', diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 84f5f6142f9..65f862ae546 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp c2435f8342c2d0ed8101cb43adfd605fdc52dca2 +third_party/abseil-cpp 29bf8085f3bf17b84d30e34b3d7ff8248fda404e third_party/benchmark 015d1a091af6937488242b70121858bce8fd40e9 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel 342e805bc1f5dfdd650e3f031686d6c939b095d9