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

Android: Consolidate AvdManagerCommand use

Browse Source 
Change-Id: I8b15f6807a6d0d38f668d56e11f75b34a8c3a722
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-01-03 09:24:40 +01:00
parent b02d1fd0e9
commit 0a3f66c790
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidavdmanager.cpp
View File

@@ -76,30 +76,26 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
return result; return result;
} }
QStringList arguments({"create", "avd", "-n", result.name}); CommandLine avdManager(config.avdManagerToolPath(), {"create", "avd", "-n", result.name});
avdManager.addArgs({"-k", result.systemImage->sdkStylePath()});
arguments << "-k" << result.systemImage->sdkStylePath();
if (result.sdcardSize > 0) if (result.sdcardSize > 0)
arguments << "-c" << QString::fromLatin1("%1M").arg(result.sdcardSize); avdManager.addArgs({"-c", QString("%1M").arg(result.sdcardSize)});
if (!result.deviceDefinition.isEmpty() && result.deviceDefinition != "Custom") if (!result.deviceDefinition.isEmpty() && result.deviceDefinition != "Custom")
arguments << "-d" << QString::fromLatin1("%1").arg(result.deviceDefinition); avdManager.addArgs({"-d", QString("%1").arg(result.deviceDefinition)});
if (result.overwrite) if (result.overwrite)
arguments << "-f"; avdManager.addArg("-f");
const FilePath avdManagerTool = config.avdManagerToolPath(); qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << avdManager.toUserOutput();
qCDebug(avdManagerLog).noquote()
<< "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
QtcProcess proc; QtcProcess proc;
proc.setProcessMode(ProcessMode::Writer); proc.setProcessMode(ProcessMode::Writer);
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config)); proc.setEnvironment(AndroidConfigurations::toolsEnvironment(config));
proc.setCommand({avdManagerTool, arguments}); proc.setCommand(avdManager);
proc.start(); proc.start();
if (!proc.waitForStarted()) { if (!proc.waitForStarted()) {
result.error = Tr::tr("Could not start process \"%1 %2\"") result.error = Tr::tr("Could not start process \"%1\"").arg(avdManager.toUserOutput());
.arg(avdManagerTool.toString(), arguments.join(' '));
return result; return result;
} }
QTC_CHECK(proc.isRunning()); QTC_CHECK(proc.isRunning());