commit 8fa96e2fcd1fb6df11638dfbe8be329f499288bf
author Ben Gruver <bgruv@google.com> Mon Oct 17 16:15:17 2016 -0700
committer Ben Gruver <bgruv@google.com> Mon Oct 17 16:15:17 2016 -0700
tree dc5c2c9443d55f99c8cabdf452daad8d60e989f4
parent 5401a9cbaa777ea99fd0fc788c5fca425524268c

Resolve odex dependencies to jar files when needed

dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java b/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java
index 82525bb..5a45325 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java
@@ -133,7 +133,18 @@
                     throw new ResolveException(ex);
                 }
             } catch (NotFoundException ex) {
-                throw new ResolveException(ex);
+                if (entry.endsWith(".odex")) {
+                    String jarEntry = entry.substring(0, entry.length() - 5) + ".jar";
+                    try {
+                        loadLocalOrDeviceBootClassPathEntry(jarEntry);
+                        } catch (NoDexException ex2) {
+                        throw new ResolveException("Neither %s nor %s contain a dex file", entry, jarEntry);
+                    } catch (NotFoundException ex2) {
+                        throw new ResolveException(ex);
+                    }
+                } else {
+                    throw new ResolveException(ex);
+                }
             }
         }