diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-10 17:58:12 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-10 18:27:25 +0200 |
| commit | 859eac4936884b2b44e153e43180f3cb15bb8cdb (patch) | |
| tree | 4dd5494d825d0a6ec33986aa34ad4007c87b806b /jack | |
| parent | 3876ec6315dff69913b6c44f8318fdbd8292b02c (diff) | |
| download | toolchain_jack-859eac4936884b2b44e153e43180f3cb15bb8cdb.zip toolchain_jack-859eac4936884b2b44e153e43180f3cb15bb8cdb.tar.gz toolchain_jack-859eac4936884b2b44e153e43180f3cb15bb8cdb.tar.bz2 | |
Wrap FrontendCompilationException in Api01
Bug: 21751566
Change-Id: I029be65253f9dbd172a5be21f3beb8bf1be3b12a
(cherry picked from commit f2bc7ad704d4187e1618bc9ef1fe30c4a03ba304)
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/src/com/android/jack/Jack.java | 2 | ||||
| -rw-r--r-- | jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java index cbc3d11..15a91cf 100644 --- a/jack/src/com/android/jack/Jack.java +++ b/jack/src/com/android/jack/Jack.java @@ -725,7 +725,7 @@ public abstract class Jack { try { if (!jbc.compile(ecjArguments.toArray(new String[ecjArguments.size()]))) { - throw new FrontendCompilationException("Failed to compile."); + throw new FrontendCompilationException("Failed to compile"); } } catch (TransportExceptionAroundEcjError e) { throw e.getCause(); diff --git a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java index 2238fb2..3d96cc7 100644 --- a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java +++ b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java @@ -36,6 +36,7 @@ import com.android.jack.api.v01.TypeCollisionPolicy; import com.android.jack.api.v01.UnrecoverableException; import com.android.jack.api.v01.VerbosityLevel; import com.android.jack.config.id.JavaVersionPropertyId.JavaVersion; +import com.android.jack.frontend.FrontendCompilationException; import com.android.jack.reporting.Reporter; import com.android.jack.resource.ResourceImporter; import com.android.jack.shrob.obfuscation.MappingPrinter; @@ -100,6 +101,8 @@ public class Api01ConfigImpl implements Api01Config { pe = e; throw e.getCause(); } + } catch (FrontendCompilationException e) { + throw new CompilationException(e.getMessage(), e); } catch (JackUserException e) { throw new CompilationException(e.getMessage(), e); } catch (JackAbortException e) { |