[Ubuntu] Add Android NDK 22 (#2556)

* add android ndk 22
This commit is contained in:
Dibir Magomedsaygitov
2021-02-04 13:34:30 +03:00
committed by GitHub
parent aa0de6b9cc
commit 705a38a481
5 changed files with 53 additions and 17 deletions

View File

@@ -2,6 +2,8 @@ Describe "Android" {
$androidSdkManagerPackages = Get-AndroidPackages
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
[string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts"
$ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name
$platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' |
Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique |
@@ -16,8 +18,17 @@ Describe "Android" {
$buildTools,
(Get-ToolsetValue "android.extra_list" | ForEach-Object { "extras/${_}" }),
(Get-ToolsetValue "android.addon_list" | ForEach-Object { "add-ons/${_}" }),
(Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" })
) | ForEach-Object { $_ }
(Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" }),
"ndk/$ndkLTSFullVersion"
)
[string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest"
if ($ndkLatestVersion) {
$ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
$androidPackages += @("ndk/$ndkLatestFullVersion")
}
$androidPackages = $androidPackages | ForEach-Object { $_ }
BeforeAll {
$ANDROID_SDK_DIR = "/usr/local/lib/android/sdk"
@@ -38,7 +49,6 @@ Describe "Android" {
}
}
Context "Packages" {
$testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }