From 8092d344fa8cf9af692bc4e0ea544738a299b835 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 19 Dec 2016 13:19:57 +0000 Subject: use new ENABLE_NSS for code which needs nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit which isn't available on a static-only build (iOS and fuzzing) and android Change-Id: I99bb7c0b45d4499579ddf73f469a762ddcae99ab Reviewed-on: https://gerrit.libreoffice.org/32182 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- solenv/bin/native-code.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index f8336da131a4..73b3487dc2aa 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -48,10 +48,10 @@ core_factory_list = [ ("libunordflo.a", "unordf_component_getFactory"), ("libunoxmllo.a", "unoxml_component_getFactory"), ("libutllo.a", "utl_component_getFactory"), - ("libxmlsecurity.a", "xmlsecurity_component_getFactory", "#if !defined ANDROID && HAVE_FEATURE_NSS"), + ("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 !defined ANDROID && HAVE_FEATURE_NSS"), + ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if HAVE_FEATURE_NSS"), ("libxstor.a", "xstor_component_getFactory"), ("libvclcanvaslo.a", "vclcanvas_component_getFactory"), ("libmtfrendererlo.a", "mtfrenderer_component_getFactory"), -- cgit v1.2.3