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

Android: Inline *AndroidBuildApkStep::findInBuild() into callers

Browse Source 
This is an unusual and unneeded indirection.

Change-Id: If0e241364899555f5fe6e07fed38f440bbf2812b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2019-12-20 10:54:54 +01:00
parent 20a5aa889f
commit d0b8e1a1ae
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,8 +250,10 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
{
if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()))
return androidBuildApkStep->buildTargetSdk();
if (auto bc = target->activeBuildConfiguration()) {
if (auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>())
return androidBuildApkStep->buildTargetSdk();
}
QString fallback = AndroidConfig::apiLevelNameFor(
AndroidConfigurations::sdkManager()->latestAndroidSdkPlatform());
@@ -297,7 +299,10 @@ Utils::FilePath AndroidManager::apkPath(const ProjectExplorer::Target *target)
{
QTC_ASSERT(target, return Utils::FilePath());
auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration());
auto bc = target->activeBuildConfiguration();
if (!bc)
return {};
auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
if (!buildApkStep)
return Utils::FilePath();
@@ -314,7 +319,10 @@ FilePath AndroidManager::aabPath(const Target *target)
{
QTC_ASSERT(target, return Utils::FilePath());
auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration());
auto bc = target->activeBuildConfiguration();
if (!bc)
return {};
auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
if (!buildApkStep)
return Utils::FilePath();