[Libreoffice-commits] core.git: android/Bootstrap

[Christian Lohmaier]

 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java |   14 ++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 0aad6244eb1a894fc399769b7dc52e23888b6982
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Aug 31 18:25:33 2017 +0200

    need to manuall load all native-libs on e.g. Jellybean
    
    511ae02c6457e69cb6daab871acd9c3e7d64e2e3 introduced additional libraries
    that are not merged to the single liblo-native-code.so
    These need to be manually loaded in correct order. See
    https://stackoverflow.com/questions/11058898/loading-shared-libs-that-depend-on-other-shared-libs
    for details.
    
    Change-Id: I34b279b69de8a0f8f58f8f980e5b3a7347cd0439

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index 487d647d06f8..02a27941605a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -107,6 +107,20 @@ class NativeLibLoader {
         protected static synchronized void load() {
             if (done)
                 return;
+            // TODO: those should likely be merged to lo-native-code as well
+            System.loadLibrary("nspr4");
+            System.loadLibrary("plds4");
+            System.loadLibrary("plc4");
+            System.loadLibrary("nssutil3");
+            System.loadLibrary("freebl3");
+            System.loadLibrary("sqlite3");
+            System.loadLibrary("softokn3");
+            System.loadLibrary("nss3");
+            System.loadLibrary("nssckbi");
+            System.loadLibrary("nssdbm3");
+            System.loadLibrary("smime3");
+            System.loadLibrary("ssl3");
+
             System.loadLibrary("lo-native-code");
             done = true;
         }