knopp · knopp · Jan 9, 2026 · Jan 7, 2026 · Jan 7, 2026 · Jan 8, 2026
diff --git a/.github/workflows/build-and-upload-engine-artifacts.yml b/.github/workflows/build-and-upload-engine-artifacts.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,48 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "github workflow generator",
+            "type": "dart",
+            "request": "launch",
+            "cwd": "engine/src/",
+            "program": "flutter/tools/pkg/github_workflow_generator/bin/run.dart",
+            "args": [
+                "-i",
+                "flutter/ci/builders/mac_host_engine.json",
+                "-i",
+                "flutter/ci/builders/mac_ios_engine_no_ext_safe.json",
+                "-i",
+                "flutter/ci/builders/windows_host_engine.json",
+                "-i",
+                "flutter/ci/builders/windows_arm_host_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_host_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_host_desktop_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_arm_host_engine.json",
+                "-i",
+                "flutter/ci/builders/windows_android_aot_engine.json",
+                "-i",
+                "flutter/ci/builders/mac_android_aot_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_android_aot_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_android_debug_engine.json",
+                "-i",
+                "flutter/ci/builders/linux_web_engine_build.json",
+                "-o",
+                "../../.github/workflows/build-and-upload-engine-artifacts.yml",
+            ]
+        },
+        {
+            "name": "Hello World (debug)",
+            "type": "dart",
+            "request": "launch",
+            "cwd": "examples/hello_world",
+            "program": "lib/main.dart",
+        },
         {
             "name": "Hello World (host arm64, debug)",
             "type": "dart",

diff --git a/DEPS b/DEPS
@@ -446,7 +446,7 @@ deps = {
   Var('flutter_git') + '/third_party/ocmock' + '@' +  Var('ocmock_rev'),
 
   'engine/src/flutter/third_party/libpng':
-  Var('flutter_git') + '/third_party/libpng' + '@' + 'de36b892e921c684ef718fec24739ae9bb49c977',
+  Var('flutter_git') + '/third_party/libpng' + '@' + 'f139fd5d80944f5453b079672e50f32ca98ef076',
 
   'engine/src/flutter/third_party/zlib':
   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df',
@@ -607,7 +607,7 @@ deps = {
         'version': Var('clang_version'),
       }
     ],
-    'condition': 'host_os == "mac"', # On ARM64 Macs too because Goma doesn't support the host-arm64 toolchain.
+    'condition': 'host_os == "mac" and host_cpu == "x64"',
     'dep_type': 'cipd',
   },
 
@@ -629,7 +629,7 @@ deps = {
         'version': Var('clang_version'),
       }
     ],
-    'condition': 'host_os == "linux" or host_os == "mac"',
+    'condition': 'host_os == "linux" and host_cpu == "x64"',
     'dep_type': 'cipd',
   },
 

diff --git a/bin/flutter b/bin/flutter
@@ -21,6 +21,8 @@ set -e
 # Needed because if it is set, cd may print the path it changed to.
 unset CDPATH
 
+export FLUTTER_STORAGE_BASE_URL=https://engine.flutter0.dev
+
 # 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.

diff --git a/bin/flutter-dev b/bin/flutter-dev
@@ -26,6 +26,8 @@ set -e
 # Needed because if it is set, cd may print the path it changed to.
 unset CDPATH
 
+export FLUTTER_STORAGE_BASE_URL=https://engine.flutter0.dev
+
 # 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.

diff --git a/bin/flutter-dev.bat b/bin/flutter-dev.bat
@@ -13,6 +13,8 @@ REM --------------------------------------------------------------------------
 
 SETLOCAL
 
+SET FLUTTER_STORAGE_BASE_URL=https://engine.flutter0.dev
+
 REM This is a helper script for development purposes. It runs the Flutter tool
 REM from source code directly, without using the prebuilt snapshot. This is
 REM useful for development, as it allows you to make changes to the tool and see

diff --git a/bin/flutter.bat b/bin/flutter.bat
@@ -16,6 +16,8 @@ SETLOCAL
 REM To debug the tool, you can uncomment the following line to enable debug mode:
 REM SET FLUTTER_TOOL_ARGS="--enable-asserts %FLUTTER_TOOL_ARGS%"
 
+SET FLUTTER_STORAGE_BASE_URL=https://engine.flutter0.dev
+
 FOR %%i IN ("%~dp0..") DO SET FLUTTER_ROOT=%%~fi
 
 REM If available, add location of bundled mingit to PATH

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
diff --git a/engine/scripts/slim.gclient b/engine/scripts/slim.gclient
@@ -0,0 +1,22 @@
+# Copy this file to the root of your flutter checkout to bootstrap gclient
+# or just run gclient sync in an empty directory with this file.
+solutions = [
+  {
+    "custom_deps": {},
+    "deps_file": "DEPS",
+    "managed": False,
+    "name": ".",
+    "safesync_url": "",
+
+    # If you are using SSH to connect to GitHub, change the URL to:
+    # git@github.com:knopp/flutter_zero.git
+    "url": "https://github.com/knopp/flutter_zero.git",
+
+    # Uncomment the custom_vars section below if you plan to build the web engine.
+    "custom_vars": {
+      "download_esbuild": False,
+      "download_android_deps" : False,
+      "download_jdk": False,
+    },
+  },
+]
diff --git a/engine/scripts/standard.gclient b/engine/scripts/standard.gclient
@@ -9,8 +9,8 @@ solutions = [
     "safesync_url": "",
 
     # If you are using SSH to connect to GitHub, change the URL to:
-    # git@github.com:flutter/flutter.git
-    "url": "https://github.com/flutter/flutter.git",
+    # git@github.com:knopp/flutter_zero.git
+    "url": "https://github.com/knopp/flutter_zero.git",
 
     # Uncomment the custom_vars section below if you plan to build the web engine.
     # "custom_vars": {

diff --git a/engine/scripts/web.gclient b/engine/scripts/web.gclient
@@ -0,0 +1,22 @@
+# Copy this file to the root of your flutter checkout to bootstrap gclient
+# or just run gclient sync in an empty directory with this file.
+solutions = [
+  {
+    "custom_deps": {},
+    "deps_file": "DEPS",
+    "managed": False,
+    "name": ".",
+    "safesync_url": "",
+
+    # If you are using SSH to connect to GitHub, change the URL to:
+    # git@github.com:knopp/flutter_zero.git
+    "url": "https://github.com/knopp/flutter_zero.git",
+
+    # Uncomment the custom_vars section below if you plan to build the web engine.
+    "custom_vars": {
+      "download_esbuild": True,
+      "download_android_deps" : False,
+      "download_jdk": False,
+    },
+  },
+]
diff --git a/engine/src/build/config/darwin/darwin_sdk.gni b/engine/src/build/config/darwin/darwin_sdk.gni
@@ -67,7 +67,7 @@ declare_args() {
   ios_swift_lib_paths = []
 
   # Version of iOS that we're targeting for tests.
-  ios_testing_deployment_target = "13.0"
+  ios_testing_deployment_target = "14.5"
 }
 
 if (target_os == "ios" || target_os == "macos") {

diff --git a/engine/src/build/toolchain/android/BUILD.gn b/engine/src/build/toolchain/android/BUILD.gn
@@ -74,7 +74,7 @@ template("android_toolchain") {
     if (host_os == "linux") {
       host_dir = "linux-x64"
     } else if (host_os == "mac") {
-      host_dir = "mac-x64"
+      host_dir = "mac-arm64"
     } else {
       assert(false, "Unknown host")
     }

diff --git a/engine/src/build/toolchain/mac/BUILD.gn b/engine/src/build/toolchain/mac/BUILD.gn
@@ -461,7 +461,7 @@ if (is_ios) {
     is_clang = true
 
     sysroot_rel = rebase_path(ios_sdk_path, root_build_dir)
-    sysroot_flags = "-isysroot $sysroot_rel -mios-simulator-version-min=$ios_deployment_target"
+    sysroot_flags = "-isysroot $sysroot_rel"
   }
 
   # Toolchain used for iOS simulator targets (x64).
@@ -478,7 +478,7 @@ if (is_ios) {
     is_clang = true
 
     sysroot_rel = rebase_path(ios_sdk_path, root_build_dir)
-    sysroot_flags = "-isysroot $sysroot_rel -mios-simulator-version-min=$ios_deployment_target"
+    sysroot_flags = "-isysroot $sysroot_rel"
   }
 }
 

diff --git a/engine/src/flutter/bin/et b/engine/src/flutter/bin/et
@@ -40,6 +40,9 @@ case "$(uname -m)" in
   arm64)
     CPU="arm64"
     ;;
+  aarch64)
+    CPU="arm64"
+    ;;
   x86_64)
     CPU="x64"
     ;;

diff --git a/engine/src/flutter/build/copy_info_plist.py b/engine/src/flutter/build/copy_info_plist.py
@@ -27,6 +27,12 @@ def get_clang_version():
   clang_executable = str(
       os.path.join(_src_root_dir, 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
   )
+  if not os.path.exists(clang_executable):
+    clang_executable = str(
+        os.path.join(
+            _src_root_dir, 'flutter', 'buildtools', 'mac-arm64', 'clang', 'bin', 'clang++'
+        )
+    )
   version = subprocess.check_output([clang_executable, '--version'])
   return version.splitlines()[0]
 

diff --git a/engine/src/flutter/ci/bin/format.dart b/engine/src/flutter/ci/bin/format.dart
@@ -1261,7 +1261,7 @@ Future<String> _getDiffBaseRevision(ProcessManager processManager, Directory rep
   if (upstreamUrl.isEmpty) {
     upstream = 'origin';
   }
-  await _runGit(<String>['fetch', upstream, 'main'], processRunner);
+  await _runGit(<String>['fetch', upstream, 'master'], processRunner);
   var result = '';
   try {
     // This is the preferred command to use, but developer checkouts often do

diff --git a/engine/src/flutter/ci/builders/linux_android_debug_engine.json b/engine/src/flutter/ci/builders/linux_android_debug_engine.json
@@ -23,8 +23,7 @@
                         "out/ci/android_debug/zip_archives/android-arm/symbols.zip",
                         "out/ci/android_debug/zip_archives/download.flutter.io",
                         "out/ci/android_debug/zip_archives/sky_engine.zip",
-                        "out/ci/android_debug/zip_archives/android-javadoc.zip",
-                        "out/ci/android_debug/zip_archives/flutter_gpu.zip"
+                        "out/ci/android_debug/zip_archives/android-javadoc.zip"
                     ],
                     "realm": "production"
                 }
@@ -52,7 +51,6 @@
                 "targets": [
                     "flutter",
                     "flutter/sky/dist:zip_old_location",
-                    "flutter/lib/gpu/dist:zip_old_location",
                     "flutter/shell/platform/android:embedding_jars",
                     "flutter/shell/platform/android:abi_jars",
                     "flutter/shell/platform/embedder:embedder-archive"

diff --git a/engine/src/flutter/ci/builders/linux_android_emulator.json b/engine/src/flutter/ci/builders/linux_android_emulator.json
@@ -34,9 +34,6 @@
             "ninja": {
                 "config": "ci/android_emulator_debug_x64",
                 "targets": [
-                    "flutter/impeller/renderer/backend/vulkan:vulkan_android_unittests",
-                    "flutter/impeller/renderer/backend/vulkan:vulkan_android_apk_unittests",
-                    "flutter/impeller/toolkit/android:unittests",
                     "flutter/shell/platform/android:flutter_shell_native_unittests"
                 ]
             },
@@ -64,12 +61,6 @@
                         "--type",
                         "android"
                     ]
-                },
-                {
-                    "language": "dart",
-                    "name": "skia_gold_client/e2e_test",
-                    "script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
-                    "max_attempts": 1
                 }
             ]
         }