Skip to content

Reverts "Unmodified android sdk bundle (#179647)" #179904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
auto-submit merged 1 commit into from
Dec 15, 2025
Merged

Reverts "Unmodified android sdk bundle (#179647)" #179904

auto-submit merged 1 commit into from
Dec 15, 2025

Conversation

@auto-submit
Copy link
Contributor

@auto-submit auto-submit bot commented Dec 15, 2025

Reverts: #179647

Initiated by: gmackall

Reason for reverting: Mac_mokey run_release_test failing

Original PR Author: gmackall

Reviewed By: {reidbaker, jtmcdole}

This change reverts the following previous change:
Changes our cipd hosted android sdk+ndk bundle to no longer modify directory structure from what Android directly provides, allowing AGP to find the ndk automatically and preventing downloading.

  1. Changes the create_cipd_packages.sh script so we don't move the ndk
  2. Uses the new script to upload a 36v4unmodified bundle
  3. Changes DEPS+ci.yaml to reference the new bundle
  4. Changes GN build rules accordingly
  5. Removes special config in existing build.gradle files to point at the location of the ndk - agp should now know where it is without conig
  6. For some tests, passes in an environment variable pointing to the ndk location, to override the environment variable passed by the recipes. This variable is respected by the tool, so the recipes passing it, pointing to the wrong place, is problematic. After this change lands we can stop passing it in the recipes, and then we can remove this special config in the tests. But adding it temporarily allows us to make this change without coordinating a recipes change at the same moment, and probably breaking things out of band.

Logs from a random postsubmit run of Mac build_android_host_app_with_module_aar on the tree currently:
https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8695664517253382913/+/u/run_build_android_host_app_with_module_aar/stdout
We see

[2025-12-12 10:49:49.223087] [STDOUT] stdout: Checking the license for package NDK (Side by side) 28.2.13676358 in /Volumes/Work/s/w/ir/cache/android/sdk/licenses
[2025-12-12 10:49:49.223221] [STDOUT] stdout: License for package NDK (Side by side) 28.2.13676358 accepted.
[2025-12-12 10:49:49.223268] [STDOUT] stdout: Preparing "Install NDK (Side by side) 28.2.13676358 v.28.2.13676358".
[2025-12-12 10:50:14.093824] [STDOUT] stdout: "Install NDK (Side by side) 28.2.13676358 v.28.2.13676358" ready.
[2025-12-12 10:50:14.093909] [STDOUT] stdout: Installing NDK (Side by side) 28.2.13676358 in /Volumes/Work/s/w/ir/cache/android/sdk/ndk/28.2.13676358
[2025-12-12 10:50:14.093947] [STDOUT] stdout: "Install NDK (Side by side) 28.2.13676358 v.28.2.13676358" complete.
[2025-12-12 10:50:14.410724] [STDOUT] stdout: "Install NDK (Side by side) 28.2.13676358 v.28.2.13676358" finished.

Example of no longer downloading:
Logs from a presubmit run:
https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8695732180931529361/+/u/run_build_android_host_app_with_module_aar/stdout

We don't see these logs. We still see android build tools downloading - we can probably tackle that in another pr.

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.

@auto-submit auto-submit bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Dec 15, 2025
@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 15, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Dec 15, 2025
Merged via the queue into master with commit 8edbbb7 Dec 15, 2025
10 of 12 checks passed
@auto-submit auto-submit bot deleted the revert_c0b808c9ed37ca92b5fa91dcec4e486ba3dd14e8 branch December 15, 2025 22:32
gmackall pushed a commit to gmackall/flutter that referenced this pull request Dec 16, 2025
Revert "Reverts "Unmodified android sdk bundle (flutter#179647)" (flu…
84cecf6 
…tter#179904)"

This reverts commit 8edbbb7.
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 16, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 16, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
011b523 
…utter#179904)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 16, 2025
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 16, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
9a23104 
…utter#179904)
@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
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
76258ec 
…utter#179904)
@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
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
04f3350 
…utter#179904)
@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
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
fbbb9af 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
2272d9d 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
2c7e861 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
80775f6 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
10b1e01 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
85456cb 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 18, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
0620206 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
b0b85e8 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
999beb3 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
bdbddaa 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
3e88916 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 19, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
1244bbd 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 20, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
2f147f5 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 20, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
2b35016 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
a836cf6 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
250fc13 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 21, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
e9e03d5 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
0ff2cbc 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
37416f1 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 22, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
45a626e 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
5b6f242 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
4543954 
…utter#179904)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
8edbbb7 Reverts "Unmodified android sdk bundle (#179647)" (flutter/fl…
a9bb33a 
…utter#179904)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Dec 23, 2025
@engine-flutter-autoroll
Roll Flutter from 6e1aa823523d to d81baabfec4c (47 revisions) (#10637)
d9ed827 
Roll Flutter from 6e1aa82 to d81baab (47 revisions)

flutter/flutter@6e1aa82...d81baab

2025-12-16 68449066+zijiehe-google-com@users.noreply.github.com Revert "chore: linux fuchsia tests are flaking" (flutter/flutter#179897)
2025-12-15 planetmarshall@users.noreply.github.com add default-linux-sysroot to gn frontend args (flutter/flutter#179303)
2025-12-15 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#179751)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from 783ce2077e46 to 6903a4e65c3f (2 revisions) (flutter/flutter#179903)
2025-12-15 adilhanney@disroot.org Add `Adwaita Sans` as a font fallback on Linux (flutter/flutter#179144)
2025-12-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Unmodified android sdk bundle (#179647)" (flutter/flutter#179904)
2025-12-15 robert.ancell@canonical.com Update window settings as they change rather than the more outdated "Apply" pattern. (flutter/flutter#179861)
2025-12-15 49699333+dependabot[bot]@users.noreply.github.com Bump dessant/lock-threads from 5.0.1 to 6.0.0 in the all-github-actions group (flutter/flutter#179901)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from 9decbd4c216b to 783ce2077e46 (2 revisions) (flutter/flutter#179896)
2025-12-15 34871572+gmackall@users.noreply.github.com Unmodified android sdk bundle (flutter/flutter#179647)
2025-12-15 mdebbar@google.com [web] Fix `resizeToAvoidBottomInset` on Android web (flutter/flutter#179581)
2025-12-15 iliyazelenkog@gmail.com Suppress deprecation warning for AChoreographer_postFrameCallback (flutter/flutter#178580)
2025-12-15 planetmarshall@users.noreply.github.com remove unnecessary virtual destructor from VertexDescriptor (flutter/flutter#178682)
2025-12-15 engine-flutter-autoroll@skia.org Roll Dart SDK from b245f6022727 to 20d114f951db (1 revision) (flutter/flutter#179893)
2025-12-15 jason-simmons@users.noreply.github.com [Impeller] Delete GLES framebuffer objects only on the thread where they were created (flutter/flutter#179768)
2025-12-15 jason-simmons@users.noreply.github.com [Impeller] Convert paths in ImpellerC command line flags to std::filesystem::path objects (flutter/flutter#179717)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from 5e1ff611b36b to 9decbd4c216b (2 revisions) (flutter/flutter#179890)
2025-12-15 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from DtfDWAx6t_CsD2e1W... to 433KtmJvbMyaDMJvD... (flutter/flutter#179889)
2025-12-15 116356835+AbdeMohlbi@users.noreply.github.com Remove unnecessary unboxing in `FlutterLoader.java‎` (flutter/flutter#179869)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from f04f8ca3b284 to 5e1ff611b36b (1 revision) (flutter/flutter#179882)
2025-12-15 engine-flutter-autoroll@skia.org Roll Packages from 0ac7a03 to 2cd921c (1 revision) (flutter/flutter#179885)
2025-12-15 bkonyi@google.com [ Widget Preview ] Pass DTD URI as a constant in a generated file (flutter/flutter#179821)
2025-12-15 116356835+AbdeMohlbi@users.noreply.github.com Bump minSdk to `24` in `engine` (flutter/flutter#175508)
2025-12-15 engine-flutter-autoroll@skia.org Roll Dart SDK from bca8bb37d95f to b245f6022727 (1 revision) (flutter/flutter#179879)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from eb1347d18957 to f04f8ca3b284 (1 revision) (flutter/flutter#179876)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from 41bcfb848b13 to eb1347d18957 (1 revision) (flutter/flutter#179871)
2025-12-15 engine-flutter-autoroll@skia.org Roll Skia from d194c3b7a9a9 to 41bcfb848b13 (6 revisions) (flutter/flutter#179866)
2025-12-14 robert.ancell@canonical.com Remove obsolete windowing channel (flutter/flutter#179718)
2025-12-14 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from SCLq31whvg8nJvuYE... to DtfDWAx6t_CsD2e1W... (flutter/flutter#179856)
2025-12-14 engine-flutter-autoroll@skia.org Roll Skia from 5d98ce0af031 to d194c3b7a9a9 (1 revision) (flutter/flutter#179854)
2025-12-13 engine-flutter-autoroll@skia.org Roll Skia from f9b242d9a365 to 5d98ce0af031 (1 revision) (flutter/flutter#179843)
2025-12-13 engine-flutter-autoroll@skia.org Roll Skia from abe90c72cf56 to f9b242d9a365 (1 revision) (flutter/flutter#179838)
2025-12-13 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from fppT9ZrwbFx7iYrIh... to SCLq31whvg8nJvuYE... (flutter/flutter#179836)
2025-12-13 engine-flutter-autoroll@skia.org Roll Dart SDK from 34654f2a3baa to bca8bb37d95f (1 revision) (flutter/flutter#179835)
2025-12-13 engine-flutter-autoroll@skia.org Roll Skia from 9e7c893bb593 to abe90c72cf56 (1 revision) (flutter/flutter#179830)
2025-12-13 engine-flutter-autoroll@skia.org Roll Dart SDK from f105c2168574 to 34654f2a3baa (1 revision) (flutter/flutter#179823)
2025-12-13 97480502+b-luk@users.noreply.github.com Add FilterQuality parameter to FragmentShader.setImageSampler (flutter/flutter#179760)
2025-12-13 evanwall@buffalo.edu Add profiling counts to pipeline uses (flutter/flutter#179374)
2025-12-13 engine-flutter-autoroll@skia.org Roll Skia from edf52cb27f29 to 9e7c893bb593 (3 revisions) (flutter/flutter#179819)
2025-12-12 jacksongardner@google.com Update Skwasm to engine style guidelines. (flutter/flutter#179756)
2025-12-12 engine-flutter-autoroll@skia.org Roll Dart SDK from 9a65db770758 to f105c2168574 (5 revisions) (flutter/flutter#179814)
2025-12-12 engine-flutter-autoroll@skia.org Roll Skia from f23b00a407a4 to edf52cb27f29 (5 revisions) (flutter/flutter#179807)
2025-12-12 97480502+b-luk@users.noreply.github.com Use depth buffer to implement geometry overdraw protection (flutter/flutter#179426)
2025-12-12 nshahan@google.com [flutter_tool] Force UTF-8 character set for dev (flutter/flutter#179419)
2025-12-12 engine-flutter-autoroll@skia.org Roll Skia from e66816c3645e to f23b00a407a4 (2 revisions) (flutter/flutter#179798)
2025-12-12 30870216+gaaclarke@users.noreply.github.com Implements decodeImageFromPixelsSync (flutter/flutter#179519)
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fluttergithubbot fluttergithubbot fluttergithubbot approved these changes

Assignees

@gmackall gmackall

Labels

a: tests "flutter test", flutter_test, or one of our tests 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. revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fluttergithubbot @gmackall