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

Add ndk-related environment variables (#5984)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-07-29 10:50:39 +04:00
committed by GitHub
parent cd98711e9d
commit 1c6ef2dda5
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/macos/provision/core/android-toolsets.sh
View File

@@ -32,6 +32,7 @@ ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]'))
ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]'))
ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]'))
ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]'))
ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default')
ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]')
# Get the latest command line tools from https://developer.android.com/studio#cmdline-tools # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools
cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"')
@@ -81,8 +82,14 @@ do
echo y | $SDKMANAGER "ndk;$ndk_full_version" echo y | $SDKMANAGER "ndk;$ndk_full_version"
done done
ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT)
ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault
ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST)
ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest
# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879
echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc"
availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u))

10
images/macos/software-report/SoftwareReport.Android.psm1
View File

@@ -96,7 +96,7 @@ function Build-AndroidTable {
function Build-AndroidEnvironmentTable { function Build-AndroidEnvironmentTable {
$androidVersions = Get-Item env:ANDROID_* $androidVersions = Get-Item env:ANDROID_*
$shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME'
return $androidVersions | Sort-Object -Property Name | ForEach-Object { return $androidVersions | Sort-Object -Property Name | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{
"Name" = $_.Name "Name" = $_.Name
@@ -177,7 +177,13 @@ function Get-AndroidGoogleAPIsVersions {
function Get-AndroidNDKVersions { function Get-AndroidNDKVersions {
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
$versions += Get-ChildItem -Path $ndkFolderPath -Name $versions += Get-ChildItem -Path $ndkFolderPath -Name
return ($versions | Join-String -Separator "<br>") $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default"
$ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1
return ($versions | ForEach-Object {
$defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : ""
$_ + $defaultPostfix
} | Join-String -Separator "<br>")
} }
function Get-IntelHaxmVersion { function Get-IntelHaxmVersion {

1
images/macos/toolsets/toolset-10.15.json
View File

@@ -179,6 +179,7 @@
"cmake;3.18.1" "cmake;3.18.1"
], ],
"ndk": { "ndk": {
"default": "25",
"versions": [ "versions": [
"23", "24", "25" "23", "24", "25"
] ]

1
images/macos/toolsets/toolset-11.json
View File

@@ -178,6 +178,7 @@
"cmake;3.22.1" "cmake;3.22.1"
], ],
"ndk": { "ndk": {
"default": "25",
"versions": [ "versions": [
"23", "24", "25" "23", "24", "25"
] ]

1
images/macos/toolsets/toolset-12.json
View File

@@ -113,6 +113,7 @@
"cmake;3.22.1" "cmake;3.22.1"
], ],
"ndk": { "ndk": {
"default": "25",
"versions": [ "versions": [
"23", "24", "25" "23", "24", "25"
] ]