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

Android: also adb pull /system/bin/linker

Browse Source 
This is so that gdb can find the address of rtld_db_dlactivity
 to enable breakpoints pending on shared libraries to be set.

Several fixes were needed so this can be used both in Jellybean
 as well as older versions of Android. Credit for these
 improvements goes to Ryan Bissell:

  https://android-review.googlesource.com/#/c/39180/
  https://android-review.googlesource.com/#/c/42611/
  https://android-review.googlesource.com/#/c/42612/

Change-Id: Ibfb6335ab256df58b407e1661e1f04070fc3ecb6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ray Donnelly
2013-01-23 18:19:05 +00:00
committed by Daniel Teske
parent 632eaf06a9
commit 6fc9c0732b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,10 @@ bool AndroidDeployStep::deployPackage()
QStringList() << QLatin1String("-s") << m_deviceSerialNumber QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("pull") << QLatin1String("/system/bin/app_process") << QLatin1String("pull") << QLatin1String("/system/bin/app_process")
<< QString::fromLatin1("%1/app_process").arg(m_buildDirectory)); << QString::fromLatin1("%1/app_process").arg(m_buildDirectory));
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull")
<< QLatin1String("/system/bin/linker")
<< QString::fromLatin1("%1/linker").arg(m_buildDirectory));
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull") QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull")
<< QLatin1String("/system/lib/libc.so") << QLatin1String("/system/lib/libc.so")