Skip to content

Commit 63ac2b1

Browse files
authored
Set Android common page size to 16 KB (#1260)
* Set common page size to 16kb * Update readme.md
1 parent 7fbd65a commit 63ac2b1

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

cmake/build_shared.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
108108
"-static-libstdc++"
109109
# Set the max page size to 16KB, needed by Android 15
110110
"-Wl,-z,max-page-size=16384"
111+
"-Wl,-z,common-page-size=16384"
111112
)
112113
add_custom_command(TARGET ${shared_target} POST_BUILD
113114
COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose

cmake/build_universal.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ function(build_uni TARGET_LINK_LIB_NAMES PROJECT_LIST_HEADER_VARIABLE)
8888
"-static-libstdc++"
8989
# Set the max page size to 16KB, needed by Android 15
9090
"-Wl,-z,max-page-size=16384"
91+
"-Wl,-z,common-page-size=16384"
9192
)
9293
add_custom_command(TARGET firebase_app_uni POST_BUILD
9394
COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose

docs/readme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ Support
7171

7272
Release Notes
7373
-------------
74+
### Upcoming
75+
- Changes
76+
- General (Android): Fix a crash with 16 KB page sizes.
77+
([#1259](https://github.com/firebase/firebase-unity-sdk/issues/1259)).
78+
7479
### 12.9.0
7580
- Changes
7681
- General: Update to EDM4U version 1.2.186.

0 commit comments

Comments
 (0)