diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-13 13:25:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-13 13:25:52 +0000 |
| commit | bf117ce32f02dc2d18b44c7539b0a3471eacba55 (patch) | |
| tree | 712f43660c8e154e67579c5eb1b039c96a756e6e /jack/src | |
| parent | 992f9a132a3cdfda0f70e8114e050e8f08a9db9d (diff) | |
| parent | f79edc12fd34665b8c39de251425f67967ae8527 (diff) | |
| download | toolchain_jack-bf117ce32f02dc2d18b44c7539b0a3471eacba55.zip toolchain_jack-bf117ce32f02dc2d18b44c7539b0a3471eacba55.tar.gz toolchain_jack-bf117ce32f02dc2d18b44c7539b0a3471eacba55.tar.bz2 | |
Merge "Report library name on library errors" into ub-jack
Diffstat (limited to 'jack/src')
| -rw-r--r-- | jack/src/com/android/jack/library/InputJackLibrary.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/jack/src/com/android/jack/library/InputJackLibrary.java b/jack/src/com/android/jack/library/InputJackLibrary.java index d62e26b..b83c413 100644 --- a/jack/src/com/android/jack/library/InputJackLibrary.java +++ b/jack/src/com/android/jack/library/InputJackLibrary.java @@ -45,17 +45,18 @@ public abstract class InputJackLibrary extends CommonJackLibrary implements Inp int supportedMinor = getSupportedMinor(); if (minorVersion < supportedMinorMin) { - throw new LibraryVersionException("The version of the library file is not supported anymore." - + "Library version: " + majorVersion + "." + minorVersion + " - Current version: " - + majorVersion + "." + supportedMinor + " - Minimum compatible version: " + majorVersion - + "." + supportedMinorMin); + throw new LibraryVersionException("The version of the library " + + getLocation().getDescription() + " is not supported anymore." + "Library version: " + + majorVersion + "." + minorVersion + " - Current version: " + majorVersion + "." + + supportedMinor + " - Minimum compatible version: " + majorVersion + "." + + supportedMinorMin); } else if (minorVersion > supportedMinor) { - throw new LibraryVersionException("The version of the library file is too recent." - + "Library version: " + majorVersion + "." + minorVersion + " - Current version: " - + majorVersion + "." + supportedMinor); + throw new LibraryVersionException("The version of the library " + + getLocation().getDescription() + " is too recent." + "Library version: " + majorVersion + + "." + minorVersion + " - Current version: " + majorVersion + "." + supportedMinor); } else if (minorVersion < supportedMinor) { - Jack.getSession().getUserLogger().log(Level.WARNING, - "The version of the library is older than the current version but is " + Jack.getSession().getUserLogger().log(Level.WARNING, "The version of the library " + + getLocation().getDescription() + " is older than the current version but is " + "supported. File version: {0}.{1} - Current version: {2}.{3}", new Object[] { Integer.valueOf(majorVersion), Integer.valueOf(minorVersion), Integer.valueOf(majorVersion), Integer.valueOf(supportedMinor)}); |