Fix android manifest merger from using only one mergee manifest.

Mergee manifests are pre-processed and written to a temp directory, based on their original path, before the final merge. Previously only the filename was used, resulting in each mergee overwriting the previous, all of which were <temp_dir>/AndroidManifest.xml. Using the full path of each manifest ensures this overwriting cannot occur.

--
MOS_MIGRATED_REVID=126942789

1 files changed, 3 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
index ce1884d6a4..3df7900d61 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
@@ -139,7 +139,9 @@ public class ManifestMergerAction {
         }
       }
     }
-    Path output = outputDir.resolve(manifest.getFileName());
+    // Write resulting manifest to the output directory, maintaining full path to prevent collisions
+    Path output = outputDir.resolve(manifest.toString().replaceFirst("^/", ""));
+    Files.createDirectories(output.getParent());
     TransformerFactory.newInstance().newTransformer().transform(
         new DOMSource(doc),
         new StreamResult(output.toFile()));