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

Android: Remove some indirection when finding the minimum NDK

Browse Source 
One instance had (base) qt version already at hand, the other was
inside AndroidQtVersion itself.

Also remove the typo in the function name.

Change-Id: I8fb0a1cd11751e4dea1f29a99603ea6b0112c49e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-02-18 11:18:05 +01:00
parent 7f210bb7b2
commit 7a0ae39988
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
#include "androidglobal.h"
#include "androidrunner.h"
#include "androidmanager.h"
#include "androidqtversion.h"
#include <debugger/debuggerkitinformation.h>
#include <debugger/debuggerrunconfigurationaspect.h>
@@ -186,8 +187,11 @@ void AndroidDebugSupport::start()
gdbServer.setPort(m_runner->gdbServerPort().number());
setRemoteChannel(gdbServer);
int sdkVersion = qMax(AndroidManager::minimumSDK(target->kit()),
AndroidManager::minimumNDK(target->kit()));
auto qt = static_cast<AndroidQtVersion *>(qtVersion);
QTC_CHECK(qt);
const int minimumNdk = qt ? qt->minimumNDK() : 0;
int sdkVersion = qMax(AndroidManager::minimumSDK(target->kit()), minimumNdk);
Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation()
.appendPath("platforms")
.appendPath(QString("android-%1").arg(sdkVersion))