diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 13:19:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 14:20:47 +0000 |
| commit | 8092d344fa8cf9af692bc4e0ea544738a299b835 (patch) | |
| tree | 466efa641d64e6ebf43840609a6aa50032276f31 /xmlsecurity/Module_xmlsecurity.mk | |
| parent | salinit for non-DESKTOP too (diff) | |
| download | core-8092d344fa8cf9af692bc4e0ea544738a299b835.tar.gz core-8092d344fa8cf9af692bc4e0ea544738a299b835.zip | |
use new ENABLE_NSS for code which needs nss
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmlsecurity/Module_xmlsecurity.mk')
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 4f00c2203b24..b14729ffc405 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Module_Module,xmlsecurity)) -ifneq (,$(filter-out ANDROID IOS,$(OS))) +ifeq ($(ENABLE_NSS),TRUE) +#FIXME: ^^^, get nss&libxmlsec building on ios and android +#chromium has patches to build statically FWIW $(eval $(call gb_Module_add_targets,xmlsecurity,\ Library_xmlsecurity \ @@ -27,8 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\ UIConfig_xmlsec \ )) -#FIXME: ^^^, get nss&libxmlsec building on ios and android - # failing #$(eval $(call gb_Module_add_check_targets,xmlsecurity,\ CppunitTest_qa_certext \ |