From 4ac34a40b3018d94bd0a4ffdd5d64a6f398b6cc6 Mon Sep 17 00:00:00 2001
From: Sparsha Saha <sparshasaha@Sparshas-MacBook-Pro.local>
Date: Wed, 3 Aug 2022 17:13:23 +0530
Subject: [PATCH 1/2] Let's not build reactnativeutilsjni as it seems to  built
 from the same sources as reactnativejni. Remove references of
 reactnativeutilsjni and replace them with reactnativejni

---
 .../facebook/react/fabric/jni/CMakeLists.txt  |  2 +-
 .../src/main/jni/react/jni/CMakeLists.txt     | 27 -------------------
 .../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(+), 32 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 7afd884900a747..c4d743cfa10e7b 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 e001b79550d3b8..22d3a30944ab30 100644
--- a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
+++ b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
@@ -17,32 +17,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 +41,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 c1bc726cf9ced2..fcde0f752111ae 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 059ece7daded82..e4d39414e37b3e 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 f4a251343f978c..97a513978c7c77 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 cb12805f3c546d..ad4936a5029ef1 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
 )

From 818cc5fbe75a28acea8239202f852ead96c706e2 Mon Sep 17 00:00:00 2001
From: Sparsha Saha <saha.sparsha@gmail.com>
Date: Wed, 3 Aug 2022 22:51:45 +0530
Subject: [PATCH 2/2] Removed TODO comments

Removed some TODO comments
---
 ReactAndroid/src/main/jni/react/jni/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
index 22d3a30944ab30..cf8ffe295e4119 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(