Remove bootclasspath

Change-Id: Iebc1bc63ad83ba0d07a4fc6f675a0318746bc748

11 files changed, 15 insertions, 37 deletions

diff --git a/jill/tests/com/android/jill/AnnotationTest.java b/jill/tests/com/android/jill/AnnotationTest.java
index d864311..170f09b 100644
--- a/jill/tests/com/android/jill/AnnotationTest.java
+++ b/jill/tests/com/android/jill/AnnotationTest.java
@@ -28,7 +28,6 @@ import java.io.File;
  */
 public class AnnotationTest {
 
-  private static final File[] BOOTCLASSPATH = JillTestTools.getDefaultBootclasspath();
   private static final File ANNOTATION001_PATH =
       JillTestTools.getJackTestsWithJackFolder("annotation/test001");
 
@@ -39,7 +38,7 @@ public class AnnotationTest {
 
   @Test
   public void test001_3WithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH, null,
+    JillTestTools.checkStructureWithJill(null,
         new File(ANNOTATION001_PATH, "Annotation2.java"), false /*withDebugInfo*/);
   }
 
diff --git a/jill/tests/com/android/jill/FibonacciThreeAddressTest.java b/jill/tests/com/android/jill/FibonacciThreeAddressTest.java
index 4d2c45a..235a000 100644
--- a/jill/tests/com/android/jill/FibonacciThreeAddressTest.java
+++ b/jill/tests/com/android/jill/FibonacciThreeAddressTest.java
@@ -28,8 +28,6 @@ import java.io.File;
  */
 public class FibonacciThreeAddressTest {
 
-  private static final File[] BOOTCLASSPATH = JillTestTools.getDefaultBootclasspath();
-
   private static final String CLASS_BINARY_NAME = "com/android/jack/fibonacci/jack/FibonacciThreeAddress";
   private static final File JAVA_FILEPATH = JillTestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
@@ -41,7 +39,7 @@ public class FibonacciThreeAddressTest {
 
   @Test
   public void testCompareFiboDexFileWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH, null, JAVA_FILEPATH, false /*withDebugInfo*/);
+    JillTestTools.checkStructureWithJill(null, JAVA_FILEPATH, false /*withDebugInfo*/);
   }
 
 }
diff --git a/jill/tests/com/android/jill/FieldTest.java b/jill/tests/com/android/jill/FieldTest.java
index cc5bf11..d353874 100644
--- a/jill/tests/com/android/jill/FieldTest.java
+++ b/jill/tests/com/android/jill/FieldTest.java
@@ -33,13 +33,13 @@ public class FieldTest {
 
   @Test
   public void testStaticWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(null, null,
+    JillTestTools.checkStructureWithJill(null,
         JillTestTools.getJackTestsWithJackFolder("field/static003"), false /*withDebugInfo*/);
   }
 
   @Test
   public void testInstanceWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(null, null,
+    JillTestTools.checkStructureWithJill(null,
         JillTestTools.getJackTestsWithJackFolder("field/instance005"), false /*withDebugInfo*/);
   }
 }
diff --git a/jill/tests/com/android/jill/InnerTest.java b/jill/tests/com/android/jill/InnerTest.java
index 9fc4b96..9118db6 100644
--- a/jill/tests/com/android/jill/InnerTest.java
+++ b/jill/tests/com/android/jill/InnerTest.java
@@ -22,11 +22,8 @@ import com.android.jack.Main;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
-
 public class InnerTest {
 
-  private static final File[] BOOTCLASSPATH = JillTestTools.getDefaultBootclasspath();
 
   @BeforeClass
   public static void setUpClass() {
@@ -36,13 +33,13 @@ public class InnerTest {
   @Test
   public void testCheckStructure20WithJill() throws Exception {
     //TODO: find out why debug info check fails
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH, null,
+    JillTestTools.checkStructureWithJill(null,
         JillTestTools.getJackTestsWithJackFolder("inner/test020"), false /*withDebugInfo*/);
   }
 
   @Test
   public void testCheckStructure21WithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH, null,
+    JillTestTools.checkStructureWithJill(null,
         JillTestTools.getJackTestsWithJackFolder("inner/test021"), false /*withDebugInfo*/);
   }
 }
diff --git a/jill/tests/com/android/jill/JarjarTest.java b/jill/tests/com/android/jill/JarjarTest.java
index d8a5f69..89e723a 100644
--- a/jill/tests/com/android/jill/JarjarTest.java
+++ b/jill/tests/com/android/jill/JarjarTest.java
@@ -35,7 +35,7 @@ public class JarjarTest {
 
   @Test
   public void testCheckStructure003() throws Exception {
-    JillTestTools.checkStructureWithJill(null,
+    JillTestTools.checkStructureWithJill(
         null,
         JillTestTools.getJackTestsWithJackFolder("jarjar/test003"),
         false,
diff --git a/jill/tests/com/android/jill/JillTestTools.java b/jill/tests/com/android/jill/JillTestTools.java
index 85451a8..909579a 100644
--- a/jill/tests/com/android/jill/JillTestTools.java
+++ b/jill/tests/com/android/jill/JillTestTools.java
@@ -65,11 +65,11 @@ public class JillTestTools extends TestTools {
     new Jill(options, "").process(options.getBinaryFile());
   }
 
-  public static void checkStructureWithJill(@CheckForNull File[] refBootclasspath,
+  public static void checkStructureWithJill(
       @CheckForNull File[] refClasspath,
       @Nonnull File fileOrSourceList,
       boolean withDebugInfo) throws Exception {
-    checkStructureWithJill(refBootclasspath,
+    checkStructureWithJill(
         refClasspath,
         fileOrSourceList,
         withDebugInfo,
@@ -77,7 +77,7 @@ public class JillTestTools extends TestTools {
         null);
   }
 
-  public static void checkStructureWithJill(@CheckForNull File[] bootclasspath,
+  public static void checkStructureWithJill(
       @CheckForNull File[] classpath,
       @Nonnull File fileOrSourceList,
       boolean withDebugInfo,
@@ -85,7 +85,7 @@ public class JillTestTools extends TestTools {
       @CheckForNull ProguardFlags[] proguardFlags) throws Exception {
 
     com.android.jack.Options options =
-        buildCommandLineArgs(bootclasspath, classpath, fileOrSourceList);
+        buildCommandLineArgs(classpath, fileOrSourceList);
 
     boolean useEcjAsRefCompiler = withDebugInfo;
 
diff --git a/jill/tests/com/android/jill/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java b/jill/tests/com/android/jill/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java
index e99d8c6..d26f042 100644
--- a/jill/tests/com/android/jill/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java
+++ b/jill/tests/com/android/jill/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java
@@ -28,11 +28,6 @@ import java.io.File;
 
 public class BouncycastleCompilationTest {
 
-  private static final File[] BOOTCLASSPATH = new File[] {
-    JillTestTools.getFromAndroidTree(
-        "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar")
-  };
-
   private static final File SOURCELIST = JillTestTools.getTargetLibSourcelist("bouncycastle");
 
   private static final JarJarRules JARJAR_RULES = new JarJarRules(
@@ -42,7 +37,6 @@ public class BouncycastleCompilationTest {
   @Category(SlowTests.class)
   public void compareBouncycastleStructureWithJill() throws Exception {
     JillTestTools.checkStructureWithJill(
-        BOOTCLASSPATH,
         null,
         SOURCELIST,
         false /* compareDebugInfoBinary */,
diff --git a/jill/tests/com/android/jill/compile/androidtree/core/CoreCompilationTest.java b/jill/tests/com/android/jill/compile/androidtree/core/CoreCompilationTest.java
index 5d1b330..10a5ca5 100644
--- a/jill/tests/com/android/jill/compile/androidtree/core/CoreCompilationTest.java
+++ b/jill/tests/com/android/jill/compile/androidtree/core/CoreCompilationTest.java
@@ -37,6 +37,6 @@ public class CoreCompilationTest {
   @Test
   @Category(SlowTests.class)
   public void compareLibCoreStructureWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(null, null, SOURCELIST, false /*withDebugInfo*/);
+    JillTestTools.checkStructureWithJill(null, SOURCELIST, false /*withDebugInfo*/);
   }
 }
diff --git a/jill/tests/com/android/jill/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java b/jill/tests/com/android/jill/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java
index 1a634f8..723b2e8 100644
--- a/jill/tests/com/android/jill/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java
+++ b/jill/tests/com/android/jill/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java
@@ -27,11 +27,6 @@ import java.io.File;
 
 public class FrameworksBaseCompilationTest {
 
-  private static final File[] BOOTCLASSPATH = new File[] {
-    JillTestTools.getFromAndroidTree(
-        "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar")
-  };
-
   private final static File[] CLASSPATH = new File[] {
     JillTestTools.getFromAndroidTree(
           "out/target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates/classes.jar"),
@@ -50,7 +45,7 @@ public class FrameworksBaseCompilationTest {
   @Test
   @Category(SlowTests.class)
   public void compareFrameworksStructureWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH, CLASSPATH, SOURCELIST,
+    JillTestTools.checkStructureWithJill(CLASSPATH, SOURCELIST,
         false /*withDebugInfo*/);
   }
 }
diff --git a/jill/tests/com/android/jill/compile/androidtree/services/ServicesCompilationTest.java b/jill/tests/com/android/jill/compile/androidtree/services/ServicesCompilationTest.java
index 449d4e5..dc9bf1b 100644
--- a/jill/tests/com/android/jill/compile/androidtree/services/ServicesCompilationTest.java
+++ b/jill/tests/com/android/jill/compile/androidtree/services/ServicesCompilationTest.java
@@ -27,11 +27,6 @@ import java.io.File;
 
 public class ServicesCompilationTest {
 
-  private static final File[] BOOTCLASSPATH = new File[] {
-    JillTestTools.getFromAndroidTree(
-        "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar")
-  };
-
   private static final File[] CLASSPATH = new File[] {
       JillTestTools.getFromAndroidTree(
           "out/target/common/obj/JAVA_LIBRARIES/android.policy_intermediates/classes.jar"),
@@ -52,7 +47,7 @@ public class ServicesCompilationTest {
   @Test
   @Category(SlowTests.class)
   public void compareServicesStructureWithJill() throws Exception {
-    JillTestTools.checkStructureWithJill(BOOTCLASSPATH,
+    JillTestTools.checkStructureWithJill(
         CLASSPATH,
         SOURCELIST,
         false /* withDebugInfo */);
diff --git a/jill/tests/com/android/jill/shrob/ShrinkTest.java b/jill/tests/com/android/jill/shrob/ShrinkTest.java
index b21bedb..d166902 100644
--- a/jill/tests/com/android/jill/shrob/ShrinkTest.java
+++ b/jill/tests/com/android/jill/shrob/ShrinkTest.java
@@ -36,7 +36,7 @@ import javax.annotation.Nonnull;
 public class ShrinkTest {
 
   @Nonnull
-  private static final File[] defaultBootclasspath = JillTestTools.getDefaultBootclasspath();
+  private static final File[] defaultBootclasspath = JillTestTools.getDefaultClasspath();
 
   private static ProguardFlags dontObfuscateFlagFile =
       new ProguardFlags(JillTestTools.getJackTestFolder("shrob"), "dontobfuscate.flags");