Android: Code cosmetics

Remove unused functions, inline rarely-used code, ...

Change-Id: Ib3b0645cebf6bfabea1f4f2b4c5a582afca18101
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

src/plugins/android/androidbuildapkstep.cpp

@@ -39,6 +39,7 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -133,6 +134,17 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
     setImmutable(true);
 }
 
+AndroidBuildApkStep *AndroidBuildApkStep::findInBuild(const BuildConfiguration *bc)
+{
+    if (!bc)
+        return nullptr;
+    for (const Core::Id &id : bc->knownStepLists()) {
+        if (auto step = bc->stepList(id)->firstOfType<AndroidBuildApkStep>())
+            return step;
+    }
+    return nullptr;
+}
+
 bool AndroidBuildApkStep::init()
 {
     ProjectExplorer::BuildConfiguration *bc = buildConfiguration();

src/plugins/android/androidbuildapkstep.h

@@ -45,6 +45,8 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
 public:
     AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
 
+    static AndroidBuildApkStep *findInBuild(const ProjectExplorer::BuildConfiguration *bc);
+
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 

src/plugins/android/androiddeployqtstep.cpp

@@ -128,7 +128,7 @@ bool AndroidDeployQtStep::init()
     ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
     QTC_ASSERT(deployQtLive || bc, return false);
 
-    auto androidBuildApkStep = AndroidGlobal::buildStep<AndroidBuildApkStep>(bc);
+    auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(bc);
     if (!androidBuildApkStep && !deployQtLive) {
         emit addOutput(tr("Cannot find the android build step."), OutputFormat::Stderr);
         return false;

src/plugins/android/androidglobal.h

@@ -38,19 +38,6 @@ namespace Android {
 class AndroidGlobal
 {
 public:
-
-    template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *dc)
-    {
-        if (!dc)
-            return nullptr;
-        foreach (const Core::Id &id, dc->knownStepLists()) {
-            T *const step = dc->stepList(id)->firstOfType<T>();
-            if (step)
-                return step;
-        }
-        return nullptr;
-    }
-
     template<typename State> static void assertState(State expected,
         State actual, const char *func)
     {

src/plugins/android/androidmanager.cpp

@@ -24,6 +24,8 @@
 ****************************************************************************/
 
 #include "androidmanager.h"
+
+#include "androidbuildapkstep.h"
 #include "androidconstants.h"
 #include "androiddeployconfiguration.h"
 #include "androidconfigurations.h"
@@ -255,9 +257,7 @@ int AndroidManager::minimumNDK(const Kit *kit)
 
 QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
 {
-    auto androidBuildApkStep
+    if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()))
-            = AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
-    if (androidBuildApkStep)
         return androidBuildApkStep->buildTargetSdk();
 
     QString fallback = AndroidConfig::apiLevelNameFor(
@@ -265,15 +265,6 @@ QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
     return fallback;
 }
 
-bool AndroidManager::signPackage(ProjectExplorer::Target *target)
-{
-    auto androidBuildApkStep
-            = AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
-    if (androidBuildApkStep)
-        return androidBuildApkStep->signPackage();
-    return false;
-}
-
 QString AndroidManager::targetArch(ProjectExplorer::Target *target)
 {
     auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitInformation::qtVersion(target->kit()));
@@ -291,9 +282,7 @@ Utils::FileName AndroidManager::apkPath(const ProjectExplorer::Target *target)
 {
     QTC_ASSERT(target, return Utils::FileName());
 
-    auto buildApkStep
+    auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration());
-        = Android::AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
-
     if (!buildApkStep)
         return Utils::FileName();
 
@@ -330,16 +319,6 @@ Utils::FileName AndroidManager::defaultPropertiesPath(ProjectExplorer::Target *t
     return dirPath(target).appendPath(AndroidDefaultPropertiesName);
 }
 
-bool AndroidManager::bundleQt(ProjectExplorer::Target *target)
-{
-    auto androidBuildApkStep
-            = AndroidGlobal::buildStep<AndroidBuildApkStep>(target->activeBuildConfiguration());
-    if (androidBuildApkStep)
-        return !androidBuildApkStep->useMinistro();
-
-    return false;
-}
-
 QString AndroidManager::deviceSerialNumber(ProjectExplorer::Target *target)
 {
     return target->namedSettings(AndroidDeviceSn).toString();

src/plugins/android/androidmanager.h

@@ -76,7 +76,6 @@ public:
     static QString intentName(ProjectExplorer::Target *target);
     static QString activityName(ProjectExplorer::Target *target);
 
-    static bool bundleQt(ProjectExplorer::Target *target);
     static QString deviceSerialNumber(ProjectExplorer::Target *target);
     static void setDeviceSerialNumber(ProjectExplorer::Target *target, const QString &deviceSerialNumber);
 
@@ -85,8 +84,6 @@ public:
 
     static QString buildTargetSDK(ProjectExplorer::Target *target);
 
-    static bool signPackage(ProjectExplorer::Target *target);
-
     static int minimumSDK(ProjectExplorer::Target *target);
     static int minimumSDK(const ProjectExplorer::Kit *kit);
     static int minimumNDK(const ProjectExplorer::Kit *kit);