Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e483d323 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Only align when necessary" into nyc-dev

am: 1ccfe526

* commit '1ccfe526':
  Only align when necessary

Change-Id: I2ebeb2143e3feebb06143d2e14de28e34459180a
parents ada9c888 1ccfe526
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -2469,13 +2469,15 @@ endef
# Align STORED entries of a package on 4-byte boundaries to make them easier to mmap.
#
define align-package
$(hide) mv $@ $@.unaligned
$(hide) $(ZIPALIGN) \
$(hide) if ! $(ZIPALIGN) -c $(ZIPALIGN_PAGE_ALIGN_FLAGS) 4 $@ >/dev/null ; then \
  mv $@ $@.unaligned; \
  $(ZIPALIGN) \
    -f \
    $(ZIPALIGN_PAGE_ALIGN_FLAGS) \
    4 \
    $@.unaligned $@.aligned
$(hide) mv $@.aligned $@
    $@.unaligned $@.aligned; \
  mv $@.aligned $@; \
  fi
endef

# Remove dynamic timestamps from packages