From 0a6c637b3fc3544666669f8a76ed308a72263afc Mon Sep 17 00:00:00 2001
From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com>
Date: Fri, 1 Sep 2023 22:06:41 +0200
Subject: [PATCH] macos: drop Hardware_Accelerated_Execution_Manager (#8216)

---
 images/macos/provision/core/android-toolsets.sh          | 5 -----
 images/macos/software-report/SoftwareReport.Android.psm1 | 8 --------
 images/macos/toolsets/toolset-11.json                    | 2 +-
 images/macos/toolsets/toolset-12.json                    | 2 +-
 images/macos/toolsets/toolset-13.json                    | 2 +-
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh
index 36373be61..4b7a09baa 100755
--- a/images/macos/provision/core/android-toolsets.sh
+++ b/images/macos/provision/core/android-toolsets.sh
@@ -93,11 +93,6 @@ do
     echo y | $SDKMANAGER "extras;$extra_name"
 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[@]}"
 do
     echo "Installing add-on $addon_name ..."
diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1
index 2ba8f23c7..08f4b0746 100644
--- a/images/macos/software-report/SoftwareReport.Android.psm1
+++ b/images/macos/software-report/SoftwareReport.Android.psm1
@@ -199,11 +199,3 @@ function Get-AndroidNDKVersions {
         $_ + $defaultPostfix
     } | 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
-    }
-}
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index fda5bd376..cb426de76 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -160,7 +160,7 @@
         "platform_min_version": "27",
         "build_tools_min_version": "27.0.0",
         "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": [],
         "additional-tools": [
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 6ef6bd088..c060db3d9 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -147,7 +147,7 @@
         "platform_min_version": "27",
         "build_tools_min_version": "27.0.0",
         "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": [],
         "additional-tools": [
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 61a097141..6d9e78493 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -32,7 +32,7 @@
         "platform_min_version": "27",
         "build_tools_min_version": "27.0.0",
         "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": [],
         "additional-tools": [