fix: make sure to search for correct arm version

unoplatform · Oct 3, 2022 · 8731a29 · 8731a29
1 parent 8c6715b
commit 8731a29
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/UnoCheck/Checkups/AndroidEmulatorCheckup.cs b/UnoCheck/Checkups/AndroidEmulatorCheckup.cs
@@ -14,6 +14,7 @@ namespace DotNetCheck.Checkups
 {
 	public class AndroidEmulatorCheckup : Checkup
 	{
+		const string armArch = "arm64-v8a";
 		public override IEnumerable<CheckupDependency> DeclareDependencies(IEnumerable<string> checkupIds)
 			=> new [] { new CheckupDependency("androidsdk") };
 
@@ -120,7 +121,12 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 									// and will install the wrong emulator (x86_64)
 									// https://github.com/dotnet/runtime/issues/42130
 									return Util.IsArm64
-									? p.Path.Contains("arm", StringComparison.OrdinalIgnoreCase)
+
+									// The Path will be something like:
+									// system-images;android-33;google_apis;arm64-v8a (for arm)
+									// system-images;android-31;google_apis;x86_64 (for x86 or x64)
+
+									? p.Path.Contains(armArch, StringComparison.OrdinalIgnoreCase)
 									: p.Path.Equals(me.SdkId, StringComparison.OrdinalIgnoreCase);
 								});
 								if (sdkPackage == null && (me.AlternateSdkIds?.Any() ?? false))