Fix Android patches for real this time

Author: amgleitman

android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

@@ -1,11 +1,11 @@
 --- /dev/code/rnm-66-fresh/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk	2022-02-13 19:54:48.571686475 -0800
 +++ /dev/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk	2022-02-13 19:52:50.350473816 -0800
-@@ -11,7 +11,7 @@
- 
- LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
- 
--LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry libreact_render_runtimescheduler
-+LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativejni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry libreact_render_runtimescheduler
- 
- LOCAL_STATIC_LIBRARIES :=
- 
+@@ -39,7 +39,7 @@
+   libreact_render_uimanager \
+   libreact_utils \
+   libreact_config \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   librrc_image \
+   librrc_root \
+   librrc_unimplementedview \

android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -1,11 +1,11 @@
 --- /dev/code/rnm-66-fresh/ReactAndroid/src/main/jni/react/jni/Android.mk	2022-02-13 19:54:48.595686727 -0800
 +++ /dev/code/react-native-macos/ReactAndroid/src/main/jni/react/jni/Android.mk	2022-02-13 19:53:07.962650850 -0800
-@@ -77,7 +77,7 @@
- LOCAL_LDLIBS += -landroid
- 
- # The dynamic libraries (.so files) that this module depends on.
--LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger libreact_render_runtimescheduler libruntimeexecutor
-+LOCAL_SHARED_LIBRARIES := libreactnativejni libfolly_json libfb libfbjni libglog_init libyoga logger libreact_render_runtimescheduler libruntimeexecutor
- 
- # The static libraries (.a files) that this module depends on.
- LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder
+@@ -90,7 +90,7 @@
+   libfolly_json \
+   libglog_init \
+   libreact_render_runtimescheduler \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   libruntimeexecutor \
+   libyoga \
+   logger

android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk

@@ -1,11 +1,11 @@
 --- /dev/code/rnm-66-fresh/ReactCommon/react/renderer/components/progressbar/Android.mk	2022-02-13 19:54:48.619686978 -0800
 +++ /dev/code/react-native-macos/ReactCommon/react/renderer/components/progressbar/Android.mk	2022-02-13 19:53:12.522696921 -0800
-@@ -21,7 +21,7 @@
- 
- LOCAL_STATIC_LIBRARIES :=
- 
--LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
-+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
- 
- include $(BUILD_SHARED_LIBRARY)
+@@ -34,7 +34,7 @@
+   libreact_render_debug \
+   libreact_render_graphics \
+   libreact_render_uimanager \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   librrc_view \
+   libyoga
 

android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk

@@ -1,11 +1,11 @@
 --- /dev/code/rnm-66-fresh/ReactCommon/react/renderer/components/slider/Android.mk	2022-02-13 19:54:48.619686978 -0800
 +++ /dev/code/react-native-macos/ReactCommon/react/renderer/components/slider/Android.mk	2022-02-13 19:53:21.558788484 -0800
-@@ -21,7 +21,7 @@
- 
- LOCAL_STATIC_LIBRARIES :=
- 
--LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
-+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativejni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
- 
- include $(BUILD_SHARED_LIBRARY)
- 
+@@ -36,7 +36,7 @@
+   libreact_render_imagemanager \
+   libreact_render_mapbuffer \
+   libreact_render_uimanager \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   librrc_image \
+   librrc_view \
+   libyoga

android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk

@@ -1,11 +1,11 @@
 --- /home/mganandraj/code/rnm-66-fresh/ReactCommon/react/renderer/components/switch/Android.mk	2022-02-13 19:54:48.619686978 -0800
 +++ /home/mganandraj/code/react-native-macos/ReactCommon/react/renderer/components/switch/Android.mk	2022-02-13 19:53:25.274826242 -0800
-@@ -21,7 +21,7 @@
- 
- LOCAL_STATIC_LIBRARIES :=
- 
--LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
-+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
- 
- include $(BUILD_SHARED_LIBRARY)
+@@ -34,7 +34,7 @@
+   libreact_render_debug \
+   libreact_render_graphics \
+   libreact_render_uimanager \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   librrc_view \
+   libyoga
 

android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk

@@ -1,11 +1,11 @@
 --- /home/mganandraj/code/rnm-66-fresh/ReactCommon/react/renderer/textlayoutmanager/Android.mk	2022-02-13 19:54:48.631687103 -0800
 +++ /home/mganandraj/code/react-native-macos/ReactCommon/react/renderer/textlayoutmanager/Android.mk	2022-02-13 19:53:28.338857418 -0800
-@@ -11,7 +11,7 @@
- 
- LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
- 
--LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
-+LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativejni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
+@@ -30,7 +30,7 @@
+   libreact_render_telemetry \
+   libreact_render_uimanager \
+   libreact_utils \
+-  libreactnativeutilsjni \
++  libreactnativejni \
+   libyoga
 
  LOCAL_STATIC_LIBRARIES :=
-