From bfc73a356c27904ae78bc85a6dd95b215d2637dc Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 20 Dec 2019 13:48:45 +0100
Subject: [PATCH] Android: Move aabPath() to only user

This incidentally removes one of the activeBuildConfiguration uses.

Change-Id: I51b52a4da5f89b464b3b0644b09258ca76a2e872
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidbuildapkstep.cpp | 20 ++++++++++++++++++--
 src/plugins/android/androidmanager.cpp      | 19 -------------------
 src/plugins/android/androidmanager.h        |  1 -
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 62a77373500..faa5dd58523 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -124,6 +124,22 @@ 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)
     : AbstractProcessStep(parent, Constants::ANDROID_BUILD_APK_ID),
       m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
@@ -196,8 +212,8 @@ bool AndroidBuildApkStep::init()
     setOutputParser(parser);
 
     m_openPackageLocationForRun = m_openPackageLocation;
-    m_packagePath = m_buildAAB ? AndroidManager::aabPath(target()).toString()
-                           : AndroidManager::apkPath(target()).toString();
+    m_packagePath = m_buildAAB ? aabPath(buildConfiguration()).toString()
+                               : AndroidManager::apkPath(target()).toString();
     qCDebug(buildapkstepLog) << "Package path:" << m_packagePath;
 
     if (!AbstractProcessStep::init())
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 315ec204674..71509bbc7a0 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -315,25 +315,6 @@ Utils::FilePath AndroidManager::apkPath(const ProjectExplorer::Target *target)
     return dirPath(target).pathAppended(apkPath);
 }
 
-FilePath AndroidManager::aabPath(const Target *target)
-{
-    QTC_ASSERT(target, return Utils::FilePath());
-
-    auto bc = target->activeBuildConfiguration();
-    if (!bc)
-        return {};
-    auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
-    if (!buildApkStep)
-        return Utils::FilePath();
-
-    QString buildType;
-    if (buildApkStep->buildConfiguration()->buildType() == BuildConfiguration::Release)
-        buildType = "release";
-    else
-        buildType = "debug";
-    return dirPath(target).pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(buildType));
-}
-
 bool AndroidManager::matchedAbis(const QStringList &deviceAbis, const QStringList &appAbis)
 {
     for (const auto &abi : appAbis) {
diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h
index 49fc786b5fe..718e518e77a 100644
--- a/src/plugins/android/androidmanager.h
+++ b/src/plugins/android/androidmanager.h
@@ -103,7 +103,6 @@ public:
     static Utils::FilePath manifestSourcePath(ProjectExplorer::Target *target);
     static Utils::FilePath defaultPropertiesPath(ProjectExplorer::Target *target);
     static Utils::FilePath apkPath(const ProjectExplorer::Target *target);
-    static Utils::FilePath aabPath(const ProjectExplorer::Target *target);
     static bool matchedAbis(const QStringList &deviceAbis, const QStringList &appAbis);
     static QString devicePreferredAbi(const QStringList &deviceAbis, const QStringList &appAbis);
     static ProjectExplorer::Abi androidAbi2Abi(const QString &androidAbi);