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

Miklos Vajna vmiklos at collabora.co.uk
Fri Sep 1 09:19:26 UTC 2017


 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit fa7e15024163c0848b8c3506bcbe40f031bff14b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Sep 1 11:16:31 2017 +0200

    android: remove a hard to address TODO
    
    NSS upstream doesn't seem to support building static libs. The benefit
    of avoiding a few lines of extra java code doesn't appear to outweigh
    the cost of patching NSS to provide static libs & carry on those patches
    in our LO-bundled NSS.
    
    Change-Id: I01fc0b1ff076923fec64b469529d1b920c1d91c2

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index 02a27941605a..c82f7b16b01a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -107,7 +107,6 @@ 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");


More information about the Libreoffice-commits mailing list