diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp
index 9067f5b36df..02d0c3e92b5 100644
--- a/src/plugins/android/androidbuildapkwidget.cpp
+++ b/src/plugins/android/androidbuildapkwidget.cpp
@@ -35,6 +35,8 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -53,6 +55,8 @@
 
 #include <algorithm>
 
+using namespace ProjectExplorer;
+
 namespace Android {
 namespace Internal {
 
@@ -291,9 +295,10 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
     connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged,
             additionalLibrariesGroupBox, &QWidget::setEnabled);
 
-    AndroidQtSupport *qtSupport = AndroidManager::androidQtSupport(m_step->target());
-    QTC_ASSERT(qtSupport, return);
-    additionalLibrariesGroupBox->setEnabled(qtSupport->extraLibraryEnabled(m_step->target()));
+    Target *target = m_step->target();
+    RunConfiguration *rc = target->activeRunConfiguration();
+    const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr;
+    additionalLibrariesGroupBox->setEnabled(node && !node->parseInProgress());
 }
 
 void AndroidBuildApkWidget::addAndroidExtraLib()
diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h
index aa112486265..bfd551c6c38 100644
--- a/src/plugins/android/androidqtsupport.h
+++ b/src/plugins/android/androidqtsupport.h
@@ -67,8 +67,6 @@ public:
     virtual bool setTargetData(Core::Id role, const QVariant &value,
                                const ProjectExplorer::Target *target) const = 0;
 
-    virtual bool extraLibraryEnabled(const ProjectExplorer::Target *target) const = 0;
-
     virtual void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
                           const QStringList &addedFiles) const = 0;
 };
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
index f2f17d5b91e..f83f024cfec 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
@@ -87,12 +87,6 @@ static QmakeProFile *applicationProFile(const Target *target)
     return project->rootProFile()->findProFile(FileName::fromString(rc->buildKey()));
 }
 
-bool QmakeAndroidSupport::extraLibraryEnabled(const Target *target) const
-{
-    QmakeProFile *pro = applicationProFile(target);
-    return pro && !pro->parseInProgress();
-}
-
 bool QmakeAndroidSupport::setTargetData(Core::Id role, const QVariant &value, const Target *target) const
 {
     QmakeProFile *pro = applicationProFile(target);
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
index efa1ff9c0cb..69f4db5022d 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
@@ -42,8 +42,6 @@ public:
     bool setTargetData(Core::Id role, const QVariant &value,
                        const ProjectExplorer::Target *target) const override;
 
-    bool extraLibraryEnabled(const ProjectExplorer::Target *target) const override;
-
     void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
                   const QStringList &addedFiles) const override;
 };