diff options
author | Adam Murdoch <adam.murdoch@gradleware.com> | 2012-09-13 12:05:28 +1000 |
---|---|---|
committer | Adam Murdoch <adam.murdoch@gradleware.com> | 2012-09-13 12:05:28 +1000 |
commit | 5157d56243240d7d3c3f927a0111e6f3931fad36 (patch) | |
tree | 4471b9bed990f88e341bdb1173122e6bb6b55516 /builder | |
parent | 7f82a506e3796d15b6bc47f939f2c7f130606ce2 (diff) | |
download | build-5157d56243240d7d3c3f927a0111e6f3931fad36.tar.gz |
Don't use an empty main manifest when merging library manifests.
Change-Id: I45733f5769a8e6d5f392030f28f117b47999c985
Diffstat (limited to 'builder')
-rw-r--r-- | builder/src/main/java/com/android/builder/AndroidBuilder.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java index f083dba..65153e3 100644 --- a/builder/src/main/java/com/android/builder/AndroidBuilder.java +++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java @@ -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)); } } |