1*8975f5c5SAndroid Build Coastguard WorkerTODO: b/145122732 - Remove unprefixed dynamic annotation macros from abseil 2*8975f5c5SAndroid Build Coastguard Worker--- 3*8975f5c5SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/absl/base/dynamic_annotations.h b/third_party/abseil-cpp/absl/base/dynamic_annotations.h 4*8975f5c5SAndroid Build Coastguard Workerindex 1444dc48e283..6687291cade3 100644 5*8975f5c5SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/absl/base/dynamic_annotations.h 6*8975f5c5SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/absl/base/dynamic_annotations.h 7*8975f5c5SAndroid Build Coastguard Worker@@ -49,9 +49,6 @@ 8*8975f5c5SAndroid Build Coastguard Worker 9*8975f5c5SAndroid Build Coastguard Worker #include "absl/base/config.h" 10*8975f5c5SAndroid Build Coastguard Worker 11*8975f5c5SAndroid Build Coastguard Worker-// TODO(rogeeff): Remove after the backward compatibility period. 12*8975f5c5SAndroid Build Coastguard Worker-#include "absl/base/internal/dynamic_annotations.h" // IWYU pragma: export 13*8975f5c5SAndroid Build Coastguard Worker- 14*8975f5c5SAndroid Build Coastguard Worker // ------------------------------------------------------------------------- 15*8975f5c5SAndroid Build Coastguard Worker // Decide which features are enabled 16*8975f5c5SAndroid Build Coastguard Worker 17*8975f5c5SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/absl/base/BUILD.bazel b/third_party/abseil-cpp/absl/base/BUILD.bazel 18*8975f5c5SAndroid Build Coastguard Workerindex 65ff0ddef9fd..d6fbf3581158 100644 19*8975f5c5SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/absl/base/BUILD.bazel 20*8975f5c5SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/absl/base/BUILD.bazel 21*8975f5c5SAndroid Build Coastguard Worker@@ -115,9 +115,6 @@ cc_library( 22*8975f5c5SAndroid Build Coastguard Worker 23*8975f5c5SAndroid Build Coastguard Worker cc_library( 24*8975f5c5SAndroid Build Coastguard Worker name = "dynamic_annotations", 25*8975f5c5SAndroid Build Coastguard Worker- srcs = [ 26*8975f5c5SAndroid Build Coastguard Worker- "internal/dynamic_annotations.h", 27*8975f5c5SAndroid Build Coastguard Worker- ], 28*8975f5c5SAndroid Build Coastguard Worker hdrs = [ 29*8975f5c5SAndroid Build Coastguard Worker "dynamic_annotations.h", 30*8975f5c5SAndroid Build Coastguard Worker ], 31*8975f5c5SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/CMake/AbseilDll.cmake b/third_party/abseil-cpp/CMake/AbseilDll.cmake 32*8975f5c5SAndroid Build Coastguard Workerindex 00cddb84c6b7f..a2b8b103885a6 100644 33*8975f5c5SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/CMake/AbseilDll.cmake 34*8975f5c5SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/CMake/AbseilDll.cmake 35*8975f5c5SAndroid Build Coastguard Worker@@ -14,7 +14,6 @@ set(ABSL_INTERNAL_DLL_FILES 36*8975f5c5SAndroid Build Coastguard Worker "base/internal/cycleclock.cc" 37*8975f5c5SAndroid Build Coastguard Worker "base/internal/cycleclock.h" 38*8975f5c5SAndroid Build Coastguard Worker "base/internal/direct_mmap.h" 39*8975f5c5SAndroid Build Coastguard Worker- "base/internal/dynamic_annotations.h" 40*8975f5c5SAndroid Build Coastguard Worker "base/internal/endian.h" 41*8975f5c5SAndroid Build Coastguard Worker "base/internal/errno_saver.h" 42*8975f5c5SAndroid Build Coastguard Worker "base/internal/fast_type_id.h" 43*8975f5c5SAndroid Build Coastguard Workerdiff --git a/third_party/abseil-cpp/absl/base/CMakeLists.txt b/third_party/abseil-cpp/absl/base/CMakeLists.txt 44*8975f5c5SAndroid Build Coastguard Workerindex ed55093abe80f..6908182e97c86 100644 45*8975f5c5SAndroid Build Coastguard Worker--- a/third_party/abseil-cpp/absl/base/CMakeLists.txt 46*8975f5c5SAndroid Build Coastguard Worker+++ b/third_party/abseil-cpp/absl/base/CMakeLists.txt 47*8975f5c5SAndroid Build Coastguard Worker@@ -109,8 +109,6 @@ absl_cc_library( 48*8975f5c5SAndroid Build Coastguard Worker dynamic_annotations 49*8975f5c5SAndroid Build Coastguard Worker HDRS 50*8975f5c5SAndroid Build Coastguard Worker "dynamic_annotations.h" 51*8975f5c5SAndroid Build Coastguard Worker- SRCS 52*8975f5c5SAndroid Build Coastguard Worker- "internal/dynamic_annotations.h" 53*8975f5c5SAndroid Build Coastguard Worker COPTS 54*8975f5c5SAndroid Build Coastguard Worker ${ABSL_DEFAULT_COPTS} 55*8975f5c5SAndroid Build Coastguard Worker DEPS 56