From efdbe405f4b051880498ab041d0560db1c1c7fde Mon Sep 17 00:00:00 2001 From: Juan Marcelo Tondato Date: Thu, 27 Jun 2019 14:00:58 -0300 Subject: [PATCH] Avoids ArgumentNullException trying to get the list of available NDK if the AndroidSdk path is null fixes bug 938504: AndroidSdk initialization fails with a System.ArgumentNullException when no AndroidSdk is detected on the user machine https://devdiv.visualstudio.com/DevDiv/_workitems/edit/938504 --- src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs index 549267e..a8b30ce 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs @@ -229,7 +229,8 @@ protected override IEnumerable GetAllAvailableAndroidNdks () string ndk; var sdks = GetAllAvailableAndroidSdks().ToList(); - sdks.Add(AndroidSdkPath); + if (!string.IsNullOrEmpty(AndroidSdkPath)) + sdks.Add(AndroidSdkPath); foreach(var sdk in sdks.Distinct()) if (Directory.Exists(ndk = Path.Combine(sdk, "ndk-bundle")))