Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7eb5d3a

Browse files
gaaclarkegaaclarke
authored
Merge branch 'main' into blur-mask-gradients
2 parents ad62f61 + de8d9ee commit 7eb5d3a

File tree

150 files changed

+8401
-7639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+8401
-7639
lines changed

‎DEPS

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': 'f17ec749446982dca80e112df31c0d48c6369242',
17+
'skia_revision': 'a4fb847f47d9a63a999e57b6ff2b623d4689da2d',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
6262
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
6363
# You can use //tools/dart/create_updated_flutter_deps.py to produce
6464
# updated revision list of existing dependencies.
65-
'dart_revision': 'bbf21a08a92d0c2ef2d3aec635f2efea17bb40e8',
65+
'dart_revision': '4c64fcc134bf46e18fe1d9191b635fea3e5ebdff',
6666

6767
# WARNING: DO NOT EDIT MANUALLY
6868
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -80,9 +80,9 @@ vars = {
8080
'dart_pub_rev': '5b5fdd320a3b60a6a00bdd3122f03c6f67a39eeb',
8181
'dart_tools_rev': 'fca993e4f287e8080f2a8d91dbfbace8b6a8a0bc',
8282
'dart_watcher_rev': '21858a41da1482922e03ee65cdf2169d01d59a67',
83-
'dart_web_rev': '8870d04354cd1af4b77aeec6f4abd77a53bcc709',
83+
'dart_web_rev': '51e594b35b516b8678825e27e2f2d8051a594a57',
8484
'dart_webdev_rev': '51b5484348b4a8ede351e8dff0428b083495ba78',
85-
'dart_webkit_inspection_protocol_rev': '07295b9a5a1f1851666269128e95a9644d65107a',
85+
'dart_webkit_inspection_protocol_rev': '153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae',
8686
'dart_yaml_edit_rev': '54884db790720ac0f7ca491cb9e6d7a0395ad4cb',
8787
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
8888

@@ -257,7 +257,7 @@ vars = {
257257
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
258258
# will be used altogether with fuchsia-sdk to setup the build / test
259259
# environment.
260-
'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC',
260+
'fuchsia_test_scripts_version': 'XtkBHdNTtIpWdxN_lUNf6VqnvPUhvGTYgPDqob1R65EC',
261261

262262
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
263263
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -283,7 +283,7 @@ allowed_hosts = [
283283
]
284284

285285
deps = {
286-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '31f887a3ba13087f1bc64bd2a1736329b5f84201',
286+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ef514ca5144ba0a4ce5e7075c325d24cd6da73a4',
287287

288288
'src/flutter/third_party/depot_tools':
289289
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -392,7 +392,7 @@ deps = {
392392
Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
393393

394394
'src/third_party/dart/third_party/pkg/dartdoc':
395-
Var('dart_git') + '/dartdoc.git@cec45fbedf85b938670314e5bcdac3fbdde94f99',
395+
Var('dart_git') + '/dartdoc.git@0de8aff3d2feb6fb9fb5ecf5e4f699b3a0ef2c63',
396396

397397
'src/third_party/dart/third_party/pkg/file':
398398
Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -407,7 +407,7 @@ deps = {
407407
Var('dart_git') + '/html.git@327e37a6a4dd46599737ee982f280d73a8f646f7',
408408

409409
'src/third_party/dart/third_party/pkg/http':
410-
Var('dart_git') + '/http.git@470d2c3595c00252f92be21d2bc3d79816d0d8f2',
410+
Var('dart_git') + '/http.git@8d3c64747f9a6d99b29558b6e612dee83db7cdbb',
411411

412412
'src/third_party/dart/third_party/pkg/http_multi_server':
413413
Var('dart_git') + '/http_multi_server.git@ba9d07f3596b24718ddf45c9e071d40879cca565',
@@ -428,7 +428,7 @@ deps = {
428428
Var('dart_git') + '/logging.git@cbaf4ee2e59c318d7519edb5381f5fe2a7f69587',
429429

430430
'src/third_party/dart/third_party/pkg/markdown':
431-
Var('dart_git') + '/markdown.git@dd47c5dea1015aff2037b613fb4964450beaf81c',
431+
Var('dart_git') + '/markdown.git@1ca51664e7b1b7fe789f6be2668c909ce3aea342',
432432

433433
'src/third_party/dart/third_party/pkg/matcher':
434434
Var('dart_git') + '/matcher.git@d954c8d979579b4b46427b0ea1d9c721117c191e',
@@ -443,7 +443,7 @@ deps = {
443443
Var('dart_git') + '/native.git@0901a3323022fdb59657cc2cb00ea5c80a8468a6',
444444

445445
'src/third_party/dart/third_party/pkg/package_config':
446-
Var('dart_git') + '/package_config.git@4a7042bb286cf0b41b26e87972bc28bda535f8b9',
446+
Var('dart_git') + '/package_config.git@3d90e6955ef19b7ce4f1b742a06a20ed4260700a',
447447

448448
'src/third_party/dart/third_party/pkg/path':
449449
Var('dart_git') + '/path.git@a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4',
@@ -461,7 +461,7 @@ deps = {
461461
Var('dart_git') + '/pub_semver.git@3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16',
462462

463463
'src/third_party/dart/third_party/pkg/shelf':
464-
Var('dart_git') + '/shelf.git@da6a69ba749aded85a215fba4882fc3964d2c49b',
464+
Var('dart_git') + '/shelf.git@1acbc673326e5b31280184744f2864a8f92c5b46',
465465

466466
'src/third_party/dart/third_party/pkg/source_map_stack_trace':
467467
Var('dart_git') + '/source_map_stack_trace.git@c75649651d01826236e3ab7093d277a70756905a',
@@ -677,10 +677,10 @@ deps = {
677677
'src/flutter/third_party/swiftshader':
678678
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',
679679

680-
'src/third_party/angle':
680+
'src/flutter/third_party/angle':
681681
Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
682682

683-
'src/third_party/vulkan_memory_allocator':
683+
'src/flutter/third_party/vulkan_memory_allocator':
684684
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
685685

686686
'src/flutter/third_party/abseil-cpp':
@@ -1010,7 +1010,7 @@ deps = {
10101010
'packages': [
10111011
{
10121012
'package': 'fuchsia/sdk/core/linux-amd64',
1013-
'version': 'y67DIBX84h7pAekIppHDM8whYoQAx8F7TAl08BUiHo4C'
1013+
'version': 'lAV5jgp4796siOZgIDxa2NLJP7lcfcjMuVLO5FVgSjAC'
10141014
}
10151015
],
10161016
'condition': 'host_os == "linux" and not download_fuchsia_sdk',
@@ -1205,6 +1205,9 @@ hooks = [
12051205
'pattern': '.',
12061206
'condition': 'run_fuchsia_emu',
12071207
'action': [
1208+
'env',
1209+
'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',
1210+
'FUCHSIA_SDK_PATH={fuchsia_sdk_path}',
12081211
'python3',
12091212
'src/flutter/tools/fuchsia/with_envs.py',
12101213
'src/flutter/tools/fuchsia/test_scripts/update_product_bundles.py',

‎build/secondary/third_party/vulkan_memory_allocator/BUILD.gn renamed to ‎build/secondary/flutter/third_party/vulkan_memory_allocator/BUILD.gn

File renamed without changes.

‎build_overrides/angle.gni

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# Ensure use_xcode_clang is visibile to ANGLE.
6+
import("//build/toolchain/toolchain.gni")
7+
8+
# The ANGLE build requires this file to point to the location of third-party
9+
# dependencies.
10+
angle_root = "//flutter/third_party/angle"
11+
12+
angle_vma_version = 30000001
13+
14+
# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough
15+
# to cause GN variable collisions if we don't set this.
16+
if (!is_fuchsia) {
17+
angle_has_build = true
18+
}
19+
20+
# Overrides for ANGLE's dependencies.
21+
angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp"
22+
angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src"
23+
angle_googletest_dir = "//third_party/googletest/googletest/src"
24+
25+
# Note: This path doesn't actually exist; see
26+
# //build/secondary/third_party/jsoncpp/BUILD.gn
27+
angle_jsoncpp_dir = "//third_party/jsoncpp"
28+
angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
29+
angle_libpng_dir = "//flutter/third_party/libpng"
30+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
31+
angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
32+
angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
33+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
34+
angle_vulkan_memory_allocator_dir =
35+
"//flutter/third_party/vulkan_memory_allocator"
36+
37+
# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
38+
# so it is defined here.
39+
is_cfi = false

‎build_overrides/build.gni

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# The engine build uses some Chromium-sourced versions of third-party
6+
# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't
7+
# want the Chromium-specific parts of the build.
8+
build_with_chromium = false
9+
10+
# Perfetto targets fail to build without this variable. It is used by Perfetto
11+
# targets to distinguish embedder builds from Perfetto standalone builds, and
12+
# builds in the Android tree.
13+
perfetto_build_with_embedder = true

‎build_overrides/glslang.gni

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
6+
spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"

‎build_overrides/spirv_tools.gni

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# We are building inside Flutter.
6+
spirv_tools_standalone = false
7+
8+
# Paths to SPIRV-Tools dependencies in Flutter.
9+
spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
10+
spirv_tools_spirv_headers_dir =
11+
"//flutter/third_party/vulkan-deps/spirv-headers/src"

‎build_overrides/swiftshader.gni

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# We are building SwiftShader in Flutter.
6+
swiftshader_standalone = false
7+
8+
# Path to SwiftShader.
9+
swiftshader_dir = "//flutter/third_party/swiftshader"

‎build_overrides/vulkan_headers.gni

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright 2020 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# This file is needed by the vulkan-headers build, but doesn't need to actually
6+
# set anything.
7+
8+
if (is_linux) {
9+
vulkan_use_x11 = true
10+
vulkan_use_wayland = true
11+
}

‎build_overrides/vulkan_loader.gni

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Copyright 2020 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
7+
# Vulkan loader build options
8+
vulkan_loader_shared = true

‎build_overrides/vulkan_tools.gni

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright 2020 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
7+
# Subdirectories for generated files
8+
vulkan_data_subdir = ""
9+
vulkan_gen_subdir = ""

‎build_overrides/vulkan_utility_libraries.gni

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"

‎build_overrides/vulkan_validation_layers.gni

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2020 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
vulkan_utility_libraries_dir =
7+
"//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src"
8+
vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
9+
vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
10+
11+
# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include"
12+
13+
# Subdirectories for generated files
14+
vulkan_data_subdir = "vulkan-data"
15+
vulkan_gen_subdir = ""

‎build_overrides/wayland.gni

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Copyright 2019 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# ANGLE expects this to be here.
6+
7+
# Flutter has no wayland third-party dir
8+
wayland_gn_dir = ""

‎ci/builders/mac_host_engine.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,26 +183,14 @@
183183
"tests": [
184184
{
185185
"language": "python3",
186-
"name": "Dart and engine tests for host_release",
186+
"name": "Impeller-golden, dart and engine tests for host_release",
187187
"script": "flutter/testing/run_tests.py",
188188
"parameters": [
189189
"--variant",
190190
"host_release",
191191
"--type",
192-
"dart,dart-host,engine"
192+
"dart,dart-host,engine,impeller-golden"
193193
]
194-
},
195-
{
196-
"language": "python3",
197-
"name": "Impeller-golden tests for host_release",
198-
"script": "flutter/testing/run_tests.py",
199-
"parameters": [
200-
"--variant",
201-
"host_release",
202-
"--type",
203-
"impeller-golden"
204-
],
205-
"test_if": "main"
206194
}
207195
]
208196
},

‎ci/check_build_configs.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ function follow_links() (
2727
echo "$file"
2828
)
2929

30+
function dart_bin() {
31+
dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
32+
if [[ ! -e "$dart_path" ]]; then
33+
dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
34+
fi
35+
echo "$dart_path"
36+
}
37+
3038
SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
3139
SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
3240
FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
33-
DART_BIN="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk/bin"
41+
DART_BIN=$(dart_bin "$SRC_DIR")
3442
DART="${DART_BIN}/dart"
3543

3644
cd "$SCRIPT_DIR"

‎ci/clang_tidy.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ function follow_links() (
2727
echo "$file"
2828
)
2929

30+
function dart_bin() {
31+
dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
32+
if [[ ! -e "$dart_path" ]]; then
33+
dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
34+
fi
35+
echo "$dart_path"
36+
}
37+
3038
SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
3139
SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
3240
FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
33-
DART_BIN="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk/bin"
41+
DART_BIN=$(dart_bin "$SRC_DIR")
3442
DART="${DART_BIN}/dart"
3543

3644
# FLUTTER_LINT_PRINT_FIX will make it so that fix is executed and the generated

‎ci/format.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ function follow_links() (
2727
echo "$file"
2828
)
2929

30+
function dart_bin() {
31+
dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
32+
if [[ ! -e "$dart_path" ]]; then
33+
dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
34+
fi
35+
echo "$dart_path"
36+
}
37+
3038
SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
3139
SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
32-
DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
33-
DART="${DART_SDK_DIR}/bin/dart"
40+
DART_BIN=$(dart_bin "$SRC_DIR")
41+
DART="${DART_BIN}/dart"
3442

3543
cd "$SCRIPT_DIR"
3644
"$DART" \

‎ci/licenses.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,20 @@ function follow_links() (
3030
echo "$file"
3131
)
3232

33+
function dart_bin() {
34+
dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
35+
if [[ ! -e "$dart_path" ]]; then
36+
dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
37+
fi
38+
echo "$dart_path"
39+
}
40+
3341
SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
3442
SRC_DIR="$(
3543
cd "$SCRIPT_DIR/../.."
3644
pwd -P
3745
)"
38-
DART_BIN="$SRC_DIR/third_party/dart/tools/sdks/dart-sdk/bin"
46+
DART_BIN=$(dart_bin "$SRC_DIR")
3947
PATH="$DART_BIN:$PATH"
4048

4149
# Use:
@@ -162,7 +170,7 @@ function verify_licenses() (
162170

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

167175
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
168176
echo "=============================== ERROR ==============================="

0 commit comments

Comments
 (0)