From 6fc9c0732bda2ada8954c6ca3ba11aed970be572 Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 23 Jan 2013 18:19:05 +0000 Subject: [PATCH] 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> --- src/plugins/android/androiddeploystep.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index 286e1474151..03853c59bcd 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -311,6 +311,10 @@ bool AndroidDeployStep::deployPackage() QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull") << QLatin1String("/system/bin/app_process") << 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") -- GitLab