Merge branch 'main' into blur-mask-gradients

Author: gaaclarke

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'f17ec749446982dca80e112df31c0d48c6369242',
+  'skia_revision': 'a4fb847f47d9a63a999e57b6ff2b623d4689da2d',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'bbf21a08a92d0c2ef2d3aec635f2efea17bb40e8',
+  'dart_revision': '4c64fcc134bf46e18fe1d9191b635fea3e5ebdff',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -80,9 +80,9 @@ vars = {
   'dart_pub_rev': '5b5fdd320a3b60a6a00bdd3122f03c6f67a39eeb',
   'dart_tools_rev': 'fca993e4f287e8080f2a8d91dbfbace8b6a8a0bc',
   'dart_watcher_rev': '21858a41da1482922e03ee65cdf2169d01d59a67',
-  'dart_web_rev': '8870d04354cd1af4b77aeec6f4abd77a53bcc709',
+  'dart_web_rev': '51e594b35b516b8678825e27e2f2d8051a594a57',
   'dart_webdev_rev': '51b5484348b4a8ede351e8dff0428b083495ba78',
-  'dart_webkit_inspection_protocol_rev': '07295b9a5a1f1851666269128e95a9644d65107a',
+  'dart_webkit_inspection_protocol_rev': '153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae',
   'dart_yaml_edit_rev': '54884db790720ac0f7ca491cb9e6d7a0395ad4cb',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
 
@@ -257,7 +257,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC',
+  'fuchsia_test_scripts_version': 'XtkBHdNTtIpWdxN_lUNf6VqnvPUhvGTYgPDqob1R65EC',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -283,7 +283,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '31f887a3ba13087f1bc64bd2a1736329b5f84201',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ef514ca5144ba0a4ce5e7075c325d24cd6da73a4',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -392,7 +392,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@cec45fbedf85b938670314e5bcdac3fbdde94f99',
+   Var('dart_git') + '/dartdoc.git@0de8aff3d2feb6fb9fb5ecf5e4f699b3a0ef2c63',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -407,7 +407,7 @@ deps = {
    Var('dart_git') + '/html.git@327e37a6a4dd46599737ee982f280d73a8f646f7',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@470d2c3595c00252f92be21d2bc3d79816d0d8f2',
+   Var('dart_git') + '/http.git@8d3c64747f9a6d99b29558b6e612dee83db7cdbb',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@ba9d07f3596b24718ddf45c9e071d40879cca565',
@@ -428,7 +428,7 @@ deps = {
    Var('dart_git') + '/logging.git@cbaf4ee2e59c318d7519edb5381f5fe2a7f69587',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@dd47c5dea1015aff2037b613fb4964450beaf81c',
+   Var('dart_git') + '/markdown.git@1ca51664e7b1b7fe789f6be2668c909ce3aea342',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@d954c8d979579b4b46427b0ea1d9c721117c191e',
@@ -443,7 +443,7 @@ deps = {
    Var('dart_git') + '/native.git@0901a3323022fdb59657cc2cb00ea5c80a8468a6',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@4a7042bb286cf0b41b26e87972bc28bda535f8b9',
+   Var('dart_git') + '/package_config.git@3d90e6955ef19b7ce4f1b742a06a20ed4260700a',
 
   'src/third_party/dart/third_party/pkg/path':
    Var('dart_git') + '/path.git@a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4',
@@ -461,7 +461,7 @@ deps = {
    Var('dart_git') + '/pub_semver.git@3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@da6a69ba749aded85a215fba4882fc3964d2c49b',
+   Var('dart_git') + '/shelf.git@1acbc673326e5b31280184744f2864a8f92c5b46',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@c75649651d01826236e3ab7093d277a70756905a',
@@ -677,10 +677,10 @@ deps = {
    'src/flutter/third_party/swiftshader':
    Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',
 
-   'src/third_party/angle':
+   'src/flutter/third_party/angle':
    Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
 
-   'src/third_party/vulkan_memory_allocator':
+   'src/flutter/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
    'src/flutter/third_party/abseil-cpp':
@@ -1010,7 +1010,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'y67DIBX84h7pAekIppHDM8whYoQAx8F7TAl08BUiHo4C'
+        'version': 'lAV5jgp4796siOZgIDxa2NLJP7lcfcjMuVLO5FVgSjAC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',
@@ -1205,6 +1205,9 @@ hooks = [
     'pattern': '.',
     'condition': 'run_fuchsia_emu',
     'action': [
+      'env',
+      'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',
+      'FUCHSIA_SDK_PATH={fuchsia_sdk_path}',
       'python3',
       'src/flutter/tools/fuchsia/with_envs.py',
       '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

@@ -0,0 +1,39 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ensure use_xcode_clang is visibile to ANGLE.
+import("//build/toolchain/toolchain.gni")
+
+# The ANGLE build requires this file to point to the location of third-party
+# dependencies.
+angle_root = "//flutter/third_party/angle"
+
+angle_vma_version = 30000001
+
+# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough
+# to cause GN variable collisions if we don't set this.
+if (!is_fuchsia) {
+  angle_has_build = true
+}
+
+# Overrides for ANGLE's dependencies.
+angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp"
+angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src"
+angle_googletest_dir = "//third_party/googletest/googletest/src"
+
+# Note: This path doesn't actually exist; see
+# //build/secondary/third_party/jsoncpp/BUILD.gn
+angle_jsoncpp_dir = "//third_party/jsoncpp"
+angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
+angle_libpng_dir = "//flutter/third_party/libpng"
+angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
+angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
+angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
+angle_vulkan_memory_allocator_dir =
+    "//flutter/third_party/vulkan_memory_allocator"
+
+# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
+# so it is defined here.
+is_cfi = false

build_overrides/angle.gni

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

build_overrides/build.gni

@@ -0,0 +1,6 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"

build_overrides/glslang.gni

@@ -0,0 +1,11 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# We are building inside Flutter.
+spirv_tools_standalone = false
+
+# Paths to SPIRV-Tools dependencies in Flutter.
+spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
+spirv_tools_spirv_headers_dir =
+    "//flutter/third_party/vulkan-deps/spirv-headers/src"

build_overrides/spirv_tools.gni

@@ -0,0 +1,9 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# We are building SwiftShader in Flutter.
+swiftshader_standalone = false
+
+# Path to SwiftShader.
+swiftshader_dir = "//flutter/third_party/swiftshader"

build_overrides/swiftshader.gni

@@ -0,0 +1,11 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is needed by the vulkan-headers build, but doesn't need to actually
+# set anything.
+
+if (is_linux) {
+  vulkan_use_x11 = true
+  vulkan_use_wayland = true
+}

build_overrides/vulkan_headers.gni

@@ -0,0 +1,8 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+
+# Vulkan loader build options
+vulkan_loader_shared = true

build_overrides/vulkan_loader.gni

@@ -0,0 +1,9 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+
+# Subdirectories for generated files
+vulkan_data_subdir = ""
+vulkan_gen_subdir = ""