Remove default bootclasspath in legacy compilers for tests

Classpath is explicitely passed by each test.

Change-Id: Id492cd9b515ed489291fb3a6e0a3693704774208

5 files changed, 12 insertions, 6 deletions

diff --git a/jack-tests/prebuilts/core-stubs-mini.jack b/jack-tests/prebuilts/core-stubs-mini.jack
index f8a0960..bbb6195 100644
--- a/jack-tests/prebuilts/core-stubs-mini.jack
+++ b/jack-tests/prebuilts/core-stubs-mini.jack
diff --git a/jack-tests/prebuilts/core-stubs-mini.jar b/jack-tests/prebuilts/core-stubs-mini.jar
index cfdfeee..540e9a7 100644
--- a/jack-tests/prebuilts/core-stubs-mini.jar
+++ b/jack-tests/prebuilts/core-stubs-mini.jar
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 629376c..8881bd6 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -22,19 +22,13 @@ import com.android.jack.Sourcelist;
 import com.android.jack.backend.dex.rop.CodeItemBuilder;
 import com.android.jack.shrob.spec.Flags;
 import com.android.sched.util.config.cli.TokenIterator;
-import com.android.sched.util.file.CannotReadException;
-import com.android.sched.util.file.NoSuchFileException;
-import com.android.sched.util.file.NotFileOrDirectoryException;
-import com.android.sched.util.file.WrongPermissionException;
 import com.android.sched.util.location.NoLocation;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
index ae4f273..32040f1 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
@@ -147,6 +147,9 @@ public class LegacyJillToolchain extends JillBasedToolchain {
       arguments.add(annotationProcessorClass.getName());
     }
 
+    arguments.add("-bootclasspath");
+    arguments.add("no-bootclasspath.jar");
+
     if (classpath != null) {
       arguments.add("-classpath");
       arguments.add(classpath);
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
index 8603980..9badefa 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
@@ -207,10 +207,15 @@ public class LegacyToolchain extends AndroidToolchain {
   private void compileWithEcj(@Nonnull File[] sources, @CheckForNull String classpath,
       @Nonnull File out) {
     List<String> args = new ArrayList<String>(4 + sources.length);
+
+    args.add("-bootclasspath");
+    args.add("no-bootclasspath.jar");
+
     if (classpath != null) {
       args.add("-classpath");
       args.add(classpath);
     }
+
     if (isVerbose) {
       args.add("-verbose");
     }
@@ -226,6 +231,7 @@ public class LegacyToolchain extends AndroidToolchain {
     for (File sourceFile : sources) {
       args.add(sourceFile.getAbsolutePath());
     }
+
     org.eclipse.jdt.internal.compiler.batch.Main.main(args.toArray(new String[args.size()]));
   }
 
@@ -278,6 +284,9 @@ public class LegacyToolchain extends AndroidToolchain {
       arguments.add(annotationProcessorClass.getName());
     }
 
+    arguments.add("-bootclasspath");
+    arguments.add("no-bootclasspath.jar");
+
     if (classpath != null) {
       arguments.add("-classpath");
       arguments.add(classpath);