Expose the ability to define a binary output to the merge call.

New method to deserialize parsed resources.
Remove unthrown exceptions.

RELNOTES:None

--
PiperOrigin-RevId: 144221111
MOS_MIGRATED_REVID=144221111

1 files changed, 10 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
index e2a800d584..a602c658ea 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
@@ -136,6 +136,15 @@ public class AndroidResourceMergingAction {
       help = "Custom java package to generate the R symbols files."
     )
     public String packageForR;
+
+    @Option(
+      name = "symbolsBinOut",
+      defaultValue = "null",
+      converter = PathConverter.class,
+      category = "config",
+      help = "Path to write the merged symbols binary."
+    )
+    public Path symbolsBinOut;
   }
 
   public static void main(String[] args) throws Exception {
@@ -181,6 +190,7 @@ public class AndroidResourceMergingAction {
               mergedAssets,
               new StubPngCruncher(),
               packageType,
+              options.symbolsBinOut,
               resourceClassWriter);
 
       logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));