From aa8629cbfd089e8dca310e6bae7214adbdb8fdaa Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Thu, 29 Nov 2018 10:46:42 +0100
Subject: [PATCH] Android: Ensure the correct sysroot is passed to debugger

Change-Id: Iaa5e026eef658b7b729291beac30788f35c6489a
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/android/androiddebugsupport.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 03f322ba784..5025ca74df9 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -147,9 +147,10 @@ void AndroidDebugSupport::start()
         gdbServer.setPort(m_runner->gdbServerPort().number());
         setRemoteChannel(gdbServer);
 
+        int sdkVersion = qMax(AndroidManager::minimumSDK(target), AndroidManager::minimumNDK(target));
         Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation()
                 .appendPath("platforms")
-                .appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target)))
+                .appendPath(QString("android-%1").arg(sdkVersion))
                 .appendPath(toNdkArch(AndroidManager::targetArch(target)));
         setSysRoot(sysRoot);
         qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot;