Merge branch 'main' into focus-management-1

Author: tugorez

.ci.yaml

@@ -61,6 +61,7 @@ targets:
     timeout: 60
     runIf:
       - .ci.yaml
+      - ci/builders/linux_android_emulator.json
       - DEPS
       - lib/ui/**
       - shell/platform/android/**
@@ -82,6 +83,7 @@ targets:
     timeout: 60
     runIf:
       - .ci.yaml
+      - ci/builders/linux_android_emulator_api_33.json
       - DEPS
       - lib/ui/**
       - shell/platform/android/**

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': '4081496b769386bea3ee4aa38748f460580bd3e4',
+  'skia_revision': 'b8acfa559db0438cb0c3dbf54d78844a5d9b38e4',
 
   # 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': 'dca13675e65e5bcdf77935c1b9f80d8c2f883253',
+  'dart_revision': '032323fa534b4e569bd4215878d2701ae9a23185',
 
   # 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,7 +80,7 @@ vars = {
   'dart_pub_rev': '4ab2e3663f0a98be40427e004e789caebf3ea72e',
   'dart_tools_rev': '2ef7673ca4c8eb346debe6d628f0196788fc3c66',
   'dart_watcher_rev': '21858a41da1482922e03ee65cdf2169d01d59a67',
-  'dart_webdev_rev': '2539d54bca7143a2dd1a1ec5d55fa38ca481639c',
+  'dart_webdev_rev': '629c63214466a77d0994e9b8003120f48af9ef1d',
   'dart_webkit_inspection_protocol_rev': '07295b9a5a1f1851666269128e95a9644d65107a',
   'dart_yaml_edit_rev': '2a9a11bee120d507d61d501c34585440be8c12b6',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -274,7 +274,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '4c8d0040fca0fff675b487618ebaa8b7a8259858',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5413806166ee3b5198b9dd1c1f684d266ad9850c',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -298,7 +298,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
 
   'src/third_party/vulkan-deps':
-   Var('chromium_git') + '/vulkan-deps' + '@' + '40b75117a60b11c42a1fb87bf14c0f49bcdb8b3d',
+   Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',
 
   'src/flutter/third_party/flatbuffers':
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
@@ -372,7 +372,7 @@ deps = {
    Var('dart_git') + '/convert.git@d4d6368cffb8f4f25522875ef8e1d5f7d158bbad',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@c9540156d875e3645b030e2eb9c40a322818aaf5',
+   Var('dart_git') + '/crypto.git@f059196bae4718187c9f421565f9cd1f8fb43898',
 
   'src/third_party/dart/third_party/pkg/csslib':
    Var('dart_git') + '/csslib.git@62ae85e84590f61169fddbca650e91a57544834b',
@@ -381,7 +381,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@457c34ec5adf39edfdabb3d2bb509e60f1e41fc7',
+   Var('dart_git') + '/dartdoc.git@f152c0138bff8e4265a3459a6b08e4a83fe860b7',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -429,7 +429,7 @@ deps = {
    Var('dart_git') + '/mockito.git@7d6632fd679f0f6aae32ee74038ba8cb6b64a607',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@876f9a1948c1642a57640ef9b1526746042a17eb',
+   Var('dart_git') + '/native.git@cb9bd7ef604f71f2c51d0acbb3214cfe06e952be',
 
   'src/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@4a7042bb286cf0b41b26e87972bc28bda535f8b9',
@@ -462,7 +462,7 @@ deps = {
    Var('dart_git') + '/source_span.git@21a403a75b6887fbd811fb53b74b08c2cef67ab6',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@e483b1413bdaae14a102a80d559b3cfcbd0adcce',
+   Var('dart_git') + '/sse.git@af7d8d0881d3309fe9ffc3f0778b33ae745fddd1',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
    Var('dart_git') + '/stack_trace.git@155f12c51226d6372f6722f5e55c38ef39625006',
@@ -636,7 +636,7 @@ deps = {
   'src/flutter/third_party/libjpeg-turbo/src':
    Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
-  'src/third_party/libpng':
+  'src/flutter/third_party/libpng':
    Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
 
   'src/flutter/third_party/libwebp':
@@ -996,7 +996,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'RVHAIKU50ogkiV-LjqGMenlaBlAy2QNDBpQQIRIIdjoC'
+        'version': 'l6mWjvlO1xJg5ZFKKwU7YJDjzw-ncLCsu2BjKF1plHcC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

analysis_options.yaml

@@ -10,8 +10,10 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   errors:
-    # allow self-reference to deprecated members (we do this because otherwise we have
-    # to annotate every member in every test, assert, etc, when we deprecate something)
+    # allow deprecated members (we do this because otherwise we have to annotate
+    # every member in every test, assert, etc, when we or the Dart SDK deprecates
+    # something (https://github.com/flutter/flutter/issues/143312)
+    deprecated_member_use: ignore
     deprecated_member_use_from_same_package: ignore
   exclude: # DIFFERENT FROM FLUTTER/FLUTTER
     # Fixture depends on dart:ui and raises false positives.

build/secondary/third_party/libpng/BUILD.gn

@@ -0,0 +1,7 @@
+# Copyright 2013 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.
+
+group("libpng") {
+  public_deps = [ "//flutter/third_party/libpng" ]
+}