Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all CMakeLists.txt files to enable 16kb page size on Android. #1690

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update all CMakeLists.txt files to enable 16kb page size on Android. #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f65c48
Update all CMakeLists.txt files to enable 16kb page size on Android.
jonsimantov Feb 10, 2025
1da1171
Switch to an FTL device with 16kb page sizes to see if the error occurs.
jonsimantov Feb 10, 2025
73f03d5
Remove 16kb flatbuffers page size.
jonsimantov Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions analytics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ add_library(firebase_analytics STATIC

set_property(TARGET firebase_analytics PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_analytics
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_analytics
PUBLIC firebase_app)
Expand Down
6 changes: 6 additions & 0 deletions app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,12 @@ else()
target_compile_options(firebase_app PRIVATE -fno-exceptions)
endif()

if(ANDROID)
target_link_options(firebase_app
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

target_include_directories(firebase_app
PUBLIC
${CMAKE_CURRENT_LIST_DIR}/src/include
Expand Down
6 changes: 6 additions & 0 deletions app_check/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ add_library(firebase_app_check STATIC

set_property(TARGET firebase_app_check PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_app_check
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_app_check
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions auth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ add_library(firebase_auth STATIC

set_property(TARGET firebase_auth PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_auth
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_auth
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions database/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ add_library(firebase_database STATIC

set_property(TARGET firebase_database PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_database
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_database
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions dynamic_links/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ add_library(firebase_dynamic_links STATIC

set_property(TARGET firebase_dynamic_links PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_dynamic_links
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_dynamic_links
PUBLIC firebase_app)
Expand Down
6 changes: 6 additions & 0 deletions firestore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,12 @@ add_library(firebase_firestore STATIC

set_property(TARGET firebase_firestore PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_firestore
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_firestore
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions functions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ add_library(firebase_functions STATIC

set_property(TARGET firebase_functions PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_functions
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_functions
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions gma/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ add_library(firebase_gma STATIC

set_property(TARGET firebase_gma PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_gma
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_gma
PUBLIC firebase_app)
Expand Down
6 changes: 6 additions & 0 deletions installations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ add_library(firebase_installations STATIC

set_property(TARGET firebase_installations PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_installations
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_installations
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions messaging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ add_library(firebase_messaging STATIC

set_property(TARGET firebase_messaging PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_messaging
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_messaging
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions remote_config/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ add_library(firebase_remote_config STATIC

set_property(TARGET firebase_remote_config PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_remote_config
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_remote_config
PUBLIC
Expand Down
19 changes: 10 additions & 9 deletions scripts/gha/print_matrix_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,16 @@
{"type": "ftl", "device": "model=SH-01L,version=28"}, # AQUOS sense2 SH-01L
],
"android_latest": [
{"type": "ftl", "device": "model=oriole,version=33"}, # Pixel 6
{"type": "ftl", "device": "model=panther,version=33"}, # Pixel 7
{"type": "ftl", "device": "model=lynx,version=33"}, # Pixel 7a
{"type": "ftl", "device": "model=cheetah,version=33"}, # Pixel 7 Pro
{"type": "ftl", "device": "model=felix,version=33"}, # Pixel Fold
{"type": "ftl", "device": "model=tangorpro,version=33"}, # Pixel Tablet
{"type": "ftl", "device": "model=gts8uwifi,version=33"}, # Galaxy Tab S8 Ultra
{"type": "ftl", "device": "model=b0q,version=33"}, # Galaxy S22 Ultra
{"type": "ftl", "device": "model=b4q,version=33"}, # Galaxy Z Flip4
{"type": "ftl", "device": "model=shiba_beta,version=35"}, # Pixel 8 (to test 16kb page size)
# {"type": "ftl", "device": "model=oriole,version=33"}, # Pixel 6
# {"type": "ftl", "device": "model=panther,version=33"}, # Pixel 7
# {"type": "ftl", "device": "model=lynx,version=33"}, # Pixel 7a
# {"type": "ftl", "device": "model=cheetah,version=33"}, # Pixel 7 Pro
# {"type": "ftl", "device": "model=felix,version=33"}, # Pixel Fold
# {"type": "ftl", "device": "model=tangorpro,version=33"}, # Pixel Tablet
# {"type": "ftl", "device": "model=gts8uwifi,version=33"}, # Galaxy Tab S8 Ultra
# {"type": "ftl", "device": "model=b0q,version=33"}, # Galaxy S22 Ultra
# {"type": "ftl", "device": "model=b4q,version=33"}, # Galaxy Z Flip4
],
"emulator_ftl_target": [
{"type": "ftl", "device": "model=Pixel2,version=28"},
Expand Down
6 changes: 6 additions & 0 deletions storage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ add_library(firebase_storage STATIC

set_property(TARGET firebase_storage PROPERTY FOLDER "Firebase Cpp")

if(ANDROID)
target_link_options(firebase_storage
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

# Set up the dependency on Firebase App.
target_link_libraries(firebase_storage
PUBLIC
Expand Down
6 changes: 6 additions & 0 deletions testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ add_library(firebase_testing STATIC
${util_SRCS}
)

if(ANDROID)
target_link_options(firebase_testing
PRIVATE
"-Wl,-z,max-page-size=16384")
endif()

target_include_directories(firebase_testing
PUBLIC
${FLATBUFFERS_SOURCE_DIR}/include
Expand Down
Loading