From e6898fd863bfd671a0eacb2a46c33bbd35ee7fb8 Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Thu, 29 Mar 2018 10:15:05 +0200
Subject: [PATCH] Android: Fix app_process not being copied for 32bit cpu abi

Task-number: QTCREATORBUG-20084
Change-Id: Id06cfb6250030851211c7c170f8d0c8b0491b3d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/android/androiddeployqtstep.cpp | 4 ++--
 src/plugins/android/androiddeployqtstep.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 4207c25adab..ceede4e58d8 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -158,8 +158,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
             m_filesToPull["/system/bin/app_process32"] = buildDir + "app_process";
         }
     } else {
-        m_appProcessBinaries << QLatin1String("/system/bin/app_process32")
-                             << QLatin1String("/system/bin/app_process");
+        m_filesToPull["/system/bin/app_process32"] = buildDir + "app_process";
+        m_filesToPull["/system/bin/app_process"] = buildDir + "app_process";
     }
 
     m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName;
diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h
index fad99d545a1..4b5534fda59 100644
--- a/src/plugins/android/androiddeployqtstep.h
+++ b/src/plugins/android/androiddeployqtstep.h
@@ -116,7 +116,6 @@ private:
     QString m_avdName;
     QString m_apkPath;
     QMap<QString, QString> m_filesToPull;
-    QStringList m_appProcessBinaries;
 
     QString m_targetArch;
     bool m_uninstallPreviousPackage = false;