Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Conversation

@cbracken
Copy link
Member

@cbracken cbracken commented May 10, 2022

This is a minor refactoring to extract functions that resolve target_os
and target_cpu gn settings.

This is cleanup prior to adding support for host builds on Apple Silicon
Macs.

Issue: flutter/flutter#96745

This is a reland of #33224
That patch was reverted in #33231

On non-host Windows builds (e.g. android builds of gen_snapshot)
target_cpu is rewritten to either x86 or x64. However, dart_target_arch
should remain the original target_cpu (e.g. arm or arm64). The previous
version of this refactor inlined that logic into get_target_cpu() which
happens before we set dart_target_arch, thus incorrectly causing
gen_snapshot to be built to target x86 or x64 instead of the original
target architecture.

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 and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

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

@cbracken cbracken requested a review from zanderso May 10, 2022 20:22
This is a minor refactoring to extract functions that resolve target_os
and target_cpu gn settings.

This is cleanup prior to adding support for host builds on Apple Silicon
Macs.

Issue: flutter/flutter#96745

This is a reland of #33224
That patch was reverted in #33231

On non-host Windows builds (e.g. android builds of gen_snapshot)
target_cpu is rewritten to either x86 or x64. However, dart_target_arch
should remain the original target_cpu (e.g. arm or arm64). The previous
version of this refactor inlined that logic into get_target_cpu() which
happens before we set dart_target_arch, thus incorrectly causing
gen_snapshot to be built to target x86 or x64 instead of the original
target architecture.
Copy link
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@cbracken cbracken added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label May 10, 2022
@fluttergithubbot fluttergithubbot merged commit 98a1c4c into flutter:main May 10, 2022
@cbracken cbracken deleted the extract-target-os-cpu-reland branch May 10, 2022 21:43
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants