diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-02 14:50:31 +0100 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-06 14:12:20 +0100 |
commit | d235ed6f21b7b21aefb4b066b0c64acfa2bbb229 (patch) | |
tree | e2a963acc70ba664991df32bf3f64176cbcc6a82 /jack-tests/tests/com/android/jack/tools | |
parent | d6059b4371b3039f5e6e473664302b4c6cada7dc (diff) | |
download | toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.tar.gz toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.tar.bz2 toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.zip |
Start using jack-api for jack API based test toolchains
Implementation is still to be done.
Change-Id: I010ab9f00f4c00275982d4abfcbf6c94248f3fb4
Diffstat (limited to 'jack-tests/tests/com/android/jack/tools')
-rw-r--r-- | jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java | 6 |
1 files changed, 3 insertions, 3 deletions
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); |