Get Android constants used by Channel from Bionic instead#2026
Merged
Lukasa merged 2 commits intoapple:mainfrom Jan 6, 2022
Merged
Get Android constants used by Channel from Bionic instead#2026Lukasa merged 2 commits intoapple:mainfrom
Lukasa merged 2 commits intoapple:mainfrom
Conversation
Motivation: An upcoming pull, swiftlang/swift#35707, moves Android to the same single-header modulemap for Bionic as used on linux, but that doesn't work unless this is changed. This approach works both with the current release toolchain and with that new modulemap. Modifications: Change how these Bionic constants are imported. Result: This repo compiles for Android and the tests pass with both modulemap approaches.
Contributor
Author
|
I had not tested with old toolchains like 5.2, let's see if this new approach works. |
Contributor
Author
|
Single failing test on 5.2 looks like a flake: |
Contributor
|
@swift-nio-bot test this please |
Contributor
|
Blocked by #2027. |
Lukasa
approved these changes
Jan 6, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation:
An upcoming pull, swiftlang/swift#35707, moves Android to the same single-header modulemap for Bionic as used on linux, but that doesn't work unless this is changed. This approach works both with the current release toolchain and with that new modulemap.
Modifications:
Change how these Bionic constants are imported.
Result:
This repo compiles for Android and the tests pass with both modulemap approaches.
I've been using an earlier version of this pull to cross-compile this repo on my Android CI, where I apply that modulemap pull to the trunk SDK. Without it, I get the following error with the new modulemap, because of this definition:
That Bionic pull should be merged into trunk soon, once Daniel, who maintains the community Android CI, approves it. In the meantime, this pull gets this repo working with both approaches.