From dc0db90015fab1c685a099987cb54b3d84ed1732 Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Wed, 12 Feb 2025 14:32:36 -0800
Subject: [PATCH 1/2] Support 16 KB page sizes on Android

---
 cmake/build_shared.cmake    | 2 ++
 cmake/build_universal.cmake | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cmake/build_shared.cmake b/cmake/build_shared.cmake
index 3cbb39140..040179fdd 100644
--- a/cmake/build_shared.cmake
+++ b/cmake/build_shared.cmake
@@ -106,6 +106,8 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
         "-Wl,--no-undefined"
         # Link against the static libc++, which is the default done by Gradle.
         "-static-libstdc++"
+        # Set the max page size to 16KB, needed by Android 15
+        "-Wl,-z,max-page-size=16384"
     )
     add_custom_command(TARGET ${shared_target} POST_BUILD
       COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose
diff --git a/cmake/build_universal.cmake b/cmake/build_universal.cmake
index e14a086e8..d24e04903 100644
--- a/cmake/build_universal.cmake
+++ b/cmake/build_universal.cmake
@@ -86,6 +86,8 @@ function(build_uni TARGET_LINK_LIB_NAMES PROJECT_LIST_HEADER_VARIABLE)
         "-Wl,--no-undefined"
         # Link against the static libc++, which is the default done by Gradle.
         "-static-libstdc++"
+        # Set the max page size to 16KB, needed by Android 15
+        "-Wl,-z,max-page-size=16384"
     )
     add_custom_command(TARGET firebase_app_uni POST_BUILD
       COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose

From 1a09dd54a5a3619ba899cc6d24173934633cacb5 Mon Sep 17 00:00:00 2001
From: a-maurice <amaurice@google.com>
Date: Wed, 12 Feb 2025 14:34:02 -0800
Subject: [PATCH 2/2] Update readme.md

---
 docs/readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/readme.md b/docs/readme.md
index b4a8aed67..9a013c9d3 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -71,6 +71,11 @@ Support
 
 Release Notes
 -------------
+### Upcoming
+- Changes
+    - General (Android): Support 16 KB page sizes, needed by Android 15.
+      For more info, see https://developer.android.com/guide/practices/page-sizes
+
 ### 12.5.0
 - Changes
     - General: Update to Firebase C++ SDK version 12.5.0.