diff options
author | 2021-09-14 14:18:31 -0700 | |
---|---|---|
committer | 2021-09-14 15:20:42 -0700 | |
commit | df73d1b4733b8b3cdfd96199018455026ba8d9d2 (patch) | |
tree | c7b06a6ca03da4f8b07937306cd9d474ec6685b4 /tools/zipalign/ZipFile.cpp | |
parent | 1011d45f5b5230fdc031f654f701e511dd4d935c (diff) |
Zipalign: Avoid unnecessary padding
Problem: Aligned entry always get padded to the next aligned slot.
Solution: Fix alignment test.
Bug: 199932309
Test: align_test.cpp
Change-Id: I1e61c67dcf45454dd782d0fcc6903f7e71954083
Diffstat (limited to 'tools/zipalign/ZipFile.cpp')
-rw-r--r-- | tools/zipalign/ZipFile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp index 6037d595da..f2f65a63bc 100644 --- a/tools/zipalign/ZipFile.cpp +++ b/tools/zipalign/ZipFile.cpp @@ -530,7 +530,7 @@ status_t ZipFile::alignEntry(android::ZipEntry* pEntry, uint32_t alignTo){ // If the alignment is not what was requested, add some padding in the extra // so the payload ends up where is requested. uint64_t alignDiff = alignTo - (expectedPayloadOffset % alignTo); - if (alignDiff == 0) + if (alignDiff == alignTo) return OK; return pEntry->addPadding(alignDiff); |