From 5c6b6f24a3c34c6ac52d199533790a1ee942eb3e Mon Sep 17 00:00:00 2001
From: Juan Yescas <jyescas@google.com>
Date: Mon, 16 Oct 2023 09:20:00 -0700
Subject: [PATCH] 16k: Sign the APKs to support 4k/16k page sizes

The page agnostic targets have to support 4k/16k page sizes. For
these targets, the APKs have to be aligned at 16k boundaries.

Bug: 302343940
Test: source build/envsetup.sh
      lunch aosp_cf_arm64_phone_pgagnostic
      m
      launch_cvd -userdata_format=ext4
Change-Id: Ia0e39a90c0d6a3e62d450157fdfd5e3ee36d346e
---
 tools/signapk/src/com/android/signapk/SignApk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/signapk/src/com/android/signapk/SignApk.java b/tools/signapk/src/com/android/signapk/SignApk.java
index 25c53d328c..2f2b833ba8 100644
--- a/tools/signapk/src/com/android/signapk/SignApk.java
+++ b/tools/signapk/src/com/android/signapk/SignApk.java
@@ -687,7 +687,7 @@ class SignApk {
         if (entryName.endsWith(".so")) {
             // Align .so contents to memory page boundary to enable memory-mapped
             // execution.
-            return 4096;
+            return 16384;
         } else {
             return defaultAlignment;
         }