Bundlemerge optionally takes a completed plist to bundle into the archive, instead of multiple plists to merge and variable substitutions to apply.

The new key bundle_info_plist_file, gives the path to the completed plist.  If it is defined, the keys source_plist_file and variable_substitution are not used.

--
MOS_MIGRATED_REVID=110010012

1 files changed, 4 insertions, 2 deletions

diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
index 00f211dd9e..c7ed0b182a 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
@@ -80,8 +80,10 @@ public class PlistMerging extends Value<PlistMerging> {
 
   private final NSDictionary merged;
 
-  @VisibleForTesting
-  PlistMerging(NSDictionary merged) {
+  /**
+   * Wraps a {@code NSDictionary} as a PlistMerging.
+   */
+  public PlistMerging(NSDictionary merged) {
     super(merged);
     this.merged = merged;
   }