Don't use an empty main manifest when merging library manifests.
Adam Murdoch [Thu, 13 Sep 2012 02:05:28 +0000 (12:05 +1000)]
Change-Id: I45733f5769a8e6d5f392030f28f117b47999c985

builder/src/main/java/com/android/builder/AndroidBuilder.java

index f083dba..65153e3 100644 (file)
@@ -361,13 +361,9 @@ public class AndroidBuilder {
                         throw new RuntimeException();
                     }
                 } else {
-
-                    File appMergeOut = File.createTempFile("manifestMerge", ".xml");
-                    appMergeOut.deleteOnExit();
-
                     // recursively merge all manifests starting with the leaves and up toward the
                     // root (the app)
-                    mergeLibraryManifests(appMergeOut, config.getDirectLibraries(),
+                    mergeLibraryManifests(mainLocation, config.getDirectLibraries(),
                             new File(outManifestLocation));
                     }
             }