commit 17054d5c3d56c5d6887fa7373f1456a8458ce258
author Ben Gruver <bgruv@google.com> Sat Sep 24 18:11:50 2016 -0700
committer Ben Gruver <bgruv@google.com> Sat Sep 24 18:11:50 2016 -0700
tree 745588a1de215597327449c30cfe731c8a7c59d9
parent c3270cf991b4a992b6d802dd1de743c4a82f9361

Load oat dependencies by default, if present

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 f363bc1..82525bb 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassPathResolver.java
@@ -41,6 +41,7 @@
 import org.jf.dexlib2.dexbacked.DexBackedDexFile;
 import org.jf.dexlib2.dexbacked.DexBackedOdexFile;
 import org.jf.dexlib2.dexbacked.OatFile;
+import org.jf.dexlib2.dexbacked.OatFile.OatDexFile;
 import org.jf.dexlib2.iface.DexFile;
 import org.jf.dexlib2.iface.MultiDexContainer;
 import org.jf.dexlib2.iface.MultiDexContainer.MultiDexFile;
@@ -106,8 +107,7 @@
     }
 
     private ClassPathResolver(@Nonnull List<String> bootClassPathDirs, @Nullable List<String> bootClassPathEntries,
-                              @Nonnull List<String> extraClassPathEntries,
-                             @Nonnull DexFile dexFile, int apiLevel)
+                              @Nonnull List<String> extraClassPathEntries, @Nonnull DexFile dexFile, int apiLevel)
             throws IOException {
         this.classPathDirs = bootClassPathDirs;
         opcodes = dexFile.getOpcodes();
@@ -116,7 +116,7 @@
             bootClassPathEntries = getDefaultBootClassPath(dexFile, apiLevel);
         }
 
-        for (String entry: bootClassPathEntries) {
+        for (String entry : bootClassPathEntries) {
             try {
                 loadLocalOrDeviceBootClassPathEntry(entry);
             } catch (NoDexException ex) {
@@ -311,6 +311,16 @@
     @Nonnull
     private static List<String> getDefaultBootClassPath(@Nonnull DexFile dexFile, int apiLevel) {
         if (dexFile instanceof OatFile.OatDexFile) {
+            List<String> bcp = ((OatDexFile)dexFile).getContainer().getBootClassPath();
+            if (!bcp.isEmpty()) {
+                for (int i=0; i<bcp.size(); i++) {
+                    String entry = bcp.get(i);
+                    if (entry.endsWith(".art")) {
+                        bcp.set(i, entry.substring(0, entry.length() - 4) + ".oat");
+                    }
+                }
+                return bcp;
+            }
             return Lists.newArrayList("boot.oat");
         }