From c8042b06458b08538410fc26efa9d760bd0ed74c Mon Sep 17 00:00:00 2001 From: Lanchon Date: Wed, 13 Jun 2018 00:43:17 -0300 Subject: [PATCH] Stop using DexVersionMap --- src/main/java/lanchon/multidexlib2/OpcodeUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java index 23ad2f6..7c587d8 100644 --- a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java +++ b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java @@ -12,16 +12,20 @@ package lanchon.multidexlib2; import org.jf.dexlib2.Opcodes; import org.jf.dexlib2.VersionMap; +import org.jf.dexlib2.dexbacked.raw.HeaderItem; public class OpcodeUtils { public static Opcodes getOpcodesFromDexVersion(int dexVersion) { - return Opcodes.forApi(DexVersionMap.getHighestApiLevelFromDexVersion(dexVersion)); + //return Opcodes.forApi(DexVersionMap.getHighestApiLevelFromDexVersion(dexVersion)); + //return Opcodes.forApi(VersionMap.mapDexVersionToApi(dexVersion)); + return Opcodes.forDexVersion(dexVersion); } public static int getDexVersionFromOpcodes(Opcodes opcodes) { if (opcodes.api == VersionMap.NO_VERSION) throw undefinedApiLevel(); - return DexVersionMap.getDexVersionFromApiLevel(opcodes.api); + //return DexVersionMap.getDexVersionFromApiLevel(opcodes.api); + return HeaderItem.getVersion(HeaderItem.getMagicForApi(opcodes.api), 0); } public static Opcodes getNewestOpcodes(Opcodes o1, Opcodes o2, boolean nullable) {