From 622803e9d6cbfc8a0d2701d281dc07ff4d9e846f Mon Sep 17 00:00:00 2001
From: shum <shum@liber.li>
Date: Fri, 24 Oct 2025 15:17:50 +0000
Subject: [PATCH] apps/multiplatform: align androidx.camera and libapp to 16kb

---
 apps/multiplatform/common/build.gradle.kts                     | 3 ++-
 .../common/src/commonMain/cpp/android/CMakeLists.txt           | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index 2227766cfa..9fc2c7da52 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -95,7 +95,8 @@ kotlin {
 
         implementation("com.jakewharton:process-phoenix:3.0.0")
 
-        val cameraXVersion = "1.3.4"
+        // https://issuetracker.google.com/issues/351313880
+        val cameraXVersion = "1.5.1"
         implementation("androidx.camera:camera-core:${cameraXVersion}")
         implementation("androidx.camera:camera-camera2:${cameraXVersion}")
         implementation("androidx.camera:camera-lifecycle:${cameraXVersion}")
diff --git a/apps/multiplatform/common/src/commonMain/cpp/android/CMakeLists.txt b/apps/multiplatform/common/src/commonMain/cpp/android/CMakeLists.txt
index 44cb31d424..49794a8ab5 100644
--- a/apps/multiplatform/common/src/commonMain/cpp/android/CMakeLists.txt
+++ b/apps/multiplatform/common/src/commonMain/cpp/android/CMakeLists.txt
@@ -57,6 +57,9 @@ set_target_properties( support PROPERTIES IMPORTED_LOCATION
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
 
+# https://developer.android.com/guide/practices/page-sizes#cmake
+target_link_options(app-lib PRIVATE "-Wl,-z,max-page-size=16384")
+
 target_link_libraries( # Specifies the target library.
     app-lib