Skip to content
This repository was archived by the owner on Apr 29, 2022. It is now read-only.

Build fixes for roll#135

Merged
dnfield merged 2 commits into
flutter-team-archive:mainfrom
dnfield:build
Apr 13, 2022
Merged

Build fixes for roll#135
dnfield merged 2 commits into
flutter-team-archive:mainfrom
dnfield:build

Conversation

@dnfield

@dnfield dnfield commented Apr 13, 2022

Copy link
Copy Markdown
Contributor

@dnfield

dnfield commented Apr 13, 2022

Copy link
Copy Markdown
Contributor Author

Actually I don't think I need this.

@dnfield dnfield closed this Apr 13, 2022
@dnfield dnfield reopened this Apr 13, 2022
@dnfield dnfield changed the title Add define for rendering Build fixes for roll Apr 13, 2022
@dnfield

dnfield commented Apr 13, 2022

Copy link
Copy Markdown
Contributor Author

The new define isn't essential, but the missing build dep and enum definition will make this landable.

@bdero bdero left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If the new define/version check isn't needed, can we remove it? I don't understand it, but I will speculatively approve this PR to unblock the roll. (I slipped the include fix in one of my PRs that still waiting on review BTW)

@dnfield

dnfield commented Apr 13, 2022

Copy link
Copy Markdown
Contributor Author

We can remove it when we're certain that no bot will build using Xcode 12. Until then, the bots may be using an older macOS SDK that does not have the enum defined - so we conditionally define it to allow the TU to compile.

@jmagman FYI

@dnfield
dnfield merged commit fd3f368 into flutter-team-archive:main Apr 13, 2022
@dnfield
dnfield deleted the build branch April 13, 2022 23:33
@dnfield

dnfield commented Apr 13, 2022

Copy link
Copy Markdown
Contributor Author

Argh. I too eagerly merged this. the typedef isn't set up right


// TODO(dnfield): remove this declaration when we no longer need to build on
// machines with lower SDK versions than 11.0.s
#if !defined(MAC_OS_X_VERSION_11_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_11_0

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

What exactly are you trying to do? Does API_AVAILABLE(macos(11.0)) work? Do you need an iOS availability constraint as MTLCommandEncoderErrorStateToString has API_AVAILABLE(ios(14.0), macos(11.0))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

See more of this continued in #136.

I'm trying to make sure that if we end up on a bot that has an older SDK that does not define this enum, we can still compile.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants