commit 288f22800c8fe1eb44afff78ec1fff815379183e
author Yohann Roussel <yroussel@google.com> Wed Nov 07 02:03:30 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 07 02:03:30 2012 -0800
tree 7f6dcdf488f19101577ebbf281e99069e59fd2d2
parent 707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6

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

This reverts commit 707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6

Looks like jb-dev is missing some other patches before it possible to cherry-pick this one.

Change-Id: I8cbdd649d03696cb80be0dacc8640275468ef162

dx/src/com/android/dx/merge/DexMerger.java

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