commit 5b7285481d0f9ece6aad7f1bceddf903e3dde82d
author Jesse Wilson <jessewilson@google.com> Thu Sep 22 14:19:20 2011 -0400
committer Brian Carlstrom <bdc@google.com> Sat May 04 10:53:47 2013 -0700
tree 5b51143b660a7a001b2d01ce10c256a08d817303
parent 1d6aa9e267ea8f0705b857d70fbf6c2082ce5db3

Use zero filled alignment padding before method code

(cherry picked from commit d8760772c49647ab197c34b8e46438c410decb42)

Change-Id: I092ff646b02abf7b3ee6285361e4e256c1ade37d

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 7566845..7caea2b 100644
--- a/dx/src/com/android/dx/merge/DexMerger.java
+++ b/dx/src/com/android/dx/merge/DexMerger.java
@@ -805,7 +805,7 @@
             if (method.getCodeOffset() == 0) {
                 classDataOut.writeUleb128(0);
             } else {
-                codeOut.alignToFourBytes();
+                codeOut.alignToFourBytesWithZeroFill();
                 classDataOut.writeUleb128(codeOut.getPosition());
                 transformCode(in, in.readCode(method), indexMap);
             }