commit 8163cfa5f43db08dd8c1abca31b9e0a6a81ece0f
author Fabien Sanglard <sanglardf@google.com> Mon Oct 10 22:19:47 2022 +0000
committer Fabien Sanglard <sanglardf@google.com> Wed Oct 12 13:57:16 2022 -0700
tree b90eee014c849b7b7a12ee0d21b550f5457970fa
parent d8b3c2901dcda8042f5f116e9cf74be2bdc8f912

Zipalign: Don't align directory entries

Directories are entries with uncompressed size zero and ending with
character '/' or '\' are allowed in apks since b/204425803. These
entries should not be considered for alignment since they are not
mmap by the framework.

Test: align_test.cpp
Bug: 250872480
Change-Id: I964aad118a82839f9ed230acc4c2c76f51888c67

tools/zipalign/Android.bp

diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp
index 8cab04c..0e1d58e 100644
--- a/tools/zipalign/Android.bp
+++ b/tools/zipalign/Android.bp
@@ -70,6 +70,7 @@
         "libgmock",
     ],
     data: [
+         "tests/data/archiveWithOneDirectoryEntry.zip",
          "tests/data/diffOrders.zip",
          "tests/data/holes.zip",
          "tests/data/unaligned.zip",