Skip to content

[macOS] fix DirectoryNotFoundException on clean systems #110

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

Merged
merged 1 commit into from
Mar 1, 2021
Merged

[macOS] fix DirectoryNotFoundException on clean systems #110

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ protected virtual IEnumerable<string> GetAllAvailableAndroidNdks ()
// Look in PATH
foreach (var ndkStack in ProcessUtils.FindExecutablesInPath (NdkStack)) {
var ndkDir = Path.GetDirectoryName (ndkStack);
if (ndkDir == null)
if (string.IsNullOrEmpty (ndkDir))
continue;
yield return ndkDir;
}
Expand All @@ -161,12 +161,19 @@ protected virtual IEnumerable<string> GetAllAvailableAndroidNdks ()
foreach (var sdk in GetAllAvailableAndroidSdks ()) {
if (sdk == AndroidSdkPath)
continue;
yield return FindBestNDK (sdk);
var ndkDir = FindBestNDK (sdk);
if (string.IsNullOrEmpty (ndkDir))
continue;
yield return ndkDir;
}
}

string FindBestNDK (string androidSdkPath)
{
if (!Directory.Exists (androidSdkPath)) {
return String.Empty;
}

var ndkInstances = new SortedDictionary<Version, string> (Comparer<Version>.Create ((Version l, Version r) => r.CompareTo (l)));

foreach (string ndkPath in Directory.EnumerateDirectories (androidSdkPath, "ndk*", SearchOption.TopDirectoryOnly)) {
Expand Down
22 changes: 22 additions & 0 deletions tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,28 @@ public void Ndk_PathInSdk()
}
}

[Test]
public void Ndk_AndroidSdkDoesNotExist ()
{
CreateSdks (out string root, out string jdk, out string ndk, out string sdk);

Action<TraceLevel, string> logger = (level, message) => {
Console.WriteLine ($"[{level}] {message}");
if (level == TraceLevel.Error)
Assert.Fail (message);
};

var oldAndroidHome = Environment.GetEnvironmentVariable ("ANDROID_HOME");
try {
Environment.SetEnvironmentVariable ("ANDROID_HOME", "/i/dont/exist");
// Check that this doesn't throw
new AndroidSdkInfo (logger, androidSdkPath: sdk, androidNdkPath: null, javaSdkPath: jdk);
} finally {
Environment.SetEnvironmentVariable ("ANDROID_HOME", oldAndroidHome);
Directory.Delete (root, recursive: true);
}
}

[Test]
public void Constructor_SetValuesFromPath ()
{
Expand Down