diff options
author | Jesse Wilson <jwilson@squareup.com> | 2012-08-22 23:20:26 -0700 |
---|---|---|
committer | Jesse Wilson <jwilson@squareup.com> | 2012-08-22 23:20:26 -0700 |
commit | 55ac44b64744cd5692d6495bca99dfc8181e0cfc (patch) | |
tree | c199559e9e67fc6453865424b23d25f191eeef5f /dx | |
parent | b931f9065990520bf34b8c6128e069b4cca4a7ec (diff) | |
download | android_dalvik-55ac44b64744cd5692d6495bca99dfc8181e0cfc.tar.gz android_dalvik-55ac44b64744cd5692d6495bca99dfc8181e0cfc.tar.bz2 android_dalvik-55ac44b64744cd5692d6495bca99dfc8181e0cfc.zip |
Fix a bug where debugInfos' size wasn't being computed.
Previously debugInfos' size of 0 caused a malformed dex file
because debug data was present but not mentioned in the table
of contents.
Change-Id: I07171aaee12fef9f303fc505909f44ef1a714114
Diffstat (limited to 'dx')
-rw-r--r-- | dx/src/com/android/dx/merge/DexMerger.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dx/src/com/android/dx/merge/DexMerger.java b/dx/src/com/android/dx/merge/DexMerger.java index a6f413a5d..c48f436f4 100644 --- a/dx/src/com/android/dx/merge/DexMerger.java +++ b/dx/src/com/android/dx/merge/DexMerger.java @@ -33,9 +33,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; /** * Combine two dex files into one. @@ -839,6 +837,7 @@ public final class DexMerger { private static final byte DBG_SET_FILE = 0x09; private void transformDebugInfoItem(DexBuffer.Section in, IndexMap indexMap) { + contentsOut.debugInfos.size++; int lineStart = in.readUleb128(); debugInfoOut.writeUleb128(lineStart); |