From 2499f6937fa0137e9a4c6b87d107e9fb17ddadec Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 15 Mar 2025 08:55:53 -0700 Subject: [PATCH] Revert "utils: Update default Android SDKs in build.ps1 (#79944)" This reverts commit c4a472eccfe600b8ace9aca92b7981276df62a52. --- utils/build.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index a02505ec24323..afa65098dbbd4 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -210,11 +210,9 @@ $msbuild = "$VSInstallRoot\MSBuild\Current\Bin\$BuildArchName\MSBuild.exe" $UnixToolsBinDir = "$env:SystemDrive\Program Files\Git\usr\bin" if ($Android -and ($AndroidSDKs.Length -eq 0)) { - # By default, build and test the arm64 Android SDK. That choice might change - # once we can run executable tests in CI. - $AndroidSDKs = @("aarch64") + # Enable all android SDKs by default. + $AndroidSDKs = @("aarch64","armv7","i686","x86_64") } - # Work around limitations of cmd passing in array arguments via powershell.exe -File if ($AndroidSDKs.Length -eq 1) { $AndroidSDKs = $AndroidSDKs[0].Split(",") } if ($WindowsSDKs.Length -eq 1) { $WindowsSDKs = $WindowsSDKs[0].Split(",") }