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

Android: Auto detect clang toolchains

Browse Source 
Remove GCC auto detection
Make Clang toochain default for Android
Remove auto detected toolchains from old NDK

Task-number: QTCREATORBUG-11846
Change-Id: I618e6f8eda4f24f498260b8de778ef543311acd1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Vikas Pachdha
2018-10-25 18:12:43 +02:00
parent dabe72b7bb
commit de97b8cf3e
6 changed files with 153 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidconfigurations.h
View File

@@ -117,7 +117,6 @@ public:
void setKeystoreLocation(const Utils::FileName &keystoreLocation);
QString toolchainHost() const;
QStringList makeExtraSearchDirectories() const;
unsigned partitionSize() const;
void setPartitionSize(unsigned partitionSize);
@@ -134,10 +133,8 @@ public:
Utils::FileName avdManagerToolPath() const;
Utils::FileName aaptToolPath() const;
Utils::FileName gccPath(const ProjectExplorer::Abi &abi, Core::Id lang,
const QString &ndkToolChainVersion) const;
Utils::FileName gdbPath(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion) const;
Utils::FileName clangPath() const;
Utils::FileName gdbPath() const;
Utils::FileName makePath() const;
Utils::FileName keytoolPath() const;
@@ -162,7 +159,6 @@ public:
private:
static QString getDeviceProperty(const QString &adbToolPath, const QString &device, const QString &property);
Utils::FileName toolPath(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion) const;
Utils::FileName openJDKBinPath() const;
int getSDKVersion(const QString &device) const;
static int getSDKVersion(const QString &adbToolPath, const QString &device);
@@ -179,7 +175,6 @@ private:
Utils::FileName m_ndkLocation;
Utils::FileName m_openJDKLocation;
Utils::FileName m_keystoreLocation;
QStringList m_makeExtraSearchDirectories;
unsigned m_partitionSize = 1024;
bool m_automaticKitCreation = true;