From 6db50818c1f6685adc4551c6927c9420f0872775 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Wed, 28 Mar 2012 16:42:34 +0300
Subject: Add JNI wrapper for InitUCBHelper() and call it

---
 sal/android/lo-bootstrap.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'sal/android/lo-bootstrap.c')

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 27f4e07f0522..068ba7cab069 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1577,6 +1577,27 @@ Java_org_libreoffice_android_Bootstrap_setCommandArgs(JNIEnv* env,
     (*osl_setCommandArgs)(c_argc, c_argv);
 }
 
+// public static native void initUCBhelper();
+
+__attribute__ ((visibility("default")))
+void
+Java_org_libreoffice_android_Bootstrap_initUCBHelper(JNIEnv* env,
+                                                     jobject clazz)
+{
+    void (*InitUCBHelper)(void);
+    (void) env;
+    (void) clazz;
+
+    /* This obviously should be called only after the ucbhelper so has been loaded */
+
+    InitUCBHelper = dlsym(RTLD_DEFAULT, "InitUCBHelper");
+    if (InitUCBHelper == NULL) {
+        LOGE("InitUCBHelper: InitUCBHelper not found");
+        return;
+    }
+    (*InitUCBHelper)();
+}
+
 __attribute__ ((visibility("default")))
 JavaVM *
 lo_get_javavm(void)
-- 
cgit