[CP-stable] Remove ancient tools:tools dep from android_sdk bundle - #190184
auto-submit[bot] merged 1 commit into
Conversation
…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
|
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. |
There was a problem hiding this comment.
Code Review
This pull request updates the Android SDK dependency version to version:37v2 across multiple targets in .ci.yaml. It also updates the Android lint baseline configurations, removes the tools package from the Android SDK packages list, and refactors daemon_test.dart to remove an unused import and re-enable a previously skipped emulator test on macOS. No review comments were provided, and there is no additional feedback.
|
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. |
|
cc @LongCatIsLooong should be part of 3.44.10 Stable |
5a2a6a4
into
flutter:flutter-3.44-candidate.0
#190184 <- omitted in the changelog, not an end user facing change. #190550 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#103386 Fixes: 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.
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
stablebranch 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:
Issue: #189876
Issue: #103386
Fixes: #190178 (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-assistbot 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.