summaryrefslogtreecommitdiff
path: root/tools/dexdeps/src/com/android
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-04-07 17:04:27 -0700
committerColin Cross <ccross@android.com>2017-04-07 17:08:58 -0700
commit881d15f2e394997b1b3bbe444acb57666a36836a (patch)
treee18077a2c68d587f1662063573fc5e6968248fd6 /tools/dexdeps/src/com/android
parente4ecc9ff1d3ce159645db761747a5c1dda54ad24 (diff)
downloaddalvik-881d15f2e394997b1b3bbe444acb57666a36836a.tar.gz
Support dex version 38 in dexdeps
Dexdeps is used by cts-api-coverage Test: m -j ANDROID_COMPILE_WITH_JACK=false continuous_instrumentation_tests_api_coverage Change-Id: I16407367362166fed298a5b07e30bcd2f580b539
Diffstat (limited to 'tools/dexdeps/src/com/android')
-rw-r--r--tools/dexdeps/src/com/android/dexdeps/DexData.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/dexdeps/src/com/android/dexdeps/DexData.java b/tools/dexdeps/src/com/android/dexdeps/DexData.java
index 6f4fe80e5..448c21e32 100644
--- a/tools/dexdeps/src/com/android/dexdeps/DexData.java
+++ b/tools/dexdeps/src/com/android/dexdeps/DexData.java
@@ -68,7 +68,8 @@ public class DexData {
*/
private static boolean verifyMagic(byte[] magic) {
return Arrays.equals(magic, HeaderItem.DEX_FILE_MAGIC_v035) ||
- Arrays.equals(magic, HeaderItem.DEX_FILE_MAGIC_v037);
+ Arrays.equals(magic, HeaderItem.DEX_FILE_MAGIC_v037) ||
+ Arrays.equals(magic, HeaderItem.DEX_FILE_MAGIC_v038);
}
/**
@@ -549,6 +550,11 @@ public class DexData {
// V037 was introduced in API LEVEL 24
public static final byte[] DEX_FILE_MAGIC_v037 =
"dex\n037\0".getBytes(StandardCharsets.US_ASCII);
+
+ // V038 was introduced in API LEVEL 26
+ public static final byte[] DEX_FILE_MAGIC_v038 =
+ "dex\n038\0".getBytes(StandardCharsets.US_ASCII);
+
public static final int ENDIAN_CONSTANT = 0x12345678;
public static final int REVERSE_ENDIAN_CONSTANT = 0x78563412;
}