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

trizin · web-flow · commit bf18e3958a05 · 2026-04-10T17:36:18.000Z
Fixes #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.
diff --git a/packages/flutter_tools/lib/src/xcode_project.dart b/packages/flutter_tools/lib/src/xcode_project.dart
@@ -572,7 +572,7 @@ def __lldb_init_module(debugger: lldb.SBDebugger, _):
       }
     }
 
-    return !buildSettings.contains(RegExp('EXCLUDED_ARCHS.*arm64'));
+    return !buildSettings.contains(RegExp(r'EXCLUDED_ARCHS.*\barm64\b'));
   }
 
   /// Returns a list of targets and their associated plugin (if found) that exclude arm64 architecture.
diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
@@ -1565,9 +1565,14 @@ Build settings for action build and target good_plugin:
           );
 
           final File config = fs.file('path/to/project/ios/Flutter/Generated.xcconfig');
+          final String configContents = config.readAsStringSync();
           expect(logger.warningText, isEmpty);
-          expect(config.readAsStringSync(), contains('EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386'));
-          expect(config.readAsStringSync(), contains('EXCLUDED_ARCHS[sdk=iphoneos*]=armv7'));
+          expect(configContents, contains('EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386'));
+          expect(
+            configContents,
+            isNot(contains('EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 arm64')),
+          );
+          expect(configContents, contains('EXCLUDED_ARCHS[sdk=iphoneos*]=armv7'));
           expect(fakeProcessManager, hasNoRemainingExpectations);
         },
         overrides: <Type, Generator>{

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ def __lldb_init_module(debugger: lldb.SBDebugger, _):`
`572`	`572`	`}`
`573`	`573`	`}`
`574`	`574`
`575`		`- return !buildSettings.contains(RegExp('EXCLUDED_ARCHS.*arm64'));`
	`575`	`+ return !buildSettings.contains(RegExp(r'EXCLUDED_ARCHS.*\barm64\b'));`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`/// Returns a list of targets and their associated plugin (if found) that exclude arm64 architecture.`