Remove the redundant reactnativejniutils .so from packaging (#901)

msgharpu · Mayuresh Gharpure · web-flow · commit a76dff9c7a89 · 2021-11-17T04:23:34.000-08:00
Co-authored-by: Mayuresh Gharpure &lt;Mayuresh.Gharpure@microsoft.com&gt;
diff --git a/.ado/templates/apple-droid-node-patching.yml b/.ado/templates/apple-droid-node-patching.yml
@@ -5,4 +5,4 @@ steps:
   - task: CmdLine@2
     displayName: Apply Android specific patches for Office consumption
     inputs:
-      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor RootViewAttach --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor RootViewAttach JniUtils --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
@@ -1,6 +1,6 @@
 --- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
 +++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec"	2021-10-16 13:47:24.356639200 -0700
-@@ -0,0 +1,242 @@
+@@ -0,0 +1,231 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 +  <metadata>
@@ -105,11 +105,6 @@
 +    <file src="build\react-ndk\all\x86\libreact_nativemodule_core.so" target="lib\droidx86"/>
 +    <file src="build\react-ndk\all\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64"/>
 +
-+    <file src="build\react-ndk\all\x86_64\libreactnativeutilsjni.so" target="lib\droidx64"/>
-+    <file src="build\react-ndk\all\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm"/>
-+    <file src="build\react-ndk\all\x86\libreactnativeutilsjni.so" target="lib\droidx86"/>
-+    <file src="build\react-ndk\all\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64"/>
-+
 +    <file src="build\react-ndk\all\x86_64\libreactperfloggerjni.so" target="lib\droidx64"/>
 +    <file src="build\react-ndk\all\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm"/>
 +    <file src="build\react-ndk\all\x86\libreactperfloggerjni.so" target="lib\droidx86"/>
@@ -211,11 +206,6 @@
 +    <file src="build\tmp\buildReactNdkLib\local\x86\libreact_nativemodule_core.so" target="lib\droidx86\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreact_nativemodule_core.so" target="lib\droidarm64\unstripped"/>
 +
-+    <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactnativeutilsjni.so" target="lib\droidx64\unstripped"/>
-+    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactnativeutilsjni.so" target="lib\droidarm\unstripped"/>
-+    <file src="build\tmp\buildReactNdkLib\local\x86\libreactnativeutilsjni.so" target="lib\droidx86\unstripped"/>
-+    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libreactnativeutilsjni.so" target="lib\droidarm64\unstripped"/>
-+
 +    <file src="build\tmp\buildReactNdkLib\local\x86_64\libreactperfloggerjni.so" target="lib\droidx64\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libreactperfloggerjni.so" target="lib\droidarm\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\x86\libreactperfloggerjni.so" target="lib\droidx86\unstripped"/>
@@ -242,4 +232,3 @@
 +    <file src="..\android\dependencies\**\*.*" target="dependencies"/>
 +  </files>
 +</package>
-+
diff --git a/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
++++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
+@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
+ 
+ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+ 
+-LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_progressbar libreact_render_components_switch libreact_render_components_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 libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_viewmanagers react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker
++LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_progressbar libreact_render_components_switch libreact_render_components_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 libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_viewmanagers react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker
+ 
+ LOCAL_STATIC_LIBRARIES :=
+ 
diff --git a/android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
++++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
+@@ -77,7 +77,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
+ LOCAL_LDLIBS += -landroid
+ 
+ # The dynamic libraries (.so files) that this module depends on.
+-LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga
++LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga
+ 
+ # The static libraries (.a files) that this module depends on.
+ LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder
diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactCommon/react/renderer/components/progressbar/Android.mk
++++ b/ReactCommon/react/renderer/components/progressbar/Android.mk
+@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+ 
+ LOCAL_STATIC_LIBRARIES :=
+ 
+-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
++LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+ 
+ include $(BUILD_SHARED_LIBRARY)
+ 
diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactCommon/react/renderer/components/slider/Android.mk
++++ b/ReactCommon/react/renderer/components/slider/Android.mk
+@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+ 
+ LOCAL_STATIC_LIBRARIES :=
+ 
+-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libreact_render_components_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
++LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreact_render_imagemanager libreactnativejni libreact_render_componentregistry libreact_render_uimanager libreact_render_components_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+ 
+ include $(BUILD_SHARED_LIBRARY)
+ 
diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactCommon/react/renderer/components/switch/Android.mk
++++ b/ReactCommon/react/renderer/components/switch/Android.mk
+@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+ 
+ LOCAL_STATIC_LIBRARIES :=
+ 
+-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
++LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+ 
+ include $(BUILD_SHARED_LIBRARY)
+ 
diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk
@@ -0,0 +1,11 @@
+--- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk
++++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
+@@ -11,7 +11,7 @@ LOCAL_MODULE := react_render_textlayoutmanager
+ 
+ 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 libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics
++LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativejni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics
+ 
+ LOCAL_STATIC_LIBRARIES :=
+ 
