Use the dex version mapping implemented in dexlib2 2.2.5

This commit is contained in:
Lanchon 2018-09-13 06:08:53 -03:00
parent 7bd1ecd8ce
commit d7a4e29f32

View File

@ -12,7 +12,6 @@ package lanchon.multidexlib2;
import org.jf.dexlib2.Opcodes; import org.jf.dexlib2.Opcodes;
import org.jf.dexlib2.VersionMap; import org.jf.dexlib2.VersionMap;
import org.jf.dexlib2.dexbacked.raw.HeaderItem;
public class OpcodeUtils { public class OpcodeUtils {
@ -25,7 +24,8 @@ public class OpcodeUtils {
public static int getDexVersionFromOpcodes(Opcodes opcodes) { public static int getDexVersionFromOpcodes(Opcodes opcodes) {
if (opcodes.api == VersionMap.NO_VERSION) throw undefinedApiLevel(); 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); //return HeaderItem.getVersion(HeaderItem.getMagicForApi(opcodes.api), 0);
return VersionMap.mapApiToDexVersion(opcodes.api);
} }
public static Opcodes getNewestOpcodes(Opcodes o1, Opcodes o2, boolean nullable) { public static Opcodes getNewestOpcodes(Opcodes o1, Opcodes o2, boolean nullable) {