diff options
| author | Narayan Kamath <narayan@google.com> | 2016-10-13 15:12:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 15:12:36 +0000 |
| commit | 6bcd17ae3bd9f54be4eb2c232050b879cfd18958 (patch) | |
| tree | be81feffef0eaa31430d69afe4665b8aa3ee884d | |
| parent | f43cabb63593235a4e0df06d9fa76bafd5a57c22 (diff) | |
| parent | cb5c5daefce2792ce8641d01eb8bfb7f0b02bd10 (diff) | |
| download | smali-6bcd17ae3bd9f54be4eb2c232050b879cfd18958.tar.gz | |
Merge "Add a placeholder ART version number / api level for aosp/master."
am: cb5c5daefc
Change-Id: I9774453534a30791f04c5eec65893e1564113da1
| -rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/Opcode.java | 4 | ||||
| -rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java | 4 | ||||
| -rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java | 15 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/Opcode.java b/dexlib2/src/main/java/org/jf/dexlib2/Opcode.java index 138c6c63..843550f8 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/Opcode.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/Opcode.java @@ -305,8 +305,8 @@ public enum Opcode SPARSE_SWITCH_PAYLOAD(0x200, "sparse-switch-payload", ReferenceType.NONE, Format.SparseSwitchPayload, 0), ARRAY_PAYLOAD(0x300, "array-payload", ReferenceType.NONE, Format.ArrayPayload, 0), - INVOKE_POLYMORPHIC(firstApi(0xfa, 26), "invoke-polymorphic", ReferenceType.METHOD, ReferenceType.METHOD_PROTO, Format.Format45cc, Opcode.CAN_THROW | Opcode.CAN_CONTINUE | Opcode.SETS_RESULT), - INVOKE_POLYMORPHIC_RANGE(firstApi(0xfb, 26), "invoke-polymorphic/range", ReferenceType.METHOD, ReferenceType.METHOD_PROTO, Format.Format4rcc, Opcode.CAN_THROW | Opcode.CAN_CONTINUE | Opcode.SETS_RESULT); + INVOKE_POLYMORPHIC(firstArtVersion(0xfa, 87), "invoke-polymorphic", ReferenceType.METHOD, ReferenceType.METHOD_PROTO, Format.Format45cc, Opcode.CAN_THROW | Opcode.CAN_CONTINUE | Opcode.SETS_RESULT), + INVOKE_POLYMORPHIC_RANGE(firstArtVersion(0xfb, 87), "invoke-polymorphic/range", ReferenceType.METHOD, ReferenceType.METHOD_PROTO, Format.Format4rcc, Opcode.CAN_THROW | Opcode.CAN_CONTINUE | Opcode.SETS_RESULT); //if the instruction can throw an exception public static final int CAN_THROW = 0x1; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java b/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java index 9f7d128d..a137dee2 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/Opcodes.java @@ -101,9 +101,9 @@ public class Opcodes { int version; if (isArt()) { - version = artVersion; + version = this.artVersion; } else { - version = api; + version = this.api; } for (Opcode opcode: Opcode.values()) { diff --git a/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java b/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java index e0e1a6bb..b3581876 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java @@ -35,6 +35,12 @@ public class VersionMap { public static final int NO_VERSION = -1; public static int mapArtVersionToApi(int artVersion) { + // NOTE: Art version 87 and api level 26 do not correspond to any + // particular android release and represent the current (as of + // October 2016) state of aosp/master. + if (artVersion >= 87) { + return 26; + } if (artVersion >= 79) { return 24; } @@ -62,10 +68,15 @@ public class VersionMap { case 23: return 64; case 24: + case 25: return 79; } - if (api > 24) { - return 79; + + // NOTE: Art version 87 and api level 26 do not correspond to any + // particular android release and represent the current (as of + // October 2016) state of aosp/master. + if (api > 25) { + return 87; } return NO_VERSION; } |