diff options
author | Ben Gruver <bgruv@google.com> | 2015-06-18 17:44:30 -0700 |
---|---|---|
committer | Ben Gruver <bgruv@google.com> | 2015-06-18 17:44:30 -0700 |
commit | 3065d6b7dec0849265da9d7e9654c9d154520bc5 (patch) | |
tree | 0003c134fdde23f64b2109b6b0e8c48494eb48f2 | |
parent | b960e8950b72c53f8f3eb32d8467f881261c95cc (diff) | |
download | smali-3065d6b7dec0849265da9d7e9654c9d154520bc5.tar.gz |
Add backwards compatible version of DexFileFactory.loadDexFile and Opcodes
Keep the old prototype, so we don't break existing code.
-rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java | 11 | ||||
-rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java b/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java index a1ddee2e..113b60a3 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java @@ -45,12 +45,23 @@ import java.util.zip.ZipFile; public final class DexFileFactory { @Nonnull + public static DexBackedDexFile loadDexFile(String path, int api) + throws IOException { + return loadDexFile(path, api, false); + } + + @Nonnull public static DexBackedDexFile loadDexFile(String path, int api, boolean experimental) throws IOException { return loadDexFile(new File(path), "classes.dex", new Opcodes(api, experimental)); } @Nonnull + public static DexBackedDexFile loadDexFile(File dexFile, int api) throws IOException { + return loadDexFile(dexFile, api, false); + } + + @Nonnull public static DexBackedDexFile loadDexFile(File dexFile, int api, boolean experimental) throws IOException { return loadDexFile(dexFile, "classes.dex", new Opcodes(api, experimental)); diff --git a/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java b/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java index dd876813..e718e275 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java @@ -40,6 +40,10 @@ public class Opcodes { private final Opcode[] opcodesByValue; private final HashMap<String, Opcode> opcodesByName; + public Opcodes(int api) { + this(api, false); + } + public Opcodes(int api, boolean experimental) { opcodesByValue = new Opcode[256]; opcodesByName = Maps.newHashMap(); |