Remove ancient tools:tools dep from android_sdk bundle - #189962
Merged
auto-submit[bot] merged 4 commits intoJul 24, 2026
Conversation
gmackall
marked this pull request as ready for review
July 24, 2026 05:02
Contributor
There was a problem hiding this comment.
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.
cbracken
previously approved these changes
Jul 24, 2026
gmackall
force-pushed
the
remove_ancient_tools_dep
branch
from
July 24, 2026 15:57
cd2b0d1 to
78c91cd
Compare
gmackall
requested review from
a team,
jmagman and
reidbaker
and removed request for
a team
July 24, 2026 17:06
reidbaker
approved these changes
Jul 24, 2026
13 tasks
auto-submit Bot
pushed a commit
to flutter/packages
that referenced
this pull request
Jul 25, 2026
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
Contributor
|
Failed to create CP due to merge conflicts. |
Contributor
|
Failed to create CP due to merge conflicts. |
This was referenced Jul 29, 2026
auto-submit Bot
pushed a commit
that referenced
this pull request
Jul 31, 2026
…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: #103386 Fixes: #190176 (cherry-pick issue) <!-- Thanks for filing a pull request! Reviewers are typically assigned within a week of filing a request. To learn more about code review, see our documentation on Tree Hygiene: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md --> 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.
auto-submit Bot
pushed a commit
that referenced
this pull request
Jul 31, 2026
…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: #103386 Fixes: #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.
10 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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