diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-01 11:01:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-11 10:07:06 +0300 |
| commit | 602f93da371efc727aabe051cc1b67e8e0f88157 (patch) | |
| tree | c36a3f62b9d91cceb2535150f5ec04563b58c835 /android | |
| parent | 8ab89346ba711a3b18ed63ae5e8f61b0451ff9a2 (diff) | |
Link in more libs
Change-Id: I5e016a061ea4206966757cda2d6681617b45b550
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 4 | ||||
| -rw-r--r-- | android/experimental/DocumentLoader/native-code.cxx | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 95251bef71af..6e12d8b7aae2 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -32,6 +32,7 @@ LIBS = \ basegfxlo \ bootstrap.uno \ canvastoolslo \ + cdrlib \ collator_data \ comphelpgcc3 \ configmgr.uno \ @@ -89,6 +90,7 @@ LIBS = \ lpsolve55 \ lwpftlo \ msfilterlo \ + mspublib \ mswordlo \ ooxlo \ orcus \ @@ -187,7 +189,7 @@ properties: link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) - $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + $(CXX) -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz mkdir -p $(SODEST) cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx index c85fc3c73564..8c5152bb0cc8 100644 --- a/android/experimental/DocumentLoader/native-code.cxx +++ b/android/experimental/DocumentLoader/native-code.cxx @@ -12,11 +12,16 @@ extern "C" { extern void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * sdd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -32,11 +37,16 @@ lo_get_libmap(void) { static lib_to_component_mapping map[] = { { "libhwplo.a", hwp_component_getFactory }, + { "liblwpftlo.a", lotuswordpro_component_getFactory }, { "libscdlo.a", scd_component_getFactory }, { "libscfiltlo.a", scfilt_component_getFactory }, { "libsclo.a", sc_component_getFactory }, + { "libsddlo.a", sdd_component_getFactory }, + { "libsdlo.a", sd_component_getFactory }, + { "libsvgfilterlo.a", svgfilter_component_getFactory }, { "libswdlo.a", swd_component_getFactory }, { "libswlo.a", sw_component_getFactory }, + { "libt602filterlo.a", t602filter_component_getFactory }, { "libunoxmllo.a", unoxml_component_getFactory }, { "libwpftdrawlo.a", wpftdraw_component_getFactory }, { "libwpftwriterlo.a", wpftwriter_component_getFactory }, |