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

Fix the manifest overlays.

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

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

@ -116,18 +116,17 @@ class AndroidBuild {
// //
// Manifest // Manifest
// //
val mainManifest = File("src/main/AndroidManifest.xml") val manifestOverlays = variant.allDirectories(project).map {
File("src/$it/AndroidManifest.xml")
val appInfo = AppInfo(mainManifest, config) }.filter {
val manifestOverlays = listOf( it.exists()
File("src/${variant.productFlavor.name}/AndroidManifest.xml"), }
File("src/${variant.buildType.name}/AndroidManifest.xml")).filter {
it.exists()
}
val libraries = listOf<ManifestDependency>() val libraries = listOf<ManifestDependency>()
val outManifest = AndroidFiles.mergedManifest(project, variant) val outManifest = AndroidFiles.mergedManifest(project, variant)
val outAaptSafeManifestLocation = KFiles.joinDir(project.directory, project.buildDirectory, "generatedSafeAapt") val outAaptSafeManifestLocation = KFiles.joinDir(project.directory, project.buildDirectory, "generatedSafeAapt")
val reportFile = File(KFiles.joinDir(project.directory, project.buildDirectory, "manifest-merger-report.txt")) val reportFile = File(KFiles.joinDir(project.directory, project.buildDirectory, "manifest-merger-report.txt"))
val mainManifest = File("src/main/AndroidManifest.xml")
val appInfo = AppInfo(mainManifest, config)
androidBuilder.mergeManifests(mainManifest, manifestOverlays, libraries, androidBuilder.mergeManifests(mainManifest, manifestOverlays, libraries,
null /* package override */, null /* package override */,
appInfo.versionCode, appInfo.versionCode,