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

This reverts commit d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.

Change-Id: Idceeda07056275eb887d42a5aa75b624024554e0

28 files changed, 410 insertions, 498 deletions

diff --git a/jack-tests/.classpath b/jack-tests/.classpath
index cd01390..3cc771d 100644
--- a/jack-tests/.classpath
+++ b/jack-tests/.classpath
@@ -15,6 +15,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Jack"/>
 	<classpathentry kind="lib" path="libs/ddmlib.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Dx"/>
-	<classpathentry kind="lib" path="libs/jack-api-lib.jar" sourcepath="/jack-api/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
index 11af77b..90bffbc 100644
--- a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
@@ -22,7 +22,7 @@ import com.android.jack.test.runner.AbstractRuntimeRunner;
 import com.android.jack.test.runner.RuntimeRunner;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
-import com.android.jack.test.toolchain.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.jack.test.toolchain.JackBasedToolchain.MultiDexKind;
 import com.android.jack.test.toolchain.JillBasedToolchain;
 
@@ -176,8 +176,8 @@ public class IncrementalTestHelper {
     List<Class<? extends IToolchain>> excludeList = new ArrayList<Class<? extends IToolchain>>(1);
     excludeList.add(JillBasedToolchain.class);
 
-    JackApiToolchainBase jackToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class, excludeList);
+    JackApiToolchain jackToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class, excludeList);
     jackToolchain.setIncrementalFolder(getCompilerStateFolder());
     jackToolchain.addStaticLibs(imports.toArray(new File[imports.size()]));
     jackToolchain.setMultiDexKind(multiDexKind);
diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
index be3414b..0c9fa32 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
@@ -82,10 +82,10 @@ public abstract class AbstractTestTools {
   static {
 
     toolchainBuilders = new HashMap<String, ToolchainBuilder>();
-    toolchainBuilders.put("jack-cli"      , new JackCliToolchainBuilder());
-    toolchainBuilders.put("jack-api-v01"  , new JackApiV01ToolchainBuilder());
-    toolchainBuilders.put("legacy"        , new LegacyToolchainBuilder());
-    toolchainBuilders.put("jill-legacy"   , new LegacyJillToolchainBuilder());
+    toolchainBuilders.put("jack-cli"   , new JackCliToolchainBuilder());
+    toolchainBuilders.put("jack-api"   , new JackApiToolchainBuilder());
+    toolchainBuilders.put("legacy"     , new LegacyToolchainBuilder());
+    toolchainBuilders.put("jill-legacy", new LegacyJillToolchainBuilder());
 
     try {
       runtimes.addAll(parseRuntimeList(TestsProperties.getProperty(RUNTIME_LIST_KEY)));
@@ -122,12 +122,12 @@ public abstract class AbstractTestTools {
     }
   }
 
-  private static class JackApiV01ToolchainBuilder implements ToolchainBuilder {
+  private static class JackApiToolchainBuilder implements ToolchainBuilder {
 
     @Override
     @Nonnull
-    public JackApiV01Toolchain build() {
-      return new JackApiV01Toolchain(getPrebuilt("jack"));
+    public JackApiToolchain build() {
+      return new JackApiToolchain();
     }
   }
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
new file mode 100644
index 0000000..e48177e
--- /dev/null
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.test.toolchain;
+
+import com.android.jack.Jack;
+import com.android.jack.Options;
+import com.android.jack.Sourcelist;
+import com.android.jack.backend.dex.rop.CodeItemBuilder;
+import com.android.jack.shrob.spec.Flags;
+import com.android.sched.util.config.cli.TokenIterator;
+import com.android.sched.util.location.NoLocation;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.Nonnull;
+
+/**
+ * This class implements a {@link JackBasedToolchain} by calling Jack via API.
+ */
+public class JackApiToolchain extends JackBasedToolchain {
+
+  @Nonnull
+  private Options jackOptions = new Options();
+
+  JackApiToolchain() {}
+
+  @Override
+  @Nonnull
+  protected JackApiToolchain setVerbosityLevel(@Nonnull Options.VerbosityLevel level) {
+    jackOptions.setVerbosityLevel(level);
+    return this;
+  }
+
+  @Override
+  public void srcToExe(@Nonnull File out, boolean zipFile,
+      @Nonnull File... sources) throws Exception {
+
+    try {
+
+      srcToCommon(sources);
+
+      if (zipFile) {
+        jackOptions.setOutputZip(out);
+      } else {
+        jackOptions.setOutputDir(out);
+      }
+
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
+      Jack.checkAndRun(jackOptions);
+    } finally {
+      System.setOut(stdOut);
+      System.setErr(stdErr);
+    }
+  }
+
+  @Override
+  public void srcToLib(@Nonnull File out, boolean zipFiles,
+      @Nonnull File... sources) throws Exception {
+
+    try {
+
+      srcToCommon(sources);
+
+      if (zipFiles) {
+        jackOptions.setJayceOutputZip(out);
+      } else {
+        jackOptions.setJayceOutputDir(out);
+      }
+
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
+      Jack.checkAndRun(jackOptions);
+    } finally {
+      System.setOut(stdOut);
+      System.setErr(stdErr);
+    }
+  }
+
+  private void srcToCommon(@Nonnull File... sources) throws Exception {
+    addProperties(properties, jackOptions);
+
+    jackOptions.setSanityChecks(sanityChecks);
+
+    if (jackOptions.getFlags() != null) {
+      jackOptions.applyShrobFlags();
+    }
+
+    if (classpath.size() > 0) {
+      jackOptions.setClasspath(getClasspathAsString());
+    }
+
+    fillEcjArgs(sources);
+
+    for (File res : resImport) {
+      jackOptions.addResource(res);
+    }
+
+    jackOptions.setImportedLibraries(staticLibs);
+
+    if (jarjarRules != null) {
+      jackOptions.setJarjarRulesFile(jarjarRules);
+    }
+
+    if (proguardFlags.size() > 0) {
+      jackOptions.setProguardFlagsFile(proguardFlags);
+    }
+
+    jackOptions.addProperty(Options.EMIT_LOCAL_DEBUG_INFO.getName(),
+        Boolean.toString(withDebugInfos));
+
+    jackOptions.addProperty(CodeItemBuilder.DEX_OPTIMIZE.getName(),
+        Boolean.toString(!withDebugInfos));
+
+  }
+
+  @Override
+  public void libToExe(@Nonnull File[] in, @Nonnull File out, boolean zipFile) throws Exception {
+
+    try {
+
+      libToCommon(in);
+
+      if (zipFile) {
+        jackOptions.setOutputZip(out);
+      } else {
+        jackOptions.setOutputDir(out);
+      }
+
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
+      Jack.checkAndRun(jackOptions);
+    } finally {
+      System.setOut(stdOut);
+      System.setErr(stdErr);
+    }
+  }
+
+  @Override
+  public void libToLib(@Nonnull File[] in, @Nonnull File out, boolean zipFiles) throws Exception {
+
+    try {
+
+      libToCommon(in);
+
+      if (zipFiles) {
+        jackOptions.setJayceOutputZip(out);
+      } else {
+        jackOptions.setJayceOutputDir(out);
+      }
+
+      System.setOut(outRedirectStream);
+      System.setErr(errRedirectStream);
+
+      Jack.checkAndRun(jackOptions);
+    } finally {
+      System.setOut(stdOut);
+      System.setErr(stdErr);
+    }
+  }
+
+  private void libToCommon(@Nonnull File[] in) {
+    addProperties(properties, jackOptions);
+
+    jackOptions.setSanityChecks(sanityChecks);
+
+    if (jarjarRules != null) {
+      jackOptions.setJarjarRulesFile(jarjarRules);
+    }
+
+    if (classpath.size() > 0) {
+      jackOptions.setClasspath(getClasspathAsString());
+    }
+
+    if (jackOptions.getFlags() != null) {
+      jackOptions.applyShrobFlags();
+    }
+
+    if (proguardFlags.size() > 0) {
+      jackOptions.setProguardFlagsFile(proguardFlags);
+    }
+
+    for (File res : resImport) {
+      jackOptions.addResource(res);
+    }
+
+    List<File> libsToImport = new ArrayList<File>();
+    for (File staticLib : in) {
+      libsToImport.add(staticLib);
+    }
+    libsToImport.addAll(staticLibs);
+    jackOptions.setImportedLibraries(libsToImport);
+
+  }
+
+  @Nonnull
+  public JackApiToolchain setShrobFlags(@Nonnull Flags shrobFlags)  {
+    jackOptions.setFlags(shrobFlags);
+    return this;
+  }
+
+  @Override
+  @Nonnull
+  public JackApiToolchain setIncrementalFolder(@Nonnull File incrementalFolder) {
+    jackOptions.setIncrementalFolder(incrementalFolder);
+    return this;
+  }
+
+  private static final void addProperties(@Nonnull Map<String, String> properties,
+      @Nonnull Options jackOptions) {
+    for (Entry<String, String> entry : properties.entrySet()) {
+      jackOptions.addProperty(entry.getKey(), entry.getValue());
+    }
+  }
+
+  private final void fillEcjArgs(@Nonnull File... sources) throws Exception {
+    List<String> ecjArgs = new ArrayList<String>();
+
+    if (annotationProcessorClass != null) {
+      ecjArgs.add("-processor");
+      ecjArgs.add(annotationProcessorClass.getName());
+    }
+
+    if (annotationProcessorOutDir != null) {
+      ecjArgs.add("-d");
+      ecjArgs.add(annotationProcessorOutDir.getAbsolutePath());
+    }
+
+    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()) {
+          toCompile.add(new File(iterator.next()));
+        }
+      } else {
+        toCompile.add(srcFile);
+      }
+    }
+
+    if (sources.length > 0) {
+      jackOptions.setEcjExtraArguments(ecjArgs);
+      jackOptions.setInputSources(toCompile);
+    }
+  }
+
+}
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java
deleted file mode 100644
index 33fb3dd..0000000
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.jack.test.toolchain;
-
-import com.android.jack.api.ConfigNotSupportedException;
-import com.android.jack.api.JackConfig;
-import com.android.jack.api.JackConfigProvider;
-import com.android.jack.api.example.Main;
-import com.android.jack.api.v01.VerbosityLevel;
-import com.android.jack.shrob.spec.Flags;
-import com.android.jack.test.TestConfigurationException;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-/**
- * This class implements a {@link JackBasedToolchain} by calling Jack via API.
- */
-public abstract class JackApiToolchainBase extends JackBasedToolchain {
-
-  @Nonnull
-  protected JackConfig config;
-
-  @Nonnull
-  private String compilerCodeName;
-  @Nonnull
-  private String compilerVersion;
-  @Nonnull
-  private String compilerBuildId;
-  @Nonnull
-  private String compilerCodeBase;
-
-  @CheckForNull
-  protected File incrementalFolder;
-  @Nonnull
-  protected VerbosityLevel verbosityLevel = VerbosityLevel.WARNING;
-
-  public String getCompilerCodeName() {
-    return compilerCodeName;
-  }
-
-  public String getCompilerVersion() {
-    return compilerVersion;
-  }
-
-  public String getCompilerBuildId() {
-    return compilerBuildId;
-  }
-
-  public String getCompilerCodeBase() {
-    return compilerCodeBase;
-  }
-
-  protected <T extends JackConfig> JackApiToolchainBase(@Nonnull File jackPrebuilt,
-      @Nonnull Class<T> jackConfig) {
-    try {
-      ClassLoader loader;
-      JackConfigProvider confProvider;
-      loader = URLClassLoader.newInstance(new URL[] {jackPrebuilt.toURI().toURL()},
-          Main.class.getClassLoader());
-
-      Class<? extends JackConfigProvider> confProviderClass = Class.forName(
-          JackConfigProvider.CLASS_NAME, true, loader).asSubclass(JackConfigProvider.class);
-
-      JackConfigProvider configProvider = confProviderClass.getConstructor().newInstance();
-
-      compilerCodeName = configProvider.getCompilerCodeName();
-      compilerVersion = configProvider.getCompilerVersion();
-      compilerBuildId = configProvider.getCompilerBuildId();
-      compilerCodeBase = configProvider.getCompilerCodeBase();
-
-      config = confProviderClass.getConstructor().newInstance().getConfig(jackConfig);
-
-    } catch (ConfigNotSupportedException e) {
-      throw new TestConfigurationException("Jack API v01 not supported", e);
-    } catch (MalformedURLException e) {
-      throw new TestConfigurationException(e);
-    } catch (ClassNotFoundException e) {
-      throw new TestConfigurationException(e);
-    } catch (InstantiationException e) {
-      throw new TestConfigurationException(e);
-    } catch (IllegalAccessException e) {
-      throw new TestConfigurationException(e);
-    } catch (IllegalArgumentException e) {
-      throw new TestConfigurationException(e);
-    } catch (InvocationTargetException e) {
-      throw new TestConfigurationException(e);
-    } catch (NoSuchMethodException e) {
-      throw new TestConfigurationException(e);
-    } catch (SecurityException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  @Override
-  @Nonnull
-  public JackApiToolchainBase setIncrementalFolder(@Nonnull File incrementalFolder) {
-    this.incrementalFolder = incrementalFolder;
-    return this;
-  }
-
-  @Nonnull
-  public abstract JackApiToolchainBase setShrobFlags(@Nonnull Flags shrobFlags);
-
-}
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java
deleted file mode 100644
index 83efb1e..0000000
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.jack.test.toolchain;
-
-import com.google.common.collect.Lists;
-
-import com.android.jack.Options;
-import com.android.jack.api.v01.Api01Config;
-import com.android.jack.api.v01.ConfigurationException;
-import com.android.jack.api.v01.VerbosityLevel;
-import com.android.jack.shrob.spec.Flags;
-import com.android.jack.test.TestConfigurationException;
-import com.android.sched.vfs.Container;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-/**
- * This {@link Toolchain} uses Jack through v01 API
- */
-public class JackApiV01Toolchain extends JackApiToolchainBase {
-
-  @Nonnull
-  private Api01Config apiV01Config;
-
-  JackApiV01Toolchain(@Nonnull File jackPrebuilt) {
-    super(jackPrebuilt, Api01Config.class);
-    apiV01Config = (Api01Config) config;
-  }
-
-  @Override
-  public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources)
-      throws Exception {
-    srcToCommon(sources);
-    setOutputDex(out);
-    apiV01Config.getTask().run();
-  }
-
-  @Override
-  public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources)
-      throws Exception {
-    srcToCommon(sources);
-    setOutputJack(out);
-    apiV01Config.getTask().run();
-  }
-
-  @Override
-  public void libToExe(@Nonnull File[] in, @Nonnull File out, boolean zipFile) throws Exception {
-    libToCommon(in);
-    setOutputDex(out);
-    apiV01Config.getTask().run();
-  }
-
-  @Override
-  public void libToLib(@Nonnull File[] in, @Nonnull File out, boolean zipFiles) throws Exception {
-    libToCommon(in);
-    setOutputJack(out);
-    apiV01Config.getTask().run();
-  }
-
-  @Override
-  @Nonnull
-  public JackApiV01Toolchain setIncrementalFolder(@Nonnull File incrementalFolder) {
-    try {
-      apiV01Config.setIncrementalDir(incrementalFolder);
-      return this;
-    } catch (ConfigurationException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  @Override
-  @Nonnull
-  public JackApiV01Toolchain setVerbose(boolean isVerbose) {
-    super.setVerbose(isVerbose);
-    try {
-      if (isVerbose) {
-        apiV01Config.setVerbosityLevel(VerbosityLevel.DEBUG);
-      } else {
-        apiV01Config.setVerbosityLevel(VerbosityLevel.WARNING);
-      }
-      return this;
-    } catch (ConfigurationException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  @Override
-  @Nonnull
-  public final JackApiV01Toolchain addProperty(@Nonnull String propertyName,
-      @Nonnull String propertyValue) {
-    try {
-      apiV01Config.setProperty(propertyName, propertyValue);
-      return this;
-    } catch (ConfigurationException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  @Override
-  @Nonnull
-  public JackApiV01Toolchain setWithDebugInfos(boolean withDebugInfos) {
-    try {
-      apiV01Config.setEmitDebug(withDebugInfos);
-      return this;
-    } catch (ConfigurationException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  @Override
-  @Nonnull
-  public JackApiV01Toolchain setShrobFlags(@Nonnull Flags shrobFlags) {
-    // STOPSHIP(jmhenaff): another CL remove the need for this API
-    throw new AssertionError("Must no be used");
-  }
-
-  @Override
-  @Nonnull
-  public JackApiV01Toolchain setSanityChecks(boolean sanityChecks) {
-    try {
-      apiV01Config.setProperty(Options.SANITY_CHECKS.getName(), Boolean.toString(sanityChecks));
-      return this;
-    } catch (ConfigurationException e) {
-      throw new TestConfigurationException(e);
-    }
-  }
-
-  private void srcToCommon(@Nonnull File... sources) throws Exception {
-    apiV01Config.setClasspath(classpath);
-    apiV01Config.setImportedJackLibraryFiles(staticLibs);
-    apiV01Config.setSourceEntries(Lists.newArrayList(sources));
-    apiV01Config.setResourceDirs(resImport);
-    apiV01Config.setProguardConfigFiles(proguardFlags);
-    if (jarjarRules != null) {
-      apiV01Config.setJarJarConfigFile(jarjarRules);
-    }
-  }
-
-  private void libToCommon(@Nonnull File... in) throws Exception {
-    apiV01Config.setClasspath(classpath);
-    List<File> importedLibs = new ArrayList<File>(staticLibs);
-    Collections.addAll(importedLibs, in);
-    apiV01Config.setImportedJackLibraryFiles(importedLibs);
-    apiV01Config.setResourceDirs(resImport);
-    apiV01Config.setProguardConfigFiles(proguardFlags);
-    if (jarjarRules != null) {
-      apiV01Config.setJarJarConfigFile(jarjarRules);
-    }
-  }
-
-  private void setOutputDex(@Nonnull File outDex) throws Exception {
-    if (outDex.isDirectory()) {
-      apiV01Config.setOutputDexDir(outDex);
-    } else {
-      apiV01Config.setProperty(Options.DEX_OUTPUT_CONTAINER_TYPE.getName(), Container.ZIP.name());
-      apiV01Config.setProperty(Options.GENERATE_DEX_FILE.getName(), "true");
-      apiV01Config.setProperty(Options.DEX_OUTPUT_ZIP.getName(), outDex.getAbsolutePath());
-    }
-  }
-
-  private void setOutputJack(@Nonnull File outjack) throws Exception {
-    if (!outjack.isDirectory()) {
-      apiV01Config.setOutputJackFile(outjack);
-    } else {
-      apiV01Config.setProperty(Options.LIBRARY_OUTPUT_CONTAINER_TYPE.getName(),
-          Container.DIR.name());
-      apiV01Config.setProperty(Options.LIBRARY_OUTPUT_DIR.getName(), outjack.getAbsolutePath());
-      apiV01Config.setProperty(Options.GENERATE_JACK_LIBRARY.getName(), "true");
-      apiV01Config.setProperty(Options.GENERATE_JAYCE_IN_LIBRARY.getName(), "true");
-      apiV01Config.setProperty(Options.GENERATE_DEPENDENCIES_IN_LIBRARY.getName(), "true");
-    }
-  }
-
-}
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
index 34610eb..b7f0f55 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
@@ -16,6 +16,8 @@
 
 package com.android.jack.test.toolchain;
 
+import com.android.jack.Options;
+import com.android.jack.Options.VerbosityLevel;
 import com.android.jack.backend.dex.DexFileWriter;
 import com.android.jack.backend.dex.MultiDexLegacy;
 import com.android.jack.backend.dex.rop.CodeItemBuilder;
@@ -23,7 +25,9 @@ import com.android.jack.test.TestsProperties;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -42,15 +46,21 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
     LEGACY
   }
 
-
+  @Nonnull
+  protected final Map<String, String> properties = new HashMap<String, String>();
   @CheckForNull
   protected File annotationProcessorOutDir;
   @Nonnull
   protected List<File> resImport = new ArrayList<File>();
 
+  protected boolean sanityChecks = true;
+
   @Nonnull
-  public abstract JackBasedToolchain addProperty(@Nonnull String propertyName,
-      @Nonnull String propertyValue);
+  public final JackBasedToolchain addProperty(@Nonnull String propertyName,
+      @Nonnull String propertyValue) {
+    properties.put(propertyName, propertyValue);
+    return this;
+  }
 
   public final JackBasedToolchain setMultiDexKind(@Nonnull MultiDexKind kind) {
     switch (kind) {
@@ -109,8 +119,26 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
     return this;
   }
 
+  @Override
   @Nonnull
-  public abstract JackBasedToolchain setSanityChecks(boolean sanityChecks);
+  public JackBasedToolchain setVerbose(boolean isVerbose) {
+    super.setVerbose(isVerbose);
+    if (isVerbose) {
+      setVerbosityLevel(VerbosityLevel.DEBUG);
+    } else {
+      setVerbosityLevel(VerbosityLevel.WARNING);
+    }
+    return this;
+  }
+
+  @Nonnull
+  protected abstract JackBasedToolchain setVerbosityLevel(@Nonnull Options.VerbosityLevel level);
+
+  @Nonnull
+  public JackBasedToolchain setSanityChecks(boolean sanityChecks){
+    this.sanityChecks = sanityChecks;
+    return this;
+  }
 
   @Override
   @Nonnull
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
index 3542d03..280f8c9 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -22,7 +22,6 @@ import com.android.jack.util.ExecuteFile;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -44,10 +43,6 @@ public class JackCliToolchain extends JackBasedToolchain {
   protected File incrementalFolder;
   @Nonnull
   protected Options.VerbosityLevel verbosityLevel = VerbosityLevel.WARNING;
-  @Nonnull
-  protected final Map<String, String> properties = new HashMap<String, String>();
-
-  protected boolean sanityChecks = true;
 
   JackCliToolchain(@Nonnull File prebuilt) {
     this.jackPrebuilt = prebuilt;
@@ -55,9 +50,8 @@ public class JackCliToolchain extends JackBasedToolchain {
 
   @Override
   @Nonnull
-  public JackCliToolchain setVerbose(boolean isVerbose) {
-    super.setVerbose(isVerbose);
-    verbosityLevel = isVerbose ? VerbosityLevel.DEBUG : VerbosityLevel.WARNING;
+  protected JackCliToolchain setVerbosityLevel(@Nonnull Options.VerbosityLevel level) {
+    verbosityLevel = level;
     return this;
   }
 
@@ -312,14 +306,6 @@ public class JackCliToolchain extends JackBasedToolchain {
     return this;
   }
 
-  @Override
-  @Nonnull
-  public JackBasedToolchain addProperty(@Nonnull String propertyName,
-      @Nonnull String propertyValue) {
-    properties.put(propertyName, propertyValue);
-    return this;
-  }
-
   protected static void addProperties(@Nonnull Map<String, String> properties,
       @Nonnull List<String> args) {
     for (Entry<String, String> entry : properties.entrySet()) {
@@ -328,11 +314,4 @@ public class JackCliToolchain extends JackBasedToolchain {
     }
   }
 
-  @Override
-  @Nonnull
-  public JackBasedToolchain setSanityChecks(boolean sanityChecks){
-    this.sanityChecks = sanityChecks;
-    return this;
-  }
-
 }
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 c56c636..59e9790 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.jack.util.filter.SignatureMethodFilter;
 
 import org.junit.Test;
@@ -30,8 +30,7 @@ public class ReachingDefsTests {
   @Test
   public void testDfa001() throws Exception {
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 3aaa72d..d01ff0c 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.JillBasedToolchain;
 
@@ -160,15 +160,14 @@ public class ClasspathTests {
 
   @Test
   public void testMissingClasspathEntry() throws Exception {
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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(JackApiToolchainBase.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addProperty(Jack.STRICT_CLASSPATH.getName(), "true");
     try {
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
@@ -192,15 +191,14 @@ public class ClasspathTests {
       Exception {
     Assert.assertTrue(invalidJack.isFile());
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     File testOut = AbstractTestTools.createTempFile("ClasspathTest", "invalid");
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(invalidJack)
     .srcToLib(testOut, /* zipFiles = */ true, srcDir);
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 a5e310c..b3c4700 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import junit.framework.Assert;
 
@@ -69,8 +69,7 @@ public class AnnotationProcessorErrorTest {
         "package jack.incremental; \n"+
         "public class A {} \n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
 
     try {
@@ -101,8 +100,7 @@ public class AnnotationProcessorErrorTest {
 
     runAnnotProcBuildingResource(te);
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -139,8 +137,7 @@ public class AnnotationProcessorErrorTest {
         + "public class A {}\n");
 
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     jackApiToolchain.setAnnotationProcessorClass(SourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -173,8 +170,7 @@ public class AnnotationProcessorErrorTest {
         + "@" + SourceAnnotationTest.class.getSimpleName() + "\n"
         + "public class A {}\n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     jackApiToolchain.setAnnotationProcessorClass(SourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
 
@@ -202,8 +198,7 @@ public class AnnotationProcessorErrorTest {
         + "@" + ResourceAnnotationTest.class.getSimpleName() + "\n"
         + "public class A {}\n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class);
     jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder());
 
@@ -236,8 +231,7 @@ public class AnnotationProcessorErrorTest {
     }
 
     // Compile annotation to a jack file
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 ca85cba..47ffba7 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import junit.framework.Assert;
 
@@ -47,8 +47,7 @@ public class CommandLineErrorTest {
   public void testCommandLineError002() throws Exception {
     ErrorTestHelper ite = new ErrorTestHelper();
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
@@ -74,8 +73,7 @@ public class CommandLineErrorTest {
     File sourceFile = AbstractTestTools.createFile(ite.getSourceFolder(), "jack.incremental",
         "A.java", "package jack.incremental; \n" + "public class A {} \n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 f8a9d17..948f0e7 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.sched.util.config.UnknownPropertyNameException;
 
 import org.junit.Assert;
@@ -33,8 +33,7 @@ public class ConfigErrorTest {
   public void testUnknownProperty001() throws Exception {
     ErrorTestHelper ite = new ErrorTestHelper();
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 cb419a0..91fb962 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import junit.framework.Assert;
 
@@ -52,8 +52,7 @@ public class ErrorTest {
 
   private void checkInternalCompilerException(@Nonnull String testName)
       throws Exception, IOException {
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 3156ded..7f8a360 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.sched.util.codec.ListParsingException;
 import com.android.sched.util.codec.ParsingException;
 import com.android.sched.util.config.PropertyIdException;
@@ -63,8 +63,7 @@ public class FileAccessErrorTest {
     if (!jackOutputFile.setReadable(false)) {
       Assert.fail("Fails to change file permissions of " + jackOutputFile.getAbsolutePath());
     }
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     try {
       jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
@@ -89,8 +88,8 @@ public class FileAccessErrorTest {
     File srcFile = AbstractTestTools.createFile(helper.getSourceFolder(), "jack.incremental",
         "A.java", "package jack.incremental; \n" + "public class A {} \n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
     .srcToLib(helper.getJackFolder(), /* zipFiles = */ false, helper.getSourceFolder());
@@ -105,7 +104,7 @@ public class FileAccessErrorTest {
       Assert.fail("Fails to change file permissions of " + helper.getJackFolder().getAbsolutePath());
     }
 
-    jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
@@ -142,8 +141,7 @@ public class FileAccessErrorTest {
       Assert.fail("Fails to change file permissions of " + a.getAbsolutePath());
     }
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     jackApiToolchain.setErrorStream(errOut);
 
@@ -172,8 +170,7 @@ public class FileAccessErrorTest {
         "package jack.incremental; \n"+
         "public class A {} \n");
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath())
     .srcToLib(te.getJackFolder(), false, te.getSourceFolder());
@@ -219,8 +216,7 @@ public class FileAccessErrorTest {
   public void testFileAccessError005() throws Exception {
     ErrorTestHelper te = new ErrorTestHelper();
 
-    JackApiToolchainBase jackApiToolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 9af3c44..5ac5c12 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import junit.framework.Assert;
 
@@ -70,8 +70,7 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     toolchain.setVerbose(true);
 
@@ -117,8 +116,7 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     toolchain.setVerbose(true);
 
@@ -163,8 +161,7 @@ public class JackFormatErrorTest {
         "package jack.incremental; \n"+
         "public class B extends A {} \n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 74f2481..f9c4b9c 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -44,8 +44,7 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public clas A {}\n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -71,8 +70,7 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "publi class A {}\n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -98,8 +96,7 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public class B {}\n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -126,8 +123,7 @@ public class SourceErrorTest {
         + "import jack.invalidsource.B;\n"
         + "public class A {}\n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
     toolchain.setErrorStream(errOut);
@@ -162,8 +158,7 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.overflow", "A.java",
         "package jack.overflow; \n" + content.toString());
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -194,8 +189,7 @@ 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");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -231,8 +225,7 @@ 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");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -266,8 +259,7 @@ 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");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -298,8 +290,7 @@ public class SourceErrorTest {
     AbstractTestTools.createFile(helper.getSourceFolder(), "jack.invalidsource", "A.java", "package jack.invalidsource;\n"
         + "public class A { private void m(in a) {}; } \n");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
@@ -328,8 +319,7 @@ 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");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 0302d49..0b0b34a 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 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,8 +485,7 @@ public class FileConflictTests {
     File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test004.jack");
     File tempJackFolder = AbstractTestTools.createTempDir();
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         tempJackFolder,
@@ -513,7 +512,7 @@ public class FileConflictTests {
     copyFileToDir(resource2, "pcz/nbqfcvq/wnpx/svyrpcbsyvph/hrgh004/wnpx/ZmPyngg.txt", jackOutput);
 
     // run Jack on Jack dir
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addProguardFlags(new File(testSrcDir, "proguard.flags"));
     toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
     toolchain.libToLib(jackImport1, jackOutput, /* zipFiles = */ false);
@@ -529,7 +528,7 @@ public class FileConflictTests {
     if (isApiTest) {
       excludeList.add(JackCliToolchain.class);
     }
-    return AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class, excludeList);
+    return AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 fbcbd61..3b508cf 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 
 import junit.framework.Assert;
@@ -62,8 +62,7 @@ public class ImportTests {
   @Test
   public void testCompileConflictingSourceAndImport() throws Exception {
     File jackOut = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         jackOut,
@@ -119,15 +118,15 @@ public class ImportTests {
   public void testConflictingImportWithFailPolicy1() throws Exception {
     String testName = "com.android.jack.inner.test015";
     File lib = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib,
         /* zipFile = */ false,
         AbstractTestTools.getTestRootDir(testName + ".lib"));
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     // import twice the same lib
     toolchain.addStaticLibs(lib, lib);
     toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail");
@@ -155,8 +154,8 @@ public class ImportTests {
   public void testConflictingImportWithFailPolicy2() throws Exception {
     String testName = "com.android.jack.inner.test015";
     File lib1 = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib1,
@@ -165,14 +164,14 @@ public class ImportTests {
 
     File lib2 = AbstractTestTools.createTempDir();
     toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .srcToLib(
         lib2,
         /* zipFile = */ false,
         AbstractTestTools.getTestRootDir(testName + ".lib"));
 
-    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 58fa82c..8349e98 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 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);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.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);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 764448e..a1a641b 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.LegacyJillToolchain;
 import com.android.sched.util.TextUtils;
@@ -94,8 +94,7 @@ public class MultiDexTests {
   public void versionedTest001a() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
 
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
@@ -121,8 +120,7 @@ public class MultiDexTests {
   public void versionedTest001b() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
 
@@ -147,8 +145,7 @@ public class MultiDexTests {
   public void versionedTest001c() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
 
@@ -173,8 +170,7 @@ public class MultiDexTests {
   public void versionedTest001a_withoutAnnotations() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
@@ -192,7 +188,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();
-    JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
@@ -213,8 +209,7 @@ public class MultiDexTests {
 
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
@@ -323,8 +318,7 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
 
@@ -354,8 +348,7 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(library);
@@ -391,8 +384,7 @@ public class MultiDexTests {
     Assert.assertTrue(jackInf.mkdir());
     Files.copy(new File(testFolder,"config-001.jpp"), new File(jackInf, "config-001.jpp"));
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 3cb631d..c59e2d7 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import org.junit.experimental.categories.Category;
 
@@ -43,8 +43,7 @@ public class FlattenPackageTests extends AbstractTest {
       @Nonnull String mappingNumber)
       throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber);
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 7b35e50..fb09d89 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import org.junit.Test;
 
@@ -40,8 +40,7 @@ public class ObfuscationWithMappingTests extends AbstractTest {
       throws Exception {
 
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber);
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 546b5a5..bd7030f 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -48,8 +48,7 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
     String testPackageName = "com.android.jack.shrob.test" + testNumber;
     File testFolder = AbstractTestTools.getTestRootDir(testPackageName);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 042a5a4..805d2c5 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import java.io.File;
 
@@ -49,8 +49,7 @@ public class RepackagingTest extends AbstractTest {
     flags.setOutputMapping(candidateOutputMapping);
     flags.setPrintMapping(true);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 dbc4c17..938f57d 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -53,8 +53,7 @@ public class SeedTests extends AbstractTest {
     flags.setSeedsFile(candidateOutputSeeds);
     flags.setPrintSeeds(true);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 241a6f4..81f6ba7 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 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 {
-      JackApiToolchainBase toolchain =
-          AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+      JackApiToolchain toolchain =
+          AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .srcToLib(
           libOut,
           /* zipFiles = */ false,
           new File(shrobTestsDir, "test020/lib"));
 
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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(JackApiToolchainBase.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 {
-      JackApiToolchainBase toolchain =
-          AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+      JackApiToolchain toolchain =
+          AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
       toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
       .srcToLib(
           jackOut,
           /* zipFiles = */ false,
           new File(shrobTestsDir, "test021/jack"));
 
-      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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(JackApiToolchainBase.class);
+      toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.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 668a3da..777951e 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.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiToolchain;
 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 {
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackApiToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiToolchain.class);
     try {
       File multiDexFolder = AbstractTestTools.createTempDir();
       File multiDex = new File(multiDexFolder, DexFileWriter.DEX_FILENAME);