Skip to content

Commit e472653

Browse files
authored
fix: unblock build for 0.76 (#660)
1 parent cdd1d19 commit e472653

File tree

1 file changed

+32
-21
lines changed

1 file changed

+32
-21
lines changed

Diff for: package/android/src/main/jni/CMakeLists.txt

+32-21
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,38 @@ target_include_directories(
3737
${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
3838
)
3939

40-
target_link_libraries(
41-
${LIB_TARGET_NAME}
42-
fbjni
43-
folly_runtime
44-
glog
45-
jsi
46-
react_codegen_rncore
47-
react_debug
48-
react_render_componentregistry
49-
react_render_core
50-
react_render_debug
51-
react_render_graphics
52-
react_render_imagemanager
53-
react_render_mapbuffer
54-
react_utils
55-
react_nativemodule_core
56-
rrc_image
57-
turbomodulejsijni
58-
rrc_view
59-
yoga
60-
)
40+
# https://github.com/react-native-community/discussions-and-proposals/discussions/816
41+
# This if-then-else can be removed once this library does not support version below 0.76
42+
if (REACTNATIVE_MERGED_SO)
43+
target_link_libraries(
44+
${LIB_TARGET_NAME}
45+
fbjni
46+
jsi
47+
reactnative
48+
)
49+
else()
50+
target_link_libraries(
51+
${LIB_TARGET_NAME}
52+
fbjni
53+
folly_runtime
54+
glog
55+
jsi
56+
react_codegen_rncore
57+
react_debug
58+
react_render_componentregistry
59+
react_render_core
60+
react_render_debug
61+
react_render_graphics
62+
react_render_imagemanager
63+
react_render_mapbuffer
64+
react_utils
65+
react_nativemodule_core
66+
rrc_image
67+
turbomodulejsijni
68+
rrc_view
69+
yoga
70+
)
71+
endif()
6172

6273
target_compile_options(
6374
${LIB_TARGET_NAME}

0 commit comments

Comments
 (0)