Remove ancient `tools:tools` dep from `android_sdk` bundle by gmackall · Pull Request #189962 · flutter/flutter

gmackall · 2026-07-24T01:55:02Z

This dep has been abandoned https://developer.android.com/tools/releases/sdk-tools

Also bumps to include sdk 37, because the underlying script had been bumped without a corresponding bump in the ci.yaml

gemini-code-assist

Code Review

This pull request updates the Android SDK dependency version from version:36v9unmodified to version:37v2 across multiple targets in .ci.yaml. It also modifies the Android lint baseline in baseline.xml by removing obsolete issues, updating line numbers, and adding an OldTargetApi warning. Additionally, the tools:tools package is removed from packages.txt. No review comments were provided, so there is no feedback to address.

flutter/flutter@b65f4d9...e292197 2026-07-25 engine-flutter-autoroll@skia.org Roll Skia from 2c014dc494f1 to 62442d6cf0ec (1 revision) (flutter/flutter#190022) 2026-07-25 engine-flutter-autoroll@skia.org Roll Skia from d8d20eef4dbd to 2c014dc494f1 (1 revision) (flutter/flutter#190020) 2026-07-25 bdero@google.com [Impeller] Add 2D texture array support (kTexture2DArray) (flutter/flutter#188778) 2026-07-24 jesswon@google.com Bumped Engine AGP Dependencies to 9.1.0 for 3.50 (flutter/flutter#189417) 2026-07-24 engine-flutter-autoroll@skia.org Roll Dart SDK from 153abd9a8296 to 28e63ac22d8d (2 revisions) (flutter/flutter#190013) 2026-07-24 codefu@google.com ci: add mac verify binaries workflow (flutter/flutter#190010) 2026-07-24 engine-flutter-autoroll@skia.org Roll Skia from f2f9b52fe1ee to d8d20eef4dbd (21 revisions) (flutter/flutter#190011) 2026-07-24 codefu@google.com fix(ci): quote labels to fix yaml mapping error (flutter/flutter#190002) 2026-07-24 1063596+reidbaker@users.noreply.github.com Update contributing guidelines for commit message format (flutter/flutter#189922) 2026-07-24 louisehsu@google.com Migrate a11y_assessments to uiscene (flutter/flutter#189960) 2026-07-24 codefu@google.com docs(contributing): add git worktree and rebase workflow guide (flutter/flutter#189992) 2026-07-24 engine-flutter-autoroll@skia.org Roll Dart SDK from e3fc57eae9eb to 153abd9a8296 (3 revisions) (flutter/flutter#189987) 2026-07-24 matt.kosarek@canonical.com Rename RegularWindow* to Window* in the windowing API + rename sizedToContent to shrinkWrap in the windowing API (flutter/flutter#189363) 2026-07-24 34871572+gmackall@users.noreply.github.com Remove ancient `tools:tools` dep from `android_sdk` bundle (flutter/flutter#189962) 2026-07-24 jason-simmons@users.noreply.github.com Reduce the number of gtest-parallel workers when running Impeller tests on Mac Minis used by CI (flutter/flutter#189813) 2026-07-24 engine-flutter-autoroll@skia.org Roll Packages from 8260a1e to 6969329 (21 revisions) (flutter/flutter#189983) 2026-07-24 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 9org0yL3yZkp80x5S... to Cdb1RGKCqpcz9z4cl... (flutter/flutter#189975) 2026-07-24 engine-flutter-autoroll@skia.org Roll Skia from 6e9c4687c001 to f2f9b52fe1ee (3 revisions) (flutter/flutter#189959) 2026-07-24 zhongliu88889@gmail.com [web] Cancel touch pointers WebKit abandons mid-gesture (flutter/flutter#189608) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC bmparr@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

flutteractionsbot · 2026-07-29T03:08:05Z

Failed to create CP due to merge conflicts.
You will need to create the PR manually. See the cherrypick wiki for more info.

flutteractionsbot · 2026-07-29T03:08:06Z

Failed to create CP due to merge conflicts.
You will need to create the PR manually. See the cherrypick wiki for more info.

…190182) This dep has been abandoned https://developer.android.com/tools/releases/sdk-tools Also bumps to include sdk 37, because the underlying script had been bumped without a corresponding bump in the ci.yaml This is a cherry-pick of #189962 to `beta` branch to ensure tests pass for builds/releases on the beta branch. Impacted Users: Flutter releng / CI infra team. No direct end-user or app-developer impact. This affects the ability to produce beta/release builds on the arm64 Mac CI bot pool. Impact Description: The android_sdk CIPD bundle pulls in the ancient, abandoned tools:tools package, whose emulator binary is Intel-only and requires Rosetta to run. We're removing Rosetta from the arm64 Mac CI bot pool, so any CI step that touches that binary will fail on those machines. Without this, we can't remove Rosetta from the prod/dart-internal.flutter bot pools. No impact on flutter apps. Workaround: The only alternatives are to keep Rosetta installed on the arm64 Mac bots. Risk: Low. The removed tools:tools package has been abandoned by Android and is not used by the build; the change swaps to the already-published android_sdk version:37v2 CIPD bundle and re-enables a test that was only skipped because of the Intel-only binary. Changes are confined to CI/dependency configuration, the lint baseline, and a single test. Test Coverage: Yes. The change re-enables the emulator.getEmulators should respond with list daemon test on macOS (previously skipped via #189876), and the existing Android/CI test shards exercise the updated SDK bundle. The commit landed and passed on master as #189962. Validation Steps: 1. Confirm CI is green on the candidate branch, in particular the Android and macOS shards that consume the android_sdk dependency. 2. Verify the emulator.getEmulators daemon test runs (no longer skipped) and passes on macOS. 3. Post Rosetta-removal: confirm builds succeed on an arm64 Mac bot with Rosetta absent, i.e. no step attempts to invoke the Intel-only tools emulator binary. Issue: #189876 Issue: #103386Fixes: #190176 (cherry-pick issue)  If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

…190184) This dep has been abandoned https://developer.android.com/tools/releases/sdk-tools Also bumps to include sdk 37, because the underlying script had been bumped without a corresponding bump in the ci.yaml This is a cherry-pick of #189962 to `stable` branch to ensure tests pass for builds/releases on the stable branch. Impacted Users: Flutter releng / CI infra team. No direct end-user or app-developer impact. This affects the ability to produce beta/release builds on the arm64 Mac CI bot pool. Impact Description: The android_sdk CIPD bundle pulls in the ancient, abandoned tools:tools package, whose emulator binary is Intel-only and requires Rosetta to run. We're removing Rosetta from the arm64 Mac CI bot pool, so any CI step that touches that binary will fail on those machines. Without this, we can't remove Rosetta from the prod/dart-internal.flutter bot pools. No impact on flutter apps. Workaround: The only alternatives are to keep Rosetta installed on the arm64 Mac bots. Risk: Low. The removed tools:tools package has been abandoned by Android and is not used by the build; the change swaps to the already-published android_sdk version:37v2 CIPD bundle and re-enables a test that was only skipped because of the Intel-only binary. Changes are confined to CI/dependency configuration, the lint baseline, and a single test. Test Coverage: Yes. The change re-enables the emulator.getEmulators should respond with list daemon test on macOS (previously skipped via #189876), and the existing Android/CI test shards exercise the updated SDK bundle. The commit landed and passed on master as #189962. Validation Steps: 1. Confirm CI is green on the candidate branch, in particular the Android and macOS shards that consume the android_sdk dependency. 2. Verify the emulator.getEmulators daemon test runs (no longer skipped) and passes on macOS. 3. Post Rosetta-removal: confirm builds succeed on an arm64 Mac bot with Rosetta absent, i.e. no step attempts to invoke the Intel-only tools emulator binary. Issue: #189876 Issue: #103386Fixes: #190178 (cherry-pick issue) If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

…lutter#190184) This dep has been abandoned https://developer.android.com/tools/releases/sdk-tools Also bumps to include sdk 37, because the underlying script had been bumped without a corresponding bump in the ci.yaml This is a cherry-pick of flutter#189962 to `stable` branch to ensure tests pass for builds/releases on the stable branch. Impacted Users: Flutter releng / CI infra team. No direct end-user or app-developer impact. This affects the ability to produce beta/release builds on the arm64 Mac CI bot pool. Impact Description: The android_sdk CIPD bundle pulls in the ancient, abandoned tools:tools package, whose emulator binary is Intel-only and requires Rosetta to run. We're removing Rosetta from the arm64 Mac CI bot pool, so any CI step that touches that binary will fail on those machines. Without this, we can't remove Rosetta from the prod/dart-internal.flutter bot pools. No impact on flutter apps. Workaround: The only alternatives are to keep Rosetta installed on the arm64 Mac bots. Risk: Low. The removed tools:tools package has been abandoned by Android and is not used by the build; the change swaps to the already-published android_sdk version:37v2 CIPD bundle and re-enables a test that was only skipped because of the Intel-only binary. Changes are confined to CI/dependency configuration, the lint baseline, and a single test. Test Coverage: Yes. The change re-enables the emulator.getEmulators should respond with list daemon test on macOS (previously skipped via flutter#189876), and the existing Android/CI test shards exercise the updated SDK bundle. The commit landed and passed on master as flutter#189962. Validation Steps: 1. Confirm CI is green on the candidate branch, in particular the Android and macOS shards that consume the android_sdk dependency. 2. Verify the emulator.getEmulators daemon test runs (no longer skipped) and passes on macOS. 3. Post Rosetta-removal: confirm builds succeed on an arm64 Mac bot with Rosetta absent, i.e. no step attempts to invoke the Intel-only tools emulator binary. Issue: flutter#189876 Issue: flutter#103386Fixes: flutter#190178 (cherry-pick issue) If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

gmackall added 2 commits July 23, 2026 17:49

try fully removing, to see if tools:tools dep is load bearing
f3d10e0

hmm... didn't mean to do version bump + removal, but that's life
9d1500f

github-actionsBot added the engine flutter/engine related. See also e: labels. label Jul 24, 2026

gmackall added the CICD Run CI/CD label Jul 24, 2026

supress old api warning
ccc9ae3

gmackall marked this pull request as ready for review July 24, 2026 05:02

gemini-code-assistBot reviewed Jul 24, 2026
View reviewed changes

github-actionsBot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jul 24, 2026

cbracken previously approved these changes Jul 24, 2026
View reviewed changes

unskip emulators test and remove unused import
78c91cd

gmackall dismissed cbracken’s stale review via 78c91cdJuly 24, 2026 15:57

gmackall force-pushed the remove_ancient_tools_dep branch from cd2b0d1 to 78c91cdCompare July 24, 2026 15:57

gmackall requested review from a team, jmagman and reidbaker and removed request for a teamJuly 24, 2026 17:06

reidbaker approved these changes Jul 24, 2026
View reviewed changes

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2026

auto-submitBot added this pull request to the merge queue Jul 24, 2026

jesswrd mentioned this pull request Jul 24, 2026
☂️ Update CI to test against Android 17 (API level 37) #189518
Open
13 tasks

Merged via the queue into flutter:master with commit be25aaeJul 24, 2026
29 checks passed

flutter-dashboardBot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2026

gmackall mentioned this pull request Jul 24, 2026
daemon_test.dart failing in Mac_arm64 tool_tests_commands #189876
Closed

engine-flutter-autoroll mentioned this pull request Jul 25, 2026
Roll Flutter from b65f4d9bc3fe to e2921977d4cc (19 revisions) flutter/packages#12287
Merged

kevmoo mentioned this pull request Jul 28, 2026
feat(web): support --web-content-hash for entrypoint files #190153
Open

cbracken added cp: beta cherry pick this pull request to beta release candidate branch cp: stable cherry pick this pull request to stable release candidate branch labels Jul 29, 2026

jesswrd mentioned this pull request Aug 3, 2026
Updated Remaining Engine Defaults to SDK 37 #190429
Open
10 tasks

Navigation Menu

Uh oh!

Remove ancient `tools:tools` dep from `android_sdk` bundle - #189962

Remove ancient `tools:tools` dep from `android_sdk` bundle#189962
auto-submit[bot] merged 4 commits into
flutter:masterfrom
gmackall:remove_ancient_tools_dep

gmackall commented Jul 24, 2026

Uh oh!

gemini-code-assistBot left a comment

Uh oh!

Uh oh!

flutteractionsbot commented Jul 29, 2026

Uh oh!

flutteractionsbot commented Jul 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

gmackall commented Jul 24, 2026

Uh oh!

gemini-code-assistBot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

flutteractionsbot commented Jul 29, 2026

Uh oh!

flutteractionsbot commented Jul 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants