diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-18 18:37:05 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-02-16 16:04:03 +0000 |
| commit | cb48e4854aaade6216ffca4060885a8ce16367d7 (patch) | |
| tree | 9fc06c2f0b031690a4a143aec92ab9175a34c8ab /src/plugins/android/androidconfigurations.h | |
| parent | e1c426f2bcd372fe8d47666b33cf6f1d2a23905f (diff) | |
| download | qt-creator-cb48e4854aaade6216ffca4060885a8ce16367d7.tar.gz | |
Android 64bit toolchains
Change-Id: Ia2b57013b392237434ea3649c4f60a671e84ceb5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidconfigurations.h')
| -rw-r--r-- | src/plugins/android/androidconfigurations.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 55152b81e1..7c1d7649f9 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -126,8 +126,8 @@ public: Utils::FileName emulatorToolPath() const; - Utils::FileName gccPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; - Utils::FileName gdbPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; + Utils::FileName gccPath(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion) const; + Utils::FileName gdbPath(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion) const; Utils::FileName keytoolPath() const; @@ -156,9 +156,10 @@ public: QString waitForAvd(int apiLevel, const QString &cpuAbi, const QFutureInterface<bool> &fi = QFutureInterface<bool>()) const; QString bestNdkPlatformMatch(int target) const; - static ProjectExplorer::Abi::Architecture architectureForToolChainPrefix(const QString &toolchainprefix); - static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture); - static QLatin1String toolsPrefix(ProjectExplorer::Abi::Architecture architecture); + static ProjectExplorer::Abi abiForToolChainPrefix(const QString &toolchainPrefix); + static QLatin1String toolchainPrefix(const ProjectExplorer::Abi &abi); + static QLatin1String toolsPrefix(const ProjectExplorer::Abi &abi); + static QLatin1String displayName(const ProjectExplorer::Abi &abi); QString getProductModel(const QString &device) const; bool hasFinishedBooting(const QString &device) const; @@ -170,7 +171,7 @@ private: static CreateAvdInfo createAVDImpl(CreateAvdInfo info, Utils::FileName androidToolPath, Utils::Environment env); static QVector<AndroidDeviceInfo> androidVirtualDevicesImpl(const Utils::FileName &androidTool, const Utils::Environment &environment); - Utils::FileName toolPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; + Utils::FileName toolPath(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion) const; Utils::FileName openJDKBinPath() const; int getSDKVersion(const QString &device) const; QStringList getAbis(const QString &device) const; |