Try setting the max page size

a-maurice · a-maurice · commit cb3a5a060778 · 2025-02-10T11:39:06.000-08:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)`
`106`	`106`	`"-Wl,--no-undefined"`
`107`	`107`	`# Link against the static libc++, which is the default done by Gradle.`
`108`	`108`	`"-static-libstdc++"`
	`109`	`+ # Set the max page size to 16KB, needed by Android 15`
	`110`	`+ "-Wl,-z,max-page-size=16384"`
`109`	`111`	`)`
`110`	`112`	`add_custom_command(TARGET ${shared_target} POST_BUILD`
`111`	`113`	`COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ function(build_uni TARGET_LINK_LIB_NAMES PROJECT_LIST_HEADER_VARIABLE)`
`86`	`86`	`"-Wl,--no-undefined"`
`87`	`87`	`# Link against the static libc++, which is the default done by Gradle.`
`88`	`88`	`"-static-libstdc++"`
	`89`	`+ # Set the max page size to 16KB, needed by Android 15`
	`90`	`+ "-Wl,-z,max-page-size=16384"`
`89`	`91`	`)`
`90`	`92`	`add_custom_command(TARGET firebase_app_uni POST_BUILD`
`91`	`93`	`COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose`