[Libreoffice-commits] core.git: solenv/bin

[Miklos Vajna]

 solenv/bin/native-code.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 420d2c48bc2afc262d04d20ecab90517d07f3aa8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Feb 7 12:58:15 2018 +0100

    solenv: adapt native-code.py to recent xmlsecurity changes
    
    /tmp/native-code-95f2b3.o:native-code.cxx:lo_get_factory_map::map: error: undefined reference to 'xmlsecurity_component_getFactory'
    clang++: error: linker command failed with exit code 1 (use -v to see invocation)
    ../Bootstrap/Makefile.shared:61: recipe for target 'obj/local/armeabi-v7a/liblo-native-code.so' failed
    make[2]: *** [obj/local/armeabi-v7a/liblo-native-code.so] Error 1
    /home/vmiklos/git/libreoffice/master-android/android/CustomTarget_lo_android.mk:17: recipe for target '/home/vmiklos/git/libreoffice/master-android/workdir/CustomTarget/android/source/done' failed
    
    Change-Id: Idd63986122216c0fb1822ea7a3fbec00d00b444b

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0cab8a26e096..8499a94e13e9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,6 @@ core_factory_list = [
     ("libunordflo.a", "unordf_component_getFactory"),
     ("libunoxmllo.a", "unoxml_component_getFactory"),
     ("libutllo.a", "utl_component_getFactory"),
-    ("libxmlsecurity.a", "xmlsecurity_component_getFactory", "#if HAVE_FEATURE_NSS"),
     ("libxoflo.a", "xof_component_getFactory"),
     ("libxolo.a", "xo_component_getFactory"),
     ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if HAVE_FEATURE_NSS"),
@@ -242,6 +241,9 @@ core_constructor_list = [
     "com_sun_star_comp_xmlscript_XMLBasicImporter",
     "com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
     "com_sun_star_comp_xmlscript_XMLOasisBasicImporter",
+# xmlsecurity/util/xmlsecurity.component
+    "com_sun_star_security_CertificateContainer_get_implementation",
+    "com_sun_star_security_DocumentDigitalSignatures_get_implementation",
     ]
 
 # edit group for apps, where you can edit documents