[Libreoffice-commits] .: 3 commits - android/experimental sal/android

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile                                                 |    4 ++--
 android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java |    6 +++---
 sal/android/lo-bootstrap.c                                                                   |    5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit fcbfccdeb0d1f25627f9be8d4ca1b886e0b184a5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed May 16 18:31:43 2012 +0300

    Create the redirection thread in detached state
    
    Change-Id: I293fa84452f00a41f4a33d4a45eee6d1a32ff761

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index f3ba3bb..a180e62 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1779,6 +1779,7 @@ Java_org_libreoffice_android_Bootstrap_redirect_1stdio(JNIEnv* env,
 {
     static jboolean current = JNI_FALSE;
     pthread_t thread;
+    pthread_attr_t attr;
 
     (void) env;
     (void) clazz;
@@ -1827,7 +1828,9 @@ Java_org_libreoffice_android_Bootstrap_redirect_1stdio(JNIEnv* env,
         close(stdout_pipe[1]);
         close(stderr_pipe[1]);
 
-        if (pthread_create(&thread, NULL, redirect_thread, NULL) != 0) {
+        if (pthread_attr_init(&attr) != 0 ||
+            pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0 ||
+            pthread_create(&thread, &attr, redirect_thread, NULL) != 0) {
             LOGE("redirect_stdio: Could not create thread: %s", strerror(errno));
             redirect_to_null();
             close(stdout_pipe[0]);
commit 62f030133d5dd1a89b2320b9f123165958d899bb
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed May 16 18:30:40 2012 +0300

    Move the sleep (for attaching debugger) earlier
    
    Change-Id: I3183ed3da25bd0fbd2121f235f209edb51a21d2e

diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 409a95c..63ee569 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -59,15 +59,15 @@ public class DocumentLoader
             Bootstrap.dlopen("libswdlo.so");
             Bootstrap.dlopen("libswlo.so");
             
+            Log.i(TAG, "Sleeping NOW");
+            Thread.sleep(20000);
+
             com.sun.star.uno.XComponentContext xContext = null;
 
             xContext = com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
 
             Log.i(TAG, "xContext is" + (xContext!=null ? " not" : "") + " null");
 
-            Log.i(TAG, "Sleeping NOW");
-            Thread.sleep(20000);
-
             com.sun.star.lang.XMultiComponentFactory xMCF =
                 xContext.getServiceManager();
 
commit cf4f6a71ffbb4ec83d50a05326b5a1c69aaff21c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed May 16 18:29:52 2012 +0300

    Don't mention the same rdb file in both UNO_SERVICES and URE_MORE_SERVICES
    
    Change-Id: I81b3a451b5fd4eaf83ee525aa38df32686e38cfe

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 3c513ec..cf4ac48 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -183,13 +183,13 @@ copy-stuff:
 	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
 	echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc
 	echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb file:///assets/bin/types.rdb' >> assets/program/fundamentalrc
-	echo 'URE_MORE_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
+	echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
 #
 # Set up unorc
 	echo '[Bootstrap]' > assets/program/unorc
 	echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc
 	echo 'UNO_TYPES=file:///assets/bin/ure/types.rdb file:///assets/bin/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
-	echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc
+	echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc
 #
 # Set up bootstraprc
 	echo '[Bootstrap]' > assets/program/bootstraprc