From dd72d8cbd6edb4d97c5ea579620b781b966c884d Mon Sep 17 00:00:00 2001 From: Kacper Kafara Date: Tue, 2 Dec 2025 15:44:22 +0100 Subject: [PATCH 1/2] Remove build code covering RN 0.75 or older We do not support such old versions for a long time now. --- android/CMakeLists.txt | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 86ec079de3..5d5dfe442a 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -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 From 0ddb5312fcca2d1044dea39b30bbb737dc09d82e Mon Sep 17 00:00:00 2001 From: Kacper Kafara Date: Tue, 2 Dec 2025 16:32:45 +0100 Subject: [PATCH 2/2] Do the same for react_codegen_rnscreens target --- android/src/main/jni/CMakeLists.txt | 34 +++++------------------------ 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt index 1b26dac910..b2dfc56afc 100644 --- a/android/src/main/jni/CMakeLists.txt +++ b/android/src/main/jni/CMakeLists.txt @@ -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)