erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Android runner should use the merged manifest.

Browse source
This commit is contained in:
Cedric Beust 2015-12-10 01:27:08 +04:00
parent b65753d4d9
commit a33d83d99c
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
View file

@ -367,13 +367,14 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v
} }
override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>): TaskResult { override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>): TaskResult {
val manifest = AndroidFiles.manifest(project, context) AndroidFiles.mergedManifest(project, context.variant).let { manifestPath ->
FileInputStream(File(manifest)).use { ins -> FileInputStream(File(manifestPath)).use { ins ->
// adb shell am start -n com.package.name/com.package.name.ActivityName // adb shell am start -n com.package.name/com.package.name.ActivityName
val manifest = AndroidManifest(ins) val manifest = AndroidManifest(ins)
RunCommand(adb(project)).useErrorStreamAsErrorIndicator(false).run(args = listOf( RunCommand(adb(project)).useErrorStreamAsErrorIndicator(false).run(args = listOf(
"shell", "am", "start", "-n", manifest.pkg + "/" + manifest.mainActivity)) "shell", "am", "start", "-n", manifest.pkg + "/" + manifest.mainActivity))
return TaskResult() return TaskResult()
}
} }
} }