diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-12-15 16:43:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-12-15 16:46:48 +0200 |
| commit | 48e956e506b056eefcbf5c24a706b6152e7ea8b3 (patch) | |
| tree | fe5651d1b43a7702b4f46006b8039113b052e825 | |
| parent | 86a553753170b20a03ac1038798c910ece95cbaf (diff) | |
Try to fix Android and iOS build
Fix what probably is fallout from
a7c35729e00f18f79156b3f8f57472506f786074.
Just bypass all of xmlsecurity for Android and iOS. At least the iOS
demo app, TiledLibreOffice, builds then.
Change-Id: Ibc9486c0d67d1aeafa08932809b23ceeb9b5c2f3
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 2 | ||||
| -rwxr-xr-x | solenv/bin/native-code.py | 2 | ||||
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index cd952135cc96..0c1614ccfc29 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -109,9 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\ xmloff/source/transform/xof \ xmloff/util/xo \ xmlscript/util/xmlscript \ - xmlsecurity/util/xmlsecurity \ - xmlsecurity/util/xsec_fw \ $(if $(filter-out ANDROID IOS,$(OS)), \ + xmlsecurity/util/xmlsecurity \ + xmlsecurity/util/xsec_fw \ xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \ $(if $(ENABLE_COINMP), \ sccomp/source/solver/coinmpsolver \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 7b3beea2c612..ae4bed45298e 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ ucbhelper \ utl \ vcl \ - xmlsecurity \ + $(if $(filter-out ANDROID IOS,$(OS)),xmlsecurity) \ $(gb_UWINAPI) \ )) diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index ef527e7c4c96..e2c7b69e7f8e 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -48,7 +48,7 @@ core_factory_list = [ ("libunordflo.a", "unordf_component_getFactory"), ("libunoxmllo.a", "unoxml_component_getFactory"), ("libutllo.a", "utl_component_getFactory"), - ("libxmlsecurity.a", "xmlsecurity_component_getFactory"), + ("libxmlsecurity.a", "xmlsecurity_component_getFactory", "#if !defined ANDROID && !defined IOS"), ("libxoflo.a", "xof_component_getFactory"), ("libxolo.a", "xo_component_getFactory"), ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if !defined ANDROID && !defined IOS"), diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 6fdc86eb60f4..4f00c2203b24 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -9,10 +9,12 @@ $(eval $(call gb_Module_Module,xmlsecurity)) +ifneq (,$(filter-out ANDROID IOS,$(OS))) + $(eval $(call gb_Module_add_targets,xmlsecurity,\ Library_xmlsecurity \ Library_xsec_fw \ - $(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \ + Library_xsec_xmlsec \ )) $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\ @@ -45,4 +47,6 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ endif +endif + # vim: set noet sw=4 ts=4: |