Add additional logging and fallbacks

dotnet · Jun 29, 2023 · 7d898d2 · 7d898d2
1 parent 8fde2d0
commit 7d898d2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs
@@ -26,6 +26,11 @@ public class DeviceTest: BaseTest
 		protected static bool IsDeviceAttached (bool refreshCachedValue = false)
 		{
 			if (string.IsNullOrEmpty (_shellEchoOutput) || refreshCachedValue) {
+				// run this twice as sometimes the first time returns the
+				// device as "offline".
+				RunAdbCommand ("devices");
+				var devices = RunAdbCommand ("devices");
+				TestContext.Out.WriteLine ($"LOG adb devices: {devices}");
 				_shellEchoOutput = RunAdbCommand ("shell echo OK", timeout: 15);
 			}
 			return _shellEchoOutput.Contains ("OK");
@@ -58,11 +63,14 @@ public void DeviceSetup ()
 							DeviceAbi = RunAdbCommand ("shell getprop ro.product.cpu.abilist64").Trim ();
 
 						if (string.IsNullOrEmpty (DeviceAbi))
-							DeviceAbi = RunAdbCommand ("shell getprop ro.product.cpu.abi") ?? RunAdbCommand ("shell getprop ro.product.cpu.abi2");
+							DeviceAbi = (RunAdbCommand ("shell getprop ro.product.cpu.abi") ?? RunAdbCommand ("shell getprop ro.product.cpu.abi2")) ?? "x86_64";
 
 						if (DeviceAbi.Contains (",")) {
 							DeviceAbi = DeviceAbi.Split (',')[0];
 						}
+					} else {
+						TestContext.Out.WriteLine ($"LOG GetSdkVersion: {DeviceSdkVersion}");
+						DeviceAbi = "x86_64";
 					}
 				} catch (Exception ex) {
 					Console.Error.WriteLine ("Failed to determine whether there is Android target emulator or not: " + ex);