diff options
Diffstat (limited to 'jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java')
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java | 17 |
1 files changed, 5 insertions, 12 deletions
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 34d974f..517d955 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java @@ -55,13 +55,12 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(jackPrebuilt.getAbsolutePath()); if (incrementalFolder != null) { - args.add(com.android.jack.experimental.incremental.Main.class.getName()); args.add("--incremental-folder"); args.add(incrementalFolder.getAbsolutePath()); - } else { - args.add(com.android.jack.Main.class.getName()); } + args.add(com.android.jack.Main.class.getName()); + addProperties(properties, args); if (classpath != null) { @@ -133,12 +132,10 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(jackPrebuilt.getAbsolutePath()); if (incrementalFolder != null) { - args.add(com.android.jack.experimental.incremental.Main.class.getName()); args.add("--incremental-folder"); args.add(incrementalFolder.getAbsolutePath()); - } else { - args.add(com.android.jack.Main.class.getName()); } + args.add(com.android.jack.Main.class.getName()); addProperties(properties, args); @@ -205,12 +202,10 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(jackPrebuilt.getAbsolutePath()); if (incrementalFolder != null) { - args.add(com.android.jack.experimental.incremental.Main.class.getName()); args.add("--incremental-folder"); args.add(incrementalFolder.getAbsolutePath()); - } else { - args.add(com.android.jack.Main.class.getName()); } + args.add(com.android.jack.Main.class.getName()); if (withDebugInfos) { args.add("-D"); @@ -257,12 +252,10 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(jackPrebuilt.getAbsolutePath()); if (incrementalFolder != null) { - args.add(com.android.jack.experimental.incremental.Main.class.getName()); args.add("--incremental-folder"); args.add(incrementalFolder.getAbsolutePath()); - } else { - args.add(com.android.jack.Main.class.getName()); } + args.add(com.android.jack.Main.class.getName()); addProperties(properties, args); |