feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Ensure the correct sysroot is passed to debugger

Browse Source 
Change-Id: Iaa5e026eef658b7b729291beac30788f35c6489a
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Christian Stenger
2018-11-29 10:46:42 +01:00
parent 1d683dcc07
commit aa8629cbfd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddebugsupport.cpp
View File

@@ -147,9 +147,10 @@ void AndroidDebugSupport::start()
gdbServer.setPort(m_runner->gdbServerPort().number()); gdbServer.setPort(m_runner->gdbServerPort().number());
setRemoteChannel(gdbServer); setRemoteChannel(gdbServer);
int sdkVersion = qMax(AndroidManager::minimumSDK(target), AndroidManager::minimumNDK(target));
Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation() Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation()
.appendPath("platforms") .appendPath("platforms")
.appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target))) .appendPath(QString("android-%1").arg(sdkVersion))
.appendPath(toNdkArch(AndroidManager::targetArch(target))); .appendPath(toNdkArch(AndroidManager::targetArch(target)));
setSysRoot(sysRoot); setSysRoot(sysRoot);
qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot; qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot;