1TODO(b/178696376): Remove unprefixed annotation macros from abseil 2--- 3diff --git a/third_party/abseil-cpp/absl/base/dynamic_annotations.h b/third_party/abseil-cpp/absl/base/dynamic_annotations.h 4index 1444dc48e283..6687291cade3 100644 5--- a/third_party/abseil-cpp/absl/base/dynamic_annotations.h 6+++ b/third_party/abseil-cpp/absl/base/dynamic_annotations.h 7@@ -49,9 +49,6 @@ 8 9 #include "absl/base/config.h" 10 11-// TODO(rogeeff): Remove after the backward compatibility period. 12-#include "absl/base/internal/dynamic_annotations.h" // IWYU pragma: export 13- 14 // ------------------------------------------------------------------------- 15 // Decide which features are enabled 16 17diff --git a/third_party/abseil-cpp/absl/base/thread_annotations.h b/third_party/abseil-cpp/absl/base/thread_annotations.h 18index 5f51c0c2d2d5..10b9bde551a7 100644 19--- a/third_party/abseil-cpp/absl/base/thread_annotations.h 20+++ b/third_party/abseil-cpp/absl/base/thread_annotations.h 21@@ -35,8 +35,6 @@ 22 #define ABSL_BASE_THREAD_ANNOTATIONS_H_ 23 24 #include "absl/base/config.h" 25-// TODO(mbonadei): Remove after the backward compatibility period. 26-#include "absl/base/internal/thread_annotations.h" // IWYU pragma: export 27 28 #if defined(__clang__) 29 #define ABSL_INTERNAL_THREAD_ANNOTATION_ATTRIBUTE(x) __attribute__((x)) 30diff --git a/third_party/abseil-cpp/absl/base/BUILD.bazel b/third_party/abseil-cpp/absl/base/BUILD.bazel 31index 65ff0ddef9fd..d6fbf3581158 100644 32--- a/third_party/abseil-cpp/absl/base/BUILD.bazel 33+++ b/third_party/abseil-cpp/absl/base/BUILD.bazel 34@@ -115,9 +115,6 @@ cc_library( 35 36 cc_library( 37 name = "dynamic_annotations", 38- srcs = [ 39- "internal/dynamic_annotations.h", 40- ], 41 hdrs = [ 42 "dynamic_annotations.h", 43 ], 44@@ -131,9 +128,6 @@ cc_library( 45 46 cc_library( 47 name = "core_headers", 48- srcs = [ 49- "internal/thread_annotations.h", 50- ], 51 hdrs = [ 52 "attributes.h", 53 "const_init.h", 54diff --git a/third_party/abseil-cpp/CMake/AbseilDll.cmake b/third_party/abseil-cpp/CMake/AbseilDll.cmake 55index 00cddb84c6b7f..a2b8b103885a6 100644 56--- a/third_party/abseil-cpp/CMake/AbseilDll.cmake 57+++ b/third_party/abseil-cpp/CMake/AbseilDll.cmake 58@@ -14,7 +14,6 @@ set(ABSL_INTERNAL_DLL_FILES 59 "base/internal/cycleclock.cc" 60 "base/internal/cycleclock.h" 61 "base/internal/direct_mmap.h" 62- "base/internal/dynamic_annotations.h" 63 "base/internal/endian.h" 64 "base/internal/errno_saver.h" 65 "base/internal/fast_type_id.h" 66@@ -41,7 +40,6 @@ set(ABSL_INTERNAL_DLL_FILES 67 "base/internal/spinlock_wait.h" 68 "base/internal/sysinfo.cc" 69 "base/internal/sysinfo.h" 70- "base/internal/thread_annotations.h" 71 "base/internal/thread_identity.cc" 72 "base/internal/thread_identity.h" 73 "base/internal/throw_delegate.cc" 74diff --git a/third_party/abseil-cpp/absl/base/CMakeLists.txt b/third_party/abseil-cpp/absl/base/CMakeLists.txt 75index ed55093abe80f..6908182e97c86 100644 76--- a/third_party/abseil-cpp/absl/base/CMakeLists.txt 77+++ b/third_party/abseil-cpp/absl/base/CMakeLists.txt 78@@ -109,8 +109,6 @@ absl_cc_library( 79 dynamic_annotations 80 HDRS 81 "dynamic_annotations.h" 82- SRCS 83- "internal/dynamic_annotations.h" 84 COPTS 85 ${ABSL_DEFAULT_COPTS} 86 DEPS 87@@ -128,7 +126,6 @@ absl_cc_library( 88 "optimization.h" 89 "port.h" 90 "thread_annotations.h" 91- "internal/thread_annotations.h" 92 COPTS 93 ${ABSL_DEFAULT_COPTS} 94 DEPS 95