solenv/bin/native-code.py | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 369b84e847802d77e7469f4ed71400c20e23039f
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Aug 13 09:14:51 2014 +0300
We don't build libxsec_xmlsec for Android currently
(Because we don't build NSS for Android, so it would be pointless to build
libxsec_xmlsec. Or something like that. No doubt at some stage somebody will
get the great idea that we need to build NSS for Android, too. But postpone
the pain.)
Python experts, feel free to generate the ifdefs in this script in a more
elegant fashion. Surely it would be better to somehow mark those entries in
the table that should be optional with the corresponding condition, instead
of
hardcoding tests for 'sb_component_getFactory' and
'xsec_xmlsec_component_getFactory' in four places.
Change-Id: I69255ab4966605849a2f3335d45a2bc0366f3ab9
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6054065..24cdde3 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -198,9 +198,13 @@ if options.groups:
for (factory_name,factory_function) in factory_map[factory_group]:
if factory_function == 'sb_component_getFactory':
print ('#ifdef ANDROID')
+ if factory_function == 'xsec_xmlsec_component_getFactory':
+ print ('#ifndef ANDROID')
print ('void * '+factory_function+'( const char* , void* , void*
);')
if factory_function == 'sb_component_getFactory':
print ('#endif')
+ if factory_function == 'xsec_xmlsec_component_getFactory':
+ print ('#endif')
print ('')
if options.groups:
@@ -219,9 +223,13 @@ if options.groups:
for (factory_name,factory_function) in factory_map[factory_group]:
if factory_function == 'sb_component_getFactory':
print ('#ifdef ANDROID')
+ if factory_function == 'xsec_xmlsec_component_getFactory':
+ print ('#ifndef ANDROID')
print (' { "'+factory_name+'", '+factory_function+' },')
if factory_function == 'sb_component_getFactory':
print ('#endif')
+ if factory_function == 'xsec_xmlsec_component_getFactory':
+ print ('#endif')
print ("""
{ 0, 0 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
