diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-03-28 12:43:57 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-03-28 12:44:57 +0200 |
commit | 804e3bfc56ad6d42a6b76d9e227dde759befd5d2 (patch) | |
tree | 3e6885b15f4f53304cfc8131127bc7f9f812997d /solenv | |
parent | Switch to android-15 here, too (diff) | |
download | core-804e3bfc56ad6d42a6b76d9e227dde759befd5d2.tar.gz core-804e3bfc56ad6d42a6b76d9e227dde759befd5d2.zip |
Maybe we need libsblo.a for Android
Saw messages about that in logcat. Didn't help making the 'desktop' app work
again, though. I wonder when it last worked.
Change-Id: I32f7f32a30f3d00aa0754c00469ecddf2831aad5
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/native-code.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index a6a21ce2a4f5..88dbf7449ff7 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -143,6 +143,7 @@ draw_constructor_list = [ ] writer_factory_list = [ + ("libsblo.a", "sb_component_getFactory"), ("libswdlo.a", "swd_component_getFactory"), ("libswlo.a", "sw_component_getFactory"), ("libwriterfilterlo.a", "writerfilter_component_getFactory"), @@ -186,7 +187,11 @@ extern "C" { if options.groups: for factory_group in options.groups: for (factory_name,factory_function) in factory_map[factory_group]: + if factory_function == 'sb_component_getFactory': + print ('#ifdef ANDROID') print ('void * '+factory_function+'( const char* , void* , void* );') + if factory_function == 'sb_component_getFactory': + print ('#endif') print ('') if options.groups: @@ -203,7 +208,11 @@ lo_get_factory_map(void) if options.groups: for factory_group in options.groups: for (factory_name,factory_function) in factory_map[factory_group]: + if factory_function == 'sb_component_getFactory': + print ('#ifdef ANDROID') print (' { "'+factory_name+'", '+factory_function+' },') + if factory_function == 'sb_component_getFactory': + print ('#endif') print (""" { 0, 0 } |