commit f9e07d6b9bd19b52df0473702d290e007d40d3e5
author Colin Cross <ccross@android.com> Fri Oct 11 08:02:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 11 08:02:14 2019 -0700
tree f913e6231e1e9a5cfa5592df437198aa68efe272
parent c18689e4e422265fa6b4fa2c639290b4c80de56d
parent 4c0fccb650f0829e9904f988d07dffc573d499dc

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

Change-Id: I06add3e875c8511c70a010cd6f4f223e0258ea94

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 7450d4f..a8bf4d5 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2279,7 +2279,7 @@
 # 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 \