Use 16 KB options for zipalign.

When using Android build tools version 35.0.0-rc3 or newer, use `-P 16`
with `zipalign` instead of `-p 4`. This change is applied in both
`mobile_install` and `apk_packaging` rules.

#417

PiperOrigin-RevId: 826576032
Change-Id: Ifa58aed4d4390d26490685ea43da36716cec6d0e

Author: A Googler

mobile_install/apks.bzl

@@ -206,7 +206,9 @@ def _zipalign_sign(ctx, unsigned_apk, signed_apk, debug_signing_keys, debug_sign
                       " --deterministic-dsa-signing true" +
                       " --provider-class org.bouncycastle.jce.provider.BouncyCastleProvider")
 
-    # zipalign -p 4 input.apk output.apk will align the apk in a 4k boundary.
+    # note zipalign usage:
+    # https://cs.android.com/android/platform/superproject/main/+/main:build/make/tools/zipalign/ZipAlignMain.cpp
+
     cmd = """
 zipalign=$1
 unsigned_apk=$2
@@ -216,7 +218,7 @@ signing_params=$5
 signed_apk=$6
 tmp_dir=$(mktemp -d)
 tmp_apk="${tmp_dir}/zipaligned.apk"
-${zipalign} -p 4 ${unsigned_apk} ${tmp_apk}
+${zipalign} -P 16 4 ${unsigned_apk} ${tmp_apk}
 ${jvm} -jar ${apk_signer} sign ${signing_params} --out ${signed_apk} ${tmp_apk}
 """
     ctx.actions.run_shell(

rules/apk_packaging.bzl

@@ -298,7 +298,10 @@ def _zipalign_apk(
         toolchain_type = None):
     """ Zipaligns an unsigned apk."""
     args = ctx.actions.args()
-    args.add("-p", "4")
+
+    # note usage: https://cs.android.com/android/platform/superproject/main/+/main:build/make/tools/zipalign/ZipAlignMain.cpp
+    args.add("-P", "16")
+    args.add("4")
     args.add(in_apk)
     args.add(out_apk)