Skip to content

[6.3][test] Fix building Android tests on Windows toolchain CI (#86694)#86839

Merged
finagolfin merged 1 commit intoswiftlang:release/6.3from
finagolfin:droid
Jan 28, 2026
Merged

[6.3][test] Fix building Android tests on Windows toolchain CI (#86694)#86839
finagolfin merged 1 commit intoswiftlang:release/6.3from
finagolfin:droid

Conversation

@finagolfin
Copy link
Copy Markdown
Member

@finagolfin finagolfin commented Jan 28, 2026

We're seeing the same Android build issue on the 6.3 toolchain CI, so getting this in there too.

…86694)

Ever since swiftlang#84574 added Android availability versioning, the Reflection
test stopped building for Android unless the API level was in the target
triple, so [we hacked that into CMake in that
pull](https://github.com/swiftlang/swift/pull/84574/files#diff-e2e2a250882f66d531f2a42c201e013fa2d8be892b2880a32d6596710761f470R2549),
but the Windows CI does not pass in `SWIFT_ANDROID_API_LEVEL`, [like
`build-script`
does](https://github.com/swiftlang/swift/blob/9143271dfdc92053a7b9d95000d9fd60e42413c3/utils/build-script-impl#L1632),
so pass it in here.
@finagolfin finagolfin added the Android Platform: Android label Jan 28, 2026
@finagolfin finagolfin requested a review from a team as a code owner January 28, 2026 09:15
@finagolfin finagolfin added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.3 labels Jan 28, 2026
@finagolfin
Copy link
Copy Markdown
Member Author

@swift-ci test

@finagolfin
Copy link
Copy Markdown
Member Author

@stephentyrone, need review on this trivial pull, which won't break anything on the Windows CI but gets the Android tests running on it again.

@finagolfin finagolfin merged commit a5c450d into swiftlang:release/6.3 Jan 28, 2026
5 checks passed
@finagolfin finagolfin deleted the droid branch January 28, 2026 21:32
@finagolfin
Copy link
Copy Markdown
Member Author

As planned, this got the Android tests running again on the Swift 6.3 Windows CI. 👍

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

Labels

Android Platform: Android 🍒 release cherry pick Flag: Release branch cherry picks swift 6.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants