1 files changed, 2 insertions, 25 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 7e91db6ef8..55ae7a5cdc 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -24,8 +24,6 @@
 ****************************************************************************/
 #include "androidavdmanager.h"
 
-#include "androidtoolmanager.h"
-
 #include <coreplugin/icore.h>
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
@@ -62,7 +60,6 @@ const char avdInfoSdcardKey[] = "Sdcard";
 const char avdInfoTargetTypeKey[] = "Target";
 const char avdInfoDeviceKey[] = "Device";
 const char avdInfoSkinKey[] = "Skin";
-const char googleApiTag[] = "google_apis";
 
 const int avdCreateTimeoutMs = 30000;
 
@@ -77,7 +74,7 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
     Utils::SynchronousProcess proc;
     auto env = AndroidConfigurations::toolsEnvironment(config).toStringList();
     proc.setEnvironment(env);
-    qCDebug(avdManagerLog) << "Running command:" << cmd.toUserOutput();
+    qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
     SynchronousProcessResponse response = proc.runBlocking(cmd);
     if (response.result == Utils::SynchronousProcessResponse::Finished) {
         if (output)
@@ -139,7 +136,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
 
     const QString avdManagerTool = config.avdManagerToolPath().toString();
     qCDebug(avdManagerLog)
-            << "Running command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
+            << "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
     QProcess proc;
     proc.start(avdManagerTool, arguments);
     if (!proc.waitForStarted()) {
@@ -223,7 +220,6 @@ private:
 
 AndroidAvdManager::AndroidAvdManager(const AndroidConfig &config):
     m_config(config),
-    m_androidTool(new AndroidToolManager(m_config)),
     m_parser(new AvdManagerOutputParser)
 {
 
@@ -231,29 +227,13 @@ AndroidAvdManager::AndroidAvdManager(const AndroidConfig &config):
 
 AndroidAvdManager::~AndroidAvdManager() = default;
 
-void AndroidAvdManager::launchAvdManagerUiTool() const
-{
-    if (m_config.useNativeUiTools()) {
-        m_androidTool->launchAvdManager();
-     } else {
-        qCDebug(avdManagerLog) << "AVD Ui tool launch failed. UI tool not available"
-                               << m_config.sdkToolsVersion();
-    }
-}
-
 QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
 {
-    if (m_config.useNativeUiTools())
-        return m_androidTool->createAvd(info);
-
     return Utils::runAsync(&createAvdCommand, m_config, info);
 }
 
 bool AndroidAvdManager::removeAvd(const QString &name) const
 {
-    if (m_config.useNativeUiTools())
-        return m_androidTool->removeAvd(name);
-
     const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
     qCDebug(avdManagerLog) << "Running command (removeAvd):" << command.toUserOutput();
     Utils::SynchronousProcess proc;
@@ -264,9 +244,6 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
 
 QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const
 {
-    if (m_config.useNativeUiTools())
-        return m_androidTool->androidVirtualDevicesFuture();
-
     return Utils::runAsync(&AvdManagerOutputParser::listVirtualDevices, m_parser.get(), m_config);
 }