Revert "Revert "Start using jack-api for jack API based test toolchains""

This reverts commit b43732ee3d9f9ffcd7595ab657e4c683a1751b3a.

Change-Id: Id9fbfcd8f7aebca1136bfcbbf9e37359dc42a19d

20 files changed, 142 insertions, 97 deletions

diff --git a/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java b/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java
index 59e97901..c56c636d 100644
--- a/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java
+++ b/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java
@@ -18,7 +18,7 @@ package com.android.jack.analysis.dfa.reachingdefs;
 
 import com.android.jack.Options;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.util.filter.SignatureMethodFilter;
 
 import org.junit.Test;
@@ -30,7 +30,8 @@ public class ReachingDefsTests {
   @Test
   public void testDfa001() throws Exception {
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.addProperty(Options.METHOD_FILTER.getName(), "method-with-signature");
     toolchain.addProperty(SignatureMethodFilter.METHOD_SIGNATURE_FILTER.getName(),
diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
index d01ff0cc..3aaa72d0 100644
--- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
+++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
@@ -22,7 +22,7 @@ import com.android.jack.library.FileType;
 import com.android.jack.library.LibraryReadingException;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.JillBasedToolchain;
 
@@ -160,14 +160,15 @@ public class ClasspathTests {
 
   @Test
   public void testMissingClasspathEntry() throws Exception {
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack");
     File testOut = AbstractTestTools.createTempFile("ClasspathTest", "missing");
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(new File(srcDir, "missing.jack"))
     .srcToLib(testOut, /* zipFiles = */ true, srcDir);
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addProperty(Jack.STRICT_CLASSPATH.getName(), "true");
     try {
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
@@ -191,14 +192,15 @@ public class ClasspathTests {
       Exception {
     Assert.assertTrue(invalidJack.isFile());
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     File testOut = AbstractTestTools.createTempFile("ClasspathTest", "invalid");
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(invalidJack)
     .srcToLib(testOut, /* zipFiles = */ true, srcDir);
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addProperty(Jack.STRICT_CLASSPATH.getName(), "true");
 
     try {
diff --git a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
index b3c47003..a5e310c3 100644
--- a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
@@ -29,7 +29,7 @@ import com.android.jack.frontend.FrontendCompilationException;
 import com.android.jack.test.TestsProperties;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import junit.framework.Assert;
 
@@ -69,7 +69,8 @@ public class AnnotationProcessorErrorTest {
         "package jack.incremental; \n"+
         "public class A {} \n");
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
 
     try {
@@ -100,7 +101,8 @@ public class AnnotationProcessorErrorTest {
 
     runAnnotProcBuildingResource(te);
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -137,7 +139,8 @@ public class AnnotationProcessorErrorTest {
         + "public class A {}\n");
 
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.setAnnotationProcessorClass(SourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -170,7 +173,8 @@ public class AnnotationProcessorErrorTest {
         + "@" + SourceAnnotationTest.class.getSimpleName() + "\n"
         + "public class A {}\n");
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.setAnnotationProcessorClass(SourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
 
@@ -198,7 +202,8 @@ public class AnnotationProcessorErrorTest {
         + "@" + ResourceAnnotationTest.class.getSimpleName() + "\n"
         + "public class A {}\n");
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
 
@@ -231,7 +236,8 @@ public class AnnotationProcessorErrorTest {
     }
 
     // Compile annotation to a jack file
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
     .srcToLib(te.getJackFolder(), false /* zipFiles = */, te.getSourceFolder());
 
diff --git a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java
index 47ffba7a..ca85cba9 100644
--- a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java
@@ -20,7 +20,7 @@ import com.android.jack.Main;
 import com.android.jack.frontend.FrontendCompilationException;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import junit.framework.Assert;
 
@@ -47,7 +47,8 @@ public class CommandLineErrorTest {
   public void testCommandLineError002() throws Exception {
     ErrorTestHelper ite = new ErrorTestHelper();
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
@@ -73,7 +74,8 @@ public class CommandLineErrorTest {
     File sourceFile = AbstractTestTools.createFile(ite.getSourceFolder(), "jack.incremental",
         "A.java", "package jack.incremental; \n" + "public class A {} \n");
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
diff --git a/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java b/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java
index 948f0e72..f8a9d17c 100644
--- a/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java
@@ -18,7 +18,7 @@ package com.android.jack.error;
 
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.sched.util.config.UnknownPropertyNameException;
 
 import org.junit.Assert;
@@ -33,7 +33,8 @@ public class ConfigErrorTest {
   public void testUnknownProperty001() throws Exception {
     ErrorTestHelper ite = new ErrorTestHelper();
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
 
diff --git a/jack-tests/tests/com/android/jack/error/ErrorTest.java b/jack-tests/tests/com/android/jack/error/ErrorTest.java
index 91fb962a..cb419a09 100644
--- a/jack-tests/tests/com/android/jack/error/ErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/ErrorTest.java
@@ -18,7 +18,7 @@ package com.android.jack.error;
 
 import com.android.jack.frontend.FrontendCompilationException;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import junit.framework.Assert;
 
@@ -52,7 +52,8 @@ public class ErrorTest {
 
   private void checkInternalCompilerException(@Nonnull String testName)
       throws Exception, IOException {
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream err = new ByteArrayOutputStream();
     toolchain.setErrorStream(err);
diff --git a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
index 1d520522..ff2cef23 100644
--- a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
@@ -24,7 +24,7 @@ import com.android.jack.library.LibraryIOException;
 import com.android.jack.library.LibraryReadingException;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.sched.util.codec.ListParsingException;
 import com.android.sched.util.codec.ParsingException;
 import com.android.sched.util.config.PropertyIdException;
@@ -63,7 +63,8 @@ public class FileAccessErrorTest {
     if (!jackOutputFile.setReadable(false)) {
       Assert.fail("Fails to change file permissions of " + jackOutputFile.getAbsolutePath());
     }
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     try {
       jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
@@ -88,8 +89,8 @@ public class FileAccessErrorTest {
     File srcFile = AbstractTestTools.createFile(helper.getSourceFolder(), "jack.incremental",
         "A.java", "package jack.incremental; \n" + "public class A {} \n");
 
-    JackApiToolchain jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
     .srcToLib(helper.getJackFolder(), /* zipFiles = */ false, helper.getSourceFolder());
@@ -104,7 +105,7 @@ public class FileAccessErrorTest {
       Assert.fail("Fails to change file permissions of " + helper.getJackFolder().getAbsolutePath());
     }
 
-    jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
@@ -141,7 +142,8 @@ public class FileAccessErrorTest {
       Assert.fail("Fails to change file permissions of " + a.getAbsolutePath());
     }
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
 
@@ -170,7 +172,8 @@ public class FileAccessErrorTest {
         "package jack.incremental; \n"+
         "public class A {} \n");
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
     .srcToLib(te.getJackFolder(), false, te.getSourceFolder());
@@ -216,7 +219,8 @@ public class FileAccessErrorTest {
   public void testFileAccessError005() throws Exception {
     ErrorTestHelper te = new ErrorTestHelper();
 
-    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     try {
 
diff --git a/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java b/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java
index 5ac5c121..9af3c449 100644
--- a/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java
@@ -27,7 +27,7 @@ import com.android.jack.library.LibraryReadingException;
 import com.android.jack.library.v0001.Version;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import junit.framework.Assert;
 
@@ -70,7 +70,8 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.setVerbose(true);
 
@@ -116,7 +117,8 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.setVerbose(true);
 
@@ -161,7 +163,8 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.setVerbose(true);
 
diff --git a/jack-tests/tests/com/android/jack/error/SourceErrorTest.java b/jack-tests/tests/com/android/jack/error/SourceErrorTest.java
index f9c4b9c7..74f24818 100644
--- a/jack-tests/tests/com/android/jack/error/SourceErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/SourceErrorTest.java
@@ -20,7 +20,7 @@ import com.android.jack.frontend.FrontendCompilationException;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -44,7 +44,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public clas A {}\n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -70,7 +71,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "publi class A {}\n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -96,7 +98,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public class B {}\n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -123,7 +126,8 @@ public class SourceErrorTest {
         + "import jack.invalidsource.B;\n"
         + "public class A {}\n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -158,7 +162,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.overflow", "A.java",
         "package jack.overflow; \n" + content.toString());
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -189,7 +194,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "B.java", "package jack.invalidsource;\n"
         + "public class B { private void m(in a) {}; \n private void n(int a) {re}; } \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -225,7 +231,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "B.java", "package jack.invalidsource;\n"
         + "public class B { private void m(in a) {}; \n private void n(int a) {}; } \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -259,7 +266,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "B.java", "package jack.invalidsource;\n"
         + "public class B { private void m(int a) {}; \n private void n(int a) {}; } \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -290,7 +298,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public class A { private void m(in a) {}; } \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -319,7 +328,8 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public class A { private void n(int a) {re;} } \n");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
index 0b0b34ab..0302d497 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
+++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
@@ -30,7 +30,7 @@ import com.android.jack.shrob.obfuscation.NameProviderFactory;
 import com.android.jack.test.category.KnownBugs;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.JackCliToolchain;
 import com.android.jack.test.toolchain.LegacyJillToolchain;
@@ -51,9 +51,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -485,7 +485,8 @@ public class FileConflictTests {
     File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test004.jack");
     File tempJackFolder = AbstractTestTools.createTempDir();
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         tempJackFolder,
@@ -512,7 +513,7 @@ public class FileConflictTests {
     copyFileToDir(resource2, "pcz/nbqfcvq/wnpx/svyrpcbsyvph/hrgh004/wnpx/ZmPyngg.txt", jackOutput);
 
     // run Jack on Jack dir
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addProguardFlags(new File(testSrcDir, "proguard.flags"));
     toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
     toolchain.libToLib(jackImport1, jackOutput, /* zipFiles = */ false);
@@ -528,7 +529,7 @@ public class FileConflictTests {
     if (isApiTest) {
       excludeList.add(JackCliToolchain.class);
     }
-    return AbstractTestTools.getCandidateToolchain(JackApiToolchain.class, excludeList);
+    return AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class, excludeList);
   }
 
   private void runTest001(@Nonnull File jackOutput, @CheckForNull String collisionPolicy,
diff --git a/jack-tests/tests/com/android/jack/imports/ImportTests.java b/jack-tests/tests/com/android/jack/imports/ImportTests.java
index 3b508cf6..fbcbd613 100644
--- a/jack-tests/tests/com/android/jack/imports/ImportTests.java
+++ b/jack-tests/tests/com/android/jack/imports/ImportTests.java
@@ -22,7 +22,7 @@ import com.android.jack.backend.jayce.TypeImportConflictException;
 import com.android.jack.library.LibraryReadingException;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 
 import junit.framework.Assert;
@@ -62,7 +62,8 @@ public class ImportTests {
   @Test
   public void testCompileConflictingSourceAndImport() throws Exception {
     File jackOut = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         jackOut,
@@ -118,15 +119,15 @@ public class ImportTests {
   public void testConflictingImportWithFailPolicy1() throws Exception {
     String testName = "com.android.jack.inner.test015";
     File lib = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib,
         /* zipFile = */ false,
         AbstractTestTools.getTestRootDir(testName + ".lib"));
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     // import twice the same lib
     toolchain.addStaticLibs(lib, lib);
     toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail");
@@ -154,8 +155,8 @@ public class ImportTests {
   public void testConflictingImportWithFailPolicy2() throws Exception {
     String testName = "com.android.jack.inner.test015";
     File lib1 = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib1,
@@ -164,14 +165,14 @@ public class ImportTests {
 
     File lib2 = AbstractTestTools.createTempDir();
     toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib2,
         /* zipFile = */ false,
         AbstractTestTools.getTestRootDir(testName + ".lib"));
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     // import twice the same lib
     toolchain.addStaticLibs(lib1, lib2);
     toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail");
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
index 8349e981..58fa82c5 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
@@ -23,7 +23,7 @@ import com.android.jack.backend.dex.MainDexOverflowException;
 import com.android.jack.backend.dex.MultiDexLegacy;
 import com.android.jack.test.category.SlowTests;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.tools.merger.FieldIdOverflowException;
 import com.android.jack.tools.merger.MethodIdOverflowException;
 import com.android.sched.scheduler.ProcessException;
@@ -68,8 +68,8 @@ public class MultiDexOverflowTests {
     }
     generateJavaFileWithMethods(srcFolder, fileCount, 36);
 
-    JackApiToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
@@ -105,8 +105,8 @@ public class MultiDexOverflowTests {
     }
     generateJavaFileWithFields(srcFolder, fileCount, 37);
 
-    JackApiToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
index a1a641b4..764448e9 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
@@ -34,7 +34,7 @@ import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.LegacyJillToolchain;
 import com.android.sched.util.TextUtils;
@@ -94,7 +94,8 @@ public class MultiDexTests {
   public void versionedTest001a() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
 
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
@@ -120,7 +121,8 @@ public class MultiDexTests {
   public void versionedTest001b() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
 
@@ -145,7 +147,8 @@ public class MultiDexTests {
   public void versionedTest001c() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
 
@@ -170,7 +173,8 @@ public class MultiDexTests {
   public void versionedTest001a_withoutAnnotations() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
@@ -188,7 +192,7 @@ public class MultiDexTests {
   public void versionedTest001b_minimal_withoutAnnotations() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
@@ -209,7 +213,8 @@ public class MultiDexTests {
 
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
@@ -318,7 +323,8 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
 
@@ -348,7 +354,8 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(library);
@@ -384,7 +391,8 @@ public class MultiDexTests {
     Assert.assertTrue(jackInf.mkdir());
     Files.copy(new File(testFolder,"config-001.jpp"), new File(jackInf, "config-001.jpp"));
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(autoLibrary);
diff --git a/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java b/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java
index c59e2d73..3cb631d5 100644
--- a/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java
@@ -17,15 +17,15 @@
 package com.android.jack.shrob;
 
 import com.android.jack.Options;
-import com.android.jack.test.category.SlowTests;
 import com.android.jack.shrob.obfuscation.NameProviderFactory;
 import com.android.jack.shrob.proguard.GrammarActions;
 import com.android.jack.shrob.spec.Flags;
+import com.android.jack.test.category.SlowTests;
 import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import org.junit.experimental.categories.Category;
 
@@ -43,7 +43,8 @@ public class FlattenPackageTests extends AbstractTest {
       @Nonnull String mappingNumber)
       throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber);
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     Flags flags = new Flags();
     toolchain.setShrobFlags(flags);
     GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags);
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
index fb09d898..7b35e501 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
@@ -22,7 +22,7 @@ import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import org.junit.Test;
 
@@ -40,7 +40,8 @@ public class ObfuscationWithMappingTests extends AbstractTest {
       throws Exception {
 
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber);
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     Flags flags = new Flags();
     toolchain.setShrobFlags(flags);
     GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags);
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
index bd7030f4..546b5a56 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
@@ -25,7 +25,7 @@ import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -48,7 +48,8 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
     String testPackageName = "com.android.jack.shrob.test" + testNumber;
     File testFolder = AbstractTestTools.getTestRootDir(testPackageName);
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     Flags flags = new Flags();
     toolchain.setShrobFlags(flags);
     GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags);
diff --git a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
index 805d2c51..042a5a42 100644
--- a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
@@ -24,7 +24,7 @@ import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import java.io.File;
 
@@ -49,7 +49,8 @@ public class RepackagingTest extends AbstractTest {
     flags.setOutputMapping(candidateOutputMapping);
     flags.setPrintMapping(true);
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.setShrobFlags(flags);
     toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
     toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
diff --git a/jack-tests/tests/com/android/jack/shrob/SeedTests.java b/jack-tests/tests/com/android/jack/shrob/SeedTests.java
index 938f57d6..dbc4c173 100644
--- a/jack-tests/tests/com/android/jack/shrob/SeedTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/SeedTests.java
@@ -16,14 +16,14 @@
 
 package com.android.jack.shrob;
 
-import com.android.jack.test.category.SlowTests;
 import com.android.jack.shrob.proguard.GrammarActions;
 import com.android.jack.shrob.spec.Flags;
+import com.android.jack.test.category.SlowTests;
 import com.android.jack.test.comparator.ComparatorSeeds;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -53,7 +53,8 @@ public class SeedTests extends AbstractTest {
     flags.setSeedsFile(candidateOutputSeeds);
     flags.setPrintSeeds(true);
 
-    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     toolchain.setShrobFlags(flags);
 
     SourceToDexComparisonTestHelper env =
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
index 81f6ba76..241a6f4a 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
@@ -24,7 +24,7 @@ import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.util.TextUtils;
 
@@ -93,15 +93,15 @@ public class ShrinkTests extends AbstractTest {
     File shrinkOut = null;
 
     try {
-      JackApiToolchain toolchain =
-          AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      JackApiToolchainBase toolchain =
+          AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .srcToLib(
           libOut,
           /* zipFiles = */ false,
           new File(shrobTestsDir, "test020/lib"));
 
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       testOut = AbstractTestTools.createTempDir();
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .addToClasspath(libOut)
@@ -110,7 +110,7 @@ public class ShrinkTests extends AbstractTest {
           new File(shrobTestsDir, "test020/jack"));
 
       shrinkOut = AbstractTestTools.createTempDir();
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       toolchain.addProguardFlags(
           dontObfuscateFlagFile,
           new ProguardFlags(new File(shrobTestsDir, "test020"),"proguard.flags"));
@@ -141,15 +141,15 @@ public class ShrinkTests extends AbstractTest {
     File dexOut = null;
 
     try {
-      JackApiToolchain toolchain =
-          AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      JackApiToolchainBase toolchain =
+          AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .srcToLib(
           jackOut,
           /* zipFiles = */ false,
           new File(shrobTestsDir, "test021/jack"));
 
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       toolchain.addProguardFlags(
           dontObfuscateFlagFile,
           new ProguardFlags(new File( shrobTestsDir, "test021"),"proguard.flags001"));
@@ -157,7 +157,7 @@ public class ShrinkTests extends AbstractTest {
       toolchain.libToLib(jackOut, shrinkOut, /* zipFiles = */ false);
 
       dexOut = AbstractTestTools.createTempDir();
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
       toolchain.libToExe(shrinkOut, dexOut, /* zipFile = */ false);
 
     } catch (Exception e) {
diff --git a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java
index 777951e0..668a3dab 100644
--- a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java
+++ b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java
@@ -19,7 +19,7 @@ package com.android.jack.tools.merger;
 import com.android.jack.Options;
 import com.android.jack.backend.dex.DexFileWriter;
 import com.android.jack.test.toolchain.AbstractTestTools;
-import com.android.jack.test.toolchain.JackApiToolchain;
+import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.sched.scheduler.ScheduleInstance;
 
 import java.io.File;
@@ -34,8 +34,8 @@ public class MergerTestTools {
   @Nonnull
   protected File buildOneDexPerType(@Nonnull File sourceFolder,
       boolean withDebug, @CheckForNull OutputStream out, @CheckForNull OutputStream err) throws Exception {
-    JackApiToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
+    JackApiToolchainBase toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     try {
       File multiDexFolder = AbstractTestTools.createTempDir();
       File multiDex = new File(multiDexFolder, DexFileWriter.DEX_FILENAME);