Merge "Replace List by Collection in jack API setSourceEntries()" into ub-jack

3 files changed, 7 insertions, 4 deletions

diff --git a/jack-api/src/com/android/jack/api/v01/Api01Config.java b/jack-api/src/com/android/jack/api/v01/Api01Config.java
index 54bc495..0fc545d 100644
--- a/jack-api/src/com/android/jack/api/v01/Api01Config.java
+++ b/jack-api/src/com/android/jack/api/v01/Api01Config.java
@@ -20,6 +20,7 @@ import com.android.jack.api.JackConfig;
 
 import java.io.File;
 import java.io.OutputStream;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -188,7 +189,7 @@ public interface Api01Config extends JackConfig {
    * @param sourceEntries The source entries
    * @throws ConfigurationException
    */
-  void setSourceEntries(@Nonnull List<File> sourceEntries) throws ConfigurationException;
+  void setSourceEntries(@Nonnull Collection<File> sourceEntries) throws ConfigurationException;
 
   /**
    * Sets the value for the given property.
diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java
index fdbf008..a96ccf0 100644
--- a/jack/src/com/android/jack/Options.java
+++ b/jack/src/com/android/jack/Options.java
@@ -107,6 +107,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -526,8 +527,8 @@ public class Options {
     return helpProperties;
   }
 
-  public void setInputSources(@Nonnull List<File> inputSources) {
-    this.inputSources = inputSources;
+  public void setInputSources(@Nonnull Collection<File> inputSources) {
+    this.inputSources = new ArrayList<File>(inputSources);
   }
 
   public void setOutputDir(File out) {
diff --git a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
index 6b8e9a7..ce57d80 100644
--- a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
+++ b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
@@ -44,6 +44,7 @@ import com.android.sched.util.RunnableHooks;
 
 import java.io.File;
 import java.io.OutputStream;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -328,7 +329,7 @@ public class Api01ConfigImpl implements Api01Config {
   }
 
   @Override
-  public void setSourceEntries(@Nonnull List<File> sourceEntries) {
+  public void setSourceEntries(@Nonnull Collection<File> sourceEntries) {
     options.setInputSources(sourceEntries);
   }