Merge "Fix inefficiency in APK entry data alignment."

2016-06-13 18:14:18 +00:00 · 2016-06-13 18:14:18 +00:00 · a85e0aa883
parent 8b3b1727da ab2a3b0061
commit a85e0aa883
1 changed files with 2 additions and 1 deletions
--- a/tools/signapk/src/com/android/signapk/SignApk.java
+++ b/tools/signapk/src/com/android/signapk/SignApk.java
@ -445,7 +445,8 @@ class SignApk {
            int extraPaddingSizeBytes = 0;
            if (alignment > 0) {
                long paddingStartOffset = offset + ALIGNMENT_ZIP_EXTRA_DATA_FIELD_MIN_SIZE_BYTES;
-                extraPaddingSizeBytes = alignment - (int) (paddingStartOffset % alignment);
+                extraPaddingSizeBytes =
+                        (alignment - (int) (paddingStartOffset % alignment)) % alignment;
            }
            byte[] extra =
                    new byte[ALIGNMENT_ZIP_EXTRA_DATA_FIELD_MIN_SIZE_BYTES + extraPaddingSizeBytes];