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

macos: drop Hardware_Accelerated_Execution_Manager (#8216)

Browse Source
This commit is contained in:
ilia-shipitsin
2023-09-01 22:06:41 +02:00
committed by GitHub
parent 587a8c8e6f
commit 0a6c637b3f
5 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,11 +93,6 @@ do
echo y | $SDKMANAGER "extras;$extra_name" echo y | $SDKMANAGER "extras;$extra_name"
done done
# Intel x86 Emulator Accelerator (HAXM installer)
# 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
for addon_name in "${ANDROID_ADDON_LIST[@]}" for addon_name in "${ANDROID_ADDON_LIST[@]}"
do do
echo "Installing add-on $addon_name ..." echo "Installing add-on $addon_name ..."

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

@@ -199,11 +199,3 @@ function Get-AndroidNDKVersions {
$_ + $defaultPostfix $_ + $defaultPostfix
} | Join-String -Separator "<br>") } | Join-String -Separator "<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
}
}

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

@@ -160,7 +160,7 @@
"platform_min_version": "27", "platform_min_version": "27",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "27.0.0",
"extra-list": [ "extra-list": [
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" "android;m2repository", "google;m2repository", "google;google_play_services"
], ],
"addon-list": [], "addon-list": [],
"additional-tools": [ "additional-tools": [

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

@@ -147,7 +147,7 @@
"platform_min_version": "27", "platform_min_version": "27",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "27.0.0",
"extra-list": [ "extra-list": [
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" "android;m2repository", "google;m2repository", "google;google_play_services"
], ],
"addon-list": [], "addon-list": [],
"additional-tools": [ "additional-tools": [

2
images/macos/toolsets/toolset-13.json
View File

@@ -32,7 +32,7 @@
"platform_min_version": "27", "platform_min_version": "27",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "27.0.0",
"extra-list": [ "extra-list": [
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" "android;m2repository", "google;m2repository", "google;google_play_services"
], ],
"addon-list": [], "addon-list": [],
"additional-tools": [ "additional-tools": [