[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - xmlsecurity/source

[Mert Tumer (via logerrit)]

 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da24149ac681555430271f264095e2d8807c55cf
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Sep 30 17:14:59 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Oct 2 22:53:49 2020 +0200

    Fix libnssckbi not found error on Android
    
    This error causes Android App to be unable to
    open Password-protected documents.
    
    Change-Id: Iacbacb1c780025752e2447db325b075c58947818
    Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103708
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 8c71ed12b67d..d5f95d096e91 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -353,7 +353,7 @@ bool nsscrypto_initialize(css::uno::Reference<css::uno::XComponentContext> const
 
         if (true)
 #else
-#if defined SYSTEM_NSS
+#if defined SYSTEM_NSS || defined ANDROID
         OUString rootModule("libnssckbi" SAL_DLLEXTENSION);
 #else
         OUString rootModule("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION);