mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
1b936203a9
<!-- Thanks for filing a pull request! Reviewers are typically assigned within a week of filing a request. To learn more about code review, see our documentation on Tree Hygiene: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md --> Passes `EXCLUDED_ARCHS` from Xcode project build settings to the xcodebuild command, fixing macOS builds when dependencies don't support all architectures. ### Problem Release builds for macOS create universal binaries (arm64 + x86_64) by default. This causes build failures when using native dependencies that only provide binaries for a single architecture. While developers can set `EXCLUDED_ARCHS` in their Xcode project's xcconfig files, Swift Package Manager dependencies don't respect this project-level setting. **Fixes**: https://github.com/flutter/flutter/issues/176605 ## Solution Instead of adding a CLI flag, pass `EXCLUDED_ARCHS` from the Xcode project's build settings directly to xcodebuild. This ensures Swift Package Manager dependencies respect architecture exclusions set in the project configuration. **How it works:** When `macos/Runner/Configs/Release.xcconfig` contains: ```xcconfig EXCLUDED_ARCHS = x86_64 ``` The build command now includes `EXCLUDED_ARCHS=x86_64`, creating an arm64-only binary. ## Usage **1. Edit your xcconfig file** (e.g., `macos/Runner/Configs/Release.xcconfig`): ```xcconfig #include "../../Flutter/Flutter-Release.xcconfig" #include "Warnings.xcconfig" // Exclude x86_64 for dependencies that only support Apple Silicon EXCLUDED_ARCHS = x86_64 ``` **2. Build normally:** ```bash flutter build macos --release ``` **Without exclusions (default behavior):** ```bash # Creates universal binary (arm64 + x86_64) flutter build macos --release ``` ## Implementation - Modified `buildMacOS()` to retrieve `EXCLUDED_ARCHS` from Xcode project build settings - Pass `EXCLUDED_ARCHS` to xcodebuild command when set and non-empty - Removed unused `activeArch` parameter - Added inline documentation explaining the SPM compatibility fix ## Testing **Manual verification:** - ✅ Built ExecuTorch Flutter example with `EXCLUDED_ARCHS = x86_64`: arm64-only binary (518.6MB) - ✅ Built without exclusions: universal binary (existing behavior) - ✅ Verified architecture with `lipo -info`: arm64-only when excluded **Unit tests:** - ✅ Added test: "Passes EXCLUDED_ARCHS from Xcode project to xcodebuild command" - ✅ Added test: "Does not pass EXCLUDED_ARCHS when not set in Xcode project" - ✅ All 25 macOS build tests passing *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## 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. - [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. 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](https://developers.google.com/gemini-code-assist/docs/review-github-code). 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. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --------- Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com>