[CP] Beta/3.22 Workaround for platform view android 14

.ci.yaml

@@ -89,29 +89,6 @@ targets:
       - testing/scenario_app/**
       - testing/skia_gold_client/**
 
-# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
-# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
-  - name: Linux linux_android_emulator_tests_api_33
-    bringup: true
-    enabled_branches:
-      - main
-    recipe: engine_v2/engine_v2
-    properties:
-      config_name: linux_android_emulator_api_33
-      dependencies: >-
-        [
-          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
-        ]
-    timeout: 60
-    runIf:
-      - .ci.yaml
-      - ci/builders/linux_android_emulator_api_33.json
-      - DEPS
-      - lib/ui/**
-      - shell/platform/android/**
-      - testing/scenario_app/**
-      - testing/skia_gold_client/**
-
   - name: Linux builder_cache
     enabled_branches:
       - main
@@ -300,6 +277,11 @@ targets:
       - ci/**
       - flutter_frontend_server/**
 
+  - name: Linux clangd
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_unopt_debug_no_rbe
+
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
     timeout: 120
@@ -385,6 +367,14 @@ targets:
     drone_dimensions:
       - os=Mac-13
 
+  - name: Linux mac_clangd
+    recipe: engine_v2/engine_v2
+    # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
+    drone_dimensions:
+      - os=Linux
+    properties:
+      config_name: mac_unopt_debug_no_rbe
+
   - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:

.clangd

@@ -0,0 +1,10 @@
+# Used to allow clangd to run on CI platforms as part of //tools/clangd_check.
+#
+# Intended to have no effect elsewhere.
+#
+# See also:
+# - https://clangd.llvm.org/config#compileflags
+# - https://github.com/clangd/clangd/issues/662
+CompileFlags:
+  Add: -Wno-unknown-warning-option
+  Remove: [-m*, -f*]

.engine-release.version

@@ -0,0 +1,8 @@
+# Used to branch and track golden-file rendering of release branches.
+#
+# See ./testing/skia_gold_client/README.md#release-testing for more information.
+
+# On the main branch, this should always read 'none'.
+# On release branches, this should be the release version such as '3.21'
+# (without the quotes).
+none

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': 'c0e0b76d6d519c4d4d1be59e4723d415dd01f24e',
+  'skia_revision': 'c61843470d89de81c571d87ed2c810911edeb1a3',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -72,7 +72,7 @@ vars = {
   'dart_browser_launcher_rev': '79562306c86e5c087359a31a60309c8d65a699d3',
   'dart_clock_rev': 'daf0fadabc5b3dc8e6e71bf3fb27ef9c3b79df5c',
   'dart_collection_rev': 'fc616ff8fd7b732c07b2b19e31b6601e59900ccf',
-  'dart_devtools_rev': '7421a2d5d67cbcdec92f1a2ac993b8b64b28d7ca',
+  'dart_devtools_rev': '8be1bc8d6862a3fcf8f43917f6e0c783cac06d51',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -336,7 +336,7 @@ deps = {
   Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
 
   'src/flutter/third_party/boringssl/src':
-   'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
+  'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
   'src/flutter/third_party/perfetto':
    Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'),
@@ -358,7 +358,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@9784f012848a7eb321c2037bdb363dfe0eab8bc9',
 
   'src/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:7421a2d5d67cbcdec92f1a2ac993b8b64b28d7ca'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:8be1bc8d6862a3fcf8f43917f6e0c783cac06d51'}]},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@788d93541a578e49f066699e1584bc3ce591c376',
@@ -397,7 +397,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@79c1675956f74b4e3f44134879beeb230a84bcd1',
+   Var('dart_git') + '/dartdoc.git@bf6080c8a12bf3a2f29f517d152bbd5fa1bb0a37',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
@@ -412,7 +412,7 @@ deps = {
    Var('dart_git') + '/html.git@327e37a6a4dd46599737ee982f280d73a8f646f7',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@7949d6f4a60bb5e9158da52910aa6bacda6b9286',
+   Var('dart_git') + '/http.git@280d3615a2d248d155e87766c9d9bcf586af2c3c',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@ba9d07f3596b24718ddf45c9e071d40879cca565',
@@ -695,6 +695,9 @@ deps = {
   'src/flutter/third_party/pkg/archive':
   Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
 
+  'src/flutter/third_party/pkg/coverage':
+  Var('flutter_git') + '/third_party/coverage.git' + '@' + 'bb0ab721ee4ceef1abfa413d8d6fd46013b583b9', # 1.7.2
+
   'src/flutter/third_party/pkg/equatable':
   Var('flutter_git') + '/third_party/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5
 
@@ -707,6 +710,12 @@ deps = {
   'src/flutter/third_party/pkg/googleapis':
   Var('flutter_git') + '/third_party/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various
 
+  'src/flutter/third_party/pkg/io':
+  Var('flutter_git') + '/third_party/io.git' + '@' + '997a6243aad20af4238147d9ec00bf638b9169af', # 1.0.5-wip
+
+  'src/flutter/third_party/pkg/node_preamble':
+  Var('flutter_git') + '/third_party/node_preamble.dart.git' + '@' + '47245865175929ec452d8058e563c267b64c3d64', # 2.0.2
+
   'src/flutter/third_party/pkg/platform':
   Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0
 
@@ -1015,7 +1024,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'uzI3wnbEGlZ_dtO0Zp5QFLl5WbvXoUiKu_gjI3PhSykC'
+        'version': 'TXxMINUq7JduIRX8KEopRJ8DWvKc7M-QEoRRZAzxVp4C'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

build/copy_info_plist.py

@@ -8,8 +8,6 @@
 Copies the Info.plist and adds extra fields to it like the git hash of the
 engine.
 
-Precondition: $CWD/../../flutter is the path to the flutter engine repo.
-
 usage: copy_info_plist.py --source <src_path> --destination <dest_path>
                           --minversion=<deployment_target>
 """
@@ -20,10 +18,13 @@
 
 import git_revision
 
+_script_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..'))
+_src_root_dir = os.path.join(_script_dir, '..', '..')
+
 
 def get_clang_version():
   clang_executable = str(
-      os.path.join('..', '..', 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
+      os.path.join(_src_root_dir, 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
   )
   version = subprocess.check_output([clang_executable, '--version'])
   return version.splitlines()[0]
@@ -47,7 +48,7 @@ def main():
   args = parser.parse_args()
 
   text = open(args.source).read()
-  engine_path = os.path.join(os.getcwd(), '..', '..', 'flutter')
+  engine_path = os.path.join(_src_root_dir, 'flutter')
   revision = git_revision.get_repository_version(engine_path)
   clang_version = get_clang_version()
   text = text.format(revision=revision, clang_version=clang_version, min_version=args.minversion)

ci/analyze.sh

@@ -35,9 +35,12 @@ FLUTTER_DIR="$SRC_DIR/flutter"
 # directory. If not specified, we default to the build output for
 # host_debug_unopt.
 if [[ $# -eq 0 ]] ; then
-DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
+  DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
+  if [[ ! -d "$DART_BIN" ]]; then
+    DART_BIN="$SRC_DIR/out/ci/host_debug_unopt/dart-sdk/bin"
+  fi
 else
-DART_BIN="$1"
+  DART_BIN="$1"
 fi
 
 DART="$DART_BIN/dart"