Move Abseil from src to flutter third_party dir

In combination with: * https://flutter-review.googlesource.com/c/third_party/abseil-cpp/+/55848 * flutter/buildroot#831 this updates Flutter's references to Abseil from //third_party/abseil-cpp to //flutter/third_party/abseil-cpp. Issue: flutter/flutter#144201 Part of: flutter/flutter#67373
cbracken · Mar 7, 2024 · ccf189a · ccf189a
1 parent 9aad0e9
commit ccf189a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/DEPS b/DEPS
@@ -283,7 +283,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ebc2748229c8377d97ee1cafd11dff07c285f440',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '31f887a3ba13087f1bc64bd2a1736329b5f84201',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -683,8 +683,8 @@ deps = {
    'src/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
-   'src/third_party/abseil-cpp':
-   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + '1db3bdd4eb208bef55c77f22aa94991e52225230',
+   'src/flutter/third_party/abseil-cpp':
+   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + 'ff6504dc527b25fef0f3c531e7dba0ed6b69c162',
 
    # Dart packages
   'src/flutter/third_party/pkg/archive':

diff --git a/fml/BUILD.gn b/fml/BUILD.gn
@@ -122,7 +122,7 @@ source_set("fml") {
 
   if (enable_backtrace) {
     # This abseil dependency is only used by backtrace.cc.
-    deps += [ "//third_party/abseil-cpp/absl/debugging:symbolize" ]
+    deps += [ "//flutter/third_party/abseil-cpp/absl/debugging:symbolize" ]
   }
 
   configs += [ "//flutter/third_party/icu:icu_config" ]

diff --git a/fml/backtrace.cc b/fml/backtrace.cc
@@ -10,7 +10,7 @@
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
-#include "third_party/abseil-cpp/absl/debugging/symbolize.h"
+#include "flutter/third_party/abseil-cpp/absl/debugging/symbolize.h"
 
 #ifdef FML_OS_WIN
 #include <Windows.h>

diff --git a/impeller/golden_tests/BUILD.gn b/impeller/golden_tests/BUILD.gn
@@ -23,7 +23,7 @@ impeller_component("golden_playground_test") {
     sources += [ "golden_playground_test_mac.cc" ]
     deps += [
       ":metal_screenshot",
-      "//third_party/abseil-cpp/absl/base:no_destructor",
+      "//flutter/third_party/abseil-cpp/absl/base:no_destructor",
     ]
   } else {
     sources += [ "golden_playground_test_stub.cc" ]

diff --git a/impeller/golden_tests/golden_playground_test_mac.cc b/impeller/golden_tests/golden_playground_test_mac.cc
@@ -12,14 +12,13 @@
 #include "flutter/impeller/golden_tests/golden_digest.h"
 #include "flutter/impeller/golden_tests/metal_screenshotter.h"
 #include "flutter/impeller/golden_tests/vulkan_screenshotter.h"
+#include "flutter/third_party/abseil-cpp/absl/base/no_destructor.h"
 #include "impeller/typographer/backends/skia/typographer_context_skia.h"
 #include "impeller/typographer/typographer_context.h"
 
 #define GLFW_INCLUDE_NONE
 #include "third_party/glfw/include/GLFW/glfw3.h"
 
-#include "third_party/abseil-cpp/absl/base/no_destructor.h"
-
 namespace impeller {
 
 namespace {

diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn
@@ -43,8 +43,8 @@ executable("testing") {
     "//flutter/shell/common",
     "//flutter/shell/gpu:gpu_surface_software",
     "//flutter/skia",
+    "//flutter/third_party/abseil-cpp/absl/base:no_destructor",
     "//flutter/third_party/tonic",
-    "//third_party/abseil-cpp/absl/base:no_destructor",
   ]
 
   if (impeller_supports_rendering) {

diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc
@@ -24,8 +24,8 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
+#include "flutter/third_party/abseil-cpp/absl/base/no_destructor.h"
 
-#include "third_party/abseil-cpp/absl/base/no_destructor.h"
 #include "third_party/dart/runtime/include/bin/dart_io_api.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/skia/include/core/SkSurface.h"

diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -459,11 +459,11 @@ final List<Pattern> skippedFilePatterns = <Pattern>[
   RegExp(r'^flutter/(?:.+/)*[^/]+_unittests?\.[^/]+$'),
   RegExp(r'^flutter/lib/web_ui/lib/assets/ahem\.ttf$', expectNoMatch: true), // this gitignored file exists only for testing purposes
   RegExp(r'^flutter/sky/packages/sky_engine/LICENSE$'), // that is the output of this script
+  RegExp(r'^flutter/third_party/abseil-cpp/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^flutter/third_party/boringssl/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/bn/[^/]+.go$'),
   RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/ec/[^/]+.go$'),
   RegExp(r'^flutter/third_party/freetype2/docs/(?!FTL\.TXT$).+'), // ignore all documentation except the license
-  RegExp(r'^third_party/abseil-cpp/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^third_party/angle/(?:.+/)*[^/]+_unittest\.[^/]+$'),
   RegExp(r'^third_party/dart/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^third_party/zlib/(?:.+/)*[^/]+_unittest\.[^/]+$'),