android/experimental/LibreOffice4Android/native-code.cxx |   20 ++++++++++++++-
 sal/android/lo-bootstrap.c                               |    2 -
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit e6daeb74bc8add73254b2123fa1f378d5bfbdc47
Author: Michael Meeks <michael.me...@suse.com>
Date:   Fri Jan 18 17:54:22 2013 +0800

    add missing chartcore.
    
    Change-Id: I069065fedddad0585851629b6c674cd613ad4409

diff --git a/android/experimental/LibreOffice4Android/native-code.cxx 
b/android/experimental/LibreOffice4Android/native-code.cxx
index 676eed7..30dae38 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -14,6 +14,7 @@ extern "C"
     extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
     extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * basprov_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
     extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * dlgprov_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -80,6 +81,7 @@ lo_get_libmap(void)
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
         { "libbasprov.uno.a", basprov_component_getFactory },
+        { "libchartcorelo.a", chartcore_component_getFactory },
         { "libdlgprov.uno.a", dlgprov_component_getFactory },
         { "libdbalo.a", dba_component_getFactory },
         { "libdbaxmllo.a", dbaxml_component_getFactory },
commit 04518e4b8b62e2b2c899b13c98b1cfb6eec4930c
Author: Michael Meeks <michael.me...@suse.com>
Date:   Fri Jan 18 00:17:20 2013 +0800

    remove un-conditional 20 second sleep on-start for now.
    
    Change-Id: I37ff2164b1f0fcdc4f3fad41f344b0d73105a2c1

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 9aeb32b..4bc0a94 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -489,7 +489,7 @@ Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env,
         static int beenhere=0;
         if (!beenhere) {
             LOGI("lo-bootstrap: Sleeping for 20 seconds, start ndk-gdb NOW if 
that is your intention");
-            sleep(20);
+/*            sleep(20); */
             beenhere = 1;
         }
     }
commit c7c20d978ff55cb40598b7619c39e9184b001c24
Author: Michael Meeks <michael.me...@suse.com>
Date:   Fri Jan 18 00:18:43 2013 +0800

    Add other missing libraries.
    
    Change-Id: I9ab478dc48cc0a0e521641dd89d28a7ee419d242

diff --git a/android/experimental/LibreOffice4Android/native-code.cxx 
b/android/experimental/LibreOffice4Android/native-code.cxx
index 59ae30d..676eed7 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -17,8 +17,13 @@ extern "C"
     extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * dlgprov_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
     extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * fastsax_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * fileacc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
     extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
     extern void * fwk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -38,6 +43,8 @@ extern "C"
     extern void * scriptframe_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
     extern void * sot_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * svt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * svx_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * svxcore_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 * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -49,6 +56,7 @@ extern "C"
     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 * textfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+    extern void * tk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * ucppkg1_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * unoxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
     extern void * unordf_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -75,8 +83,13 @@ lo_get_libmap(void)
         { "libdlgprov.uno.a", dlgprov_component_getFactory },
         { "libdbalo.a", dba_component_getFactory },
         { "libdbaxmllo.a", dbaxml_component_getFactory },
+        { "libembobj.a", embobj_component_getFactory },
+        { "libemboleobj.a", emboleobj_component_getFactory },
         { "libevtattlo.a", evtatt_component_getFactory },
+        { "libexpwrap.uno.a", expwrap_component_getFactory },
+        { "libfastsax.uno.a", fastsax_component_getFactory },
         { "libfileacc.a", fileacc_component_getFactory },
+        { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfrmlo.a", frm_component_getFactory },
         { "libfsstorage.uno.a", fsstorage_component_getFactory },
         { "libfwklo.a", fwk_component_getFactory },
@@ -88,7 +101,7 @@ lo_get_libmap(void)
         { "liblnthlo.a", lnth_component_getFactory },
         { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
-        { "libprotocolhandlerli.a", protocolhandler_component_getFactory },
+        { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
         { "libscfiltlo.a", scfilt_component_getFactory },
         { "libscriptframe.a", scriptframe_component_getFactory },
@@ -103,10 +116,13 @@ lo_get_libmap(void)
         { "libstringresource.uno.a", stringresource_component_getFactory },
         { "libsvgfilterlo.a", svgfilter_component_getFactory },
         { "libsvtlo.a", svt_component_getFactory },
+        { "libsvxlo.a", svx_component_getFactory },
+        { "libsvxcorelo.a", svxcore_component_getFactory },
         { "libswdlo.a", swd_component_getFactory },
         { "libswlo.a", sw_component_getFactory },
         { "libt602filterlo.a", t602filter_component_getFactory },
         { "libtextfdlo.a", textfd_component_getFactory },
+        { "libtklo.a", tk_component_getFactory },
         { "libucppkg1.a", ucppkg1_component_getFactory },
         { "libunordflo.a", unordf_component_getFactory },
         { "libunoxmllo.a", unoxml_component_getFactory },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to