diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f117c4c9e72..0a2faf9e8b0 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -413,16 +413,6 @@ FileName AndroidConfig::toolPath(Abi::Architecture architecture, const QString & .arg(toolsPrefix(architecture))); } -FileName AndroidConfig::stripPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const -{ - return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-strip" QTC_HOST_EXE_SUFFIX)); -} - -FileName AndroidConfig::readelfPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const -{ - return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-readelf" QTC_HOST_EXE_SUFFIX)); -} - FileName AndroidConfig::gccPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const { return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-gcc" QTC_HOST_EXE_SUFFIX)); @@ -446,17 +436,6 @@ FileName AndroidConfig::keytoolPath() const return openJDKBinPath().appendPath(keytoolName); } -FileName AndroidConfig::jarsignerPath() const -{ - return openJDKBinPath().appendPath(jarsignerName); -} - -FileName AndroidConfig::zipalignPath() const -{ - FileName path = m_sdkLocation; - return path.appendPath(QLatin1String("tools/zipalign" QTC_HOST_EXE_SUFFIX)); -} - QVector AndroidConfig::connectedDevices(QString *error) const { QVector devices; diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 3b28c80f794..025ca5dced5 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -126,10 +126,6 @@ public: Utils::FileName gdbPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; Utils::FileName keytoolPath() const; - Utils::FileName jarsignerPath() const; - Utils::FileName zipalignPath() const; - Utils::FileName stripPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; - Utils::FileName readelfPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; class CreateAvdInfo {