Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Abseil from src to flutter third_party dir #51245

Merged
merged 3 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function verify_licenses() (

local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=842 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=843 # When changing this number: Update the error message below as well describing the newly expected license types.

if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="
Expand Down
622 changes: 311 additions & 311 deletions ci/licenses_golden/excluded_files

Large diffs are not rendered by default.

1,383 changes: 1,382 additions & 1 deletion ci/licenses_golden/licenses_flutter

Large diffs are not rendered by default.

1,385 changes: 2 additions & 1,383 deletions ci/licenses_golden/licenses_third_party

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 04fdc5b7c8d5b1690149c9aa20f4174d
Signature: 5517be1afb4a2e347b9c4f018c1d5e5f

2 changes: 1 addition & 1 deletion fml/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion fml/backtrace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion impeller/golden_tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
3 changes: 1 addition & 2 deletions impeller/golden_tests/golden_playground_test_mac.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion shell/testing/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion shell/testing/tester_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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\.[^/]+$'),
Expand Down