Implement Api01Config

Change-Id: I455d060994c59fecf5dbad2a1b4ff0905cb7df61

2 files changed, 6 insertions, 9 deletions

diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
index 58fa82c..6f67a94 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java
@@ -119,9 +119,8 @@ public class MultiDexOverflowTests {
     .addToClasspath(annotations)
     .srcToExe(outFolder, /* zipFile = */ false, srcFolder);
       Assert.fail();
-    } catch (ProcessException e) {
-      Assert.assertTrue(e.getCause() instanceof JackAbortException);
-      Throwable contextException = e.getCause().getCause();
+    } catch (JackAbortException e) {
+      Throwable contextException = e.getCause();
       Assert.assertTrue(contextException instanceof DexWritingException);
       Assert.assertTrue(contextException.getCause() instanceof MainDexOverflowException);
       Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException);
diff --git a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
index 2393284..351b590 100644
--- a/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
+++ b/jack-tests/tests/com/android/jack/tools/merger/test011/MergerTest011.java
@@ -75,9 +75,8 @@ public class MergerTest011 extends MergerTestTools {
     try {
       buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err);
       Assert.fail();
-    } catch (ProcessException e) {
-      Assert.assertTrue(e.getCause() instanceof JackAbortException);
-      Throwable contextException = e.getCause().getCause();
+    } catch (JackAbortException e) {
+      Throwable contextException = e.getCause();
       Assert.assertTrue(contextException instanceof DexWritingException);
       Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException);
       Assert.assertTrue(contextException.getCause().getCause() instanceof MethodIdOverflowException);
@@ -99,9 +98,8 @@ public class MergerTest011 extends MergerTestTools {
     try {
       buildOneDexPerType(srcFolder, /* withDebug = */false, /* out = */ null, err);
       Assert.fail();
-    } catch (ProcessException e) {
-      Assert.assertTrue(e.getCause() instanceof JackAbortException);
-      Throwable contextException = e.getCause().getCause();
+    } catch (JackAbortException e) {
+      Throwable contextException = e.getCause();
       Assert.assertTrue(contextException instanceof DexWritingException);
       Assert.assertTrue(contextException.getCause() instanceof SingleDexOverflowException);
       Assert.assertTrue(contextException.getCause().getCause() instanceof FieldIdOverflowException);