diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-04 16:29:21 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-17 17:43:31 +0200 |
| commit | 48b0af54ccabf715f1ead0a5c281984bbdc04237 (patch) | |
| tree | fccfee5a468762e66008a459cf97d4d3dd0f34cc /jack | |
| parent | 859eac4936884b2b44e153e43180f3cb15bb8cdb (diff) | |
| download | toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.zip toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.tar.gz toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.tar.bz2 | |
Adapt ResourceTests to support CaseInsesitiveFS
Bug: 21486756
Change-Id: I3f0e0b7d6a2511b08129bff4bc34a0ba54aead4e
(cherry picked from commit 973a373d8fc030c0ea3e8f6113caa29be3776454)
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java | 4 | ||||
| -rw-r--r-- | jack/src/com/android/jack/library/InputJackLibraryCodec.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java index 2400b55..8b9e3ad 100644 --- a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java +++ b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java @@ -258,8 +258,8 @@ public class JayceClassOrInterfaceLoader extends AbstractClassOrInterfaceLoader TypePackageAndMethodFormatter lookupFormatter = Jack.getLookupFormatter(); String expectedSignature = lookupFormatter.getName(enclosingPackage, simpleName); if (!signature.equals(expectedSignature)) { - throw new AssertionError("Wrong type in '" + source + "', found '" - + signature + "' while expecting '" + expectedSignature + "'"); + throw new AssertionError("Wrong type in '" + source.getLocation().getDescription() + + "', found '" + signature + "' while expecting '" + expectedSignature + "'"); } return true; } diff --git a/jack/src/com/android/jack/library/InputJackLibraryCodec.java b/jack/src/com/android/jack/library/InputJackLibraryCodec.java index 2b81b0a..4dbc3f9 100644 --- a/jack/src/com/android/jack/library/InputJackLibraryCodec.java +++ b/jack/src/com/android/jack/library/InputJackLibraryCodec.java @@ -94,7 +94,6 @@ public class InputJackLibraryCodec implements StringCodec<InputJackLibrary> { } } else { RunnableHooks hooks = context.getRunnableHooks(); - assert hooks != null; vfs = new ReadZipFS(new InputZipFile(workingDirectory, string, hooks, Existence.MUST_EXIST, ChangePermission.NOCHANGE)); } |