diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-01-23 18:19:05 +0000 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-01-24 12:05:13 +0100 |
| commit | 6fc9c0732bda2ada8954c6ca3ba11aed970be572 (patch) | |
| tree | 6c095d44ff3987a2429c951c7a08117c2d57fc0b | |
| parent | 632eaf06a9f4727c185bad2b43449e8d1f306658 (diff) | |
| download | qt-creator-6fc9c0732bda2ada8954c6ca3ba11aed970be572.tar.gz | |
Android: also adb pull /system/bin/linker
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>
| -rw-r--r-- | src/plugins/android/androiddeploystep.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index 286e147415..03853c59bc 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -313,6 +313,10 @@ bool AndroidDeployStep::deployPackage() << 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(), + QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull") << QLatin1String("/system/lib/libc.so") << QString::fromLatin1("%1/libc.so").arg(m_buildDirectory)); disconnect(deployProc, 0, this, 0); |