summaryrefslogtreecommitdiffstats
path: root/jack/src
diff options
context:
space:
mode:
Diffstat (limited to 'jack/src')
-rw-r--r--jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java4
-rw-r--r--jack/src/com/android/jack/library/InputJackLibraryCodec.java1
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));
}