iOS,macOS: Unify iOS,macOS build configs #168517

cbracken · 2025-05-08T00:22:34Z

Merges:

//build/config/ios:compiler
//build/config/mac:compiler
Into:
//build/config/apple:compiler

Merges:

//flutter/shell/platform/darwin/ios:config_ios
//flutter/shell/platform/darwin/mac:config_macos
Into:
//flutter/shell/platform/darwin/common:config

Merges:

//flutter/shell/platform/darwin/ios:config_ios_test
//flutter/shell/platform/darwin/mac:config_macos_test
Into:
//flutter/shell/platform/darwin/common:test_config

This avoids the duplication between iOS and macOS build configs used for building Swift and Objective-C that depends on Swift, and avoids further duplication when we add Swift to //flutter/shell/platform/darwin/common in a followup patch.

Issue: #167592

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
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.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Merges: * //build/config/ios:compiler * //build/config/mac:compiler Into: * //build/config/apple:compiler Merges: * //flutter/shell/platform/darwin/ios:config_ios * //flutter/shell/platform/darwin/mac:config_macos Into: * //flutter/shell/platform/darwin/common:config Merges: * //flutter/shell/platform/darwin/ios:config_ios_test * //flutter/shell/platform/darwin/mac:config_macos_test Into: * //flutter/shell/platform/darwin/common:test_config This avoids the duplication between iOS and macOS build configs used for building Swift and Objective-C that depends on Swift. Issue: flutter#167592

engine/src/build/config/apple/BUILD.gn

vashworth

LGTM

…68517)

flutter/flutter@b0f5c8c...02d8c1a 2025-05-08 chris@bracken.jp iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#168517) 2025-05-08 engine-flutter-autoroll@skia.org Roll Packages from b2ce3b0 to ab44c26 (3 revisions) (flutter/flutter#168548) 2025-05-08 zhongliu88889@gmail.com Remove unnecessary setAriaRole('dialog') fallback in SemanticRoute class (flutter/flutter#168345) 2025-05-08 engine-flutter-autoroll@skia.org Roll Skia from 4d617bb1bb7d to 43ae814d2d95 (1 revision) (flutter/flutter#168526) 2025-05-08 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from _GJje-N2Jk51qtBs6... to mqhX1OP8ezmialgqA... (flutter/flutter#168525) 2025-05-08 36861262+QuncCccccc@users.noreply.github.com Make MergeSemantics be able to merge customAction (flutter/flutter#168414) 2025-05-08 engine-flutter-autoroll@skia.org Roll Skia from d787c26f873a to 4d617bb1bb7d (1 revision) (flutter/flutter#168514) 2025-05-08 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#168509) 2025-05-07 fluttergithubbot@gmail.com Marks Mac_arm64_ios imitation_game_swiftui to be unflaky (flutter/flutter#163114) 2025-05-07 20605958+mohamedamara@users.noreply.github.com Add option to hide trailing icon in DropdownMenu (flutter/flutter#167782) 2025-05-07 engine-flutter-autoroll@skia.org Roll Skia from 1ea3ec8e7863 to d787c26f873a (6 revisions) (flutter/flutter#168505) 2025-05-07 kevmoo@users.noreply.github.com [web] drop more use of deprecated JS functions (flutter/flutter#166157) 2025-05-07 83038251+nailahsall0@users.noreply.github.com docs: Fixed broken links in WidgetStateProperty documentations (flutter/flutter#168191) 2025-05-07 engine-flutter-autoroll@skia.org Roll Skia from 14f3e3209b73 to 1ea3ec8e7863 (2 revisions) (flutter/flutter#168489) 2025-05-07 matanlurey@users.noreply.github.com Use `config: enable-swift-...: false`, remove `disable-swift-...: true`. (flutter/flutter#168433) 2025-05-07 sokolovskyi.konstantin@gmail.com Replace MediaQuery.sizeOf with heightOf and widthOf. (flutter/flutter#168479) 2025-05-07 robert.ancell@canonical.com Fix stencil buffer leak (flutter/flutter#168448) 2025-05-07 robert.ancell@canonical.com Fix framebuffer leak rendering to secondary views. (flutter/flutter#168447) 2025-05-07 robert.ancell@canonical.com Fix uninitalized fields in FlutterWindowMetricsEvent (flutter/flutter#168446) 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 bmparr@google.com,stuartmorgan@google.com 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

While unifying iOS and macOS gn configuration in flutter#168517, I failed to correctly merge the deployment target in the target triple, resulting in it being incorrectly hardcoded to the macOS deployment target. This corrects this to the correct value for the `target_os` of the current compile. Issue: flutter#167592

While unifying iOS and macOS gn configuration in flutter#168517, I failed to correctly merge the deployment target in the target triple, resulting in it being incorrectly hardcoded to the macOS deployment target. This corrects this to the correct value for the `target_os` of the current compile. Also gets rid of an unnecessary assertion; we already `assert(is_mac || is_ios)` at the top of the file. Issue: flutter#167592

While unifying iOS and macOS gn configuration in #168517, I failed to correctly merge the deployment target in the target triple, resulting in it being incorrectly hardcoded to the macOS deployment target. This corrects this to the correct value for the `target_os` of the current compile. Also gets rid of an unnecessary assertion; we already `assert(is_mac || is_ios)` at the top of the file. Issue: #167592 ## 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].  [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

…r#9230) flutter/flutter@b0f5c8c...02d8c1a 2025-05-08 chris@bracken.jp iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#168517) 2025-05-08 engine-flutter-autoroll@skia.org Roll Packages from b2ce3b0 to ab44c26 (3 revisions) (flutter/flutter#168548) 2025-05-08 zhongliu88889@gmail.com Remove unnecessary setAriaRole('dialog') fallback in SemanticRoute class (flutter/flutter#168345) 2025-05-08 engine-flutter-autoroll@skia.org Roll Skia from 4d617bb1bb7d to 43ae814d2d95 (1 revision) (flutter/flutter#168526) 2025-05-08 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from _GJje-N2Jk51qtBs6... to mqhX1OP8ezmialgqA... (flutter/flutter#168525) 2025-05-08 36861262+QuncCccccc@users.noreply.github.com Make MergeSemantics be able to merge customAction (flutter/flutter#168414) 2025-05-08 engine-flutter-autoroll@skia.org Roll Skia from d787c26f873a to 4d617bb1bb7d (1 revision) (flutter/flutter#168514) 2025-05-08 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#168509) 2025-05-07 fluttergithubbot@gmail.com Marks Mac_arm64_ios imitation_game_swiftui to be unflaky (flutter/flutter#163114) 2025-05-07 20605958+mohamedamara@users.noreply.github.com Add option to hide trailing icon in DropdownMenu (flutter/flutter#167782) 2025-05-07 engine-flutter-autoroll@skia.org Roll Skia from 1ea3ec8e7863 to d787c26f873a (6 revisions) (flutter/flutter#168505) 2025-05-07 kevmoo@users.noreply.github.com [web] drop more use of deprecated JS functions (flutter/flutter#166157) 2025-05-07 83038251+nailahsall0@users.noreply.github.com docs: Fixed broken links in WidgetStateProperty documentations (flutter/flutter#168191) 2025-05-07 engine-flutter-autoroll@skia.org Roll Skia from 14f3e3209b73 to 1ea3ec8e7863 (2 revisions) (flutter/flutter#168489) 2025-05-07 matanlurey@users.noreply.github.com Use `config: enable-swift-...: false`, remove `disable-swift-...: true`. (flutter/flutter#168433) 2025-05-07 sokolovskyi.konstantin@gmail.com Replace MediaQuery.sizeOf with heightOf and widthOf. (flutter/flutter#168479) 2025-05-07 robert.ancell@canonical.com Fix stencil buffer leak (flutter/flutter#168448) 2025-05-07 robert.ancell@canonical.com Fix framebuffer leak rendering to secondary views. (flutter/flutter#168447) 2025-05-07 robert.ancell@canonical.com Fix uninitalized fields in FlutterWindowMetricsEvent (flutter/flutter#168446) 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 bmparr@google.com,stuartmorgan@google.com 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

…68517)

cbracken requested review from a team and vashworth as code owners May 8, 2025 00:22

github-actions bot added platform-ios iOS applications specifically engine flutter/engine related. See also e: labels. a: desktop Running on desktop team-ios Owned by iOS platform team platform-macos labels May 8, 2025

cbracken force-pushed the unify-ios-macos-configs branch from 0292176 to d3ba929 Compare May 8, 2025 00:48

cbracken requested review from LouiseHsu and hellohuanlin May 8, 2025 01:39

cbracken force-pushed the unify-ios-macos-configs branch from d3ba929 to 94a6ced Compare May 8, 2025 02:29

cbracken force-pushed the unify-ios-macos-configs branch from 94a6ced to 34407c8 Compare May 8, 2025 13:54

jmagman reviewed May 8, 2025

View reviewed changes

engine/src/build/config/apple/BUILD.gn Show resolved Hide resolved

matanlurey mentioned this pull request May 8, 2025

Rename apple -> darwin across our buildroot #168558

Merged

9 tasks

vashworth approved these changes May 8, 2025

View reviewed changes

cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label May 8, 2025

auto-submit bot added this pull request to the merge queue May 8, 2025

Merged via the queue into flutter:master with commit 02d8c1a May 8, 2025
179 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 8, 2025

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 8, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

dc31df1

…68517)

engine-flutter-autoroll mentioned this pull request May 8, 2025

Roll Flutter from b0f5c8ce03e2 to 02d8c1aceb75 (19 revisions) flutter/packages#9230

Merged

cbracken deleted the unify-ios-macos-configs branch May 8, 2025 19:16

cbracken mentioned this pull request May 13, 2025

macOS,iOS: fix swift target triple #168749

Merged

9 tasks

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

e0159a9

…68517)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

f6bdf08

…68517)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

0a723c5

…68517)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

656cdee

…68517)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025

02d8c1ace iOS,macOS: Unify iOS,macOS build configs (flutter/flutter#1…

7e93b85

…68517)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

iOS,macOS: Unify iOS,macOS build configs #168517

iOS,macOS: Unify iOS,macOS build configs #168517

Uh oh!

cbracken commented May 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

vashworth left a comment

Uh oh!

Uh oh!

Uh oh!

iOS,macOS: Unify iOS,macOS build configs #168517

iOS,macOS: Unify iOS,macOS build configs #168517

Uh oh!

Conversation

cbracken commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Uh oh!

vashworth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cbracken commented May 8, 2025 •

edited

Loading