From d7a4e29f3245f8dc33033e95fbe622130584b68a Mon Sep 17 00:00:00 2001 From: Lanchon Date: Thu, 13 Sep 2018 06:08:53 -0300 Subject: [PATCH] Use the dex version mapping implemented in dexlib2 2.2.5 --- src/main/java/lanchon/multidexlib2/OpcodeUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java index 7c587d8..9a5fc3a 100644 --- a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java +++ b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java @@ -12,7 +12,6 @@ package lanchon.multidexlib2; import org.jf.dexlib2.Opcodes; import org.jf.dexlib2.VersionMap; -import org.jf.dexlib2.dexbacked.raw.HeaderItem; public class OpcodeUtils { @@ -25,7 +24,8 @@ public class OpcodeUtils { public static int getDexVersionFromOpcodes(Opcodes opcodes) { if (opcodes.api == VersionMap.NO_VERSION) throw undefinedApiLevel(); //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) {