Android: Merge compileAppProfiles() into master

Follows 6ea2ab3ab7

Change-Id: Ia7e1e3ce9a36a17500f22b23d77e6cf00cfd5257
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-08-26 17:14:36 +02:00
parent d490f8b073
commit c63c6b7684

View File

@@ -854,6 +854,16 @@ static ExecutableItem pidRecipe(RunnerStorage *storage)
return DoneResult::Error; return DoneResult::Error;
}; };
const auto onArtSetup = [storage](Process &process) {
process.setCommand(storage->adbCommand({"shell", "pm", "art", "clear-app-profiles",
storage->m_packageName}));
};
const auto onCompileSetup = [storage](Process &process) {
process.setCommand(storage->adbCommand({"shell", "pm", "compile", "-m", "verify", "-f",
storage->m_packageName}));
};
const auto onIsAliveSetup = [storage](Process &process) { const auto onIsAliveSetup = [storage](Process &process) {
process.setProcessChannelMode(QProcess::MergedChannels); process.setProcessChannelMode(QProcess::MergedChannels);
process.setCommand(storage->adbCommand({"shell", pidPollingScript.arg(storage->m_processPID)})); process.setCommand(storage->adbCommand({"shell", pidPollingScript.arg(storage->m_processPID)}));
@@ -867,6 +877,8 @@ static ExecutableItem pidRecipe(RunnerStorage *storage)
DoneResult::Error) DoneResult::Error)
}.withTimeout(45s), }.withTimeout(45s),
ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success), ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success),
ProcessTask(onArtSetup, DoneResult::Success),
ProcessTask(onCompileSetup, DoneResult::Success),
Group { Group {
parallel, parallel,
startNativeDebuggingRecipe(storage), startNativeDebuggingRecipe(storage),