File tree 1 file changed +15
-2
lines changed
1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -159,11 +159,24 @@ public override Task<DiagnosticResult> Examine(SharedState history)
159
159
160
160
if ( installedPkg == null )
161
161
{
162
+ var packagePath = package . Path . Trim ( ) ;
163
+ var packageVersion = package . Version ;
164
+
165
+ if ( packagePath . EndsWith ( "x86_64" ) && Util . IsArm64 )
166
+ {
167
+ // On arm64 devices, use arm64 emulators
168
+ if ( package . Alternatives . FirstOrDefault ( a => a . Path . EndsWith ( "arm64-v8a" ) ) is { } alternative )
169
+ {
170
+ packagePath = alternative . Path ;
171
+ packageVersion = alternative . Version ;
172
+ }
173
+ }
174
+
162
175
var pkgToInstall = sdkInstance ? . Components ? . AllNotInstalled ( ) ?
163
- . FirstOrDefault ( p => p . Path . Equals ( package . Path . Trim ( ) , StringComparison . OrdinalIgnoreCase )
176
+ . FirstOrDefault ( p => p . Path . Equals ( packagePath , StringComparison . OrdinalIgnoreCase )
164
177
&& p . Revision >= ( v ?? p . Revision ) ) ;
165
178
166
- ReportStatus ( $ "{ package . Path } ({ package . Version } ) missing.", Status . Error ) ;
179
+ ReportStatus ( $ "{ packagePath } ({ packageVersion } ) missing.", Status . Error ) ;
167
180
168
181
if ( pkgToInstall != null )
169
182
missingPackages . Add ( pkgToInstall ) ;
You can’t perform that action at this time.
0 commit comments