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

Removing reactnativeutilsjni as it is built from the same sources as reactnativejni #34339

Closed
wants to merge 3 commits into from
Closed

Removing reactnativeutilsjni as it is built from the same sources as reactnativejni #34339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac34a4
Let's not build reactnativeutilsjni as it seems to built from the sa…
Aug 3, 2022
380e04d
Merge pull request #3 from SparshaSaha/RemoveReactNativeUtilsjni
SparshaSaha Aug 3, 2022
818cc5f
Removed TODO comments
SparshaSaha Aug 3, 2022
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
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ target_link_libraries(
react_render_uimanager
react_utils
react_config
reactnativeutilsjni
reactnativejni
rrc_image
rrc_modal
rrc_progressbar
Expand Down
27 changes: 0 additions & 27 deletions ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,6 @@ add_compile_options(
-std=c++17
-DWITH_INSPECTOR=1)

##########################
SparshaSaha marked this conversation as resolved.
Show resolved Hide resolved
### React Native Utils ###
##########################

add_library(
reactnativeutilsjni
SHARED
${reactnativejni_SRC}
)

# TODO This should not be ../../
target_include_directories(reactnativeutilsjni PUBLIC ../../)

target_link_libraries(reactnativeutilsjni
android
callinvokerholder
fb
fbjni
folly_runtime
glog_init
react_render_runtimescheduler
reactnative
runtimeexecutor
yoga
)

######################
### reactnativejni ###
######################
Expand All @@ -67,7 +41,6 @@ target_link_libraries(reactnativejni
logger
react_render_runtimescheduler
reactnative
reactnativeutilsjni
runtimeexecutor
yoga
)
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/progressbar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ target_link_libraries(rrc_progressbar
react_render_debug
react_render_graphics
react_render_uimanager
reactnativeutilsjni
reactnativejni
rrc_view
yoga
)
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/slider/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ target_link_libraries(rrc_slider
react_render_imagemanager
react_render_mapbuffer
react_render_uimanager
reactnativeutilsjni
reactnativejni
rrc_image
rrc_view
yoga
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/components/switch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ target_link_libraries(
react_render_debug
react_render_graphics
react_render_uimanager
reactnativeutilsjni
reactnativejni
rrc_view
yoga
)
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ target_link_libraries(react_render_textlayoutmanager
react_render_telemetry
react_render_uimanager
react_utils
reactnativeutilsjni
reactnativejni
yoga
)