actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 15:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,10 +85,13 @@ do
done done
# Intel x86 Emulator Accelerator (HAXM installer) # Intel x86 Emulator Accelerator (HAXM installer)
# see Issue 31164 notes # The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
# Command needs to be run under sudo. # https://developer.android.com/studio/run/emulator-acceleration#vm-mac
chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh # The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh if is_Less_BigSur; then
chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
fi
for addon_name in "${ANDROID_ADDON_LIST[@]}" for addon_name in "${ANDROID_ADDON_LIST[@]}"
do do

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

@@ -187,3 +187,11 @@ function Get-AndroidNDKVersions {
return ($versions -Join "<br>") 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
}
}

6
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -276,7 +276,11 @@ $markdown += New-MDNewLine
# Android section # Android section
$markdown += New-MDHeader "Android" -Level 3 $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-MDNewLine
$markdown += New-MDHeader "Environment variables" -Level 4 $markdown += New-MDHeader "Environment variables" -Level 4
$markdown += Build-AndroidEnvironmentTable | New-MDTable $markdown += Build-AndroidEnvironmentTable | New-MDTable

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

@@ -83,8 +83,7 @@ Describe "Android" {
} }
} }
It "HAXM is installed" { It "HAXM is installed" -Skip:($os.IsBigSur) {
$haxmPath = Join-Path $ANDROID_SDK_DIR "extras" "intel" "Hardware_Accelerated_Execution_Manager" "silent_install.sh" "kextstat | grep 'com.intel.kext.intelhaxm'" | Should -ReturnZeroExitCode
"$haxmPath -v" | Should -ReturnZeroExitCode
} }
} }