summaryrefslogtreecommitdiffstats
path: root/jack-tests/src/com/android/jack
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-03-02 18:05:55 +0100
committerYohann Roussel <yroussel@google.com>2015-03-03 15:15:33 +0100
commitcf8617093ba8d323ca5b3f917f5ab4a9b863bd53 (patch)
treea4e0618eb9e52e9908c7ddc5904e8be21917df1c /jack-tests/src/com/android/jack
parent26bf7826306f25561e79c443e58c5bcf46d37ba4 (diff)
downloadtoolchain_jack-cf8617093ba8d323ca5b3f917f5ab4a9b863bd53.tar.gz
toolchain_jack-cf8617093ba8d323ca5b3f917f5ab4a9b863bd53.tar.bz2
toolchain_jack-cf8617093ba8d323ca5b3f917f5ab4a9b863bd53.zip
Remove JackBasedToolchain.addEcjArgs
Change-Id: I3e262be2f9f91dc29688bb8bb3255322087879c9
Diffstat (limited to 'jack-tests/src/com/android/jack')
-rw-r--r--jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java4
-rw-r--r--jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java8
-rw-r--r--jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java7
3 files changed, 0 insertions, 19 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
index 268656ad..3f227704 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -247,10 +247,6 @@ public class JackApiToolchain extends JackBasedToolchain {
ecjArgs.add(annotationProcessorOutDir.getAbsolutePath());
}
- for (String ecjArg : extraEcjArgs) {
- ecjArgs.add(ecjArg);
- }
-
ArrayList<File> toCompile = new ArrayList<File>();
for (File srcFile : sources) {
if (srcFile instanceof Sourcelist) {
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 5414e022..b7f0f552 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
@@ -51,8 +51,6 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
@CheckForNull
protected File annotationProcessorOutDir;
@Nonnull
- protected List<String> extraEcjArgs = new ArrayList<String>();
- @Nonnull
protected List<File> resImport = new ArrayList<File>();
protected boolean sanityChecks = true;
@@ -82,12 +80,6 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
}
@Nonnull
- public final JackBasedToolchain addEcjArgs(@Nonnull String arg) {
- extraEcjArgs.add(arg);
- return this;
- }
-
- @Nonnull
public JackBasedToolchain addResource(@Nonnull File resource) {
resImport.add(resource);
return this;
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 9378e0e5..280f8c9b 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -84,9 +84,6 @@ public class JackCliToolchain extends JackBasedToolchain {
args.add("-d");
args.add(annotationProcessorOutDir.getAbsolutePath());
}
- for (String ecjArg : extraEcjArgs) {
- args.add(ecjArg);
- }
AbstractTestTools.addFile(args, /* mustExist = */ false, sources);
@@ -116,10 +113,6 @@ public class JackCliToolchain extends JackBasedToolchain {
}
args.add(out.getAbsolutePath());
- for (String ecjArg : extraEcjArgs) {
- args.add(ecjArg);
- }
-
AbstractTestTools.addFile(args, /* mustExist = */ false, sources);
ExecuteFile exec = new ExecuteFile(args.toArray(new String[args.size()]));