Separate input options from ecj options

Change-Id: I60feeca57f9b88c8813cc3048733210fecf44484

1 files changed, 5 insertions, 3 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
index 05a17de..268656a 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -251,20 +251,22 @@ public class JackApiToolchain extends JackBasedToolchain {
       ecjArgs.add(ecjArg);
     }
 
+    ArrayList<File> toCompile = new ArrayList<File>();
     for (File srcFile : sources) {
       if (srcFile instanceof Sourcelist) {
         TokenIterator iterator =
             new TokenIterator(new NoLocation(), '@' + srcFile.getAbsolutePath());
         while (iterator.hasNext()) {
-          ecjArgs.add(iterator.next());
+          toCompile.add(new File(iterator.next()));
         }
       } else {
-        AbstractTestTools.addFile(ecjArgs, /* mustExist = */ false, srcFile);
+        toCompile.add(srcFile);
       }
     }
 
     if (sources.length > 0) {
-      jackOptions.setEcjArguments(ecjArgs);
+      jackOptions.setEcjExtraArguments(ecjArgs);
+      jackOptions.setInputSources(toCompile);
     }
   }