diff options
author | Colin Cross <ccross@android.com> | 2017-04-07 17:07:49 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-04-11 10:17:19 -0700 |
commit | 2f57904b105e49636d7bc6274750fce490f84971 (patch) | |
tree | 2df01c38cfe3f1df29a3c6a4586669ed3af787eb | |
parent | c18801a8be7c403aec3e6773a13449b53c7a2f0c (diff) | |
download | smali-2f57904b105e49636d7bc6274750fce490f84971.tar.gz |
Support dex version 38 in smaliandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
Smali is used by cts-api-coverage.
Bug: 36902714
Test: m -j ANDROID_COMPILE_WITH_JACK=false continuous_instrumentation_tests_api_coverage
Change-Id: I4b02caa9d4b6370497faeb4ab142b297865c5234
(cherry picked from commit 705b1ebf36002a7ffb8fb957480e30b67836625e)
-rw-r--r-- | dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java index 531ff461..2f3af4c3 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java @@ -45,11 +45,12 @@ public class HeaderItem { /** * The magic numbers for dex files. * - * They are: "dex\n035\0" and "dex\n037\0". + * They are: "dex\n035\0", "dex\n037\0", and "dex\n038\0". */ public static final byte[][] MAGIC_VALUES= new byte[][] { new byte[]{0x64, 0x65, 0x78, 0x0a, 0x30, 0x33, 0x35, 0x00}, - new byte[]{0x64, 0x65, 0x78, 0x0a, 0x30, 0x33, 0x37, 0x00}}; + new byte[]{0x64, 0x65, 0x78, 0x0a, 0x30, 0x33, 0x37, 0x00}, + new byte[]{0x64, 0x65, 0x78, 0x0a, 0x30, 0x33, 0x38, 0x00}}; public static final int LITTLE_ENDIAN_TAG = 0x12345678; public static final int BIG_ENDIAN_TAG = 0x78563412; @@ -239,9 +240,12 @@ public class HeaderItem { if (api < 24) { // Prior to Android N we only support dex version 035. return HeaderItem.MAGIC_VALUES[0]; - } else { + } else if (api < 26) { // On android N and later we support dex version 037. return HeaderItem.MAGIC_VALUES[1]; + } else { + // On android O and later we support dex version 038. + return HeaderItem.MAGIC_VALUES[2]; } } @@ -261,7 +265,7 @@ public class HeaderItem { } } if (matches) { - return i==0?35:37; + return i==0?35:(i==1?37:38); } } return 0; |