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

This reverts commit b43732ee3d9f9ffcd7595ab657e4c683a1751b3a.

Change-Id: Id9fbfcd8f7aebca1136bfcbbf9e37359dc42a19d

1 files changed, 9 insertions, 9 deletions

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) {