Skip to content

Update CI with newer android sdk package#187143

Merged
auto-submit[bot] merged 3 commits into
flutter:masterfrom
jesswrd:upload-android-sdk-with-new-defaults
May 27, 2026
Merged

Update CI with newer android sdk package#187143
auto-submit[bot] merged 3 commits into
flutter:masterfrom
jesswrd:upload-android-sdk-with-new-defaults

Conversation

@jesswrd

@jesswrd jesswrd commented May 27, 2026

Copy link
Copy Markdown
Contributor

Already uploaded newer android sdk pacakge 36v9unmodified, which now includes build-tools 36.0.0, to CIPD: https://chrome-infra-packages.appspot.com/p/flutter/android/sdk/all/linux-amd64. I downloaded the package to verify build-tools 36.0.0 was included.

I added build-tools 36.0.0 to the script used to upload a newer android sdk bundle to CIPD. Also updated the CI version we test against to test against36v9unmodified. This should fix the flakes in the issue linked below.

Fixes: #187096
Related to: #187134

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.

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label May 27, 2026
@github-actions github-actions Bot added the engine flutter/engine related. See also e: labels. label May 27, 2026
@jesswrd jesswrd changed the title [wip] Upload android sdk package to align new AGP defaults Update CI with newer android sdk package to align new AGP defaults May 27, 2026
@jesswrd jesswrd changed the title Update CI with newer android sdk package to align new AGP defaults Update CI with newer android sdk package May 27, 2026
@jesswrd jesswrd marked this pull request as ready for review May 27, 2026 07:31
@jesswrd jesswrd requested review from mboetger and reidbaker May 27, 2026 07:31

@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 version:36v9unmodified across CI targets, adds build-tools;36.0.0 to the packages list, and appends a -ref argument using $first_argument in the CIPD package creation script. Feedback highlights a potential issue where using $first_argument directly as a CIPD ref can fail due to strict naming constraints if the argument contains dots, hyphens, or uppercase letters.


echo "Uploading $upload_dir as $cipd_name to CIPD"
cipd create -in $upload_dir -name "flutter/android/sdk/all/$cipd_name" -install-mode copy -tag version:$first_argument
cipd create -in $upload_dir -name "flutter/android/sdk/all/$cipd_name" -install-mode copy -tag version:$first_argument -ref $first_argument

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.

high

CIPD refs have strict naming constraints and must match the regex ^[a-z0-9_]{1,100}$ (only lowercase letters, numbers, and underscores). If $first_argument contains dots (e.g., 36.0.0), hyphens, or uppercase letters, the cipd create command will fail. Since tags are much more permissive, using $first_argument directly as a ref is unsafe unless the input is strictly validated or sanitized.

@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label May 27, 2026
@auto-submit auto-submit Bot added this pull request to the merge queue May 27, 2026
Merged via the queue into flutter:master with commit 06f656b May 27, 2026
207 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 27, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request May 28, 2026
flutter/flutter@c8f2f16...e70534d

2026-05-28 [email protected] Linux glyph gamma correction (flutter/flutter#187122)
2026-05-28 [email protected] [iOS] Eliminate strong retain cycle from VSyncClient (flutter/flutter#187164)
2026-05-28 [email protected] Revert "[pubspec] Bump Dart SDK constraint to ^3.13.0 (#186957)" (flutter/flutter#187209)
2026-05-28 [email protected] Roll Skia from f1b8ba877c07 to 32acea791248 (3 revisions) (flutter/flutter#187220)
2026-05-27 [email protected] Roll Fuchsia Linux SDK from k9EizfEGJO4WwQN9-... to SBpmmPxqx3lAvGojE... (flutter/flutter#187211)
2026-05-27 [email protected] [Impeller] Add block-compressed texture format support (BC, ETC2, ASTC) (flutter/flutter#187077)
2026-05-27 [email protected] Disable analyzer (flutter/flutter#187205)
2026-05-27 [email protected] [Flutter GPU] Add explicit draw counts (reland) (flutter/flutter#187192)
2026-05-27 [email protected] [Flutter GPU] Inject per-backend defines into shader bundle compilation (flutter/flutter#187081)
2026-05-27 [email protected] Roll Skia from fa944af10f91 to f1b8ba877c07 (13 revisions) (flutter/flutter#187194)
2026-05-27 [email protected] Fixes bug when changing accessibilityFocusBlockType doesn't update ch… (flutter/flutter#186596)
2026-05-27 [email protected] Roll pub packages (flutter/flutter#187191)
2026-05-27 [email protected] [web, tool] Support recompiling shaders and unify asset processing (2nd try) (flutter/flutter#186902)
2026-05-27 [email protected] Fix crash if FlView is destroyed during a draw. (flutter/flutter#186848)
2026-05-27 [email protected] Roll Packages from fc795e5 to 4b424d7 (4 revisions) (flutter/flutter#187174)
2026-05-27 [email protected] Stop prefetching Swift packages in pub get (flutter/flutter#187113)
2026-05-27 [email protected] Update CI with newer android sdk package (flutter/flutter#187143)
2026-05-27 [email protected] Add a tag to the Linux platform properties in .ci.yaml that specifies x64 CPUs (flutter/flutter#187124)

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 [email protected],[email protected] 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD engine flutter/engine related. See also e: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mac tool_integration_tests_3_5 flakey on android_plugin_ndkversion_mismatch_test.dart

3 participants