Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7 am: 30124b4e1e am: 011d40c669

am: 4c0fccb650

Change-Id: I06add3e875c8511c70a010cd6f4f223e0258ea94
This commit is contained in:
Colin Cross 2019-10-11 08:02:14 -07:00 committed by android-build-merger
commit f9e07d6b9b
1 changed files with 1 additions and 1 deletions

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 \