diff options
| author | yroussel <yroussel@google.com> | 2012-10-31 16:25:42 +0100 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-04 14:10:23 -0700 |
| commit | cdab79083aae45f792dc5416f8ccc158d816bf88 (patch) | |
| tree | 5ba3125359d6f4db0ab6f24c9a211cb64ccb8aa4 /dx | |
| parent | 647260b2efc139871d70bb9d25238d69615356f9 (diff) | |
| download | android_dalvik-cdab79083aae45f792dc5416f8ccc158d816bf88.tar.gz android_dalvik-cdab79083aae45f792dc5416f8ccc158d816bf88.tar.bz2 android_dalvik-cdab79083aae45f792dc5416f8ccc158d816bf88.zip | |
Fix alignment when recompacting a DexMerger result.
(cherry picked from commit a659fe6f8a0b7d32eafc9a2ff7aa1387702da053)
Change-Id: I7c93e7d45b52655cd7adfdc3fc783757ee71079b
Diffstat (limited to 'dx')
| -rw-r--r-- | dx/src/com/android/dx/merge/DexMerger.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dx/src/com/android/dx/merge/DexMerger.java b/dx/src/com/android/dx/merge/DexMerger.java index 7caea2bac..8080947cb 100644 --- a/dx/src/com/android/dx/merge/DexMerger.java +++ b/dx/src/com/android/dx/merge/DexMerger.java @@ -1038,6 +1038,7 @@ public final class DexMerger { annotationsSet = dexMerger.annotationSetOut.used(); annotationsSetRefList = dexMerger.annotationSetRefListOut.used(); annotation = dexMerger.annotationOut.used(); + fourByteAlign(); } private void plus(TableOfContents contents, boolean exact) { |