commit 8335e26ad55f29ad9df59c56e16936228731a677
author Joachim Sauer <jsauer@google.com> Tue Mar 15 14:55:17 2016 +0000
committer Joachim Sauer <jsauer@google.com> Wed Mar 16 11:02:55 2016 +0000
tree 53ddeb18ef6bc9416230a22fa8ca7a4d031f5bc1
parent c4d63280b0d968f67bd1021abd982e2e2ddf08e3

Make JarJar abort when it can't read a .class file.

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

src/main/com/tonicsystems/jarjar/util/JarTransformer.java

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 @@
             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);