Skip to content

[CP-beta] Remove ancient tools:tools dep from android_sdk bundle - #190182

Merged
auto-submit[bot] merged 2 commits into
flutter:flutter-3.47-candidate.0from
cbracken:cp-android-sdk-derosetta-beta
Jul 31, 2026
Merged

auto-submit[bot] merged 2 commits into
flutter:flutter-3.47-candidate.0from
cbracken:cp-android-sdk-derosetta-beta

Conversation

@cbracken

@cbracken cbracken commented Jul 29, 2026 •

Copy link
Copy Markdown
Member

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)

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

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. 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.

…89962)

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
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jul 29, 2026
@flutter-dashboard
flutter-dashboard Bot changed the base branch from beta to master July 29, 2026 05:02
@flutter-dashboard
flutter-dashboard Bot requested review from a team and jtmcdole as code owners July 29, 2026 05:02
@flutter-dashboard
flutter-dashboard Bot requested review from gmackall and removed request for a team July 29, 2026 05:02
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to beta. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@github-actions github-actions Bot added platform-android Android applications specifically tool Affects the "flutter" command-line tool. See also t: labels. framework flutter/packages/flutter repository. See also f: labels. engine flutter/engine related. See also e: labels. p: material_ui material_ui package in flutter/packages p: cupertino_ui cupertino_ui package in flutter/packages e: impeller Impeller rendering backend issues and features requests team-android Owned by Android platform team labels Jul 29, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the android_sdk dependency version to 37v2 across multiple targets in .ci.yaml, updates the Android lint baseline configuration, and removes the tools:tools package from packages.txt. Additionally, it cleans up daemon_test.dart by removing an unused import and re-enabling the emulator.getEmulators test on macOS. No review comments were provided, and there is no feedback to address.

@cbracken
cbracken changed the base branch from master to stable July 29, 2026 05:04
@cbracken
cbracken requested review from a team, loic-sharma and reidbaker as code owners July 29, 2026 05:04
@flutter-dashboard
flutter-dashboard Bot changed the base branch from stable to master July 29, 2026 05:04
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to stable. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@cbracken
cbracken changed the base branch from master to beta July 29, 2026 05:04
@cbracken
cbracken removed request for a team July 29, 2026 05:05
@cbracken cbracken changed the title Remove ancient tools:tools dep from android_sdk bundle (#189962) [CP] Remove ancient tools:tools dep from android_sdk bundle (#189962) Jul 29, 2026
@cbracken cbracken changed the title [CP] Remove ancient tools:tools dep from android_sdk bundle (#189962) [CP] Remove ancient tools:tools dep from android_sdk bundle Jul 29, 2026
@cbracken cbracken added CICD Run CI/CD a: tests "flutter test", flutter_test, or one of our tests platform-macos Building on or for macOS specifically and removed CICD Run CI/CD engine flutter/engine related. See also e: labels. e: impeller Impeller rendering backend issues and features requests p: cupertino_ui cupertino_ui package in flutter/packages framework flutter/packages/flutter repository. See also f: labels. p: material_ui material_ui package in flutter/packages labels Jul 29, 2026
@reidbaker

Copy link
Copy Markdown
Member

Hey we dont merge directly into the beta branch. We merge into the flutter candidate branch that is used to then publish (aka force push beta)

@reidbaker

Copy link
Copy Markdown
Member

That said the rest of the pr looks reasonable.

@jmagman
jmagman changed the base branch from beta to flutter-3.47-candidate.0 July 29, 2026 19:32
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@jmagman jmagman changed the title [CP] Remove ancient tools:tools dep from android_sdk bundle [beta] Remove ancient tools:tools dep from android_sdk bundle Jul 29, 2026
@jmagman jmagman changed the title [beta] Remove ancient tools:tools dep from android_sdk bundle [CP-beta] Remove ancient tools:tools dep from android_sdk bundle Jul 29, 2026
@jmagman jmagman added the cp: review Cherry-picks in the review queue label Jul 29, 2026
@github-actions github-actions Bot added engine flutter/engine related. See also e: labels. and removed a: tests "flutter test", flutter_test, or one of our tests platform-android Android applications specifically platform-macos Building on or for macOS specifically team-android Owned by Android platform team labels Jul 29, 2026
@camsim99 camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 31, 2026
@auto-submit
auto-submit Bot merged commit eb61588 into flutter:flutter-3.47-candidate.0 Jul 31, 2026
8 checks passed
@camsim99

Copy link
Copy Markdown
Contributor

cc @LongCatIsLooong should be part of 3.47.0-0.4.pre Beta

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD cp: review Cherry-picks in the review queue engine flutter/engine related. See also e: labels. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CP] Remove ancient tools:tools dep from android_sdk bundle

6 participants