From a33d83d99c1461c058b7fc6ffcce9c180d39908e Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 10 Dec 2015 01:27:08 +0400 Subject: [PATCH] Android runner should use the merged manifest. --- .../beust/kobalt/plugin/android/AndroidPlugin.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index d14dcd4a..92ccda09 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -367,13 +367,14 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v } override fun run(project: Project, context: KobaltContext, classpath: List): TaskResult { - val manifest = AndroidFiles.manifest(project, context) - FileInputStream(File(manifest)).use { ins -> - // adb shell am start -n com.package.name/com.package.name.ActivityName - val manifest = AndroidManifest(ins) - RunCommand(adb(project)).useErrorStreamAsErrorIndicator(false).run(args = listOf( - "shell", "am", "start", "-n", manifest.pkg + "/" + manifest.mainActivity)) - return TaskResult() + AndroidFiles.mergedManifest(project, context.variant).let { manifestPath -> + FileInputStream(File(manifestPath)).use { ins -> + // adb shell am start -n com.package.name/com.package.name.ActivityName + val manifest = AndroidManifest(ins) + RunCommand(adb(project)).useErrorStreamAsErrorIndicator(false).run(args = listOf( + "shell", "am", "start", "-n", manifest.pkg + "/" + manifest.mainActivity)) + return TaskResult() + } } }