From 357984bde665c80b60020a98d76a5e81ab9c163d Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Tue, 30 Aug 2016 17:14:09 +0200 Subject: [PATCH] Look for gdb in `android-sdk-tool/android-ndk/prebuilt/darwin-x86_64/bin/gdb` The gdb tool is not in the previous folder anymore, so we need to look for it at this place too. --- src/Xamarin.Android.Build.Tasks/Tasks/NdkUtils.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 +}