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

Android: Use new DebuggerRunTool interface

Browse Source 
Change-Id: I4e0c8670802724984827b57e5d713548ad446654
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-08-24 16:53:53 +02:00
parent 54a43de656
commit 69f3ddb213
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/android/androiddebugsupport.cpp
View File

@@ -108,41 +108,39 @@ void AndroidDebugSupport::start()
Target *target = runConfig->target(); Target *target = runConfig->target();
Kit *kit = target->kit(); Kit *kit = target->kit();
DebuggerStartParameters params; setStartMode(AttachToRemoteServer);
params.startMode = AttachToRemoteServer; setRunControlName(AndroidManager::packageName(target));
params.displayName = AndroidManager::packageName(target); setUseContinueInsteadOfRun(true);
params.useContinueInsteadOfRun = true; setAttachPid(m_runner->pid());
params.attachPID = m_runner->pid();
if (!Utils::HostOsInfo::isWindowsHost() && if (!Utils::HostOsInfo::isWindowsHost() &&
AndroidConfigurations::currentConfig().ndkVersion() >= QVersionNumber(11, 0, 0)) { AndroidConfigurations::currentConfig().ndkVersion() >= QVersionNumber(11, 0, 0)) {
params.useTargetAsync = true; setUseTargetAsync(true);
} }
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit);
if (isCppDebugging()) { if (isCppDebugging()) {
Utils::Port gdbServerPort = m_runner->gdbServerPort(); AndroidQtSupport *qtSupport = AndroidManager::androidQtSupport(target);
params.symbolFile = target->activeBuildConfiguration()->buildDirectory().toString() + "/app_process"; QStringList solibSearchPath = qtSupport->soLibSearchPath(target);
params.skipExecutableValidation = true; solibSearchPath.append(qtSoPaths(qtVersion));
params.useExtendedRemote = true; solibSearchPath.append(uniquePaths(qtSupport->androidExtraLibs(target)));
params.remoteChannel = ":" + gdbServerPort.toString(); setSolibSearchPath(solibSearchPath);
params.solibSearchPath = AndroidManager::androidQtSupport(target)->soLibSearchPath(target); setSymbolFile(target->activeBuildConfiguration()->buildDirectory().toString()
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + "/app_process");
params.solibSearchPath.append(qtSoPaths(version)); setSkipExecutableValidation(true);
params.solibSearchPath.append(uniquePaths(AndroidManager::androidQtSupport(target)->androidExtraLibs(target))); setUseExtendedRemote(true);
params.sysRoot = AndroidConfigurations::currentConfig().ndkLocation().appendPath("platforms") setGdbServerChannel(":" + m_runner->gdbServerPort().toString());
setSysRoot(AndroidConfigurations::currentConfig().ndkLocation().appendPath("platforms")
.appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target))) .appendPath(QString("android-%1").arg(AndroidManager::minimumSDK(target)))
.appendPath(toNdkArch(AndroidManager::targetArch(target))).toString(); .appendPath(toNdkArch(AndroidManager::targetArch(target))).toString());
} }
if (isQmlDebugging()) { if (isQmlDebugging()) {
params.qmlServer = m_runner->qmlServer(); setQmlServer(m_runner->qmlServer());
//TODO: Not sure if these are the right paths. //TODO: Not sure if these are the right paths.
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); if (qtVersion)
if (version) { addSearchDirectory(qtVersion->qmakeProperty("QT_INSTALL_QML"));
const QString qmlQtDir = version->qmakeProperty("QT_INSTALL_QML");
params.additionalSearchDirectories = QStringList(qmlQtDir);
} }
}
setStartParameters(params);
// FIXME: Move signal to base class and generalize handling. // FIXME: Move signal to base class and generalize handling.
connect(this, &DebuggerRunTool::aboutToNotifyInferiorSetupOk, connect(this, &DebuggerRunTool::aboutToNotifyInferiorSetupOk,