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

Android: Fix app_process not being copied for 32bit cpu abi

Browse Source 
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>
This commit is contained in:
Vikas Pachdha
2018-03-29 10:15:05 +02:00
parent 9d4cb68894
commit e6898fd863
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -158,8 +158,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
m_filesToPull["/system/bin/app_process32"] = buildDir + "app_process"; m_filesToPull["/system/bin/app_process32"] = buildDir + "app_process";
} }
} else { } else {
m_appProcessBinaries << QLatin1String("/system/bin/app_process32") m_filesToPull["/system/bin/app_process32"] = buildDir + "app_process";
<< QLatin1String("/system/bin/app_process"); m_filesToPull["/system/bin/app_process"] = buildDir + "app_process";
} }
m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName; m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName;

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

@@ -116,7 +116,6 @@ private:
QString m_avdName; QString m_avdName;
QString m_apkPath; QString m_apkPath;
QMap<QString, QString> m_filesToPull; QMap<QString, QString> m_filesToPull;
QStringList m_appProcessBinaries;
QString m_targetArch; QString m_targetArch;
bool m_uninstallPreviousPackage = false; bool m_uninstallPreviousPackage = false;