Merge branch 'main' into clangd-check

Author: matanlurey

.ci.yaml

@@ -59,7 +59,26 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - ci/builders/linux_android_emulator.json
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+      - testing/scenario_app/**
+
+  - name: Linux linux_android_emulator_skia_tests
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_android_emulator_skia
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
     runIf:
       - .ci.yaml
       - ci/builders/linux_android_emulator.json
@@ -80,7 +99,7 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
     runIf:
       - .ci.yaml
       - ci/builders/linux_android_emulator.json

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': '254b27e90e3cdd89ff31f4d8d378910c81d2800b',
+  'skia_revision': 'ba3ed5998af356f0fb7c285b4c3d7c0f1b1c1ad1',
 
   # 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': 'e2f2d9b464e90ac10b2e4c5fd5331712020737f0',
+  'dart_revision': 'c479735adcf91684b66e94747199e3c1b17516b9',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -304,7 +304,7 @@ deps = {
   'src/flutter/third_party/flatbuffers':
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
-  'src/third_party/icu':
+  'src/flutter/third_party/icu':
    Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a622de35ac311c5ad390a7af80724634e5dc61ed',
 
    'src/flutter/third_party/gtest-parallel':
@@ -379,7 +379,7 @@ deps = {
    Var('dart_git') + '/csslib.git@62ae85e84590f61169fddbca650e91a57544834b',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
+   Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@7a9df65fbca600ecb3ada4b08002c8ab9ee4e987',
@@ -1000,7 +1000,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'j9cJ94K-T1i3u5xGhNKHB3oJWIZ3lO7m7Ob0kSQL-wsC'
+        'version': 'kLvCWEgbL1VTRW69e1re3ERw4CUAUrJ-DJdxXyXem7gC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

assets/asset_manager.cc

@@ -111,4 +111,21 @@ AssetResolver::AssetResolverType AssetManager::GetType() const {
   return AssetResolverType::kAssetManager;
 }
 
+bool AssetManager::operator==(const AssetResolver& other) const {
+  const AssetManager* other_manager = other.as_asset_manager();
+  if (!other_manager) {
+    return false;
+  }
+  if (resolvers_.size() != other_manager->resolvers_.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < resolvers_.size(); i++) {
+    if (*resolvers_[i] != *other_manager->resolvers_[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
 }  // namespace flutter

assets/asset_manager.h

@@ -88,6 +88,12 @@ class AssetManager final : public AssetResolver {
       const std::string& asset_pattern,
       const std::optional<std::string>& subdir) const override;
 
+  // |AssetResolver|
+  bool operator==(const AssetResolver& other) const override;
+
+  // |AssetResolver|
+  const AssetManager* as_asset_manager() const override { return this; }
+
  private:
   std::deque<std::unique_ptr<AssetResolver>> resolvers_;
 

assets/asset_resolver.h

@@ -14,6 +14,10 @@
 
 namespace flutter {
 
+class AssetManager;
+class APKAssetProvider;
+class DirectoryAssetBundle;
+
 class AssetResolver {
  public:
   AssetResolver() = default;
@@ -29,6 +33,14 @@ class AssetResolver {
     kDirectoryAssetBundle
   };
 
+  virtual const AssetManager* as_asset_manager() const { return nullptr; }
+  virtual const APKAssetProvider* as_apk_asset_provider() const {
+    return nullptr;
+  }
+  virtual const DirectoryAssetBundle* as_directory_asset_bundle() const {
+    return nullptr;
+  }
+
   virtual bool IsValid() const = 0;
 
   //----------------------------------------------------------------------------
@@ -81,6 +93,12 @@ class AssetResolver {
     return {};
   };
 
+  virtual bool operator==(const AssetResolver& other) const = 0;
+
+  bool operator!=(const AssetResolver& other) const {
+    return !operator==(other);
+  }
+
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(AssetResolver);
 };

assets/directory_asset_bundle.cc

@@ -110,4 +110,14 @@ std::vector<std::unique_ptr<fml::Mapping>> DirectoryAssetBundle::GetAsMappings(
   return mappings;
 }
 
+bool DirectoryAssetBundle::operator==(const AssetResolver& other) const {
+  auto other_bundle = other.as_directory_asset_bundle();
+  if (!other_bundle) {
+    return false;
+  }
+  return is_valid_after_asset_manager_change_ ==
+             other_bundle->is_valid_after_asset_manager_change_ &&
+         descriptor_.get() == other_bundle->descriptor_.get();
+}
+
 }  // namespace flutter

assets/directory_asset_bundle.h

@@ -43,6 +43,14 @@ class DirectoryAssetBundle : public AssetResolver {
       const std::string& asset_pattern,
       const std::optional<std::string>& subdir) const override;
 
+  // |AssetResolver|
+  bool operator==(const AssetResolver& other) const override;
+
+  // |AssetResolver|
+  const DirectoryAssetBundle* as_directory_asset_bundle() const override {
+    return this;
+  }
+
   FML_DISALLOW_COPY_AND_ASSIGN(DirectoryAssetBundle);
 };
 

build/archives/BUILD.gn

@@ -72,7 +72,7 @@ if (build_engine_artifacts && !is_android) {
       }
       files += [
         {
-          source = "//third_party/icu/flutter/icudtl.dat"
+          source = "//flutter/third_party/icu/flutter/icudtl.dat"
           destination = "icudtl.dat"
         },
         {

build/secondary/third_party/icu/BUILD.gn

@@ -0,0 +1,19 @@
+# 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("icui18n_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icui18n_hidden_visibility" ]
+}
+
+group("icuuc_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icuuc_hidden_visibility" ]
+}
+
+group("icui18n") {
+  public_deps = [ "//flutter/third_party/icu:icui18n" ]
+}
+
+group("icuuc") {
+  public_deps = [ "//flutter/third_party/icu:icuuc" ]
+}

ci/ban_generated_plugin_registrant_java.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# 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.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -L "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
+
+# Check if a file named **/GeneratedPluginRegistrant.java exists in the project.
+# If it does, fail the build and print a message to the user pointing them to
+# the file and instructing them to remove it.
+#
+# See: https://github.com/flutter/flutter/issues/143782.
+
+# The expected path to the file. Any *other* path is unexpected.
+EXPECTED_PATHS=("./shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java")
+
+# Temporarily change the working directory to the root of the Flutter project.
+pushd "$SRC_DIR/flutter" >/dev/null
+
+# Change back to the original working directory.
+function cleanup() {
+  popd >/dev/null
+}
+
+trap cleanup EXIT
+
+# Find all files named GeneratedPluginRegistrant.java in the project.
+echo "Finding all files named GeneratedPluginRegistrant.java in the project..."
+GENERATED_PLUGIN_REGISTRANT_PATHS=$(find . -name "GeneratedPluginRegistrant.java")
+
+# Iterate over the found paths and check if they are expected.
+for path in $GENERATED_PLUGIN_REGISTRANT_PATHS; do
+  if [[ ! " ${EXPECTED_PATHS[@]} " =~ " ${path} " ]]; then
+    echo "ERROR: Found unexpected file named GeneratedPluginRegistrant.java at $path."
+    echo "Please remove this file from the project."
+    exit 1
+  fi
+done
+
+echo "Done."