Kaydet (Commit) 48e956e5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Try to fix Android and iOS build

Fix what probably is fallout from
a7c35729.

Just bypass all of xmlsecurity for Android and iOS. At least the iOS
demo app, TiledLibreOffice, builds then.

Change-Id: Ibc9486c0d67d1aeafa08932809b23ceeb9b5c2f3
üst 86a55375
......@@ -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 \
......
......@@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
ucbhelper \
utl \
vcl \
xmlsecurity \
$(if $(filter-out ANDROID IOS,$(OS)),xmlsecurity) \
$(gb_UWINAPI) \
))
......
......@@ -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"),
......
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment