GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix exception when loading Android NDKs with invalid version folder

Browse Source 
Fixes #255
This commit is contained in:
Wojtek Figat
2021-02-21 14:10:51 +01:00
parent ae44ef0a79
commit 68b4fdb9c3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
View File

@@ -42,7 +42,19 @@ namespace Flax.Build.Platforms
var subdirs = Directory.GetDirectories(Path.Combine(AndroidSdk.Instance.RootPath, "ndk")); var subdirs = Directory.GetDirectories(Path.Combine(AndroidSdk.Instance.RootPath, "ndk"));
if (subdirs.Length != 0) if (subdirs.Length != 0)
{ {
Array.Sort(subdirs, (a, b) => Version.Parse(Path.GetFileName(a)).CompareTo(Version.Parse(Path.GetFileName(b)))); Array.Sort(subdirs, (a, b) =>
{
Version va, vb;
if (Version.TryParse(a, out va))
{
if (Version.TryParse(b, out vb))
return va.CompareTo(vb);
return 1;
}
if (Version.TryParse(b, out vb))
return -1;
return 0;
});
sdkPath = subdirs.Last(); sdkPath = subdirs.Last();
} }
} }
@@ -56,11 +68,14 @@ namespace Flax.Build.Platforms
var lines = File.ReadAllLines(Path.Combine(sdkPath, "source.properties")); var lines = File.ReadAllLines(Path.Combine(sdkPath, "source.properties"));
if (lines.Length > 1) if (lines.Length > 1)
{ {
RootPath = sdkPath;
var ver = lines[1].Substring(lines[1].IndexOf(" = ", StringComparison.Ordinal) + 2); var ver = lines[1].Substring(lines[1].IndexOf(" = ", StringComparison.Ordinal) + 2);
Version = Version.Parse(ver); if (Version.TryParse(ver, out var v))
IsValid = true; {
Log.Info(string.Format("Found Android NDK {1} at {0}", RootPath, Version)); RootPath = sdkPath;
Version = v;
IsValid = true;
Log.Info(string.Format("Found Android NDK {1} at {0}", RootPath, Version));
}
} }
} }
} }