Skip to content

Commit 0a6c637

Browse files
macos: drop Hardware_Accelerated_Execution_Manager (#8216)
1 parent 587a8c8 commit 0a6c637

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

images/macos/provision/core/android-toolsets.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ do
9393
echo y | $SDKMANAGER "extras;$extra_name"
9494
done
9595

96-
# Intel x86 Emulator Accelerator (HAXM installer)
97-
# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
98-
# https://developer.android.com/studio/run/emulator-acceleration#vm-mac
99-
# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
100-
10196
for addon_name in "${ANDROID_ADDON_LIST[@]}"
10297
do
10398
echo "Installing add-on $addon_name ..."

images/macos/software-report/SoftwareReport.Android.psm1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,3 @@ function Get-AndroidNDKVersions {
199199
$_ + $defaultPostfix
200200
} | Join-String -Separator "<br>")
201201
}
202-
203-
function Get-IntelHaxmVersion {
204-
kextstat | Where-Object { $_ -match "com.intel.kext.intelhaxm \((?<version>(\d+\.){1,}\d+)\)" } | Out-Null
205-
return [PSCustomObject] @{
206-
"Package Name" = "Intel HAXM"
207-
"Version" = $Matches.Version
208-
}
209-
}

images/macos/toolsets/toolset-11.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"platform_min_version": "27",
161161
"build_tools_min_version": "27.0.0",
162162
"extra-list": [
163-
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"
163+
"android;m2repository", "google;m2repository", "google;google_play_services"
164164
],
165165
"addon-list": [],
166166
"additional-tools": [

images/macos/toolsets/toolset-12.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"platform_min_version": "27",
148148
"build_tools_min_version": "27.0.0",
149149
"extra-list": [
150-
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"
150+
"android;m2repository", "google;m2repository", "google;google_play_services"
151151
],
152152
"addon-list": [],
153153
"additional-tools": [

images/macos/toolsets/toolset-13.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"platform_min_version": "27",
3333
"build_tools_min_version": "27.0.0",
3434
"extra-list": [
35-
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"
35+
"android;m2repository", "google;m2repository", "google;google_play_services"
3636
],
3737
"addon-list": [],
3838
"additional-tools": [

0 commit comments

Comments
 (0)