@@ -38,10 +38,10 @@ The API Level to target when building the Android SDKs
38
38
. PARAMETER Android
39
39
When set, build android SDKs.
40
40
41
- . PARAMETER AndroidSDKs
41
+ . PARAMETER AndroidSDKArchitectures
42
42
An array of architectures for which the Android Swift SDK should be built.
43
43
44
- . PARAMETER WindowsSDKs
44
+ . PARAMETER WindowsSDKArchitectures
45
45
An array of architectures for which the Windows Swift SDK should be built.
46
46
47
47
. PARAMETER ProductVersion
@@ -120,8 +120,8 @@ param
120
120
[string ] $SwiftDebugFormat = " dwarf" ,
121
121
[ValidateRange (1 , 36 )]
122
122
[int ] $AndroidAPILevel = 28 ,
123
- [string []] $AndroidSDKs = @ (),
124
- [string []] $WindowsSDKs = @ (" X64" , " X86" , " Arm64" ),
123
+ [string []] $AndroidSDKArchitectures = @ (),
124
+ [string []] $WindowsSDKArchitectures = @ (" X64" , " X86" , " Arm64" ),
125
125
[string ] $ProductVersion = " 0.0.0" ,
126
126
[string ] $ToolchainIdentifier = $ (if ($env: TOOLCHAIN_VERSION ) { $env: TOOLCHAIN_VERSION } else { " $env: USERNAME .development" }),
127
127
[string ] $PinnedBuild = " " ,
@@ -182,17 +182,17 @@ if (($PinnedBuild -or $PinnedSHA256 -or $PinnedVersion) -and -not ($PinnedBuild
182
182
throw " If any of PinnedBuild, PinnedSHA256, or PinnedVersion is set, all three must be set."
183
183
}
184
184
185
- if ($Android -and ($AndroidSDKs .Length -eq 0 )) {
185
+ if ($Android -and ($AndroidSDKArchitectures .Length -eq 0 )) {
186
186
# Enable all android SDKs by default.
187
- $AndroidSDKs = @ (" aarch64" , " armv7" , " i686" , " x86_64" )
187
+ $AndroidSDKArchitectures = @ (" aarch64" , " armv7" , " i686" , " x86_64" )
188
188
}
189
189
190
190
# Work around limitations of cmd passing in array arguments via powershell.exe -File
191
- if ($AndroidSDKs .Length -eq 1 ) { $AndroidSDKs = $AndroidSDKs [0 ].Split(" ," ) }
192
- if ($WindowsSDKs .Length -eq 1 ) { $WindowsSDKs = $WindowsSDKs [0 ].Split(" ," ) }
191
+ if ($AndroidSDKArchitectures .Length -eq 1 ) { $AndroidSDKArchitectures = $AndroidSDKArchitectures [0 ].Split(" ," ) }
192
+ if ($WindowsSDKArchitectures .Length -eq 1 ) { $WindowsSDKArchitectures = $WindowsSDKArchitectures [0 ].Split(" ," ) }
193
193
if ($Test.Length -eq 1 ) { $Test = $Test [0 ].Split(" ," ) }
194
194
195
- if ($AndroidSDKs .Length -gt 0 ) {
195
+ if ($AndroidSDKArchitectures .Length -gt 0 ) {
196
196
# Always enable android when one of the SDKs is specified.
197
197
$Android = $true
198
198
}
@@ -492,7 +492,7 @@ if ($Android -and ($HostPlatform -ne $KnownPlatforms["WindowsX64"])) {
492
492
}
493
493
494
494
# Resolve the architectures received as argument
495
- $AndroidSDKBuilds = @ ($AndroidSDKs | ForEach-Object {
495
+ $AndroidSDKBuilds = @ ($AndroidSDKArchitectures | ForEach-Object {
496
496
switch ($_ ) {
497
497
" aarch64" { $KnownPlatforms [" AndroidARM64" ] }
498
498
" armv7" { $KnownPlatforms [" AndroidARMv7" ] }
@@ -502,7 +502,7 @@ $AndroidSDKBuilds = @($AndroidSDKs | ForEach-Object {
502
502
}
503
503
})
504
504
505
- $WindowsSDKBuilds = @ ($WindowsSDKs | ForEach-Object {
505
+ $WindowsSDKBuilds = @ ($WindowsSDKArchitectures | ForEach-Object {
506
506
switch ($_ ) {
507
507
" X64" { $KnownPlatforms [" WindowsX64" ] }
508
508
" X86" { $KnownPlatforms [" WindowsX86" ] }
0 commit comments