Skip to content

Commit f511002

Browse files
remove .pfx and add x86_64 for Android (#576)
* remove .pfx and add x86_64 for Android * gradle x86 * more expected files
1 parent 9196d80 commit f511002

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

Modules/@babylonjs/react-native-iosandroid/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ android {
8585
}
8686
}
8787
ndk {
88-
abiFilters "arm64-v8a", "armeabi-v7a", "x86"
88+
abiFilters "arm64-v8a", "armeabi-v7a", "x86", 'x86_64'
8989
}
9090
packagingOptions {
9191
// .so files referenced by cmake should be autolinked with Android gradle plugin 4.0.0+

Package/gulpfile.js

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ const copyARM64ReleaseUWPFiles = () => {
381381
}
382382

383383
const copyVCXProjUWPFiles = () => {
384-
return gulp.src('../Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/*.*')
384+
return gulp.src('../Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/*.*', '!*.pfx')
385385
.pipe(gulp.dest('Assembled-Windows/windows/BabylonReactNative'));
386386
}
387387

@@ -499,6 +499,11 @@ const validateAssemblediOSAndroid = async () => {
499499
'Assembled-iOSAndroid/android/src/main/jniLibs/x86',
500500
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libBabylonNative.so',
501501
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libturbomodulejsijni.so',
502+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64',
503+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libBabylonNative.so',
504+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libturbomodulejsijni.so',
505+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libarcore_sdk_c.so',
506+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfbjni.so',
502507
'Assembled-iOSAndroid/ios',
503508
'Assembled-iOSAndroid/ios/BabylonModule.mm',
504509
'Assembled-iOSAndroid/ios/BabylonNativeInterop.h',
@@ -615,7 +620,26 @@ const validateAssemblediOSAndroid = async () => {
615620
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/librrc_view.so',
616621
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libruntimeexecutor.so',
617622
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libyoga.so',
618-
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libc++_shared.so'
623+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86/libc++_shared.so',
624+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfabricjni.so',
625+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libfolly_runtime.so',
626+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libglog.so',
627+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libjsi.so',
628+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_codegen_rncore.so',
629+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_debug.so',
630+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_nativemodule_core.so',
631+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_newarchdefaults.so',
632+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_componentregistry.so',
633+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_core.so',
634+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_debug.so',
635+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_graphics.so',
636+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_imagemanager.so',
637+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libreact_render_mapbuffer.so',
638+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/librrc_image.so',
639+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/librrc_view.so',
640+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libruntimeexecutor.so',
641+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libyoga.so',
642+
'Assembled-iOSAndroid/android/src/main/jniLibs/x86_64/libc++_shared.so'
619643
];
620644

621645
expectediosandroid = expectediosandroid.concat(expectediosandroid071);

0 commit comments

Comments
 (0)