Skip to content

Fall back to environment SDKROOT passed from Xcode #52570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jmagman merged 1 commit into from
Mar 14, 2020
Merged

Fall back to environment SDKROOT passed from Xcode #52570

jmagman merged 1 commit into from
Mar 14, 2020

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Mar 13, 2020

Description

This was doing redundant work when building from Xcode since the build settings are already exported in the env. Saves ~600ms on my machine on the first run (subsequently cached by xcrun).

Related Issues

Fixes #46137

Tests

Added SDK root tests.

Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I signed the [CLA].
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I updated/added relevant documentation (doc comments with ///).
  • All existing and new tests are passing.
  • The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

  • No, no existing tests failed, so this is not a breaking change.
  • Yes, this is a breaking change. If not, delete the remainder of this section.

@jmagman jmagman added tool Affects the "flutter" command-line tool. See also t: labels. t: xcode "xcodebuild" on iOS and general Xcode project management labels Mar 13, 2020
@jmagman jmagman self-assigned this Mar 13, 2020
christopherfujino
christopherfujino approved these changes Mar 13, 2020
View reviewed changes
Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

LGTM

packages/flutter_tools/lib/src/macos/xcode.dart

Future<String> sdkLocation(SdkType sdk) async {
Future<String> sdkLocation(SdkType sdk, Map<String, String> environment) async {
// If this is run an Xcode script build phase, the SDKROOT is already exported.
Copy link
Contributor

@christopherfujino christopherfujino Mar 13, 2020

Choose a reason for hiding this comment

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

it's unfortunate this env var is somewhat ambiguous, but hopefully there won't be collisions...

@jmagman jmagman merged commit 8e6e15f into flutter:master Mar 14, 2020
@jmagman jmagman deleted the sdkroot branch March 14, 2020 00:17
jmagman added a commit that referenced this pull request Mar 14, 2020
@jmagman
Revert "Fall back to environment SDKROOT passed from Xcode (#52570)"
c704a53 
This reverts commit 8e6e15f.
@jmagman jmagman mentioned this pull request Mar 14, 2020
Merged
jmagman added a commit that referenced this pull request Mar 14, 2020
@jmagman
Revert "Fall back to environment SDKROOT passed from Xcode (#52570)" (#…
73ea37e 
…52583)

This reverts commit 8e6e15f.
@jmagman jmagman mentioned this pull request Mar 16, 2020
Merged
10 tasks
@lock
Copy link

lock bot commented Apr 2, 2020

This thread has been automatically locked since there has not been any recent activity after it was closed. If you are still experiencing a similar issue, please open a new bug, including the output of flutter doctor -v and a minimal reproduction of the issue.

@lock lock bot locked and limited conversation to collaborators Apr 2, 2020
@jmagman jmagman added the platform-ios iOS applications specifically label Aug 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@christopherfujino christopherfujino christopherfujino approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jmagman jmagman

Labels

platform-ios iOS applications specifically t: xcode "xcodebuild" on iOS and general Xcode project management tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add xcode sdkLocation unit tests

3 participants

@jmagman @christopherfujino @googlebot