Merge "Only align when necessary" into nyc-dev

This commit is contained in:
Todd Kennedy
2016-04-29 20:59:04 +00:00
committed by Android (Google) Code Review

View File

@@ -2469,13 +2469,15 @@ 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) mv $@ $@.unaligned $(hide) if ! $(ZIPALIGN) -c $(ZIPALIGN_PAGE_ALIGN_FLAGS) 4 $@ >/dev/null ; then \
$(hide) $(ZIPALIGN) \ mv $@ $@.unaligned; \
$(ZIPALIGN) \
-f \ -f \
$(ZIPALIGN_PAGE_ALIGN_FLAGS) \ $(ZIPALIGN_PAGE_ALIGN_FLAGS) \
4 \ 4 \
$@.unaligned $@.aligned $@.unaligned $@.aligned; \
$(hide) mv $@.aligned $@ mv $@.aligned $@; \
fi
endef endef
# Remove dynamic timestamps from packages # Remove dynamic timestamps from packages