diff options
author | Joachim Sauer <jsauer@google.com> | 2016-03-15 14:55:17 +0000 |
---|---|---|
committer | Joachim Sauer <jsauer@google.com> | 2016-03-16 11:02:55 +0000 |
commit | 8335e26ad55f29ad9df59c56e16936228731a677 (patch) | |
tree | 53ddeb18ef6bc9416230a22fa8ca7a4d031f5bc1 | |
parent | c4d63280b0d968f67bd1021abd982e2e2ddf08e3 (diff) | |
download | platform_external_jarjar-android-n-preview-3.tar.gz platform_external_jarjar-android-n-preview-3.tar.bz2 platform_external_jarjar-android-n-preview-3.zip |
Make JarJar abort when it can't read a .class file.android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
This change avoids future situations where jarjar silently skips
class files that it can't read (as happened with files compiled for
Java 8)
Bug: 27637680
(cherry picked from commit 8795f34e379f7d29be2ee6cc0b9377106a1d96d7)
Change-Id: I29390c3004516f050ca470a9798bfca05d306c75
-rw-r--r-- | src/main/com/tonicsystems/jarjar/util/JarTransformer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/com/tonicsystems/jarjar/util/JarTransformer.java b/src/main/com/tonicsystems/jarjar/util/JarTransformer.java index 95f1216..53c7de0 100644 --- a/src/main/com/tonicsystems/jarjar/util/JarTransformer.java +++ b/src/main/com/tonicsystems/jarjar/util/JarTransformer.java @@ -29,7 +29,9 @@ abstract public class JarTransformer implements JarProcessor try { reader = new ClassReader(struct.data); } catch (Exception e) { - return true; // TODO? + // Android-changed: Made this failure fatal to highlight class version issues. + // http://b/27637680 + throw new RuntimeException("Failed to load " + struct.name, e); } GetNameClassWriter w = new GetNameClassWriter(ClassWriter.COMPUTE_MAXS); reader.accept(transform(w), ClassReader.EXPAND_FRAMES); |