From f6a5ae588440ff873fd72f3b52956e7b02d4e728 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 9 Jan 2020 17:49:47 +0100 Subject: NEWT JVM_JNI8: Adapt to native library separation (head, drm) of commit b91c680fb93a03720ff9fcb39cf052cfe8d40e76 See commit b91c680fb93a03720ff9fcb39cf052cfe8d40e76 To support static libraries JEP 178, we have to provide JNI_OnLoad_ etc. Hence change and add function entries accordingly. --- src/newt/native/JVM_JNI8.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/newt/native/JVM_JNI8.c b/src/newt/native/JVM_JNI8.c index c023cb0f0..b584f65ec 100644 --- a/src/newt/native/JVM_JNI8.c +++ b/src/newt/native/JVM_JNI8.c @@ -31,11 +31,18 @@ #if defined (JNI_VERSION_1_8) -JNIEXPORT jint JNICALL JNI_OnLoad_newt(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad_newt_head(JavaVM *vm, void *reserved) { return JNI_VERSION_1_8; } -JNIEXPORT void JNICALL JNI_OnUnload_newt(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad_newt_drm(JavaVM *vm, void *reserved) { + return JNI_VERSION_1_8; +} + +JNIEXPORT void JNICALL JNI_OnUnload_newt_head(JavaVM *vm, void *reserved) { +} + +JNIEXPORT void JNICALL JNI_OnUnload_newt_drm(JavaVM *vm, void *reserved) { } #endif /* defined (JNI_VERSION_1_8) */ -- cgit v1.2.3