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

Android M: Use readlink without -s

Browse Source 
Apparently the readlink on android M no longer supports that
option.

Change-Id: I27d5539ad746daa82b928801391597e43ed96cca
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2015-06-11 16:51:39 +02:00
parent 2e061f8c94
commit 8e2370638a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ bool AndroidDeployQtStep::init()
m_avdName = info.avdname;
m_serialNumber = info.serialNumber;
m_appProcess = QLatin1String("readlink -f -s /system/bin/app_process");
m_appProcess = QLatin1String("readlink -f /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)
@@ -476,7 +476,11 @@ QString AndroidDeployQtStep::systemAppProcessFilePath() const
<< m_appProcess;
proc.start(m_adbPath, args);
proc.waitForFinished();
return QString::fromUtf8(proc.readAll()).trimmed();
QString output = QString::fromUtf8(proc.readAll()).trimmed();
if (output.startsWith(QLatin1Char('/')))
return output;
else
return QString();
}
ProjectExplorer::BuildStepConfigWidget *AndroidDeployQtStep::createConfigWidget()