From 0fda5b635469ed7df20fa4ea0b05605b12f63cbc Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Mon, 14 Mar 2016 15:43:03 +0200
Subject: [PATCH] Android: Fix GDB location for NDK r11

In NDK r11 gdb was moved to <ndk_dir>/prebuilt/<host>/bin/gdb[.exe]

Change-Id: I8eebb552a92313c5f4f36611b26f54f7c9c6126f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
---
 src/plugins/android/androidconfigurations.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index ee4c7198eec..7dc4ac879fd 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -528,6 +528,10 @@ FileName AndroidConfig::gccPath(const Abi &abi, const QString &ndkToolChainVersi
 
 FileName AndroidConfig::gdbPath(const Abi &abi, const QString &ndkToolChainVersion) const
 {
+    const auto gdbPath = QString::fromLatin1("%1/prebuilt/%2/bin/gdb" QTC_HOST_EXE_SUFFIX).arg(m_ndkLocation.toString()).arg(toolchainHost());
+    if (QFile::exists(gdbPath))
+        return FileName::fromString(gdbPath);
+
     return toolPath(abi, ndkToolChainVersion).appendString(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
 }