diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 770f956..44fb12a 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -202,7 +202,7 @@ bool AndroidDeployQtStep::init() m_avdName = info.avdname; m_serialNumber = info.serialNumber; - m_appProcess = QLatin1String("readlink -f /system/bin/app_process"); + m_appProcess = QLatin1String("/system/bin/app_process"); if (info.cpuAbi.contains(QLatin1String("arm64-v8a"))) { ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(target()->kit()); if (tc && tc->targetAbi().wordWidth() == 64) @@ -473,14 +473,14 @@ QString AndroidDeployQtStep::systemAppProcessFilePath() const QProcess proc; const QStringList args = QStringList() << AndroidDeviceInfo::adbSelector(m_serialNumber) << QLatin1String("shell") - << m_appProcess; + << QString::fromLatin1("readlink -f %1").arg(m_appProcess); proc.start(m_adbPath, args); proc.waitForFinished(); - QString output = QString::fromUtf8(proc.readAll()).trimmed(); - if (output.startsWith(QLatin1Char('/'))) + QString output = QString::fromUtf8(proc.readAllStandardOutput()).trimmed(); + if (output.startsWith(QLatin1Char('/')) && !output.contains(QLatin1String("not found"))) return output; else - return QString(); + return m_appProcess; } ProjectExplorer::BuildStepConfigWidget *AndroidDeployQtStep::createConfigWidget()