summaryrefslogtreecommitdiffstats
path: root/jack-tests
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-04-29 07:33:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-29 07:33:21 +0000
commit2cf5479e81e250840001aff1d785b3ad6ab1447c (patch)
treea040387252e08dedaa792e1dac76c24c41dde78a /jack-tests
parent3dd4291feaea0a70387f70425d07011ef2a5eba9 (diff)
parent4466d5179445edef57a78a97cb7d2acd0574ee7c (diff)
downloadtoolchain_jack-2cf5479e81e250840001aff1d785b3ad6ab1447c.tar.gz
toolchain_jack-2cf5479e81e250840001aff1d785b3ad6ab1447c.tar.bz2
toolchain_jack-2cf5479e81e250840001aff1d785b3ad6ab1447c.zip
Merge "Remove use of SchedLib utility class from test framework" into ub-jack
Diffstat (limited to 'jack-tests')
-rw-r--r--jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java b/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java
index 012e6937..910cffbf 100644
--- a/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java
@@ -26,7 +26,6 @@ import com.android.jack.test.runtime.RuntimeTestInfo;
import com.android.jack.test.toolchain.AbstractTestTools;
import com.android.jack.test.toolchain.AndroidToolchain;
import com.android.jack.test.toolchain.Toolchain.SourceLevel;
-import com.android.sched.util.collect.Lists;
import junit.framework.Assert;
@@ -36,6 +35,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -236,8 +236,8 @@ public class RuntimeTestHelper {
File [] refSources = getRefSrcDir();
List<File> extras = getReferenceExtraSources();
List<File> sources = new ArrayList<File>(extras.size() + refSources.length);
- sources = Lists.addAll(sources, refSources);
- sources = Lists.addAll(sources, extras);
+ Collections.addAll(sources, refSources);
+ sources.addAll(extras);
File refPartBinaryDir = AbstractTestTools.createTempDir();
File refPartBinary = new File(refPartBinaryDir, referenceTestTools.getBinaryFileName());