diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/NdkUtils.cs b/src/Xamarin.Android.Build.Tasks/Tasks/NdkUtils.cs index b4139f87c63..4928b6dfbca 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/NdkUtils.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/NdkUtils.cs @@ -80,6 +80,15 @@ public static string GetNdkTool (string androidNdkPath, AndroidTargetArch arch, toolPaths = new List(); toolPaths.Add (path); } + { + string path = Path.Combine (androidNdkPath, "prebuilt", AndroidSdk.AndroidNdkHostPlatform, "bin", tool); + if (File.Exists (path)) + return path; + if (toolPaths == null) + toolPaths = new List(); + toolPaths.Add (path); + } + Diagnostic.Error (5101, "C compiler for target {0} was not found. Tried paths: \"{1}\"", arch, string.Join ("; ", toolPaths)); @@ -224,4 +233,4 @@ public static bool IsNdk64BitArch (AndroidTargetArch arch) return arch == AndroidTargetArch.Arm64 || arch == AndroidTargetArch.X86_64; } } -} \ No newline at end of file +}