11 files changed, 132 insertions, 6 deletions
diff --git a/core-stubs-mini/src/java/lang/ArithmeticException.java b/core-stubs-mini/src/java/lang/ArithmeticException.java
new file mode 100644
index 0000000..8eabf1f
--- /dev/null
+++ b/core-stubs-mini/src/java/lang/ArithmeticException.java
@@ -0,0 +1,27 @@
+/*
+* Copyright (C) 2015 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package java.lang;
+
+public class ArithmeticException extends java.lang.RuntimeException {
+  public ArithmeticException() {
+    throw new RuntimeException("Stub!");
+  }
+
+  public ArithmeticException(java.lang.String detailMessage) {
+    throw new RuntimeException("Stub!");
+  }
+}
diff --git a/core-stubs-mini/src/java/lang/ExceptionInInitializerError.java b/core-stubs-mini/src/java/lang/ExceptionInInitializerError.java
new file mode 100644
index 0000000..013d785
--- /dev/null
+++ b/core-stubs-mini/src/java/lang/ExceptionInInitializerError.java
@@ -0,0 +1,39 @@
+/*
+* Copyright (C) 2015 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package java.lang;
+
+public class ExceptionInInitializerError extends java.lang.LinkageError {
+  public ExceptionInInitializerError() {
+    throw new RuntimeException("Stub!");
+  }
+
+  public ExceptionInInitializerError(java.lang.String detailMessage) {
+    throw new RuntimeException("Stub!");
+  }
+
+  public ExceptionInInitializerError(java.lang.Throwable exception) {
+    throw new RuntimeException("Stub!");
+  }
+
+  public java.lang.Throwable getException() {
+    throw new RuntimeException("Stub!");
+  }
+
+  public java.lang.Throwable getCause() {
+    throw new RuntimeException("Stub!");
+  }
+}
diff --git a/core-stubs-mini/src/java/lang/IllegalMonitorStateException.java b/core-stubs-mini/src/java/lang/IllegalMonitorStateException.java
new file mode 100644
index 0000000..22f77cb
--- /dev/null
+++ b/core-stubs-mini/src/java/lang/IllegalMonitorStateException.java
@@ -0,0 +1,27 @@
+/*
+* Copyright (C) 2015 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package java.lang;
+
+public class IllegalMonitorStateException extends java.lang.RuntimeException {
+  public IllegalMonitorStateException() {
+    throw new RuntimeException("Stub!");
+  }
+
+  public IllegalMonitorStateException(java.lang.String detailMessage) {
+    throw new RuntimeException("Stub!");
+  }
+}
diff --git a/core-stubs-mini/src/java/lang/UnsatisfiedLinkError.java b/core-stubs-mini/src/java/lang/UnsatisfiedLinkError.java
new file mode 100644
index 0000000..07b7863
--- /dev/null
+++ b/core-stubs-mini/src/java/lang/UnsatisfiedLinkError.java
@@ -0,0 +1,27 @@
+/*
+* Copyright (C) 2015 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package java.lang;
+
+public class UnsatisfiedLinkError extends java.lang.LinkageError {
+  public UnsatisfiedLinkError() {
+    throw new RuntimeException("Stub!");
+  }
+
+  public UnsatisfiedLinkError(java.lang.String detailMessage) {
+    throw new RuntimeException("Stub!");
+  }
+}
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);
diff --git a/jack/prebuilts/core-stubs-mini.jack b/jack/prebuilts/core-stubs-mini.jack
index f8a0960..bbb6195 100644
--- a/jack/prebuilts/core-stubs-mini.jack
+++ b/jack/prebuilts/core-stubs-mini.jack
diff --git a/jack/prebuilts/core-stubs-mini.jar b/jack/prebuilts/core-stubs-mini.jar
index cfdfeee..540e9a7 100644
--- a/jack/prebuilts/core-stubs-mini.jar
+++ b/jack/prebuilts/core-stubs-mini.jar