From 69ff17aa2d599717efbc6565f7b6574b441cf91b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 13 Aug 2020 16:47:33 +0200
Subject: [PATCH] Android: Use new AbstractProcessStep convenience functions

Change-Id: I3fa4dcdd210f4c5d492217f2e3f1ceca353a4161
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/android/androidbuildapkstep.cpp    | 18 ++++--------------
 .../android/androidpackageinstallationstep.cpp |  7 ++-----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 751db7abe82..78065d7dd7f 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -86,18 +86,6 @@ const char KeystoreLocationKey[] = "KeystoreLocation";
 const char BuildTargetSdkKey[] = "BuildTargetSdk";
 const char VerboseOutputKey[] = "VerboseOutput";
 
-static void setupProcessParameters(ProcessParameters *pp,
-                                   BuildStep *step,
-                                   const QStringList &arguments,
-                                   const QString &command)
-{
-    pp->setMacroExpander(step->macroExpander());
-    pp->setWorkingDirectory(step->buildDirectory());
-    Utils::Environment env = step->buildEnvironment();
-    pp->setEnvironment(env);
-    pp->setCommandLine({command, arguments});
-}
-
 class PasswordInputDialog : public QDialog
 {
     Q_OBJECT
@@ -257,11 +245,13 @@ bool AndroidBuildApkStep::init()
     }
 
     ProjectExplorer::ProcessParameters *pp = processParameters();
-    Android::setupProcessParameters(pp, this, arguments, command);
+    setupProcessParameters(pp);
+    pp->setCommandLine({command, arguments});
 
     // Generate arguments with keystore password concealed
     ProjectExplorer::ProcessParameters pp2;
-    Android::setupProcessParameters(&pp2, this, argumentsPasswordConcealed, command);
+    setupProcessParameters(&pp2);
+    pp->setCommandLine({command, argumentsPasswordConcealed});
     m_command = pp2.effectiveCommand().toString();
     m_argumentsPasswordConcealed = pp2.prettyArguments();
 
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index 3d881e82947..29ca7e9b4ee 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -85,6 +85,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
     setSummaryUpdater([this] {
         return tr("<b>Make install:</b> Copy App Files to %1").arg(nativeAndroidBuildPath());
     });
+    setUseEnglishOutput();
 }
 
 bool AndroidPackageInstallationStep::init()
@@ -100,11 +101,7 @@ bool AndroidPackageInstallationStep::init()
     cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
 
     ProcessParameters *pp = processParameters();
-    pp->setMacroExpander(macroExpander());
-    pp->setWorkingDirectory(buildDirectory());
-    Environment env = buildEnvironment();
-    Environment::setupEnglishOutput(&env);
-    pp->setEnvironment(env);
+    setupProcessParameters(pp);
     pp->setCommandLine(cmd);
 
     m_androidDirsToClean.clear();