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

6
src/plugins/android/androidmanager.cpp
View File

@@ -248,12 +248,6 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
return minSDKVersion; return minSDKVersion;
} }
int AndroidManager::minimumNDK(const Kit *kit)
{
auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(kit));
return qt->mininmumNDK();
}
QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
{ {
if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration())) if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()))

1
src/plugins/android/androidmanager.h
View File

@@ -86,7 +86,6 @@ public:
static int minimumSDK(ProjectExplorer::Target *target); static int minimumSDK(ProjectExplorer::Target *target);
static int minimumSDK(const ProjectExplorer::Kit *kit); static int minimumSDK(const ProjectExplorer::Kit *kit);
static int minimumNDK(const ProjectExplorer::Kit *kit);
static QString targetArch(ProjectExplorer::Target *target); static QString targetArch(ProjectExplorer::Target *target);

4
src/plugins/android/androidqtversion.cpp
View File

@@ -99,7 +99,7 @@ void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) c
env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost()); env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost());
env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation().toUserOutput()); env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation().toUserOutput());
env.set(QLatin1String("ANDROID_NDK_PLATFORM"), env.set(QLatin1String("ANDROID_NDK_PLATFORM"),
config.bestNdkPlatformMatch(qMax(AndroidManager::minimumNDK(k), AndroidManager::minimumSDK(k)))); config.bestNdkPlatformMatch(qMax(minimumNDK(), AndroidManager::minimumSDK(k))));
} }
Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const
@@ -121,7 +121,7 @@ QString AndroidQtVersion::targetArch() const
return m_targetArch; return m_targetArch;
} }
int AndroidQtVersion::mininmumNDK() const int AndroidQtVersion::minimumNDK() const
{ {
ensureMkSpecParsed(); ensureMkSpecParsed();
return m_minNdk; return m_minNdk;

3
src/plugins/android/androidqtversion.h
View File

@@ -55,7 +55,8 @@ public:
QString description() const override; QString description() const override;
QString targetArch() const; QString targetArch() const;
int mininmumNDK() const; int minimumNDK() const;
protected: protected:
void parseMkSpec(ProFileEvaluator *) const override; void parseMkSpec(ProFileEvaluator *) const override;
private: private: