Skip to content

Commit 22e73c7

Browse files
committed
utils: begin supporting new NDKs when building
Add support for multiple NDKs for Android SDKs to be built. This is in preparation to migrate to r27c as the default NDK to use.
1 parent bb65b08 commit 22e73c7

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

utils/build.ps1

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ param
139139
[string] $PinnedToolchainVariant = "Asserts",
140140
[string] $PythonVersion = "3.9.10",
141141
[ValidatePattern("^r(?:[1-9]|[1-9][0-9])(?:[a-z])?$")]
142-
[string] $AndroidNDKVersion = "r26b",
142+
[string] $AndroidNDKVersion = "r27c",
143143
[ValidatePattern("^\d+\.\d+\.\d+(?:-\w+)?")]
144144
[string] $WinSDKVersion = "",
145145
[switch] $Android = $false,
@@ -351,8 +351,7 @@ $IsCrossCompiling = $HostArchName -ne $BuildArchName
351351
$TimingData = New-Object System.Collections.Generic.List[System.Object]
352352

353353
function Get-AndroidNDKPath {
354-
$androidNDKPath = Join-Path -Path $BinaryCache -ChildPath "android-ndk-$AndroidNDKVersion"
355-
return $androidNDKPath
354+
return Join-Path -Path $BinaryCache -ChildPath "android-ndk-$AndroidNDKVersion"
356355
}
357356

358357
function Get-FlexExecutable {
@@ -855,14 +854,23 @@ function Fetch-Dependencies {
855854
Install-PythonModules
856855

857856
if ($Android) {
858-
# Only a specific NDK version is supported right now.
859-
if ($AndroidNDKVersion -ne "r26b") {
857+
$KnownNDKs = @{
858+
r26b = @{
859+
URL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
860+
SHA256 = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
861+
}
862+
r27c = @{
863+
URL = "https://dl.google.com/android/repository/android-ndk-r27c-windows.zip"
864+
SHA256 = ""
865+
}
866+
}
867+
868+
$NDK = $KnownNDKs[$AndroidNDKVersion]
869+
if ($NDK -eq $null) {
860870
throw "Unsupported Android NDK version"
861871
}
862-
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
863-
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
864-
DownloadAndVerify $NDKURL "$BinaryCache\android-ndk-$AndroidNDKVersion-windows.zip" $NDKHash
865872

873+
DownloadAndVerify $NDK.URL "$BinaryCache\android-ndk-$AndroidNDKVersion-windows.zip" $NDK.SHA256
866874
Extract-ZipFile -ZipFileName "android-ndk-$AndroidNDKVersion-windows.zip" -BinaryCache $BinaryCache -ExtractPath "android-ndk-$AndroidNDKVersion" -CreateExtractPath $false
867875
}
868876

0 commit comments

Comments
 (0)