-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Revert "Resolve resolve native Flutter dependencies in Android Studio (#167332)" #177053
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.
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
Revert "Resolve resolve native Flutter dependencies in Android Studio (#167332)" #177053
Conversation
|
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. |
|
fyi @rekire |
There was a problem hiding this comment.
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 reverts a commit that caused Android Studio sync failures for users with local engine builds. The regression was due to unconditionally adding native dependencies for all architectures, which failed when an architecture like x86_64 was not present. The changes in packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt correctly remove the problematic logic, an unnecessary try-catch block, and related functions. The revert is clean, directly addresses the reported issue, and I see no further issues with the changes.
|
You might want to reopen #19830 when the fix get reverted. Should I revert flutter/website#12203? |
…flutter#167332)" This reverts commit 0c0406a.
2090d37 to
252d9b9
Compare
Reverted in flutter/website#12549 |
…oid Studio (#167332)" (flutter/flutter#177053)
…oid Studio (#167332)" (flutter/flutter#177053)
…oid Studio (#167332)" (flutter/flutter#177053)
…oid Studio (#167332)" (flutter/flutter#177053)
…oid Studio (#167332)" (flutter/flutter#177053)
Roll Flutter from a873a27309b0 to 891d7d539256 (32 revisions) flutter/flutter@a873a27...891d7d5 2025-10-18 [email protected] Roll Skia from b4981b621a54 to 74df18176924 (1 revision) (flutter/flutter#177204) 2025-10-18 [email protected] Roll Fuchsia Linux SDK from ZHuhfPyyV-LcKDLRh... to M8WT2GMY46e_0fFho... (flutter/flutter#177200) 2025-10-18 [email protected] [material/dropdown_menu.dart] Refactor _RenderDropdownMenuBody.computeDryLayout (flutter/flutter#176503) 2025-10-18 [email protected] Roll Skia from 579c72d673dd to b4981b621a54 (2 revisions) (flutter/flutter#177199) 2025-10-17 [email protected] Roll Skia from 89a8bc508a7c to 579c72d673dd (15 revisions) (flutter/flutter#177194) 2025-10-17 [email protected] [test_fixes] Enable `deprecated_member_use_from_same_package`. (flutter/flutter#177183) 2025-10-17 [email protected] [a11y] fix table semantics cache for cells (flutter/flutter#177073) 2025-10-17 [email protected] [web] Self-cleaning service worker (flutter/flutter#176834) 2025-10-17 [email protected] Manual roll Skia from 2d9df7c70b6f to 89a8bc508a7c (24 revisions) (flutter/flutter#177182) 2025-10-17 [email protected] Fixing WindowManagerTest::DialogCanNeverBeFullscreen possibly hanging (flutter/flutter#177179) 2025-10-17 [email protected] [VPAT][A11y][a11y-app] Add a text label to slider. (flutter/flutter#177130) 2025-10-17 [email protected] Manual roll Dart SDK from a4485e5ef821 to a66f334fee2a (5 revisions) (flutter/flutter#177142) 2025-10-17 [email protected] [web][a11y] Fix the semantics tree reconstruction logic when a subtree is reparented to another node. (flutter/flutter#177069) 2025-10-17 [email protected] `SelectableRegion` should use flutter rendered menu on the web for Android and iOS (flutter/flutter#177122) 2025-10-17 [email protected] Refactor: Convert Title widget to StatefulWidget (flutter/flutter#176010) 2025-10-17 [email protected] Bump AGP, KGP, Gradle Templates (flutter/flutter#176858) 2025-10-17 [email protected] Roll Packages from 835dccb to 3747006 (3 revisions) (flutter/flutter#177170) 2025-10-17 [email protected] Mark windows_unopt test as flakey (flutter/flutter#177173) 2025-10-17 [email protected] Tapping outside of `SelectableRegion` should dismiss the selection (flutter/flutter#176843) 2025-10-17 [email protected] Roll Fuchsia Linux SDK from _dd0Jv50H0oUI2Ad8... to ZHuhfPyyV-LcKDLRh... (flutter/flutter#177137) 2025-10-17 [email protected] Manual roll Dart to a4485e5ef821 (3.11.0-25.0.dev) (flutter/flutter#177132) 2025-10-17 [email protected] Make sure that a MenuAcceleratorLabel doesn't crash in 0x0 environment (flutter/flutter#176646) 2025-10-16 [email protected] Make sure that a NavigationRail doesn't crash in 0x0 environment (flutter/flutter#177022) 2025-10-16 [email protected] Make sure that a SubmenuButton doesn't crash in 0x0 environment (flutter/flutter#176535) 2025-10-16 [email protected] Fix typo in ButtonBar documentation (flutter/flutter#177078) 2025-10-16 [email protected] Make sure that an InkResponse doesn't crash in 0x0 environment (flutter/flutter#175426) 2025-10-16 [email protected] [Gradle 9] Resolve Gradle 9 Deprecations in flutter/flutter part 1 (flutter/flutter#176865) 2025-10-16 [email protected] Revert "Resolve resolve native Flutter dependencies in Android Studio (#167332)" (flutter/flutter#177053) 2025-10-16 [email protected] Manual roll Dart SDK from 2d8e0359a767 to 25b6094026e4 (5 revisions) (flutter/flutter#177109) 2025-10-16 [email protected] Add textfield prop to SearchAnchor (flutter/flutter#174497) 2025-10-16 [email protected] Fix crash when NSAttributedString is passed to insertText on macOS (flutter/flutter#176329) 2025-10-16 [email protected] Correct basque time format (flutter/flutter#177031) 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 ...
…flutter#167332)" (flutter#177053) This reverts commit 0c0406a. Fixes flutter#177037 I am leaving the method for checking if the build was launched from android studio. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
|
Failed to create CP due to merge conflicts. |
…flutter#167332)" (flutter#177053) This reverts commit 0c0406a. Fixes flutter#177037 I am leaving the method for checking if the build was launched from android studio. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
This reverts commit 0c0406a.
Fixes #177037
I am leaving the method for checking if the build was launched from android studio.
Pre-launch Checklist
///).