[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

@@ -85,10 +85,13 @@ do
done
# Intel x86 Emulator Accelerator (HAXM installer)
# see Issue 31164 notes
# Command needs to be run under sudo.
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
# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
# https://developer.android.com/studio/run/emulator-acceleration#vm-mac
# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
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[@]}"
do