1 files changed, 6 insertions, 5 deletions
diff --git a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
index 2f78c176..64b60223 100644
--- a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
@@ -174,8 +174,9 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper
     }
     candidateTestTools.setWithDebugInfos(withDebugInfos);
     candidateTestTools.setSourceLevel(sourceLevel);
-    candidateTestTools.addProguardFlags(proguardFlagFiles).srcToExe(
-        AbstractTestTools.getClasspathAsString(candidateClasspath), candidateDexDir,
+    candidateTestTools.addProguardFlags(proguardFlagFiles)
+    .addToClasspath(candidateClasspath)
+    .srcToExe(candidateDexDir,
         /* zipFile = */ false, filesOrSourceList);
   }
 
@@ -187,8 +188,8 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper
     }
     referenceTestTools.setWithDebugInfos(withDebugInfos);
     referenceTestTools.setSourceLevel(sourceLevel);
-    referenceTestTools.addProguardFlags(proguardFlagFiles).srcToExe(
-        AbstractTestTools.getClasspathAsString(referenceClasspath), refDexDir,
-        /* zipFile = */ false, filesOrSourceList);
+    referenceTestTools.addProguardFlags(proguardFlagFiles)
+    .addToClasspath(referenceClasspath)
+    .srcToExe(refDexDir, /* zipFile = */ false, filesOrSourceList);
   }
 }