Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a fallback for arm Cpus #98

Merged
merged 1 commit into from
Mar 10, 2023
+16 −3
Merged

Added a fallback for arm Cpus #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions UnoCheck/Checkups/AndroidEmulatorCheckup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") };

Expand All @@ -34,8 +35,8 @@ public override bool ShouldExamine(SharedState history)

public override Task<DiagnosticResult> Examine(SharedState history)
{
if(history.GetEnvironmentVariable("ANDROID_EMULATOR_SKIP") == "true")
{
if (history.GetEnvironmentVariable("ANDROID_EMULATOR_SKIP") == "true")
{
return Task.FromResult(
new DiagnosticResult(Status.Warning, this, $"Installation skipped for https://github.com/unoplatform/uno.check/issues/48"));
}
Expand Down Expand Up @@ -114,8 +115,20 @@ public override Task<DiagnosticResult> Examine(SharedState history)

var installedPackages = sdkInstance.Components.AllInstalled(true);

var sdkPackage = installedPackages.FirstOrDefault(p => p.Path.Equals(me.SdkId, StringComparison.OrdinalIgnoreCase));
var sdkPackage = installedPackages.FirstOrDefault(p =>
{
// This will be false if the proccess runs on Rosetta emulation
// and will install the wrong emulator (x86_64)
// https://github.com/dotnet/runtime/issues/42130
return Util.IsArm64

// 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))
sdkPackage = installedPackages.FirstOrDefault(p => me.AlternateSdkIds.Any(a => a.Equals(p.Path, StringComparison.OrdinalIgnoreCase)));

Expand Down