[flutter_tools] Fix arm64e incorrectly matching arm64 in regex check by trizin · Pull Request #184057 · flutter/flutter

trizin · 2026-03-24T10:39:23Z

The regex EXCLUDED_ARCHS.*arm64 in pluginsSupportArmSimulator() matches
arm64e as a substring, causing Flutter to incorrectly exclude arm64 from
simulator builds when plugins only exclude arm64e.

This adds a word boundary (\barm64\b) so that arm64e is no longer a false
positive match, fixing simulator builds on Apple Silicon Macs.

Also strengthens the existing test assertion to verify arm64 is NOT added
to EXCLUDED_ARCHS when only arm64e is excluded by plugins.

Pre-launch Checklist

…HS regex check

flutter-dashboard · 2026-03-24T10:39:27Z

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.

google-cla · 2026-03-24T10:39:29Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

gemini-code-assist

Code Review

This pull request fixes a bug where a regular expression was incorrectly matching arm64e when checking for arm64. The change correctly adds a word boundary to the regex to ensure only the arm64 architecture is matched. This prevents arm64 from being incorrectly excluded from simulator builds when only arm64e is specified as excluded.

gemini-code-assist · 2026-03-24T10:48:44Z

    }

-    return !buildSettings.contains(RegExp('EXCLUDED_ARCHS.*arm64'));
+    return !buildSettings.contains(RegExp(r'EXCLUDED_ARCHS.*\barm64\b'));


While this change correctly fixes the regular expression for the project's buildSettings, the same faulty regex appears to be used earlier in the pluginsSupportArmSimulator function when checking podBuildSettings inside a for loop. To completely fix the bug, the regex in the loop should also be updated with a word boundary (\barm64\b) to ensure consistent behavior for both project settings and pod settings.

is this a concern?

Nope, there is no faulty regex in the loop. There is only one instance of the EXCLUDED_ARCHS.*arm64 regex and it's already been fixed

…utter into fix/arm64e-regex-match

okorohelijah

@trizin lg but can you address gemini's feedback?

trizin · 2026-04-03T12:05:52Z

@okorohelijah done!

auto-submit · 2026-04-03T19:29:17Z

auto label is removed for flutter/flutter/184057, Failed to enqueue flutter/flutter/184057 with HTTP 400: GraphQL mutate failed.

okorohelijah · 2026-04-03T21:51:20Z

@trizin Linux Analyze seems to be failing:

Found 1 Dart file which was formatted incorrectly.
To fix, run `dart format packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart` or:

LongCatIsLooong · 2026-04-09T21:50:59Z

/cc @hellohuanlin from ios triage for re-review.

…gex check (flutter/flutter#184057)

flutter/flutter@81c87ea...bf18e39 2026-04-10 [email protected] [flutter_tools] Fix arm64e incorrectly matching arm64 in regex check (flutter/flutter#184057) 2026-04-10 [email protected] Specify GitHub Repo in GH CLI calls for revert workflow. (flutter/flutter#184878) 2026-04-10 [email protected] Don't use `git add -N` in the sync engine workflow. (flutter/flutter#184882) 2026-04-10 [email protected] Roll Skia from af67d5555e35 to 25b01e5f4ea0 (14 revisions) (flutter/flutter#184865) 2026-04-10 [email protected] [Dot shorthands] Finish examples/api migration (flutter/flutter#183967) 2026-04-10 [email protected] Roll Dart SDK from 98a143f8873e to e715805ddbd3 (1 revision) (flutter/flutter#184864) 2026-04-10 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Disable async mode with LLDB (#184768)" (flutter/flutter#184868) 2026-04-09 [email protected] Skip freeze check in the merge queue (flutter/flutter#184854) 2026-04-09 [email protected] Remove unused variable in `ProcessTextPlugin.java` (flutter/flutter#184161) 2026-04-09 [email protected] Roll Fuchsia Linux SDK from pDXMXRIjEHTw7B0sk... to lZcRfPoCLnDttrf9P... (flutter/flutter#184842) 2026-04-09 [email protected] Roll Dart SDK from bd6280c3e8e9 to 98a143f8873e (5 revisions) (flutter/flutter#184824) 2026-04-09 [email protected] Remove `linux_android_emu_unstable android_engine_vulkan_tests` (flutter/flutter#184787) 2026-04-09 [email protected] Roll Packages from 0e0a032 to 1aa892c (9 revisions) (flutter/flutter#184829) 2026-04-09 [email protected] [record_use] Add experimental flag and test project (flutter/flutter#184719) 2026-04-09 [email protected] Disable async mode with LLDB (flutter/flutter#184768) 2026-04-09 [email protected] Update link for rolling forward to aligned Dart hash (flutter/flutter#184780) 2026-04-09 [email protected] Roll Skia from 4d0f5389e131 to af67d5555e35 (3 revisions) (flutter/flutter#184825) 2026-04-09 [email protected] UberSDFContent refactoring and handle stroke miter limit for stroked rects (flutter/flutter#184603) 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

…lutter#184057) Fixes flutter#184056 The regex `EXCLUDED_ARCHS.*arm64` in `pluginsSupportArmSimulator()` matches `arm64e` as a substring, causing Flutter to incorrectly exclude arm64 from simulator builds when plugins only exclude arm64e. This adds a word boundary (\\barm64\\b) so that arm64e is no longer a false positive match, fixing simulator builds on Apple Silicon Macs. Also strengthens the existing test assertion to verify arm64 is NOT added to EXCLUDED_ARCHS when only arm64e is excluded by plugins. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [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. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] 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.

[flutter_tools] Fix arm64e incorrectly matching arm64 in EXCLUDED_ARC…

a2264e9

…HS regex check

trizin requested a review from a team as a code owner March 24, 2026 10:39

github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. team-ios Owned by iOS platform team labels Mar 24, 2026

gemini-code-assist Bot reviewed Mar 24, 2026

View reviewed changes

trizin added 3 commits March 24, 2026 17:52

Merge branch 'master' into fix/arm64e-regex-match

9d7115d

adjust tests

d443020

Merge branch 'fix/arm64e-regex-match' of https://github.com/trizin/fl…

042d2b1

…utter into fix/arm64e-regex-match

hellohuanlin requested a review from okorohelijah March 26, 2026 21:52

okorohelijah approved these changes Apr 2, 2026

View reviewed changes

okorohelijah self-requested a review April 2, 2026 21:09

Merge branch 'master' into fix/arm64e-regex-match

a7a6da4

okorohelijah previously approved these changes Apr 3, 2026

View reviewed changes

okorohelijah requested a review from hellohuanlin April 3, 2026 18:07

hellohuanlin previously approved these changes Apr 3, 2026

View reviewed changes

okorohelijah added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026

auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026

okorohelijah added the CICD Run CI/CD label Apr 3, 2026

Formatting

19883d0

trizin dismissed stale reviews from hellohuanlin and okorohelijah via 19883d0 April 4, 2026 08:09

github-actions Bot removed the CICD Run CI/CD label Apr 4, 2026

Merge branch 'master' into fix/arm64e-regex-match

c717a2c

trizin requested a review from okorohelijah April 4, 2026 08:11

okorohelijah requested a review from hellohuanlin April 6, 2026 05:48

okorohelijah approved these changes Apr 6, 2026

View reviewed changes

jmagman mentioned this pull request Apr 6, 2026

Fix arm64e incorrectly matching arm64 in EXCLUDED_ARCHS regex #184629

Closed

trizin added 2 commits April 7, 2026 22:59

Merge branch 'master' into fix/arm64e-regex-match

aba81cd

Merge branch 'master' into fix/arm64e-regex-match

0ca6bd7

reidbaker mentioned this pull request Apr 8, 2026

Autosubmit failing to execute #184764

Closed

4 tasks

hellohuanlin approved these changes Apr 9, 2026

View reviewed changes

hellohuanlin added the CICD Run CI/CD label Apr 9, 2026

okorohelijah added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 10, 2026

auto-submit Bot added this pull request to the merge queue Apr 10, 2026

Merged via the queue into flutter:master with commit bf18e39 Apr 10, 2026
157 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 10, 2026

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 10, 2026

bf18e3958 [flutter_tools] Fix arm64e incorrectly matching arm64 in re…

90744ed

…gex check (flutter/flutter#184057)

engine-flutter-autoroll mentioned this pull request Apr 10, 2026

Roll Flutter from 81c87ea165df to bf18e3958a05 (18 revisions) flutter/packages#11488

Merged

Piinks mentioned this pull request Apr 10, 2026

Flutter Notable Commits - 2026 #181433

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[flutter_tools] Fix arm64e incorrectly matching arm64 in regex check#184057

[flutter_tools] Fix arm64e incorrectly matching arm64 in regex check#184057
auto-submit[bot] merged 9 commits into
flutter:masterfrom
trizin:fix/arm64e-regex-match

trizin commented Mar 24, 2026 •

edited

Loading

Uh oh!

flutter-dashboard Bot commented Mar 24, 2026

Uh oh!

google-cla Bot commented Mar 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Mar 24, 2026

Uh oh!

hellohuanlin Apr 3, 2026

Uh oh!

trizin Apr 3, 2026

Uh oh!

okorohelijah left a comment •

edited

Loading

Uh oh!

trizin commented Apr 3, 2026

Uh oh!

auto-submit Bot commented Apr 3, 2026

Uh oh!

okorohelijah commented Apr 3, 2026

Uh oh!

LongCatIsLooong commented Apr 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

trizin commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

flutter-dashboard Bot commented Mar 24, 2026

Uh oh!

google-cla Bot commented Mar 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

hellohuanlin Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

trizin Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

okorohelijah left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trizin commented Apr 3, 2026

Uh oh!

auto-submit Bot commented Apr 3, 2026

Uh oh!

okorohelijah commented Apr 3, 2026

Uh oh!

LongCatIsLooong commented Apr 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

trizin commented Mar 24, 2026 •

edited

Loading

okorohelijah left a comment •

edited

Loading