feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Inline aabPath computation

Browse Source 
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>
This commit is contained in:
hjk
2020-02-19 11:55:48 +01:00
parent 72d83fddf2
commit 04f933fd67
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -124,22 +124,6 @@ private:
this); 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) AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
: AbstractProcessStep(parent, id), : AbstractProcessStep(parent, id),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations:: m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
@@ -210,8 +194,17 @@ bool AndroidBuildApkStep::init()
setOutputParser(parser); setOutputParser(parser);
m_openPackageLocationForRun = m_openPackageLocation; 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; qCDebug(buildapkstepLog) << "Package path:" << m_packagePath;
if (!AbstractProcessStep::init()) if (!AbstractProcessStep::init())