Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Reland] Unmodified android sdk bundle#179920

Merged
auto-submit[bot] merged 2 commits intoflutter:masterfrom
gmackall:reland_unmodified_android_sdk_bundle
Dec 16, 2025
Merged

[Reland] Unmodified android sdk bundle#179920
auto-submit[bot] merged 2 commits intoflutter:masterfrom
gmackall:reland_unmodified_android_sdk_bundle

Conversation

@gmackall
Copy link
Member

@gmackall gmackall commented Dec 16, 2025 •
edited
Loading

Relands #179647

There were only two failing tests (there were also two bringup failures, the mac_arm64_mokey versions of these)
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_mokey%20run_release_test/3866/overview
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_mokey%20run_debug_test_android/5454/overview

They failed with the same logs

Task result:
{
  "success": false,
  "reason": "Task failed: flutter run  had unexpected output on standard error."
}

The stderr in question:

[2025-12-15 14:06:56.311794] [STDOUT] run:stderr: - integration_test requires Android NDK 28.2.13676358
[2025-12-15 14:06:56.311989] [STDOUT] run:stderr: Fix this issue by using the highest Android NDK version (they are backward compatible).
[2025-12-15 14:06:56.312019] [STDOUT] run:stderr: Add the following to /opt/s/w/ir/x/w/rc/tmpr6kj09d_/flutter sdk/dev/integration_tests/ui/android/app/build.gradle:
[2025-12-15 14:06:56.312074] [STDOUT] run:stderr: 
[2025-12-15 14:06:56.312092] [STDOUT] run:stderr:     android {
[2025-12-15 14:06:56.312144] [STDOUT] run:stderr:         ndkVersion = "28.2.13676358"
[2025-12-15 14:06:56.312162] [STDOUT] run:stderr:         ...
[2025-12-15 14:06:56.312205] [STDOUT] run:stderr:     }

We can just set the ndk version to flutter.ndkVersion, which is this value. It's also what is set in the templates, so it isn't a hack that doesn't represent a real flutter app. Verified the tests pass now with

../../bin/cache/dart-sdk/bin/dart bin/test_runner.dart test -t run_release_test
../../bin/cache/dart-sdk/bin/dart bin/test_runner.dart test -t run_debug_test_android

Pre-launch Checklist

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

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.

@github-actions github-actions bot added a: tests "flutter test", flutter_test, or one of our tests framework flutter/packages/flutter repository. See also f: labels. engine flutter/engine related. See also e: labels. d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin labels Dec 16, 2025
@gmackall gmackall marked this pull request as ready for review December 16, 2025 01:12
jtmcdole
jtmcdole approved these changes Dec 16, 2025
View reviewed changes
Copy link
Member

@jtmcdole jtmcdole left a comment •
edited
Loading

Choose a reason for hiding this comment

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

infrastructure bridge sunset outrun 2 lgtm_640_24

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 16, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Dec 16, 2025
Merged via the queue into flutter:master with commit 91cc68f Dec 16, 2025
180 checks passed
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 16, 2025
@gmackall gmackall mentioned this pull request Dec 16, 2025
Merged
9 tasks
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 17, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
fe1ae15
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 17, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
62ef353
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 17, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
ab407f5
@gmackall gmackall mentioned this pull request Dec 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
3e7bf67
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
9733ef2
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
7ec6f2c
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
32586c3
@gmackall gmackall mentioned this pull request Dec 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
4e49372
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
3d6b4f5
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
3806f8b
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
71f64ab
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 20, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
a14ec82
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 20, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
fdc3a04
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
abf664d
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
f7128ca
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
f82c52a
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
03f53df
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
9168df7
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
b614df5
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
f090c65
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
ec7a728
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
4de1512
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
c174f9d
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 23, 2025
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
b475b50
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
e2086d9
stuartmorgan-g pushed a commit to flutter/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
Manual roll Flutter from d81baab to 57c3f8b (38 revisions) (#10671)
c7478fb 
Manual roll Flutter from d81baab to 57c3f8b (38 revisions)

Manual roll requested by [email protected]

flutter/flutter@d81baab...57c3f8b

2025-12-17 [email protected] Add FloatingActionButtonTheme
(flutter/flutter#179736)
2025-12-17 [email protected] Roll Skia from b1569739f431
to fb576bd6827a (1 revision) (flutter/flutter#179989)
2025-12-17 [email protected] Update more comments related to theme
normalization (flutter/flutter#179682)
2025-12-17 [email protected] Roll Skia from cce9b86bda7d
to b1569739f431 (1 revision) (flutter/flutter#179979)
2025-12-17 [email protected] Adds property passthrough for
CheckboxListTile, SwitchListTile and RadioListTile
(flutter/flutter#178098)
2025-12-17 [email protected] Roll Dart SDK from
ca949b915846 to 3793f3d2d0c4 (2 revisions) (flutter/flutter#179973)
2025-12-17 [email protected] Roll Skia from 318400199beb
to cce9b86bda7d (1 revision) (flutter/flutter#179976)
2025-12-17 [email protected] Make sure that a
CupertinoTextFormFieldRow doesn't crash in 0x0 envir…
(flutter/flutter#179932)
2025-12-17 [email protected] Make sure that a CupertinoTabView
doesn't crash in 0x0 environment (flutter/flutter#179845)
2025-12-17 [email protected] Make sure that a CupertinoTextField
doesn't crash in 0x0 environment (flutter/flutter#179865)
2025-12-17 [email protected] Make sure that a CupertinoSwitch
doesn't crash in 0x0 environment (flutter/flutter#179748)
2025-12-17 [email protected] Update
`BuildContext` docs to make it easier to understand
(flutter/flutter#178616)
2025-12-17 [email protected] [ios][pv]
quick fix to enable and re-enable web view's gesture recognizer
(flutter/flutter#179908)
2025-12-17 [email protected] Deduplicate wasm dry run entries in
analytics. (flutter/flutter#179970)
2025-12-17 [email protected] Roll Skia from 99899cbb415b
to 318400199beb (1 revision) (flutter/flutter#179969)
2025-12-17 [email protected] Roll Skia from 2ac4a8709bc9
to 99899cbb415b (1 revision) (flutter/flutter#179968)
2025-12-17 [email protected] Roll Dart SDK from
95a92bc705d3 to ca949b915846 (6 revisions) (flutter/flutter#179967)
2025-12-17 [email protected] Add package info to wasm dry run events.
(flutter/flutter#179826)
2025-12-17 [email protected] Platform View Hide/Show Integration
test (flutter/flutter#179902)
2025-12-16 [email protected] Roll Skia from 61162d72343f
to 2ac4a8709bc9 (14 revisions) (flutter/flutter#179961)
2025-12-16 [email protected] Roll Fuchsia Linux SDK from
433KtmJvbMyaDMJvD... to fAoyBAT99XxwPE5hL... (flutter/flutter#179960)
2025-12-16 [email protected] [ Tool ] Fix update-packages not accounting
for path dependencies (flutter/flutter#179951)
2025-12-16 [email protected] ListTile fix
MinIntrinsicHeight calculation (flutter/flutter#179515)
2025-12-16 [email protected] Fix pinned
header in NestedScrollView (flutter/flutter#179210)
2025-12-16 [email protected] Update some comments related to theme
normalization (flutter/flutter#179624)
2025-12-16 [email protected] Add Cyrillic keyboard layout support
for flutter_tools terminal commands (flutter/flutter#177855)
2025-12-16 [email protected] Minor fixes for libstdc++ 15
(flutter/flutter#178601)
2025-12-16 [email protected] Feat: Add top
gap for cupertino sheet (flutter/flutter#171348)
2025-12-16 [email protected] Align
`Build.API_LEVELS` usage in `FlutterImageDecoder.java‎` with existing
usage (flutter/flutter#179868)
2025-12-16 [email protected] Revert
"[ios][pv] accept/reject gesture based on hitTest (with new wi…
(flutter/flutter#179895)
2025-12-16 [email protected] fix: line endings for
flutter/dart/flutter-dev (flutter/flutter#179912)
2025-12-16 [email protected] Platform view blur
clipping - Rounded Rect (iOS) (flutter/flutter#177551)
2025-12-16 [email protected] Roll Dart SDK from
20d114f951db to 95a92bc705d3 (1 revision) (flutter/flutter#179909)
2025-12-16 [email protected] [Reland]
Unmodified android sdk bundle (flutter/flutter#179920)
2025-12-16 [email protected] Roll Skia from 6903a4e65c3f
to 61162d72343f (2 revisions) (flutter/flutter#179915)
2025-12-16 [email protected] Roll Packages from
2cd921c to 57725eb (1 revision) (flutter/flutter#179942)
2025-12-16 [email protected] Filter out
FrameEvents/updateAcquireFence log spam from adb logcat
(flutter/flutter#179884)
2025-12-16 [email protected] `flutter
update-packages --force-upgrade --update-hashes`
(flutter/flutter#179950)

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.
...
This was referenced Jan 7, 2026
Closed
Closed
ivan-vanyusho pushed a commit to ivan-vanyusho/packages that referenced this pull request Jan 26, 2026
@engine-flutter-autoroll @ivan-vanyusho
Manual roll Flutter from d81baab to 57c3f8b (38 revisions) (flutter#1…
10ff48a 
…0671)

Manual roll Flutter from d81baab to 57c3f8b (38 revisions)

Manual roll requested by [email protected]

flutter/flutter@d81baab...57c3f8b

2025-12-17 [email protected] Add FloatingActionButtonTheme
(flutter/flutter#179736)
2025-12-17 [email protected] Roll Skia from b1569739f431
to fb576bd6827a (1 revision) (flutter/flutter#179989)
2025-12-17 [email protected] Update more comments related to theme
normalization (flutter/flutter#179682)
2025-12-17 [email protected] Roll Skia from cce9b86bda7d
to b1569739f431 (1 revision) (flutter/flutter#179979)
2025-12-17 [email protected] Adds property passthrough for
CheckboxListTile, SwitchListTile and RadioListTile
(flutter/flutter#178098)
2025-12-17 [email protected] Roll Dart SDK from
ca949b915846 to 3793f3d2d0c4 (2 revisions) (flutter/flutter#179973)
2025-12-17 [email protected] Roll Skia from 318400199beb
to cce9b86bda7d (1 revision) (flutter/flutter#179976)
2025-12-17 [email protected] Make sure that a
CupertinoTextFormFieldRow doesn't crash in 0x0 envir…
(flutter/flutter#179932)
2025-12-17 [email protected] Make sure that a CupertinoTabView
doesn't crash in 0x0 environment (flutter/flutter#179845)
2025-12-17 [email protected] Make sure that a CupertinoTextField
doesn't crash in 0x0 environment (flutter/flutter#179865)
2025-12-17 [email protected] Make sure that a CupertinoSwitch
doesn't crash in 0x0 environment (flutter/flutter#179748)
2025-12-17 [email protected] Update
`BuildContext` docs to make it easier to understand
(flutter/flutter#178616)
2025-12-17 [email protected] [ios][pv]
quick fix to enable and re-enable web view's gesture recognizer
(flutter/flutter#179908)
2025-12-17 [email protected] Deduplicate wasm dry run entries in
analytics. (flutter/flutter#179970)
2025-12-17 [email protected] Roll Skia from 99899cbb415b
to 318400199beb (1 revision) (flutter/flutter#179969)
2025-12-17 [email protected] Roll Skia from 2ac4a8709bc9
to 99899cbb415b (1 revision) (flutter/flutter#179968)
2025-12-17 [email protected] Roll Dart SDK from
95a92bc705d3 to ca949b915846 (6 revisions) (flutter/flutter#179967)
2025-12-17 [email protected] Add package info to wasm dry run events.
(flutter/flutter#179826)
2025-12-17 [email protected] Platform View Hide/Show Integration
test (flutter/flutter#179902)
2025-12-16 [email protected] Roll Skia from 61162d72343f
to 2ac4a8709bc9 (14 revisions) (flutter/flutter#179961)
2025-12-16 [email protected] Roll Fuchsia Linux SDK from
433KtmJvbMyaDMJvD... to fAoyBAT99XxwPE5hL... (flutter/flutter#179960)
2025-12-16 [email protected] [ Tool ] Fix update-packages not accounting
for path dependencies (flutter/flutter#179951)
2025-12-16 [email protected] ListTile fix
MinIntrinsicHeight calculation (flutter/flutter#179515)
2025-12-16 [email protected] Fix pinned
header in NestedScrollView (flutter/flutter#179210)
2025-12-16 [email protected] Update some comments related to theme
normalization (flutter/flutter#179624)
2025-12-16 [email protected] Add Cyrillic keyboard layout support
for flutter_tools terminal commands (flutter/flutter#177855)
2025-12-16 [email protected] Minor fixes for libstdc++ 15
(flutter/flutter#178601)
2025-12-16 [email protected] Feat: Add top
gap for cupertino sheet (flutter/flutter#171348)
2025-12-16 [email protected] Align
`Build.API_LEVELS` usage in `FlutterImageDecoder.java‎` with existing
usage (flutter/flutter#179868)
2025-12-16 [email protected] Revert
"[ios][pv] accept/reject gesture based on hitTest (with new wi…
(flutter/flutter#179895)
2025-12-16 [email protected] fix: line endings for
flutter/dart/flutter-dev (flutter/flutter#179912)
2025-12-16 [email protected] Platform view blur
clipping - Rounded Rect (iOS) (flutter/flutter#177551)
2025-12-16 [email protected] Roll Dart SDK from
20d114f951db to 95a92bc705d3 (1 revision) (flutter/flutter#179909)
2025-12-16 [email protected] [Reland]
Unmodified android sdk bundle (flutter/flutter#179920)
2025-12-16 [email protected] Roll Skia from 6903a4e65c3f
to 61162d72343f (2 revisions) (flutter/flutter#179915)
2025-12-16 [email protected] Roll Packages from
2cd921c to 57725eb (1 revision) (flutter/flutter#179942)
2025-12-16 [email protected] Filter out
FrameEvents/updateAcquireFence log spam from adb logcat
(flutter/flutter#179884)
2025-12-16 [email protected] `flutter
update-packages --force-upgrade --update-hashes`
(flutter/flutter#179950)

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.
...
@gmackall gmackall mentioned this pull request Jan 29, 2026
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jan 29, 2026
@gmackall
Remove nonstandard ndkpath for hybrid_android_views integration test (
8c680b9 
#181666)

This is not true any more, since
#179920

This was only triggered on ci because that environment var isn't set
elsewhere.

Co-authored-by: Gray Mackall <[email protected]>
LongCatIsLooong pushed a commit to LongCatIsLooong/flutter that referenced this pull request Feb 6, 2026
@gmackall @LongCatIsLooong
Remove nonstandard ndkpath for hybrid_android_views integration test (
217ab54 
flutter#181666)

This is not true any more, since
flutter#179920

This was only triggered on ci because that environment var isn't set
elsewhere.

Co-authored-by: Gray Mackall <[email protected]>
flutter-zl pushed a commit to flutter-zl/flutter that referenced this pull request Feb 10, 2026
@gmackall @flutter-zl
Remove nonstandard ndkpath for hybrid_android_views integration test (
ab5b61c 
flutter#181666)

This is not true any more, since
flutter#179920

This was only triggered on ci because that environment var isn't set
elsewhere.

Co-authored-by: Gray Mackall <[email protected]>
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 11, 2026
@engine-flutter-autoroll
91cc68f [Reland] Unmodified android sdk bundle (flutter/flutter#179920)
53fb26d
@jmagman jmagman added the c: flake Tests that sometimes, but not always, incorrectly pass label Feb 18, 2026
rickhohler pushed a commit to rickhohler/flutter that referenced this pull request Feb 19, 2026
@gmackall @rickhohler
Remove nonstandard ndkpath for hybrid_android_views integration test (
23b4809 
flutter#181666)

This is not true any more, since
flutter#179920

This was only triggered on ci because that environment var isn't set
elsewhere.

Co-authored-by: Gray Mackall <[email protected]>
@gmackall gmackall mentioned this pull request Mar 3, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtmcdole jtmcdole jtmcdole approved these changes

@reidbaker reidbaker Awaiting requested review from reidbaker

Assignees

No one assigned

Labels

a: tests "flutter test", flutter_test, or one of our tests c: flake Tests that sometimes, but not always, incorrectly pass d: examples Sample code and demos engine flutter/engine related. See also e: labels. f: integration_test The flutter/packages/integration_test plugin framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gmackall @jtmcdole @jmagman