From 1525632c574f7ef927021cc3b1f3355ab65a672c Mon Sep 17 00:00:00 2001
From: Gautam Korlam <gkorlam@uber.com>
Date: Fri, 27 Jan 2017 19:04:49 -0800
Subject: [PATCH] Always manifest merge if its an application

---
 .../com/uber/okbuck/core/model/android/AndroidTarget.groovy   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy
index c8e2f3150..194b98d8c 100644
--- a/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy
+++ b/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy
@@ -285,9 +285,9 @@ abstract class AndroidTarget extends JavaLibTarget {
         mergedManifest.parentFile.mkdirs()
         mergedManifest.createNewFile()
 
-        if (manifests.size() == 1) { // No need to merge
+        if (manifests.size() == 1 && mergeType == ManifestMerger2.MergeType.LIBRARY) { // No need to merge for libraries
             parseManifest(project.file(manifests[0]).text, mergedManifest)
-        } else {
+        } else { // always merge if more than one manifest or its an application
             File mainManifest = project.file(manifests[0])
             List<File> secondaryManifests = []
             secondaryManifests.addAll(