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