From 04f933fd671ef4495d45cd1c5bbee7fb3a8e9e28 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 19 Feb 2020 11:55:48 +0100
Subject: [PATCH] Android: Inline aabPath computation

Mainly to avoid an explicit use of BuildStep::buildConfiguration()

Change-Id: I96f1403d0aa2b9f5bcde06e994809466700b1357
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidbuildapkstep.cpp | 29 ++++++++-------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 1b223637383..4384d8c89a6 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -124,22 +124,6 @@ private:
                                                        this);
 };
 
-static FilePath aabPath(const BuildConfiguration *bc)
-{
-    if (!bc)
-        return {};
-
-    QString buildType;
-    if (bc->buildType() == BuildConfiguration::Release)
-        buildType = "release";
-    else
-        buildType = "debug";
-
-    return bc->buildDirectory()
-            .pathAppended(Constants::ANDROID_BUILDDIRECTORY)
-            .pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(buildType));
-}
-
 AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
     : AbstractProcessStep(parent, id),
       m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
@@ -210,8 +194,17 @@ bool AndroidBuildApkStep::init()
     setOutputParser(parser);
 
     m_openPackageLocationForRun = m_openPackageLocation;
-    m_packagePath = m_buildAAB ? aabPath(buildConfiguration()).toString()
-                               : AndroidManager::apkPath(target()).toString();
+
+    if (m_buildAAB) {
+        const QString bt = buildType() == BuildConfiguration::Release ? QLatin1String("release")
+                                                                      : QLatin1String("debug");
+        m_packagePath = buildDirectory()
+                .pathAppended(Constants::ANDROID_BUILDDIRECTORY)
+                .pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(bt)).toString();
+    } else {
+        m_packagePath = AndroidManager::apkPath(target()).toString();
+    }
+
     qCDebug(buildapkstepLog) << "Package path:" << m_packagePath;
 
     if (!AbstractProcessStep::init())