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

Android: Move aabPath() to only user

Browse Source 
This incidentally removes one of the activeBuildConfiguration uses.

Change-Id: I51b52a4da5f89b464b3b0644b09258ca76a2e872
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2019-12-20 13:48:45 +01:00
parent 809e62e373
commit bfc73a356c
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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())

19
src/plugins/android/androidmanager.cpp
View File

@@ -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) {

1
src/plugins/android/androidmanager.h
View File

@@ -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);