Skip to content

chore: remove CMake code with support for RN 0.75 or older #3448

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

Merged
kkafar merged 2 commits into from
Dec 3, 2025
Merged

chore: remove CMake code with support for RN 0.75 or older #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd72d8c
Remove build code covering RN 0.75 or older
kkafar Dec 2, 2025
0ddb531
Do the same for react_codegen_rnscreens target
kkafar Dec 2, 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
38 changes: 6 additions & 32 deletions android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,12 @@ find_package(ReactAndroid REQUIRED CONFIG)

if(${RNS_NEW_ARCH_ENABLED})
find_package(fbjni REQUIRED CONFIG)

if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
target_link_libraries(rnscreens
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
android
)
else()
target_link_libraries(
rnscreens
ReactAndroid::jsi
ReactAndroid::react_nativemodule_core
ReactAndroid::react_utils
ReactAndroid::reactnativejni
ReactAndroid::fabricjni
ReactAndroid::react_debug
ReactAndroid::react_render_core
ReactAndroid::runtimeexecutor
ReactAndroid::react_render_graphics
ReactAndroid::rrc_view
ReactAndroid::yoga
ReactAndroid::rrc_text
ReactAndroid::glog
ReactAndroid::react_render_componentregistry
ReactAndroid::react_render_consistency
ReactAndroid::react_performance_timeline
ReactAndroid::react_render_observers_events
fbjni::fbjni
android
)
endif()
target_link_libraries(rnscreens
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
android
)
else()
target_link_libraries(rnscreens
ReactAndroid::jsi
Expand Down
34 changes: 6 additions & 28 deletions android/src/main/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,12 @@ target_include_directories(
${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
)

if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
target_link_libraries(
${LIB_TARGET_NAME}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
)
else()
target_link_libraries(
${LIB_TARGET_NAME}
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_core
react_render_debug
react_render_graphics
react_render_mapbuffer
react_render_componentregistry
react_utils
rrc_view
turbomodulejsijni
yoga
)
endif()
target_link_libraries(
${LIB_TARGET_NAME}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
)

if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
Expand Down
Loading