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

Jump to bottom

Move libmapbufferjni.so inside libreactnative.so #45641

Closed
wants to merge 6 commits into from
Closed

Move libmapbufferjni.so inside libreactnative.so #45641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64cf2b3
Create the libreactnative.so dependency
cortinico Jul 23, 2024
37c960e
Remove several libs from default App CMake setup
cortinico Jul 23, 2024
5e22b32
Move react_featureflags and react_render_consistency inside libreactn…
cortinico Jul 23, 2024
803a8fa
Move react_codegen_* + react_nativemodules_* libraries to static linking
cortinico Jul 24, 2024
2eae374
Move libreact_newarchdefaults.so inside libreactnative.so
cortinico Jul 24, 2024
897efb4
Move libmapbufferjni.so inside libreactnative.so (#45641)
cortinico Jul 24, 2024
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
23 changes: 8 additions & 15 deletions packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/$

add_library(
react_codegen_${libraryName}
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -85,21 +85,14 @@ target_include_directories(react_codegen_${libraryName} PUBLIC . react/renderer/
target_link_libraries(
react_codegen_${libraryName}
fbjni
folly_runtime
glog
jsi
${libraryName !== 'rncore' ? 'react_codegen_rncore' : ''}
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
${
libraryName !== 'rncore'
? 'reactnative'
: 'folly_runtime glog react_debug react_nativemodule_core react_render_componentregistry react_render_core react_render_debug react_render_graphics react_render_imagemanager react_render_mapbuffer react_utils rrc_image rrc_view'
}
turbomodulejsijni
yoga
)
Expand Down
171 changes: 36 additions & 135 deletions ...ve-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/S

add_library(
react_codegen_SampleWithUppercaseName
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -55,21 +55,10 @@ target_include_directories(react_codegen_SampleWithUppercaseName PUBLIC . react/
target_link_libraries(
react_codegen_SampleWithUppercaseName
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -133,7 +122,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/c

add_library(
react_codegen_complex_objects
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -142,21 +131,10 @@ target_include_directories(react_codegen_complex_objects PUBLIC . react/renderer
target_link_libraries(
react_codegen_complex_objects
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -213,7 +191,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/c

add_library(
react_codegen_cxx_only_native_modules
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -222,21 +200,10 @@ target_include_directories(react_codegen_cxx_only_native_modules PUBLIC . react/
target_link_libraries(
react_codegen_cxx_only_native_modules
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -300,7 +267,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/e

add_library(
react_codegen_empty_native_modules
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -309,21 +276,10 @@ target_include_directories(react_codegen_empty_native_modules PUBLIC . react/ren
target_link_libraries(
react_codegen_empty_native_modules
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -387,7 +343,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/e

add_library(
react_codegen_event_emitter_module
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -396,21 +352,10 @@ target_include_directories(react_codegen_event_emitter_module PUBLIC . react/ren
target_link_libraries(
react_codegen_event_emitter_module
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -474,7 +419,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/n

add_library(
react_codegen_native_modules_with_type_aliases
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -483,21 +428,10 @@ target_include_directories(react_codegen_native_modules_with_type_aliases PUBLIC
target_link_libraries(
react_codegen_native_modules_with_type_aliases
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -569,7 +503,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/r

add_library(
react_codegen_real_module_example
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -578,21 +512,10 @@ target_include_directories(react_codegen_real_module_example PUBLIC . react/rend
target_link_libraries(
react_codegen_real_module_example
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -656,7 +579,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/s

add_library(
react_codegen_simple_native_modules
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -665,21 +588,10 @@ target_include_directories(react_codegen_simple_native_modules PUBLIC . react/re
target_link_libraries(
react_codegen_simple_native_modules
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down Expand Up @@ -751,7 +663,7 @@ file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/t

add_library(
react_codegen_two_modules_different_files
SHARED
OBJECT
\${react_codegen_SRCS}
)

Expand All @@ -760,21 +672,10 @@ target_include_directories(react_codegen_two_modules_different_files PUBLIC . re
target_link_libraries(
react_codegen_two_modules_different_files
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
# We need to link different libraries based on wether we are building rncore or not, that's necessary
# because we want to break a circular dependency between react_codegen_rncore and reactnative
reactnative
turbomodulejsijni
yoga
)
Expand Down
16 changes: 1 addition & 15 deletions packages/react-native-popup-menu-android/android/src/main/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,8 @@ target_include_directories(react_codegen_ReactPopupMenuAndroidSpecs PUBLIC . rea
target_link_libraries(
react_codegen_ReactPopupMenuAndroidSpecs
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
turbomodulejsijni
reactnative
yoga
)

Expand Down
16 changes: 1 addition & 15 deletions packages/react-native-test-library/android/src/main/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,8 @@ target_include_directories(react_codegen_OSSLibraryExampleSpec PUBLIC . react/re
target_link_libraries(
react_codegen_OSSLibraryExampleSpec
fbjni
folly_runtime
glog
jsi
react_codegen_rncore
react_debug
react_nativemodule_core
react_render_componentregistry
react_render_core
react_render_debug
react_render_graphics
react_render_imagemanager
react_render_mapbuffer
react_utils
rrc_image
rrc_view
turbomodulejsijni
reactnative
yoga
)

Expand Down
Loading
Loading