From c63c6b7684b5c3da122e87fa7671fb5397aac615 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 26 Aug 2024 17:14:36 +0200 Subject: [PATCH] Android: Merge compileAppProfiles() into master Follows 6ea2ab3ab761f846d8ad03a2a6c51226c41b284d Change-Id: Ia7e1e3ce9a36a17500f22b23d77e6cf00cfd5257 Reviewed-by: Cristian Adam Reviewed-by: Alessandro Portale --- src/plugins/android/androidrunnerworker.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index cce7ee2eb56..aefe2ba351d 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -854,6 +854,16 @@ static ExecutableItem pidRecipe(RunnerStorage *storage) 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) { process.setProcessChannelMode(QProcess::MergedChannels); process.setCommand(storage->adbCommand({"shell", pidPollingScript.arg(storage->m_processPID)})); @@ -867,6 +877,8 @@ static ExecutableItem pidRecipe(RunnerStorage *storage) DoneResult::Error) }.withTimeout(45s), ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success), + ProcessTask(onArtSetup, DoneResult::Success), + ProcessTask(onCompileSetup, DoneResult::Success), Group { parallel, startNativeDebuggingRecipe(storage),