tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

0002-delete-unprefixed-annotations.patch (2112B)

      1 TODO: b/145122732 - Remove unprefixed dynamic annotation macros from abseil
      2 ---
      3 diff --git a/third_party/abseil-cpp/absl/base/dynamic_annotations.h b/third_party/abseil-cpp/absl/base/dynamic_annotations.h
      4 index 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 
     17 diff --git a/third_party/abseil-cpp/absl/base/BUILD.bazel b/third_party/abseil-cpp/absl/base/BUILD.bazel
     18 index 65ff0ddef9fd..d6fbf3581158 100644
     19 --- a/third_party/abseil-cpp/absl/base/BUILD.bazel
     20 +++ b/third_party/abseil-cpp/absl/base/BUILD.bazel
     21 @@ -115,9 +115,6 @@ cc_library(
     22 
     23 cc_library(
     24     name = "dynamic_annotations",
     25 -    srcs = [
     26 -        "internal/dynamic_annotations.h",
     27 -    ],
     28     hdrs = [
     29         "dynamic_annotations.h",
     30     ],
     31 diff --git a/third_party/abseil-cpp/CMake/AbseilDll.cmake b/third_party/abseil-cpp/CMake/AbseilDll.cmake
     32 index 00cddb84c6b7f..a2b8b103885a6 100644
     33 --- a/third_party/abseil-cpp/CMake/AbseilDll.cmake
     34 +++ b/third_party/abseil-cpp/CMake/AbseilDll.cmake
     35 @@ -14,7 +14,6 @@ set(ABSL_INTERNAL_DLL_FILES
     36   "base/internal/cycleclock.cc"
     37   "base/internal/cycleclock.h"
     38   "base/internal/direct_mmap.h"
     39 -  "base/internal/dynamic_annotations.h"
     40   "base/internal/endian.h"
     41   "base/internal/errno_saver.h"
     42   "base/internal/fast_type_id.h"
     43 diff --git a/third_party/abseil-cpp/absl/base/CMakeLists.txt b/third_party/abseil-cpp/absl/base/CMakeLists.txt
     44 index ed55093abe80f..6908182e97c86 100644
     45 --- a/third_party/abseil-cpp/absl/base/CMakeLists.txt
     46 +++ b/third_party/abseil-cpp/absl/base/CMakeLists.txt
     47 @@ -109,8 +109,6 @@ absl_cc_library(
     48     dynamic_annotations
     49   HDRS
     50     "dynamic_annotations.h"
     51 -  SRCS
     52 -    "internal/dynamic_annotations.h"
     53   COPTS
     54     ${ABSL_DEFAULT_COPTS}
     55   DEPS