1 files changed, 19 insertions, 16 deletions

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 3112d22ae59..7bb6bbc4647 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -178,22 +178,6 @@ bool AndroidBuildApkStep::init()
         return false;
     }
 
-    auto parser = new JavaParser;
-    parser->setProjectFileList(Utils::transform(target()->project()->files(ProjectExplorer::Project::AllFiles),
-                                                &Utils::FilePath::toString));
-
-    const QString buildKey = target()->activeBuildKey();
-    const ProjectNode *node = target()->project()->findNodeForBuildKey(buildKey);
-
-    QString sourceDirName;
-    if (node)
-        sourceDirName = node->data(Constants::AndroidPackageSourceDir).toString();
-
-    QFileInfo sourceDirInfo(sourceDirName);
-    parser->setSourceDirectory(Utils::FilePath::fromString(sourceDirInfo.canonicalFilePath()));
-    parser->setBuildDirectory(buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY));
-    setOutputParser(parser);
-
     m_openPackageLocationForRun = m_openPackageLocation;
 
     if (m_buildAAB) {
@@ -218,6 +202,8 @@ bool AndroidBuildApkStep::init()
 
     QString outputDir = buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString();
 
+    const QString buildKey = target()->activeBuildKey();
+    const ProjectNode *node = project()->findNodeForBuildKey(buildKey);
     if (node)
         m_inputFile = node->data(Constants::AndroidDeploySettingsFile).toString();
 
@@ -285,6 +271,23 @@ bool AndroidBuildApkStep::init()
     return true;
 }
 
+void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter)
+{
+    const auto parser = new JavaParser;
+    parser->setProjectFileList(Utils::transform(project()->files(ProjectExplorer::Project::AllFiles),
+                                                &Utils::FilePath::toString));
+    const QString buildKey = target()->activeBuildKey();
+    const ProjectNode *node = project()->findNodeForBuildKey(buildKey);
+    QString sourceDirName;
+    if (node)
+        sourceDirName = node->data(Constants::AndroidPackageSourceDir).toString();
+    QFileInfo sourceDirInfo(sourceDirName);
+    parser->setSourceDirectory(Utils::FilePath::fromString(sourceDirInfo.canonicalFilePath()));
+    parser->setBuildDirectory(buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY));
+    formatter->addLineParser(parser);
+    AbstractProcessStep::setupOutputFormatter(formatter);
+}
+
 void AndroidBuildApkStep::showInGraphicalShell()
 {
     Core::FileUtils::showInGraphicalShell(Core::ICore::mainWindow(), m_packagePath);