1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index a6f6c5d4a2..a727b3690c 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -27,6 +27,8 @@
 
 #include "android_global.h"
 #include "androidsdkpackage.h"
+#include "androidsdkmanager.h"
+
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtversionmanager.h>
 
@@ -124,7 +126,6 @@ public:
 
     Utils::FilePath ndkLocation(const QtSupport::BaseQtVersion *qtVersion) const;
     Utils::FilePath defaultNdkLocation() const;
-    Utils::FilePath gdbServer(const QString &androidAbi, const QtSupport::BaseQtVersion *qtVersion) const;
     QVersionNumber ndkVersion(const QtSupport::BaseQtVersion *qtVersion) const;
     QVersionNumber ndkVersion(const Utils::FilePath &ndkPath) const;
 
@@ -135,6 +136,8 @@ public:
     QStringList defaultEssentials() const;
     QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const;
     QStringList allEssentials() const;
+    bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
+    bool sdkToolsOk() const;
 
     Utils::FilePath openJDKLocation() const;
     void setOpenJDKLocation(const Utils::FilePath &openJDKLocation);
@@ -151,6 +154,7 @@ public:
     bool automaticKitCreation() const;
     void setAutomaticKitCreation(bool b);
 
+    static Utils::FilePath defaultSdkPath();
     Utils::FilePath adbToolPath() const;
     Utils::FilePath androidToolPath() const;
     Utils::FilePath emulatorToolPath() const;
@@ -175,7 +179,6 @@ public:
 
     QString bestNdkPlatformMatch(int target, const QtSupport::BaseQtVersion *qtVersion) const;
 
-    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);
@@ -185,7 +188,6 @@ public:
     OpenGl getOpenGLEnabled(const QString &emulator) const;
     bool isConnected(const QString &serialNumber) const;
 
-    bool useNativeUiTools() const;
     bool isCmdlineSdkToolsInstalled() const;
 
     bool sdkFullyConfigured() const { return m_sdkFullyConfigured; }
@@ -199,6 +201,7 @@ public:
     Utils::FilePath openSslLocation() const;
     void setOpenSslLocation(const Utils::FilePath &openSslLocation);
 
+    static Utils::FilePath getJdkPath();
 
 private:
     static QString getDeviceProperty(const Utils::FilePath &adbToolPath,