commit bc3ab29356a081d0b5dd4ac55e30f4b45d8794cc
author Corentin Wallez <cwallez@chromium.org> Mon Jul 11 11:51:46 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Jul 11 05:03:29 2022 -0700
tree b9ea57243a32b6b9a9178a2f20751ba67e4fe816
parent e44b3e77a90112bba1ebe91aca5f9af8e5afab84

absl: Also remove unprefixed annotations from CMake files

The base/internal/dynamic|thread_annotations.h are removed from the
Bazel build files but not CMake files, causing compilation errors when
trying to use Chromium's abseil-cpp through CMake. (this is done in Dawn
because it has DEPS on Chromium's abseil-cpp to get the GN build files,
but that means it also ends up being used for CMake builds).

Bug: dawn:1483
Change-Id: If636fff4ad186d9fdfd389fe4c41bd346dacda5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3755282
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1022653}
NOKEYCHECK=True
GitOrigin-RevId: 716d472130bb69a1e02f62b03081456b38b6acc6

CMake/AbseilDll.cmake

diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
index 00cddb8..a2b8b10 100644
--- a/CMake/AbseilDll.cmake
+++ b/CMake/AbseilDll.cmake
@@ -14,7 +14,6 @@
   "base/internal/cycleclock.cc"
   "base/internal/cycleclock.h"
   "base/internal/direct_mmap.h"
-  "base/internal/dynamic_annotations.h"
   "base/internal/endian.h"
   "base/internal/errno_saver.h"
   "base/internal/fast_type_id.h"
@@ -41,7 +40,6 @@
   "base/internal/spinlock_wait.h"
   "base/internal/sysinfo.cc"
   "base/internal/sysinfo.h"
-  "base/internal/thread_annotations.h"
   "base/internal/thread_identity.cc"
   "base/internal/thread_identity.h"
   "base/internal/throw_delegate.cc"

absl/base/CMakeLists.txt

diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt
index ed55093..6908182 100644
--- a/absl/base/CMakeLists.txt
+++ b/absl/base/CMakeLists.txt
@@ -109,8 +109,6 @@
     dynamic_annotations
   HDRS
     "dynamic_annotations.h"
-  SRCS
-    "internal/dynamic_annotations.h"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
@@ -128,7 +126,6 @@
     "optimization.h"
     "port.h"
     "thread_annotations.h"
-    "internal/thread_annotations.h"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS

patches/0002-delete-unprefixed-annotations.patch

diff --git a/patches/0002-delete-unprefixed-annotations.patch b/patches/0002-delete-unprefixed-annotations.patch
index 83bbcd1..985c547 100644
--- a/patches/0002-delete-unprefixed-annotations.patch
+++ b/patches/0002-delete-unprefixed-annotations.patch
@@ -49,3 +49,44 @@
      hdrs = [
          "attributes.h",
          "const_init.h",
+diff --git a/third_party/abseil-cpp/CMake/AbseilDll.cmake b/third_party/abseil-cpp/CMake/AbseilDll.cmake
+index 00cddb84c6b7f..a2b8b103885a6 100644
+--- a/third_party/abseil-cpp/CMake/AbseilDll.cmake
++++ b/third_party/abseil-cpp/CMake/AbseilDll.cmake
+@@ -14,7 +14,6 @@ set(ABSL_INTERNAL_DLL_FILES
+   "base/internal/cycleclock.cc"
+   "base/internal/cycleclock.h"
+   "base/internal/direct_mmap.h"
+-  "base/internal/dynamic_annotations.h"
+   "base/internal/endian.h"
+   "base/internal/errno_saver.h"
+   "base/internal/fast_type_id.h"
+@@ -41,7 +40,6 @@ set(ABSL_INTERNAL_DLL_FILES
+   "base/internal/spinlock_wait.h"
+   "base/internal/sysinfo.cc"
+   "base/internal/sysinfo.h"
+-  "base/internal/thread_annotations.h"
+   "base/internal/thread_identity.cc"
+   "base/internal/thread_identity.h"
+   "base/internal/throw_delegate.cc"
+diff --git a/third_party/abseil-cpp/absl/base/CMakeLists.txt b/third_party/abseil-cpp/absl/base/CMakeLists.txt
+index ed55093abe80f..6908182e97c86 100644
+--- a/third_party/abseil-cpp/absl/base/CMakeLists.txt
++++ b/third_party/abseil-cpp/absl/base/CMakeLists.txt
+@@ -109,8 +109,6 @@ absl_cc_library(
+     dynamic_annotations
+   HDRS
+     "dynamic_annotations.h"
+-  SRCS
+-    "internal/dynamic_annotations.h"
+   COPTS
+     ${ABSL_DEFAULT_COPTS}
+   DEPS
+@@ -128,7 +126,6 @@ absl_cc_library(
+     "optimization.h"
+     "port.h"
+     "thread_annotations.h"
+-    "internal/thread_annotations.h"
+   COPTS
+     ${ABSL_DEFAULT_COPTS}
+   DEPS