From 54a4fcbfdcc8111b3010b2c31ed3c1d48632ce4c Mon Sep 17 00:00:00 2001 From: Sparsha Saha Date: Thu, 4 Aug 2022 03:11:56 -0700 Subject: [PATCH] Removing reactnativeutilsjni as it is built from the same sources as reactnativejni (#34339) Summary: This Pull Request aims at removing the making of reactnativeutilsjni as it is built from the same sources as reactnativejni. It also replaces references to reactnativeutilsjni with reactnativejni. This should get rid of `reactnativeutilsjni.so` while reusing `reactnativejni.so` in it's place. This should give us some size improvements in the finally built apk. ## Changelog [Android] [Changed] - Replaced reactnativeutilsjni with reactnativejni in the build process to reduce size Pull Request resolved: https://github.com/facebook/react-native/pull/34339 Test Plan: 1. Ran the CMakelist.txt file using CMake and I could see that reactnativeutilsjni.dir is no longer generated with my changes. 2. Built the aar from this branch in Android Studio and build happened successfully. I am not sure if we could run any more tests. Please let me know in case anymore testing is required and I can do accordingly Reviewed By: cortinico Differential Revision: D38400481 Pulled By: genkikondo fbshipit-source-id: 592736e56441328389ae89135667c336ff8018e6 --- .../facebook/react/fabric/jni/CMakeLists.txt | 2 +- .../src/main/jni/react/jni/CMakeLists.txt | 29 ------------------- .../components/progressbar/CMakeLists.txt | 2 +- .../renderer/components/slider/CMakeLists.txt | 2 +- .../renderer/components/switch/CMakeLists.txt | 2 +- .../renderer/textlayoutmanager/CMakeLists.txt | 2 +- 6 files changed, 5 insertions(+), 34 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt index 7afd884900a..c4d743cfa10 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries( react_render_uimanager react_utils react_config - reactnativeutilsjni + reactnativejni rrc_image rrc_modal rrc_progressbar diff --git a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt index e001b79550d..cf8ffe295e4 100644 --- a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt @@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -# TODO Those two libraries are building against the same sources -# and should probably be merged file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp) add_compile_options( @@ -17,32 +15,6 @@ add_compile_options( -std=c++17 -DWITH_INSPECTOR=1) -########################## -### 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 ### ###################### @@ -67,7 +39,6 @@ target_link_libraries(reactnativejni logger react_render_runtimescheduler reactnative - reactnativeutilsjni runtimeexecutor yoga ) diff --git a/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt b/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt index c1bc726cf9c..fcde0f75211 100644 --- a/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(rrc_progressbar react_render_debug react_render_graphics react_render_uimanager - reactnativeutilsjni + reactnativejni rrc_view yoga ) diff --git a/ReactCommon/react/renderer/components/slider/CMakeLists.txt b/ReactCommon/react/renderer/components/slider/CMakeLists.txt index 059ece7dade..e4d39414e37 100644 --- a/ReactCommon/react/renderer/components/slider/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/slider/CMakeLists.txt @@ -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 diff --git a/ReactCommon/react/renderer/components/switch/CMakeLists.txt b/ReactCommon/react/renderer/components/switch/CMakeLists.txt index f4a251343f9..97a513978c7 100644 --- a/ReactCommon/react/renderer/components/switch/CMakeLists.txt +++ b/ReactCommon/react/renderer/components/switch/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_uimanager - reactnativeutilsjni + reactnativejni rrc_view yoga ) diff --git a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt index cb12805f3c5..ad4936a5029 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt +++ b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries(react_render_textlayoutmanager react_render_telemetry react_render_uimanager react_utils - reactnativeutilsjni + reactnativejni yoga )