2022-08-19 15:59:36 +02:00
|
|
|
// Copyright (C) 2016 The Qt Company Ltd.
|
2022-12-21 10:12:09 +01:00
|
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
#include "androidavdmanager.h"
|
2022-10-06 17:53:35 +02:00
|
|
|
#include "androidtr.h"
|
2021-05-06 15:19:56 +02:00
|
|
|
#include "avdmanageroutputparser.h"
|
|
|
|
|
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <coreplugin/icore.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2020-07-23 15:48:56 +02:00
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
2021-05-05 18:21:22 +02:00
|
|
|
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <utils/algorithm.h>
|
2023-05-03 15:05:47 +02:00
|
|
|
#include <utils/async.h>
|
2023-05-03 17:05:35 +02:00
|
|
|
#include <utils/process.h>
|
2019-01-08 16:05:57 +01:00
|
|
|
#include <utils/qtcassert.h>
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
#include <QLoggingCategory>
|
2022-07-22 13:27:19 +02:00
|
|
|
#include <QMainWindow>
|
2018-04-18 12:23:02 +02:00
|
|
|
#include <QMessageBox>
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
#include <chrono>
|
|
|
|
|
|
2019-06-06 16:27:55 +02:00
|
|
|
using namespace Utils;
|
2023-03-09 12:04:09 +01:00
|
|
|
using namespace std;
|
2019-06-06 16:27:55 +02:00
|
|
|
|
2022-09-27 10:48:30 +02:00
|
|
|
namespace Android::Internal {
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
const int avdCreateTimeoutMs = 30000;
|
|
|
|
|
|
2022-09-27 10:48:30 +02:00
|
|
|
static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
|
|
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
/*!
|
|
|
|
|
Runs the \c avdmanager tool specific to configuration \a config with arguments \a args. Returns
|
|
|
|
|
\c true if the command is successfully executed. Output is copied into \a output. The function
|
|
|
|
|
blocks the calling thread.
|
|
|
|
|
*/
|
2020-02-10 16:02:24 +02:00
|
|
|
bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
2019-06-06 16:27:55 +02:00
|
|
|
CommandLine cmd(config.avdManagerToolPath(), args);
|
2023-05-03 16:00:22 +02:00
|
|
|
Process proc;
|
2023-07-27 14:44:44 +02:00
|
|
|
proc.setEnvironment(config.toolsEnvironment());
|
2022-07-06 18:02:52 +02:00
|
|
|
qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
|
2021-05-17 12:02:42 +02:00
|
|
|
proc.setCommand(cmd);
|
|
|
|
|
proc.runBlocking();
|
2022-03-02 04:12:25 +01:00
|
|
|
if (proc.result() == ProcessResult::FinishedWithSuccess) {
|
2017-04-03 11:11:17 +02:00
|
|
|
if (output)
|
2021-05-12 14:25:50 +02:00
|
|
|
*output = proc.allOutput();
|
2017-04-03 11:11:17 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool checkForTimeout(const chrono::steady_clock::time_point &start,
|
|
|
|
|
int msecs = 3000)
|
|
|
|
|
{
|
|
|
|
|
bool timedOut = false;
|
|
|
|
|
auto end = chrono::steady_clock::now();
|
|
|
|
|
if (chrono::duration_cast<chrono::milliseconds>(end-start).count() > msecs)
|
|
|
|
|
timedOut = true;
|
|
|
|
|
return timedOut;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-10 16:02:24 +02:00
|
|
|
static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateAvdInfo &info)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
2017-08-18 08:22:34 +02:00
|
|
|
CreateAvdInfo result = info;
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
if (!result.isValid()) {
|
|
|
|
|
qCDebug(avdManagerLog) << "AVD Create failed. Invalid CreateAvdInfo" << result.name
|
2020-01-08 14:55:16 +02:00
|
|
|
<< result.systemImage->displayText() << result.systemImage->apiLevel();
|
2022-10-06 17:53:35 +02:00
|
|
|
result.error = Tr::tr("Cannot create AVD. Invalid input.");
|
2017-04-03 11:11:17 +02:00
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2023-01-03 09:24:40 +01:00
|
|
|
CommandLine avdManager(config.avdManagerToolPath(), {"create", "avd", "-n", result.name});
|
|
|
|
|
avdManager.addArgs({"-k", result.systemImage->sdkStylePath()});
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
if (result.sdcardSize > 0)
|
2023-01-03 09:24:40 +01:00
|
|
|
avdManager.addArgs({"-c", QString("%1M").arg(result.sdcardSize)});
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2020-01-08 14:55:16 +02:00
|
|
|
if (!result.deviceDefinition.isEmpty() && result.deviceDefinition != "Custom")
|
2023-01-03 09:24:40 +01:00
|
|
|
avdManager.addArgs({"-d", QString("%1").arg(result.deviceDefinition)});
|
2020-01-08 14:55:16 +02:00
|
|
|
|
|
|
|
|
if (result.overwrite)
|
2023-01-03 09:24:40 +01:00
|
|
|
avdManager.addArg("-f");
|
2020-01-08 14:55:16 +02:00
|
|
|
|
2023-01-03 09:24:40 +01:00
|
|
|
qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << avdManager.toUserOutput();
|
2023-05-03 16:00:22 +02:00
|
|
|
Process proc;
|
2022-02-10 19:25:03 +01:00
|
|
|
proc.setProcessMode(ProcessMode::Writer);
|
2023-07-27 14:44:44 +02:00
|
|
|
proc.setEnvironment(config.toolsEnvironment());
|
2023-01-03 09:24:40 +01:00
|
|
|
proc.setCommand(avdManager);
|
2021-11-02 13:11:05 +01:00
|
|
|
proc.start();
|
2017-04-03 11:11:17 +02:00
|
|
|
if (!proc.waitForStarted()) {
|
2023-06-19 10:48:16 +02:00
|
|
|
result.error = Tr::tr("Could not start process \"%1\".").arg(avdManager.toUserOutput());
|
2017-04-03 11:11:17 +02:00
|
|
|
return result;
|
|
|
|
|
}
|
2021-11-22 11:21:35 +01:00
|
|
|
QTC_CHECK(proc.isRunning());
|
2022-04-27 14:19:49 +02:00
|
|
|
proc.write("yes\n"); // yes to "Do you wish to create a custom hardware profile"
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
auto start = chrono::steady_clock::now();
|
|
|
|
|
QString errorOutput;
|
|
|
|
|
QByteArray question;
|
|
|
|
|
while (errorOutput.isEmpty()) {
|
|
|
|
|
proc.waitForReadyRead(500);
|
2023-01-05 17:55:04 +01:00
|
|
|
question += proc.readAllRawStandardOutput();
|
2017-04-03 11:11:17 +02:00
|
|
|
if (question.endsWith(QByteArray("]:"))) {
|
|
|
|
|
// truncate to last line
|
|
|
|
|
int index = question.lastIndexOf(QByteArray("\n"));
|
|
|
|
|
if (index != -1)
|
|
|
|
|
question = question.mid(index);
|
|
|
|
|
if (question.contains("hw.gpu.enabled"))
|
2022-04-27 14:19:49 +02:00
|
|
|
proc.write("yes\n");
|
2017-04-03 11:11:17 +02:00
|
|
|
else
|
2022-04-27 14:19:49 +02:00
|
|
|
proc.write("\n");
|
2017-04-03 11:11:17 +02:00
|
|
|
question.clear();
|
|
|
|
|
}
|
|
|
|
|
// The exit code is always 0, so we need to check stderr
|
|
|
|
|
// For now assume that any output at all indicates a error
|
2023-01-05 17:55:04 +01:00
|
|
|
errorOutput = QString::fromLocal8Bit(proc.readAllRawStandardError());
|
2021-11-22 11:21:35 +01:00
|
|
|
if (!proc.isRunning())
|
2017-04-03 11:11:17 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// For a sane input and command, process should finish before timeout.
|
2022-10-06 17:53:35 +02:00
|
|
|
if (checkForTimeout(start, avdCreateTimeoutMs))
|
|
|
|
|
result.error = Tr::tr("Cannot create AVD. Command timed out.");
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result.error = errorOutput;
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-06 15:19:56 +02:00
|
|
|
AndroidAvdManager::AndroidAvdManager(const AndroidConfig &config)
|
|
|
|
|
: m_config(config)
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-25 12:19:15 +02:00
|
|
|
AndroidAvdManager::~AndroidAvdManager() = default;
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2017-08-18 08:22:34 +02:00
|
|
|
QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
2023-03-03 23:59:37 +01:00
|
|
|
return Utils::asyncRun(&createAvdCommand, m_config, info);
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidAvdManager::removeAvd(const QString &name) const
|
|
|
|
|
{
|
2020-01-13 16:01:56 +01:00
|
|
|
const CommandLine command(m_config.avdManagerToolPath(), {"delete", "avd", "-n", name});
|
2022-07-06 18:02:52 +02:00
|
|
|
qCDebug(avdManagerLog).noquote() << "Running command (removeAvd):" << command.toUserOutput();
|
2023-05-03 16:00:22 +02:00
|
|
|
Process proc;
|
2017-04-03 11:11:17 +02:00
|
|
|
proc.setTimeoutS(5);
|
2023-07-27 14:44:44 +02:00
|
|
|
proc.setEnvironment(m_config.toolsEnvironment());
|
2021-05-17 12:02:42 +02:00
|
|
|
proc.setCommand(command);
|
|
|
|
|
proc.runBlocking();
|
2022-03-02 04:12:25 +01:00
|
|
|
return proc.result() == ProcessResult::FinishedWithSuccess;
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
2022-11-25 19:43:34 +01:00
|
|
|
static void avdConfigEditManufacturerTag(const FilePath &avdPath, bool recoverMode = false)
|
2021-05-06 15:19:56 +02:00
|
|
|
{
|
2022-11-25 19:43:34 +01:00
|
|
|
if (!avdPath.exists())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
const FilePath configFilePath = avdPath / "config.ini";
|
|
|
|
|
FileReader reader;
|
|
|
|
|
if (!reader.fetch(configFilePath, QIODevice::ReadOnly | QIODevice::Text))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
FileSaver saver(configFilePath);
|
|
|
|
|
QTextStream textStream(reader.data());
|
|
|
|
|
while (!textStream.atEnd()) {
|
|
|
|
|
QString line = textStream.readLine();
|
|
|
|
|
if (line.contains("hw.device.manufacturer")) {
|
|
|
|
|
if (recoverMode)
|
|
|
|
|
line.replace("#", "");
|
|
|
|
|
else
|
|
|
|
|
line.prepend("#");
|
2021-05-06 15:19:56 +02:00
|
|
|
}
|
2022-11-25 19:43:34 +01:00
|
|
|
line.append("\n");
|
|
|
|
|
saver.write(line.toUtf8());
|
2021-05-06 15:19:56 +02:00
|
|
|
}
|
2022-11-25 19:43:34 +01:00
|
|
|
saver.finalize();
|
2021-05-06 15:19:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static AndroidDeviceInfoList listVirtualDevices(const AndroidConfig &config)
|
|
|
|
|
{
|
|
|
|
|
QString output;
|
|
|
|
|
AndroidDeviceInfoList avdList;
|
|
|
|
|
/*
|
|
|
|
|
Currenly avdmanager tool fails to parse some AVDs because the correct
|
|
|
|
|
device definitions at devices.xml does not have some of the newest devices.
|
|
|
|
|
Particularly, failing because of tag "hw.device.manufacturer", thus removing
|
|
|
|
|
it would make paring successful. However, it has to be returned afterwards,
|
|
|
|
|
otherwise, Android Studio would give an error during parsing also. So this fix
|
|
|
|
|
aim to keep support for Qt Creator and Android Studio.
|
|
|
|
|
*/
|
2022-11-25 19:43:34 +01:00
|
|
|
FilePaths allAvdErrorPaths;
|
|
|
|
|
FilePaths avdErrorPaths;
|
2021-05-06 15:19:56 +02:00
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
if (!AndroidAvdManager::avdManagerCommand(config, {"list", "avd"}, &output)) {
|
|
|
|
|
qCDebug(avdManagerLog)
|
|
|
|
|
<< "Avd list command failed" << output << config.sdkToolsVersion();
|
|
|
|
|
return {};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
avdErrorPaths.clear();
|
|
|
|
|
avdList = parseAvdList(output, &avdErrorPaths);
|
|
|
|
|
allAvdErrorPaths << avdErrorPaths;
|
2022-11-25 19:43:34 +01:00
|
|
|
for (const FilePath &avdPath : std::as_const(avdErrorPaths))
|
|
|
|
|
avdConfigEditManufacturerTag(avdPath); // comment out manufacturer tag
|
|
|
|
|
} while (!avdErrorPaths.isEmpty()); // try again
|
2021-05-06 15:19:56 +02:00
|
|
|
|
2022-11-25 19:43:34 +01:00
|
|
|
for (const FilePath &avdPath : std::as_const(allAvdErrorPaths))
|
|
|
|
|
avdConfigEditManufacturerTag(avdPath, true); // re-add manufacturer tag
|
2021-05-06 15:19:56 +02:00
|
|
|
|
|
|
|
|
return avdList;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const
|
|
|
|
|
{
|
2023-03-03 23:59:37 +01:00
|
|
|
return Utils::asyncRun(listVirtualDevices, m_config);
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString AndroidAvdManager::startAvd(const QString &name) const
|
|
|
|
|
{
|
|
|
|
|
if (!findAvd(name).isEmpty() || startAvdAsync(name))
|
|
|
|
|
return waitForAvd(name);
|
2023-03-09 12:04:09 +01:00
|
|
|
return {};
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
2022-11-25 16:35:16 +01:00
|
|
|
static bool is32BitUserSpace()
|
|
|
|
|
{
|
|
|
|
|
// Do a similar check as android's emulator is doing:
|
|
|
|
|
if (HostOsInfo::isLinuxHost()) {
|
|
|
|
|
if (QSysInfo::WordSize == 32) {
|
2023-05-03 16:00:22 +02:00
|
|
|
Process proc;
|
2022-11-25 16:35:16 +01:00
|
|
|
proc.setTimeoutS(3);
|
|
|
|
|
proc.setCommand({"getconf", {"LONG_BIT"}});
|
|
|
|
|
proc.runBlocking();
|
|
|
|
|
if (proc.result() != ProcessResult::FinishedWithSuccess)
|
|
|
|
|
return true;
|
|
|
|
|
return proc.allOutput().trimmed() == "32";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-03 11:11:17 +02:00
|
|
|
bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
|
|
|
|
|
{
|
2022-09-27 10:48:30 +02:00
|
|
|
const FilePath emulator = m_config.emulatorToolPath();
|
|
|
|
|
if (!emulator.exists()) {
|
|
|
|
|
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulator] {
|
2022-07-14 11:23:13 +02:00
|
|
|
QMessageBox::critical(Core::ICore::dialogParent(),
|
2022-10-06 17:53:35 +02:00
|
|
|
Tr::tr("Emulator Tool Is Missing"),
|
|
|
|
|
Tr::tr("Install the missing emulator tool (%1) to the"
|
|
|
|
|
" installed Android SDK.")
|
|
|
|
|
.arg(emulator.displayName()));
|
2022-07-14 11:23:13 +02:00
|
|
|
});
|
2018-04-18 12:23:02 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
2022-04-05 16:57:14 +02:00
|
|
|
|
2023-05-09 22:49:14 +02:00
|
|
|
// TODO: Here we are potentially leaking Process instance in case when shutdown happens
|
2022-04-05 16:57:14 +02:00
|
|
|
// after the avdProcess has started and before it has finished. Giving a parent object here
|
|
|
|
|
// should solve the issue. However, AndroidAvdManager is not a QObject, so no clue what parent
|
|
|
|
|
// would be the most appropriate. Preferably some object taken form android plugin...
|
2023-05-03 16:00:22 +02:00
|
|
|
Process *avdProcess = new Process;
|
2019-02-07 13:04:20 +01:00
|
|
|
avdProcess->setProcessChannelMode(QProcess::MergedChannels);
|
2023-05-03 16:00:22 +02:00
|
|
|
QObject::connect(avdProcess, &Process::done, avdProcess, [avdProcess] {
|
2022-04-05 16:57:14 +02:00
|
|
|
if (avdProcess->exitCode()) {
|
2023-01-05 17:55:04 +01:00
|
|
|
const QString errorOutput = QString::fromLatin1(avdProcess->readAllRawStandardOutput());
|
2022-07-14 11:23:13 +02:00
|
|
|
QMetaObject::invokeMethod(Core::ICore::mainWindow(), [errorOutput] {
|
2022-10-06 17:53:35 +02:00
|
|
|
const QString title = Tr::tr("AVD Start Error");
|
2022-07-14 11:23:13 +02:00
|
|
|
QMessageBox::critical(Core::ICore::dialogParent(), title, errorOutput);
|
|
|
|
|
});
|
2022-04-05 16:57:14 +02:00
|
|
|
}
|
|
|
|
|
avdProcess->deleteLater();
|
|
|
|
|
});
|
2017-04-03 11:11:17 +02:00
|
|
|
|
|
|
|
|
// start the emulator
|
2022-04-14 16:52:51 +02:00
|
|
|
CommandLine cmd(m_config.emulatorToolPath());
|
2022-11-25 16:35:16 +01:00
|
|
|
if (is32BitUserSpace())
|
2022-04-14 16:52:51 +02:00
|
|
|
cmd.addArg("-force-32bit");
|
2017-04-03 11:11:17 +02:00
|
|
|
|
2022-04-14 16:52:51 +02:00
|
|
|
cmd.addArgs(m_config.emulatorArgs(), CommandLine::Raw);
|
|
|
|
|
cmd.addArgs({"-avd", avdName});
|
2022-07-06 18:02:52 +02:00
|
|
|
qCDebug(avdManagerLog).noquote() << "Running command (startAvdAsync):" << cmd.toUserOutput();
|
2022-04-14 16:52:51 +02:00
|
|
|
avdProcess->setCommand(cmd);
|
2021-11-04 19:01:16 +01:00
|
|
|
avdProcess->start();
|
2022-04-05 16:57:14 +02:00
|
|
|
return avdProcess->waitForStarted(-1);
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString AndroidAvdManager::findAvd(const QString &avdName) const
|
|
|
|
|
{
|
2022-05-04 15:56:27 +02:00
|
|
|
const QVector<AndroidDeviceInfo> devices = m_config.connectedDevices();
|
|
|
|
|
for (const AndroidDeviceInfo &device : devices) {
|
2021-10-06 22:35:12 +03:00
|
|
|
if (device.type != ProjectExplorer::IDevice::Emulator)
|
2017-04-03 11:11:17 +02:00
|
|
|
continue;
|
2021-10-13 21:18:13 +03:00
|
|
|
if (device.avdName == avdName)
|
2017-04-03 11:11:17 +02:00
|
|
|
return device.serialNumber;
|
|
|
|
|
}
|
2023-03-09 12:04:09 +01:00
|
|
|
return {};
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated
thread. Communication between the step and the manager happened via a
QFutureInterface that was passed into the step's run() function.
Later, new steps were added that operated asynchronously, so the build
manager had to differentiate between the different kinds of steps for
starting and stopping.
These days, almost all build and deploy steps work asynchronously, which
made the QFuture-based interface look increasingly odd.
With this patch, all build steps are expected to work asynchronously, so
the build manager no longer needs to differentiate. Steps are started
and requested to stop via the run() and cancel() functions,
respectively, and emit the finished() signal when they are done. Build
step implementors no longer have to deal with a QFutureInterface. For
steps whose implementation is inherently synchronous, the BuildStep base
class offers a runInThread() function.
Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803
Reviewed-by: hjk <hjk@qt.io>
2019-01-25 14:26:34 +01:00
|
|
|
QString AndroidAvdManager::waitForAvd(const QString &avdName,
|
2023-03-09 12:04:09 +01:00
|
|
|
const std::optional<QFuture<void>> &future) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
// we cannot use adb -e wait-for-device, since that doesn't work if a emulator is already running
|
|
|
|
|
// 60 rounds of 2s sleeping, two minutes for the avd to start
|
|
|
|
|
QString serialNumber;
|
|
|
|
|
for (int i = 0; i < 60; ++i) {
|
2023-03-09 12:04:09 +01:00
|
|
|
if (future && future->isCanceled())
|
2022-11-09 16:05:25 +01:00
|
|
|
return {};
|
2017-04-03 11:11:17 +02:00
|
|
|
serialNumber = findAvd(avdName);
|
|
|
|
|
if (!serialNumber.isEmpty())
|
2023-03-09 12:04:09 +01:00
|
|
|
return waitForBooted(serialNumber, future) ? serialNumber : QString();
|
2017-04-03 11:11:17 +02:00
|
|
|
QThread::sleep(2);
|
|
|
|
|
}
|
2022-11-09 16:05:25 +01:00
|
|
|
return {};
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidAvdManager::isAvdBooted(const QString &device) const
|
|
|
|
|
{
|
|
|
|
|
QStringList arguments = AndroidDeviceInfo::adbSelector(device);
|
|
|
|
|
arguments << "shell" << "getprop" << "init.svc.bootanim";
|
|
|
|
|
|
2020-01-13 16:01:56 +01:00
|
|
|
const CommandLine command({m_config.adbToolPath(), arguments});
|
2022-07-06 18:02:52 +02:00
|
|
|
qCDebug(avdManagerLog).noquote() << "Running command (isAvdBooted):" << command.toUserOutput();
|
2023-05-03 16:00:22 +02:00
|
|
|
Process adbProc;
|
2017-04-03 11:11:17 +02:00
|
|
|
adbProc.setTimeoutS(10);
|
2021-05-17 12:02:42 +02:00
|
|
|
adbProc.setCommand(command);
|
|
|
|
|
adbProc.runBlocking();
|
2022-03-02 04:12:25 +01:00
|
|
|
if (adbProc.result() != ProcessResult::FinishedWithSuccess)
|
2017-04-03 11:11:17 +02:00
|
|
|
return false;
|
2021-05-12 14:25:50 +02:00
|
|
|
QString value = adbProc.allOutput().trimmed();
|
2017-04-03 11:11:17 +02:00
|
|
|
return value == "stopped";
|
|
|
|
|
}
|
|
|
|
|
|
ProjectExplorer: Rework the build step run interface
Originally, the build manager used to run all build steps in a dedicated
thread. Communication between the step and the manager happened via a
QFutureInterface that was passed into the step's run() function.
Later, new steps were added that operated asynchronously, so the build
manager had to differentiate between the different kinds of steps for
starting and stopping.
These days, almost all build and deploy steps work asynchronously, which
made the QFuture-based interface look increasingly odd.
With this patch, all build steps are expected to work asynchronously, so
the build manager no longer needs to differentiate. Steps are started
and requested to stop via the run() and cancel() functions,
respectively, and emit the finished() signal when they are done. Build
step implementors no longer have to deal with a QFutureInterface. For
steps whose implementation is inherently synchronous, the BuildStep base
class offers a runInThread() function.
Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803
Reviewed-by: hjk <hjk@qt.io>
2019-01-25 14:26:34 +01:00
|
|
|
bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
|
2023-03-09 12:04:09 +01:00
|
|
|
const std::optional<QFuture<void>> &future) const
|
2017-04-03 11:11:17 +02:00
|
|
|
{
|
|
|
|
|
// found a serial number, now wait until it's done booting...
|
|
|
|
|
for (int i = 0; i < 60; ++i) {
|
2023-03-09 12:04:09 +01:00
|
|
|
if (future && future->isCanceled())
|
2017-04-03 11:11:17 +02:00
|
|
|
return false;
|
2022-09-27 10:48:30 +02:00
|
|
|
if (isAvdBooted(serialNumber))
|
2017-04-03 11:11:17 +02:00
|
|
|
return true;
|
2022-09-27 10:48:30 +02:00
|
|
|
QThread::sleep(2);
|
|
|
|
|
if (!m_config.isConnected(serialNumber)) // device was disconnected
|
|
|
|
|
return false;
|
2017-04-03 11:11:17 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-27 10:48:30 +02:00
|
|
|
} // Android::Internal
|