Modify Api01Config and Jack to support multiple Jarjar config files

Bug: 20913411

(cherry picked from commit  517dec6fa299a3755f38681b3fcea387c84873f0)

Change-Id: If9c1e8f827e8ed3fd68c4999a8700608a95ce7c9

1 files changed, 6 insertions, 5 deletions

diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index 223e4da..05fcf28 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -57,6 +57,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.CheckForNull;
@@ -254,16 +256,15 @@ public class TestTools {
 
   @Nonnull
   public static Options buildCommandLineArgs(@Nonnull File fileOrSourcelist) throws IOException {
-    return buildCommandLineArgs(fileOrSourcelist, null);
+    return buildCommandLineArgs(fileOrSourcelist, Collections.<File>emptyList());
   }
 
   @Nonnull
   public static Options buildCommandLineArgs(@Nonnull File fileOrSourcelist,
-      @CheckForNull File jarjarRules) throws IOException {
+      @Nonnull List<File> jarjarRules) throws IOException {
     Options options = buildCommandLineArgs(null /* classpath */, new File[] {fileOrSourcelist});
-    if (jarjarRules != null) {
-      options.setJarjarRulesFile(jarjarRules);
-    }
+    options.setJarjarRulesFiles(jarjarRules);
+
     return options;
   }