[macOS] Skip Intel HAXM installation on BigSur (#3698)

* Remove HAXM installation as it doesn't work on Big Sur
* Change test to validate successful kext load
* Add HAXM to software report
This commit is contained in:
Mikhail Timofeev
2021-07-14 10:02:12 +03:00
committed by GitHub
parent a914ed2f95
commit e139c6d581
4 changed files with 22 additions and 8 deletions

View File

@@ -187,3 +187,11 @@ function Get-AndroidNDKVersions {
return ($versions -Join "<br>")
}
function Get-IntelHaxmVersion {
kextstat | Where-Object { $_ -match "com.intel.kext.intelhaxm \((?<version>(\d+\.){1,}\d+)\)" } | Out-Null
return [PSCustomObject] @{
"Package Name" = "Intel HAXM"
"Version" = $Matches.Version
}
}

View File

@@ -276,7 +276,11 @@ $markdown += New-MDNewLine
# Android section
$markdown += New-MDHeader "Android" -Level 3
$markdown += Build-AndroidTable | New-MDTable
$androidTable = Build-AndroidTable
if ($os.IsLessThanBigSur) {
$androidTable += Get-IntelHaxmVersion
}
$markdown += $androidTable | New-MDTable
$markdown += New-MDNewLine
$markdown += New-MDHeader "Environment variables" -Level 4
$markdown += Build-AndroidEnvironmentTable | New-MDTable