[test] Fix building Android tests on Windows toolchain CI#86694
Merged
finagolfin merged 1 commit intoswiftlang:mainfrom Jan 23, 2026
Merged
[test] Fix building Android tests on Windows toolchain CI#86694finagolfin merged 1 commit intoswiftlang:mainfrom
finagolfin merged 1 commit intoswiftlang:mainfrom
Conversation
compnerd
previously requested changes
Jan 21, 2026
Member
compnerd
left a comment
There was a problem hiding this comment.
Please limit this to just the Android builds. I don't think that we should add spurious options to other builds.
finagolfin
commented
Jan 21, 2026
utils/build.ps1
Outdated
| -SwiftSDK $null ` | ||
| -BuildTargets check-swift-validation-only_non_executable ` | ||
| -Defines @{ | ||
| SWIFT_ANDROID_API_LEVEL = "$AndroidAPILevel"; |
Member
Author
There was a problem hiding this comment.
This Test-Runtime method is only invoked for Android currently, see the lit overrides 10 lines up where it skips several tests for Android.
Member
There was a problem hiding this comment.
Please conditionalise it to Android anyway. Setting the environment variable isn't great, and something to fix. But this function is generic - $Platform identifies what platform it is being executed for. The goal is to use this for all platforms, not just Android.
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, but the Windows CI does not pass in `SWIFT_ANDROID_API_LEVEL`, like `build-script` does, so pass it in here when testing Android.
finagolfin
commented
Jan 22, 2026
| $PlatformDefines = @{} | ||
| if ($Platform.OS -eq [OS]::Android) { | ||
| $PlatformDefines += @{ | ||
| SWIFT_ANDROID_API_LEVEL = "$AndroidAPILevel"; |
Member
Author
There was a problem hiding this comment.
Made the change you asked for
Member
Author
|
@swift-ci smoke test |
Made the change you asked for and would like to get this in now, so we can run it through Win toolchain CI.
finagolfin
added a commit
that referenced
this pull request
Jan 28, 2026
… (#86839) Ever since #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
added a commit
that referenced
this pull request
Feb 17, 2026
…in CI again (#87275) This was fixed in #86694, but the subsequent massive #84906 appears to have [inadvertently disabled adding the needed Android API level](https://github.com/swiftlang/swift/pull/84906/changes#diff-c861caa2fcc08744108e542ca836b07e342f537566e8c5f7a21a0e9125331ed9R2774), as it was started late last year, long before the fix was added.
blevine1
pushed a commit
to blevine1/swift
that referenced
this pull request
Feb 24, 2026
…in CI again (swiftlang#87275) This was fixed in swiftlang#86694, but the subsequent massive swiftlang#84906 appears to have [inadvertently disabled adding the needed Android API level](https://github.com/swiftlang/swift/pull/84906/changes#diff-c861caa2fcc08744108e542ca836b07e342f537566e8c5f7a21a0e9125331ed9R2774), as it was started late last year, long before the fix was added.
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.
Ever since #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, but the Windows CI does not pass in
SWIFT_ANDROID_API_LEVEL, likebuild-scriptdoes, so pass it in here.I don't see a way to run the failing build of the Android tests from the Windows toolchain CI in this pull, so will just need review from Windows people like @compnerd or @jeffdav before merging.