[ubuntu] Refactor Toolset functions (#8948)

This commit is contained in:
Shamil Mubarakshin
2023-12-06 14:00:26 +01:00
committed by GitHub
parent a9bc069a35
commit 0ade9f36d3
4 changed files with 15 additions and 41 deletions

View File

@@ -155,7 +155,7 @@ function Get-AndroidGoogleAPIsVersions {
function Get-AndroidNDKVersions {
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
$versions = Get-ChildItem -Path $ndkFolderPath -Name
$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default"
$ndkDefaultVersion = (Get-ToolsetContent).android.ndk.default
$ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1
return ($versions | ForEach-Object {