Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7

am: 30124b4e1e

Change-Id: I2b415e12eca7a870bbc2aff04b1e3556084b4ede
This commit is contained in:
Colin Cross
2019-10-11 06:26:57 -07:00
committed by android-build-merger

View File

@@ -2279,7 +2279,7 @@ endef
# Align STORED entries of a package on 4-byte boundaries to make them easier to mmap. # Align STORED entries of a package on 4-byte boundaries to make them easier to mmap.
# #
define align-package define align-package
$(hide) if ! $(ZIPALIGN) -c $(ZIPALIGN_PAGE_ALIGN_FLAGS) 4 $@ >/dev/null ; then \ $(hide) if ! $(ZIPALIGN) -c -p 4 $@ >/dev/null ; then \
mv $@ $@.unaligned; \ mv $@ $@.unaligned; \
$(ZIPALIGN) \ $(ZIPALIGN) \
-f \ -f \