Allow customizing zipalign alignment in mobile-install.

PiperOrigin-RevId: 918647938
Change-Id: I33503c6c1b14e265420958a30117bcb266989016

Author: A Googler

mobile_install/adapters/android_binary.bzl

@@ -60,6 +60,7 @@ def extract(target, ctx):
         debug_signing_keys = ctx.rule.files.debug_signing_keys,
         debug_signing_lineage_file = utils.only(ctx.rule.files.debug_signing_lineage_file, allow_empty = True),
         key_rotation_min_sdk = ctx.rule.attr.key_rotation_min_sdk,
+        zipalign_alignment = getattr(ctx.rule.attr, "zipalign_alignment", 4),
         merged_manifest = target[AndroidIdeInfo].generated_manifest,
         native_libs = target[AndroidIdeInfo].native_libs,
         package = java_package,

mobile_install/apks.bzl

@@ -63,7 +63,7 @@ def _patch_split_manifests(ctx, orig_manifest, split_manifests, out_manifest_pac
         progress_message = "MI Patch split manifests",
     )
 
-def _make_split_apk(ctx, dirs, artifacts, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, out):
+def _make_split_apk(ctx, dirs, artifacts, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, zipalign_alignment, out):
     unsigned = utils.isolated_declare_file(ctx, out.basename + "_unsigned", sibling = out)
 
     args = ctx.actions.args()
@@ -90,7 +90,7 @@ def _make_split_apk(ctx, dirs, artifacts, debug_signing_keys, debug_signing_line
         progress_message = "MI Making split app %s" % out.path,
     )
 
-    _zipalign_sign(ctx, unsigned, out, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk)
+    _zipalign_sign(ctx, unsigned, out, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, zipalign_alignment)
 
 def make_split_apks(
         ctx,
@@ -104,6 +104,7 @@ def make_split_apks(
         debug_signing_keys,
         debug_signing_lineage_file,
         key_rotation_min_sdk,
+        zipalign_alignment,
         sibling):
     """Create a split for each dex and for resources"""
     manifest_package_name = utils.isolated_declare_file(ctx, "manifest_package_name.txt", sibling = sibling)
@@ -180,6 +181,7 @@ def make_split_apks(
             debug_signing_keys,
             debug_signing_lineage_file,
             key_rotation_min_sdk,
+            zipalign_alignment,
             split,
         )
         splits.append(split)
@@ -206,12 +208,12 @@ def make_split_apks(
     # Resources are now in the base apk to support RRO. Previously they were a separate split, but
     # base reinstalls no longer require a full reinstall.
     base = utils.isolated_declare_file(ctx, "splits/base.apk", sibling = sibling)
-    _make_split_apk(ctx, [compiled], [resource_apk, java8_legacy], debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, base)
+    _make_split_apk(ctx, [compiled], [resource_apk, java8_legacy], debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, zipalign_alignment, base)
     splits.append(base)
 
     return manifest_package_name, splits
 
-def _zipalign_sign(ctx, unsigned_apk, signed_apk, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk):
+def _zipalign_sign(ctx, unsigned_apk, signed_apk, debug_signing_keys, debug_signing_lineage_file, key_rotation_min_sdk, zipalign_alignment):
     """Zipalign and signs the given apk."""
 
     signing_params = ((("--lineage %s " % debug_signing_lineage_file.path) if debug_signing_lineage_file else "") +
@@ -237,10 +239,11 @@ jvm=$3
 apk_signer=$4
 signing_params=$5
 signed_apk=$6
+zipalign_alignment=$7
 tmp_dir=$(mktemp -d)
 tmp_apk="${tmp_dir}/zipaligned.apk"
-${zipalign} -P 16 4 ${unsigned_apk} ${tmp_apk}
-${jvm} -jar ${apk_signer} sign ${signing_params} --out ${signed_apk} ${tmp_apk}
+${zipalign} -P 16 ${zipalign_alignment} ${unsigned_apk} ${tmp_apk}
+${jvm} -jar ${apk_signer} sign ${signing_params} --alignment-preserved true --out ${signed_apk} ${tmp_apk}
 """
     ctx.actions.run_shell(
         command = cmd,
@@ -251,6 +254,7 @@ ${jvm} -jar ${apk_signer} sign ${signing_params} --out ${signed_apk} ${tmp_apk}
             utils.first(ctx.attr._apk_signer[DefaultInfo].files.to_list()).path,
             signing_params,
             signed_apk.path,
+            str(zipalign_alignment),
         ],
         tools = [ctx.executable._zipalign],
         inputs = (debug_signing_keys +

mobile_install/process.bzl

@@ -38,6 +38,7 @@ def process(
         debug_signing_keys = [],
         debug_signing_lineage_file = None,
         key_rotation_min_sdk = None,
+        zipalign_alignment = 4,
         apk = None,
         sibling = None):
     """Processes the data in the mi and return data to pass up the graph.
@@ -109,6 +110,7 @@ def process(
         debug_signing_keys,
         debug_signing_lineage_file,
         key_rotation_min_sdk,
+        zipalign_alignment,
         sibling,
     )