Merge pull request #1391 from rasaha91/restore-exclude-so

restore exclude so

android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec

@@ -1,9 +1,9 @@
 diff --git a/ReactAndroid/ReactAndroid.nuspec b/ReactAndroid/ReactAndroid.nuspec
 new file mode 100644
-index 00000000000..5ea2105f8ac
+index 00000000000..d468fe65341
 --- /dev/null
 +++ b/ReactAndroid/ReactAndroid.nuspec
-@@ -0,0 +1,231 @@
+@@ -0,0 +1,312 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 +  <metadata>
@@ -118,6 +118,47 @@ index 00000000000..5ea2105f8ac
 +    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\liblogger.so" target="lib\droidx86"/>
 +    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\liblogger.so" target="lib\droidarm64"/>
 +
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_render_runtimescheduler.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_render_runtimescheduler.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_render_runtimescheduler.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_render_runtimescheduler.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libruntimeexecutor.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libruntimeexecutor.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libruntimeexecutor.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libruntimeexecutor.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_render_core.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_render_core.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_render_core.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_render_core.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_render_debug.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_render_debug.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_render_debug.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_render_debug.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_debug.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_debug.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_debug.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_debug.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_utils.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_utils.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_utils.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_utils.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_render_graphics.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_render_graphics.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_render_graphics.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_render_graphics.so" target="lib\droidarm64"/>
++
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86_64\libreact_render_mapbuffer.so" target="lib\droidx64"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\armeabi-v7a\libreact_render_mapbuffer.so" target="lib\droidarm"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\x86\libreact_render_mapbuffer.so" target="lib\droidx86"/>
++    <file src="build\intermediates\stripped_native_libs\release\out\lib\arm64-v8a\libreact_render_mapbuffer.so" target="lib\droidarm64"/>
++
++
 +    <!-- Unstripped binaries -->
 +    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libfb.so" target="lib\droidx64\unstripped"/>
 +    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libfb.so" target="lib\droidarm\unstripped"/>
@@ -219,6 +260,46 @@ index 00000000000..5ea2105f8ac
 +    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\liblogger.so" target="lib\droidx86\unstripped"/>
 +    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\liblogger.so" target="lib\droidarm64\unstripped"/>
 +
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_render_runtimescheduler.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_render_runtimescheduler.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_render_runtimescheduler.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_render_runtimescheduler.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libruntimeexecutor.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libruntimeexecutor.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libruntimeexecutor.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libruntimeexecutor.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_render_core.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_render_core.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_render_core.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_render_core.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_render_debug.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_render_debug.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_render_debug.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_render_debug.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_debug.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_debug.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_debug.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_debug.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_utils.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_utils.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_utils.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_utils.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_render_graphics.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_render_graphics.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_render_graphics.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_render_graphics.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86_64\libreact_render_mapbuffer.so" target="lib\droidx64\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\armeabi-v7a\libreact_render_mapbuffer.so" target="lib\droidarm\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\x86\libreact_render_mapbuffer.so" target="lib\droidx86\unstripped"/>
++    <file src="build\intermediates\merged_native_libs\release\out\lib\arm64-v8a\libreact_render_mapbuffer.so" target="lib\droidarm64\unstripped"/>
++
 +    <!-- AAR and POM -->
 +    <file src="..\android\com\**\*" target="maven\com"/>
 +

android-patches/patches/Build/ReactAndroid/build.gradle

@@ -1,5 +1,5 @@
 diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
-index 3c23c6a84b4..183bffe7164 100644
+index 3c23c6a84b4..df345f87eab 100644
 --- a/ReactAndroid/build.gradle
 +++ b/ReactAndroid/build.gradle
 @@ -12,6 +12,10 @@ plugins {
@@ -77,3 +77,18 @@ index 3c23c6a84b4..183bffe7164 100644
      preBuild.dependsOn("generateCodegenArtifactsFromSchema")
  
      sourceSets.main {
+@@ -363,8 +389,12 @@ android {
+         // we produce. The reason behind this is that we want to allow users to pick the
+         // JS engine by specifying a dependency on either `hermes-engine` or `android-jsc`
+         // that will include the necessary .so files to load.
+-        exclude("**/libhermes.so")
+-        exclude("**/libjsc.so")
++        if (project.hasProperty('param') ? project.property('param').equals("excludeLibs") : false) {
++            exclude '**/*.so'
++        } else {
++            exclude("**/libhermes.so")
++            exclude("**/libjsc.so")
++        }
+     }
+ 
+     configurations {