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

am: 011d40c669

Change-Id: I6a16e4f3cd614e581b5f85330e7f589466f4d268
This commit is contained in:
Colin Cross
2019-10-11 06:32:50 -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.
#
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; \
$(ZIPALIGN) \
-f \