Modify Api01Config and Jack to support multiple Jarjar config files

Bug: 20913411

(cherry picked from commit  517dec6fa299a3755f38681b3fcea387c84873f0)

Change-Id: If9c1e8f827e8ed3fd68c4999a8700608a95ce7c9

3 files changed, 8 insertions, 5 deletions

diff --git a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
index a5cc2160..ed58f658 100644
--- a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
+++ b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
@@ -67,7 +67,8 @@ public class JarjarTests {
   @Test
   public void jarjar003_1() throws Exception {
     IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
-    toolchain.setJarjarRules(new File(JARJAR003.directory, "jarjar-rules.txt"));
+    toolchain.setJarjarRules(
+        Collections.singletonList(new File(JARJAR003.directory, "jarjar-rules.txt")));
     File lib = AbstractTestTools.createTempFile("jarjarTest003Jack", toolchain.getLibraryExtension());
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
diff --git a/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java b/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java
index 4fa7fe36..1e3c6393 100644
--- a/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java
+++ b/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import java.io.File;
+import java.util.Collections;
 
 @Ignore("Tree")
 @Category(SlowTests.class)
@@ -124,7 +125,7 @@ public class NoClasspathTest {
     File conscyptRules =
         new JarJarRules(TestTools.getFromAndroidTree("external/conscrypt/jarjar-rules.txt"));
     toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
-    toolchain.setJarjarRules(conscyptRules);
+    toolchain.setJarjarRules(Collections.singletonList(conscyptRules));
     toolchain.libToLib(conscryptJack, conscryptRenamedJack, /* zipFiles = */ true);
 
     File okhttpJack = AbstractTestTools.createTempFile("okkttp", ".jack");
@@ -137,7 +138,7 @@ public class NoClasspathTest {
     File okhttpRules =
         new JarJarRules(TestTools.getFromAndroidTree("external/okhttp/jarjar-rules.txt"));
     toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
-    toolchain.setJarjarRules(okhttpRules);
+    toolchain.setJarjarRules(Collections.singletonList(okhttpRules));
     toolchain.libToLib(okhttpJack, okhttpRenamedJack, /* zipFiles = */ true);
 
     File extJack = AbstractTestTools.createTempFile("ext", ".jack");
@@ -159,7 +160,7 @@ public class NoClasspathTest {
     File jarjarRules =
         new JarJarRules(TestTools.getFromAndroidTree("external/bouncycastle/jarjar-rules.txt"));
     toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
-    toolchain.setJarjarRules(jarjarRules);
+    toolchain.setJarjarRules(Collections.singletonList(jarjarRules));
     toolchain.libToLib(bouncyCastleJack, bouncyCastleRenamedJack, /* zipFiles = */ true);
 
     File[] classpath = new File[] {coreOut,
diff --git a/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java b/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java
index c4ce4dfc..5fd70fb0 100644
--- a/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java
+++ b/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -154,7 +155,7 @@ public class ToolchainTest {
     File jarjarTestRenamedOut = AbstractTestTools.createTempFile("jarjartestrenamed", ".jack");
     File jarjarRules = new File(testFolder, "jarjar-rules.txt");
     toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class);
-    toolchain.setJarjarRules(jarjarRules);
+    toolchain.setJarjarRules(Collections.singletonList(jarjarRules));
     toolchain.libToLib(jarjarTestJackOut, jarjarTestRenamedOut, /* zipFiles = */ true);
 
     File jarjarTestDexOutFolder = AbstractTestTools.createTempDir();