Add manifest merger output log.

RELNOTES: When using android_binary.manifest_merger="android" the merger produces a summary log next to the merged manifest artifact.

--
MOS_MIGRATED_REVID=134082985

1 files changed, 9 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 520966bd53..99d0cdb430 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
@@ -116,6 +116,13 @@ public class ManifestMergerAction {
         category = "output",
         help = "Path for the merged manifest.")
     public Path manifestOutput;
+
+    @Option(name = "log",
+        defaultValue = "null",
+        category = "output",
+        converter = PathConverter.class,
+        help = "Path to where the merger log should be written.")
+    public Path log;
   }
 
   private static final String[] PERMISSION_TAGS =
@@ -174,7 +181,8 @@ public class ManifestMergerAction {
             mergeeManifests.build(),
             options.mergeType,
             options.manifestValues,
-            options.manifestOutput);
+            options.manifestOutput,
+            options.log);
       } else {
         // Only need to stamp custom package into the library level.
         mergedManifest = resourceProcessor.writeManifestPackage(