From edce5f533e880efddaa6c9a3d97bda9aed28fc7b Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 10 Dec 2015 01:15:21 +0400
Subject: [PATCH] Fix the manifest overlays.

---
 .../beust/kobalt/plugin/android/AndroidBuild.kt   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt
index 1b07e960..a591613c 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidBuild.kt
@@ -116,18 +116,17 @@ class AndroidBuild {
         //
         // Manifest
         //
-        val mainManifest = File("src/main/AndroidManifest.xml")
-
-        val appInfo = AppInfo(mainManifest, config)
-        val manifestOverlays = listOf(
-                File("src/${variant.productFlavor.name}/AndroidManifest.xml"),
-                File("src/${variant.buildType.name}/AndroidManifest.xml")).filter {
-                    it.exists()
-                }
+        val manifestOverlays = variant.allDirectories(project).map {
+                File("src/$it/AndroidManifest.xml")
+            }.filter {
+                it.exists()
+            }
         val libraries = listOf<ManifestDependency>()
         val outManifest = AndroidFiles.mergedManifest(project, variant)
         val outAaptSafeManifestLocation = KFiles.joinDir(project.directory, project.buildDirectory, "generatedSafeAapt")
         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,
                 null /* package override */,
                 appInfo.versionCode,