diff --git a/recipes/engine/engine_lint.expected/linux android all.json b/recipes/engine/engine_lint.expected/linux android all.json
index 3648f5a..71b88c0 100644
--- a/recipes/engine/engine_lint.expected/linux android all.json
+++ b/recipes/engine/engine_lint.expected/linux android all.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1320,7 +1365,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "android_debug_arm64",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1358,51 +1405,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1853,7 +1855,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/linux android branch.json b/recipes/engine/engine_lint.expected/linux android branch.json
index 3648f5a..71b88c0 100644
--- a/recipes/engine/engine_lint.expected/linux android branch.json
+++ b/recipes/engine/engine_lint.expected/linux android branch.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1320,7 +1365,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "android_debug_arm64",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1358,51 +1405,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1853,7 +1855,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/linux android head.json b/recipes/engine/engine_lint.expected/linux android head.json
index b7259b7..d91d68e 100644
--- a/recipes/engine/engine_lint.expected/linux android head.json
+++ b/recipes/engine/engine_lint.expected/linux android head.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1321,7 +1366,9 @@
       "--variant",
       "android_debug_arm64",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1359,51 +1406,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1855,7 +1857,9 @@
       "--variant",
       "host_debug",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/linux host all.json b/recipes/engine/engine_lint.expected/linux host all.json
index 3648f5a..71b88c0 100644
--- a/recipes/engine/engine_lint.expected/linux host all.json
+++ b/recipes/engine/engine_lint.expected/linux host all.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1320,7 +1365,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "android_debug_arm64",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1358,51 +1405,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1853,7 +1855,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/linux host branch.json b/recipes/engine/engine_lint.expected/linux host branch.json
index 3648f5a..71b88c0 100644
--- a/recipes/engine/engine_lint.expected/linux host branch.json
+++ b/recipes/engine/engine_lint.expected/linux host branch.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1320,7 +1365,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "android_debug_arm64",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1358,51 +1405,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1853,7 +1855,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/linux host head.json b/recipes/engine/engine_lint.expected/linux host head.json
index b7259b7..d91d68e 100644
--- a/recipes/engine/engine_lint.expected/linux host head.json
+++ b/recipes/engine/engine_lint.expected/linux host head.json
@@ -468,6 +468,51 @@
     "name": "gn --android --android-cpu arm64 --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1321,7 +1366,9 @@
       "--variant",
       "android_debug_arm64",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1359,51 +1406,6 @@
     "name": "test: lint android_debug_arm64"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -1855,7 +1857,9 @@
       "--variant",
       "host_debug",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=1",
+      "--shard-variants=android_debug_arm64"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac host all.json b/recipes/engine/engine_lint.expected/mac host all.json
index 1a092df..16f747a 100644
--- a/recipes/engine/engine_lint.expected/mac host all.json
+++ b/recipes/engine/engine_lint.expected/mac host all.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1620,7 +1665,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "ios_debug_sim",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1658,51 +1705,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2153,7 +2155,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac host branch.json b/recipes/engine/engine_lint.expected/mac host branch.json
index 1a092df..16f747a 100644
--- a/recipes/engine/engine_lint.expected/mac host branch.json
+++ b/recipes/engine/engine_lint.expected/mac host branch.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1620,7 +1665,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "ios_debug_sim",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1658,51 +1705,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2153,7 +2155,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac host head.json b/recipes/engine/engine_lint.expected/mac host head.json
index 416fa50..3c2ba17 100644
--- a/recipes/engine/engine_lint.expected/mac host head.json
+++ b/recipes/engine/engine_lint.expected/mac host head.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1621,7 +1666,9 @@
       "--variant",
       "ios_debug_sim",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1659,51 +1706,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2155,7 +2157,9 @@
       "--variant",
       "host_debug",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios all.json b/recipes/engine/engine_lint.expected/mac ios all.json
index 1a092df..16f747a 100644
--- a/recipes/engine/engine_lint.expected/mac ios all.json
+++ b/recipes/engine/engine_lint.expected/mac ios all.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1620,7 +1665,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "ios_debug_sim",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1658,51 +1705,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2153,7 +2155,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios branch.json b/recipes/engine/engine_lint.expected/mac ios branch.json
index 1a092df..16f747a 100644
--- a/recipes/engine/engine_lint.expected/mac ios branch.json
+++ b/recipes/engine/engine_lint.expected/mac ios branch.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1620,7 +1665,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "ios_debug_sim",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1658,51 +1705,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2153,7 +2155,9 @@
       "[CACHE]/builder/src/flutter/ci/lint.sh",
       "--variant",
       "host_debug",
-      "--lint-all"
+      "--lint-all",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios head.json b/recipes/engine/engine_lint.expected/mac ios head.json
index 416fa50..3c2ba17 100644
--- a/recipes/engine/engine_lint.expected/mac ios head.json
+++ b/recipes/engine/engine_lint.expected/mac ios head.json
@@ -768,6 +768,51 @@
     "name": "gn --ios --runtime-mode debug --simulator --no-lto"
   },
   {
+    "cmd": [
+      "python",
+      "[CACHE]/builder/src/flutter/tools/gn",
+      "--goma",
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--no-lto"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_PREBUILT_DART_SDK": "True",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "flutter:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+  },
+  {
     "cmd": [],
     "name": "setup goma"
   },
@@ -1621,7 +1666,9 @@
       "--variant",
       "ios_debug_sim",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=0",
+      "--shard-variants=host_debug"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
@@ -1659,51 +1706,6 @@
     "name": "test: lint ios_debug_sim"
   },
   {
-    "cmd": [
-      "python",
-      "[CACHE]/builder/src/flutter/tools/gn",
-      "--goma",
-      "--runtime-mode",
-      "debug",
-      "--prebuilt-dart-sdk",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
-  },
-  {
     "cmd": [],
     "name": "setup goma (2)"
   },
@@ -2155,7 +2157,9 @@
       "--variant",
       "host_debug",
       "--lint-all",
-      "--lint-head"
+      "--lint-head",
+      "--shard-id=1",
+      "--shard-variants=ios_debug_sim"
     ],
     "cwd": "[CACHE]/builder/src",
     "env": {
diff --git a/recipes/engine/engine_lint.py b/recipes/engine/engine_lint.py
index 166544d..7ff8053 100644
--- a/recipes/engine/engine_lint.py
+++ b/recipes/engine/engine_lint.py
@@ -49,7 +49,7 @@
   api.build_util.build(config, checkout, targets)
 
 
-def Lint(api, config):
+def Lint(api, config, shardId=None, shardVariants=""):
   checkout = GetCheckoutPath(api)
   with api.context(cwd=checkout):
     lint_cmd = checkout.join('flutter', 'ci', 'lint.sh')
@@ -58,38 +58,40 @@
       cmd += ['--lint-all']
     if api.properties.get('lint_head', False):
       cmd += ['--lint-head']
+    if shardId != None:
+      cmd += ['--shard-id=%d' % shardId, '--shard-variants=%s' % shardVariants]
     api.step(api.test_utils.test_step_name('lint %s' % config), cmd)
 
 
 def DoLints(api):
   if api.platform.is_linux:
+    RunGN(api, '--android', '--android-cpu', 'arm64', '--no-lto')
+    RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
     if api.properties.get('lint_android', True):
-      RunGN(api, '--android', '--android-cpu', 'arm64', '--no-lto')
       Build(api, 'android_debug_arm64')
-      Lint(api, 'android_debug_arm64')
+      Lint(api, 'android_debug_arm64', shardId=0, shardVariants="host_debug")
 
     if api.properties.get('lint_host', True):
-      RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
       # We have to build before linting because source files #include header
       # files that are generated during the build.
       Build(api, 'host_debug')
-      Lint(api, 'host_debug')
+      Lint(api, 'host_debug', shardId=1, shardVariants="android_debug_arm64")
 
   elif api.platform.is_mac:
     with api.osx_sdk('ios'):
+      RunGN(
+          api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto',
+      )
+      RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
       if api.properties.get('lint_ios', True):
-        RunGN(
-            api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto',
-        )
         Build(api, 'ios_debug_sim')
-        Lint(api, 'ios_debug_sim')
+        Lint(api, 'ios_debug_sim', shardId=0, shardVariants="host_debug")
 
       if api.properties.get('lint_host', True):
-        RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
         # We have to build before linting because source files #include header
         # files that are generated during the build.
         Build(api, 'host_debug')
-        Lint(api, 'host_debug')
+        Lint(api, 'host_debug', shardId=1, shardVariants="ios_debug_sim")
 
 
 def RunSteps(api, properties, env_properties):