Change handling of classpath in compilation in test framework

Make classpath an optional parameter.
This change leads to simpler calls to compilation methods.

Change-Id: Ia8a5e1bf13bfe9690a838784922622d3f3f148d7

1 files changed, 14 insertions, 10 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 3322d95d..574f4467 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -56,12 +56,12 @@ public class JackCliToolchain extends JackBasedToolchain {
   }
 
   @Override
-  public void srcToExe(@CheckForNull String classpath, @Nonnull File out,
-      boolean zipFile, @Nonnull File... sources) throws Exception {
+  public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources)
+      throws Exception {
 
     List<String> args = new ArrayList<String>();
 
-    srcToCommon(args, classpath, sources);
+    srcToCommon(args, sources);
 
     if (zipFile) {
       args.add("--output-dex-zip");
@@ -102,12 +102,12 @@ public class JackCliToolchain extends JackBasedToolchain {
   }
 
   @Override
-  public void srcToLib(@CheckForNull String classpath, @Nonnull File out,
-      boolean zipFiles, @Nonnull File... sources) throws Exception {
+  public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources)
+      throws Exception {
 
     List<String> args = new ArrayList<String>();
 
-    srcToCommon(args, classpath, sources);
+    srcToCommon(args, sources);
 
     if (zipFiles) {
       args.add("--output-jack");
@@ -133,8 +133,7 @@ public class JackCliToolchain extends JackBasedToolchain {
 
   }
 
-  private void srcToCommon(@Nonnull List<String> args, @CheckForNull String classpath,
-      @Nonnull File... sources) {
+  private void srcToCommon(@Nonnull List<String> args, @Nonnull File... sources) {
     args.add("java");
     args.add("-cp");
     args.add(jackPrebuilt.getAbsolutePath());
@@ -154,9 +153,9 @@ public class JackCliToolchain extends JackBasedToolchain {
 
     addProperties(properties, args);
 
-    if (classpath != null) {
+    if (classpath.size() > 0) {
       args.add("--classpath");
-      args.add(classpath);
+      args.add(getClasspathAsString());
     }
 
     for (File res : resImport) {
@@ -268,6 +267,11 @@ public class JackCliToolchain extends JackBasedToolchain {
 
     addProperties(properties, args);
 
+    if (classpath.size() > 0) {
+      args.add("--classpath");
+      args.add(getClasspathAsString());
+    }
+
     if (jarjarRules != null) {
       args.add("--config-jarjar");
       args.add(jarjarRules.getAbsolutePath());