1 files changed, 16 insertions, 0 deletions
diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java
index d278dc870a..9f92f65771 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java
@@ -32,6 +32,7 @@ class MergingArguments {
 
   private final FileSystem fileSystem = FileSystems.getDefault();
   private final List<Path> sourceFilePaths;
+  private final List<Path> immutableSourceFilePaths;
   private final String outFile;
   private final Map<String, String> variableSubstitutions;
   private final String primaryBundleId;
@@ -46,6 +47,13 @@ class MergingArguments {
       sourceFilePathsBuilder.add(fileSystem.getPath(pathString));
     }
     sourceFilePaths = sourceFilePathsBuilder.build();
+    
+    ImmutableList.Builder<Path> immutableSourceFilePathsBuilder = new Builder<>();
+    for (String pathString : control.getImmutableSourceFileList()) {
+      immutableSourceFilePathsBuilder.add(fileSystem.getPath(pathString));
+    }
+    immutableSourceFilePaths = immutableSourceFilePathsBuilder.build();
+    
     outFile = control.getOutFile();
     variableSubstitutions = control.getVariableSubstitutionMap();
     primaryBundleId = control.getPrimaryBundleId();
@@ -62,6 +70,7 @@ class MergingArguments {
     }
 
     sourceFilePaths = sourceFilePathsBuilder.build();
+    immutableSourceFilePaths = ImmutableList.<Path>of();
     outFile = options.outFile;
     variableSubstitutions = ImmutableMap.<String, String>of();
     primaryBundleId = options.primaryBundleId;
@@ -76,6 +85,13 @@ class MergingArguments {
     return sourceFilePaths;
   }
 
+  /*
+   * Returns paths to plist files with keys which may not be overwritten.
+   */
+  public List<Path> getImmutableSourceFilePaths() {
+    return immutableSourceFilePaths;
+  }
+  
   /**
    * Returns path to the output file to merge relative to plmerge.
    */