Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ public virtual void Initialize (string androidSdkPath = null, string androidNdkP
if (!string.IsNullOrEmpty (AndroidNdkPath)) {
// It would be nice if .NET had real globbing support in System.IO...
string toolchainsDir = Path.Combine (AndroidNdkPath, "toolchains");
IsNdk64Bit = Directory.EnumerateDirectories (toolchainsDir, "arm-linux-androideabi-*")
.Any (dir => Directory.Exists (Path.Combine (dir, "prebuilt", NdkHostPlatform64Bit)));
if (Directory.Exists (toolchainsDir)) {
IsNdk64Bit = Directory.EnumerateDirectories (toolchainsDir, "arm-linux-androideabi-*")
.Any (dir => Directory.Exists (Path.Combine (dir, "prebuilt", NdkHostPlatform64Bit)));
}
}
// we need to look for extensions other than the default .exe|.bat
// google have a habbit of changing them.
Expand Down