@@ -127,7 +127,7 @@ param
127
127
[ValidateRange (1 , 36 )]
128
128
[int ] $AndroidAPILevel = 28 ,
129
129
[string []] $AndroidSDKVersions = @ (" Android" , " AndroidExperimental" ),
130
- [string []] $AndroidSDKArchitectures = @ (),
130
+ [string []] $AndroidSDKArchitectures = @ (" aarch64 " , " armv7 " , " i686 " , " x86_64 " ),
131
131
[string []] $WindowsSDKVersions = @ (" Windows" , " WindowsExperimental" ),
132
132
[string []] $WindowsSDKArchitectures = @ (" X64" , " X86" , " Arm64" ),
133
133
[string ] $ProductVersion = " 0.0.0" ,
@@ -190,11 +190,6 @@ if (($PinnedBuild -or $PinnedSHA256 -or $PinnedVersion) -and -not ($PinnedBuild
190
190
throw " If any of PinnedBuild, PinnedSHA256, or PinnedVersion is set, all three must be set."
191
191
}
192
192
193
- if ($Android -and ($AndroidSDKArchitectures.Length -eq 0 )) {
194
- # Enable all android SDKs by default.
195
- $AndroidSDKArchitectures = @ (" aarch64" , " armv7" , " i686" , " x86_64" )
196
- }
197
-
198
193
# Work around limitations of cmd passing in array arguments via powershell.exe -File
199
194
if ($AndroidSDKVersions.Length -eq 1 ) { $AndroidSDKVersions = $AndroidSDKVersions [0 ].Split(" ," ) }
200
195
if ($AndroidSDKArchitectures.Length -eq 1 ) { $AndroidSDKArchitectures = $AndroidSDKArchitectures [0 ].Split(" ," ) }
@@ -204,11 +199,6 @@ if ($WindowsSDKArchitectures.Length -eq 1) { $WindowsSDKArchitectures = $Windows
204
199
205
200
if ($Test.Length -eq 1 ) { $Test = $Test [0 ].Split(" ," ) }
206
201
207
- if ($AndroidSDKArchitectures.Length -gt 0 ) {
208
- # Always enable android when one of the SDKs is specified.
209
- $Android = $true
210
- }
211
-
212
202
if ($Test -contains " *" ) {
213
203
# Explicitly don't include llbuild yet since tests are known to fail on Windows
214
204
$Test = @ (" lld" , " lldb" , " swift" , " dispatch" , " foundation" , " xctest" , " swift-format" , " sourcekit-lsp" )
0 commit comments