Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call VirtualMachineEnv::JNI_OnLoad for non-Android Java builds (better fix) (#4779)

Browse Source
This commit is contained in:
Ben Doherty
2021-10-28 16:02:23 -07:00
committed by Benjamin Doherty
parent cf917f1093
commit 21db695e79
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/filament-android/src/main/cpp/Filament.cpp
View File

@@ -16,9 +16,7 @@
#include <jni.h>
namespace filament {
extern jint JNI_OnLoad(JavaVM* vm, void* reserved);
};
#include "private/backend/VirtualMachineEnv.h"
JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
JNIEnv* env;
@@ -26,9 +24,9 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
return -1;
}
#if ANDROID
::filament::JNI_OnLoad(vm, reserved);
#endif
// This must be called when the library is loaded. We need this to get a reference to the
// global VM
::filament::VirtualMachineEnv::JNI_OnLoad(vm);
return JNI_VERSION_1_6;
}