actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-30 05:22:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add NDK 22 to macOS images (#2542)

Browse Source 
* add env variables to docs, add extra ndk

* add new header 4

* rename variable

* add ndk to toolset as generic approach

* grep latest version

* install latest lts

* improve function

* rename function
This commit is contained in:
Dmitry Shibanov
2021-02-01 12:56:44 +03:00
committed by GitHub
parent fa88926270
commit a49d4e2294
6 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/macos/tests/Android.Tests.ps1
View File

@@ -8,6 +8,10 @@ Describe "Android" {
$androidSdkManagerPackages = Get-AndroidPackages
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
[string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest"
[string]$ndkLtsVersion = Get-ToolsetValue "android.ndk.lts"
$ndkLatestFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
$ndkLtsFullVersion = (Get-ChildItem "$env:ANDROID_HOME/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 |
@@ -23,6 +27,8 @@ Describe "Android" {
"tools/proguard",
"ndk-bundle",
"cmake",
"ndk/$ndkLatestFullVersion",
"ndk/$ndkLtsFullVersion",
$platforms,
$buildTools,
(Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }),