Skip to content

Commit d29fad8

Browse files
committed
build.ps1: make -Android explicitly required
Default values for the Android environment should be the complete set. The top-level `-Android` flag controls whether the Android SDKs are built.
1 parent af39352 commit d29fad8

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

utils/build.ps1

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ param
127127
[ValidateRange(1, 36)]
128128
[int] $AndroidAPILevel = 28,
129129
[string[]] $AndroidSDKVersions = @("Android", "AndroidExperimental"),
130-
[string[]] $AndroidSDKArchitectures = @(),
130+
[string[]] $AndroidSDKArchitectures = @("aarch64", "armv7", "i686", "x86_64"),
131131
[string[]] $WindowsSDKVersions = @("Windows", "WindowsExperimental"),
132132
[string[]] $WindowsSDKArchitectures = @("X64","X86","Arm64"),
133133
[string] $ProductVersion = "0.0.0",
@@ -190,11 +190,6 @@ if (($PinnedBuild -or $PinnedSHA256 -or $PinnedVersion) -and -not ($PinnedBuild
190190
throw "If any of PinnedBuild, PinnedSHA256, or PinnedVersion is set, all three must be set."
191191
}
192192

193-
if ($Android -and ($AndroidSDKArchitectures.Length -eq 0)) {
194-
# Enable all android SDKs by default.
195-
$AndroidSDKArchitectures = @("aarch64","armv7","i686","x86_64")
196-
}
197-
198193
# Work around limitations of cmd passing in array arguments via powershell.exe -File
199194
if ($AndroidSDKVersions.Length -eq 1) { $AndroidSDKVersions = $AndroidSDKVersions[0].Split(",") }
200195
if ($AndroidSDKArchitectures.Length -eq 1) { $AndroidSDKArchitectures = $AndroidSDKArchitectures[0].Split(",") }
@@ -204,11 +199,6 @@ if ($WindowsSDKArchitectures.Length -eq 1) { $WindowsSDKArchitectures = $Windows
204199

205200
if ($Test.Length -eq 1) { $Test = $Test[0].Split(",") }
206201

207-
if ($AndroidSDKArchitectures.Length -gt 0) {
208-
# Always enable android when one of the SDKs is specified.
209-
$Android = $true
210-
}
211-
212202
if ($Test -contains "*") {
213203
# Explicitly don't include llbuild yet since tests are known to fail on Windows
214204
$Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")

0 commit comments

Comments
 (0)