From f51100277026c3aef1bb5047bf71613018ffc790 Mon Sep 17 00:00:00 2001
From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com>
Date: Thu, 11 May 2023 12:08:56 +0200
Subject: [PATCH] remove .pfx and add x86_64 for Android (#576)

* remove .pfx and add x86_64 for Android

* gradle x86

* more expected files
---
 .../android/build.gradle                      |  2 +-
 Package/gulpfile.js                           | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Modules/@babylonjs/react-native-iosandroid/android/build.gradle b/Modules/@babylonjs/react-native-iosandroid/android/build.gradle
index 177a7b455..e7dfd3fd0 100644
--- a/Modules/@babylonjs/react-native-iosandroid/android/build.gradle
+++ b/Modules/@babylonjs/react-native-iosandroid/android/build.gradle
@@ -85,7 +85,7 @@ android {
             }
         }
         ndk {
-            abiFilters "arm64-v8a", "armeabi-v7a", "x86"
+            abiFilters "arm64-v8a", "armeabi-v7a", "x86", 'x86_64'
         }
         packagingOptions {
             // .so files referenced by cmake should be autolinked with Android gradle plugin 4.0.0+
diff --git a/Package/gulpfile.js b/Package/gulpfile.js
index cb88f786e..ae017899a 100644
--- a/Package/gulpfile.js
+++ b/Package/gulpfile.js
@@ -381,7 +381,7 @@ const copyARM64ReleaseUWPFiles = () => {
 }
 
 const copyVCXProjUWPFiles = () => {
-  return gulp.src('../Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/*.*')
+  return gulp.src('../Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/*.*', '!*.pfx')
     .pipe(gulp.dest('Assembled-Windows/windows/BabylonReactNative'));
 }
 
@@ -499,6 +499,11 @@ const validateAssemblediOSAndroid = async () => {
     'Assembled-iOSAndroid/android/src/main/jniLibs/x86',
     'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libBabylonNative.so',
     'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libturbomodulejsijni.so',
+    'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64',
+    'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libBabylonNative.so',
+    'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libturbomodulejsijni.so',
+    'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libarcore_sdk_c.so',
+    'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfbjni.so',
     'Assembled-iOSAndroid/ios',
     'Assembled-iOSAndroid/ios/BabylonModule.mm',
     'Assembled-iOSAndroid/ios/BabylonNativeInterop.h',
@@ -615,7 +620,26 @@ const validateAssemblediOSAndroid = async () => {
           'Assembled-iOSAndroid/android/src/main/jniLibs/x86/librrc_view.so',
           'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libruntimeexecutor.so',
           'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libyoga.so',
-          'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libc++_shared.so'
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libc++_shared.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfabricjni.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfolly_runtime.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libglog.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libjsi.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_codegen_rncore.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_debug.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_nativemodule_core.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_newarchdefaults.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_componentregistry.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_core.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_debug.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_graphics.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_imagemanager.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_mapbuffer.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/librrc_image.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/librrc_view.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libruntimeexecutor.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libyoga.so',
+          'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libc++_shared.so'
         ];
 
         expectediosandroid = expectediosandroid.concat(expectediosandroid071);