Fix alignment when recompacting a DexMerger result. do not merge.

(cherry picked from commit e0e7b076e427a327e27247aa409d0b0fa8b0e0aa)

Change-Id: Ib8092bd9ce9ba5490040a41c5d604e6a138acc7d

diff --git a/dx/src/com/android/dx/merge/DexMerger.java b/dx/src/com/android/dx/merge/DexMerger.java
index fc4d145..9ca4f6e 100644 (file)
--- a/dx/src/com/android/dx/merge/DexMerger.java
+++ b/dx/src/com/android/dx/merge/DexMerger.java
@@ -1006,6 +1006,7 @@ public final class DexMerger {
             annotationsSet = dexMerger.annotationSetOut.used();
             annotationsSetRefList = dexMerger.annotationSetRefListOut.used();
             annotation = dexMerger.annotationOut.used();
+            fourByteAlign();
         }
 
         public void plus(TableOfContents contents, boolean exact) {