diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-30 21:51:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 21:51:51 +0000 |
| commit | 0b42772c20d87d468bb095205c5461dacbbe9cea (patch) | |
| tree | 3378d1ead745dad4fbbcd666fecef06d50576656 /dex/src/main/java | |
| parent | b2a9cdb4aa9ea54ba3321da199a96bd1e7a12722 (diff) | |
| parent | eb5fee6dd9c1a77af17cdf2991afe1e3db07e98a (diff) | |
| download | libcore-0b42772c20d87d468bb095205c5461dacbbe9cea.zip libcore-0b42772c20d87d468bb095205c5461dacbbe9cea.tar.gz libcore-0b42772c20d87d468bb095205c5461dacbbe9cea.tar.bz2 | |
Merge "Fix DexMerger to emit dex files without extended op codes."
Diffstat (limited to 'dex/src/main/java')
| -rw-r--r-- | dex/src/main/java/com/android/dex/TableOfContents.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dex/src/main/java/com/android/dex/TableOfContents.java b/dex/src/main/java/com/android/dex/TableOfContents.java index 54411ca..d1b87ac 100644 --- a/dex/src/main/java/com/android/dex/TableOfContents.java +++ b/dex/src/main/java/com/android/dex/TableOfContents.java @@ -75,7 +75,7 @@ public final class TableOfContents { byte[] magic = headerIn.readByteArray(8); int apiTarget = DexFormat.magicToApi(magic); - if (apiTarget < 0) { + if (apiTarget != DexFormat.API_NO_EXTENDED_OPCODES) { throw new DexException("Unexpected magic: " + Arrays.toString(magic)); } @@ -164,7 +164,7 @@ public final class TableOfContents { } public void writeHeader(Dex.Section out) throws IOException { - out.write(DexFormat.apiToMagic(DexFormat.API_CURRENT).getBytes("UTF-8")); + out.write(DexFormat.apiToMagic(DexFormat.API_NO_EXTENDED_OPCODES).getBytes("UTF-8")); out.writeInt(checksum); out.write(signature); out.writeInt(fileSize); |