diff -r 729a3ee3840a -r 817ec8de14ea buildSrc/src/main/kotlin/Avdl.kt --- a/buildSrc/src/main/kotlin/Avdl.kt Sun May 10 03:53:45 2020 -0400 +++ b/buildSrc/src/main/kotlin/Avdl.kt Sun May 10 21:25:19 2020 -0400 @@ -95,6 +95,14 @@ lastTestTask = connectedInstrumentTestProvider } } + + afterEvaluate { + // ensure that launchDeviceTask are run after StopDeviceTask of previous project + rootProject.tasks { + getByPath(":geekdroid-firebase:launchAvdlDebugAndroidTest") + .mustRunAfter(":geekdroid:stopAvdlDebugAndroidTest") + } + } } private fun TaskContainer.registerAvdlDevicesTaskForVariant(