From a6df74d00d038ddb861c90c1e12213250bb41e67 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 30 May 2018 15:30:43 +0200 Subject: [PATCH] [java-interop] Initialize dylib mono in GC bridge Temporarily initialize monodroid's mono dylib from GC bridge. This will need to be updated later with proper path to *libmonosgen* shared library to make it work on Windows. --- src/java-interop/java-interop-gc-bridge-mono.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/java-interop/java-interop-gc-bridge-mono.c b/src/java-interop/java-interop-gc-bridge-mono.c index 8de6542cc..d9c66ec7d 100644 --- a/src/java-interop/java-interop-gc-bridge-mono.c +++ b/src/java-interop/java-interop-gc-bridge-mono.c @@ -262,6 +262,13 @@ java_interop_gc_bridge_new (JavaVM *jvm) if (jvm == NULL) return NULL; +#if defined (ANDROID) || defined (DYLIB_MONO) + if (!monodroid_dylib_mono_init (monodroid_get_dylib (), NULL)) { + log_fatal (LOG_DEFAULT, "mono runtime initialization error: %s", dlerror ()); + exit (FATAL_EXIT_CANNOT_FIND_MONO); + } +#endif /* defined (ANDROID) || defined (DYLIB_MONO) */ + lookup_optional_mono_thread_functions (); JavaInteropGCBridge bridge = {0};