[Xamarin.Android.Tools.AndroidSdk] OS-specific dirs are OS-specific (#250)

jonpryor · jonpryor · commit 5612c1a2a122 · 2025-03-21T08:30:52.000-04:00
OS-specific JDK locators should only be attempted on the OS that
they're intended for: macOS-specific JDK probe mechanisms such as
`/usr/libexec/java_home -X` should only be used on macOS, and
Linux-specific JDK probe mechanisms such as looking at
`/usr/lib/jvm/*` should only be done on Linux.
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
@@ -383,6 +383,10 @@ static IEnumerable<JdkInfo> GetLibexecJdks (Action<TraceLevel, string> logger)
 
 		static IEnumerable<string> GetLibexecJdkPaths (Action<TraceLevel, string> logger)
 		{
+			if (!OS.IsMac) {
+				yield break;
+			}
+
 			var java_home	= Path.GetFullPath ("/usr/libexec/java_home");
 			if (!File.Exists (java_home)) {
 				yield break;
@@ -429,6 +433,10 @@ static IEnumerable<JdkInfo> GetJavaAlternativesJdks (Action<TraceLevel, string>
 
 		static IEnumerable<string> GetJavaAlternativesJdkPaths ()
 		{
+			if (!OS.IsLinux) {
+				return Enumerable.Empty<string> ();
+			}
+
 			var alternatives  = Path.GetFullPath ("/usr/sbin/update-java-alternatives");
 			if (!File.Exists (alternatives))
 				return Enumerable.Empty<string> ();
@@ -464,6 +472,10 @@ static IEnumerable<JdkInfo> GetLibJvmJdks (Action<TraceLevel, string> logger)
 
 		static IEnumerable<string> GetLibJvmJdkPaths ()
 		{
+			if (!OS.IsLinux) {
+				yield break;
+			}
+
 			var jvm = "/usr/lib/jvm";
 			if (!Directory.Exists (jvm))
 				yield break;
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftDistJdkLocations.cs b/src/Xamarin.Android.Tools.AndroidSdk/Jdks/MicrosoftDistJdkLocations.cs
@@ -18,6 +18,10 @@ internal static IEnumerable<JdkInfo> GetMicrosoftDistJdks (Action<TraceLevel, st
 
 		static IEnumerable<string> GetMacOSMicrosoftDistJdkPaths ()
 		{
+			if (!OS.IsMac) {
+				return Array.Empty<string> ();
+			}
+
 			var jdks    = AppDomain.CurrentDomain.GetData ($"GetMacOSMicrosoftJdkPaths jdks override! {typeof (JdkInfo).AssemblyQualifiedName}")
 				?.ToString ();
 			if (jdks == null) {
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/OS.cs b/src/Xamarin.Android.Tools.AndroidSdk/OS.cs
@@ -11,6 +11,7 @@ public class OS
 	{
 		public readonly static bool IsWindows;
 		public readonly static bool IsMac;
+		public readonly static bool IsLinux;
 
 		internal readonly static string? ProgramFilesX86;
 
@@ -20,6 +21,7 @@ static OS ()
 		{
 			IsWindows = Path.DirectorySeparatorChar == '\\';
 			IsMac = !IsWindows && IsRunningOnMac ();
+			IsLinux = !IsWindows && !IsMac;
 
 			if (IsWindows) {
 				ProgramFilesX86 = GetProgramFilesX86 ();
@@ -29,7 +31,7 @@ static OS ()
 				NativeLibraryFormat = "{0}.dll";
 			if (IsMac)
 				NativeLibraryFormat = "lib{0}.dylib";
-			if (!IsWindows && !IsMac)
+			if (IsLinux)
 				NativeLibraryFormat = "lib{0}.so";
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class OS`
`11`	`11`	`{`
`12`	`12`	`public readonly static bool IsWindows;`
`13`	`13`	`public readonly static bool IsMac;`
	`14`	`+ public readonly static bool IsLinux;`
`14`	`15`
`15`	`16`	`internal readonly static string? ProgramFilesX86;`
`16`	`17`
`@@ -20,6 +21,7 @@ static OS ()`
`20`	`21`	`{`
`21`	`22`	`IsWindows = Path.DirectorySeparatorChar == '\\';`
`22`	`23`	`IsMac = !IsWindows && IsRunningOnMac ();`
	`24`	`+ IsLinux = !IsWindows && !IsMac;`
`23`	`25`
`24`	`26`	`if (IsWindows) {`
`25`	`27`	`ProgramFilesX86 = GetProgramFilesX86 ();`
`@@ -29,7 +31,7 @@ static OS ()`
`29`	`31`	`NativeLibraryFormat = "{0}.dll";`
`30`	`32`	`if (IsMac)`
`31`	`33`	`NativeLibraryFormat = "lib{0}.dylib";`
`32`		`- if (!IsWindows && !IsMac)`
	`34`	`+ if (IsLinux)`
`33`	`35`	`NativeLibraryFormat = "lib{0}.so";`
`34`	`36`	`}`
`35`	`37`