There is no java_uno library to load in the disable-dynloading case on Android

Change-Id: I350aeeb7fb1e00b201077883dd5fd601b42a626b

2 files changed, 40 insertions, 2 deletions

diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
index bdde4f82d9ec..4285eccd95c2 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
@@ -1,3 +1,4 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -24,6 +25,22 @@ import com.sun.star.lib.util.NativeLibraryLoader;
 public final class JNI_info_holder
 {
     static {
+        if (System.getProperty("java.vendor") == "The Android Project") {
+            // See corresponding code in
+            // javaunohelper/com/sun/star/comp/helper/Bootstrap.java for more
+            // comments.
+
+            boolean disable_dynloading = false;
+            try {
+                System.loadLibrary("lo-bootstrap");
+            } catch (UnsatisfiedLinkError e) {
+                disable_dynloading = true;
+            }
+
+            if (!disable_dynloading)
+                NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
+                                                "java_uno");
+    } else
         NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
                                         "java_uno");
     }
@@ -41,3 +58,5 @@ public final class JNI_info_holder
         finalize( s_jni_info_handle );
     }
 }
+
+// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index 0b19ba60096f..31861d62a39c 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
@@ -1,3 +1,4 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -30,8 +31,24 @@ import com.sun.star.uno.IQueryInterface;
 public final class JNI_proxy implements java.lang.reflect.InvocationHandler
 {
     static {
-        NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
-                                        "java_uno");
+        if (System.getProperty("java.vendor") == "The Android Project") {
+            // See corresponding code in
+            // javaunohelper/com/sun/star/comp/helper/Bootstrap.java for more
+            // comments.
+
+            boolean disable_dynloading = false;
+            try {
+                System.loadLibrary("lo-bootstrap");
+            } catch (UnsatisfiedLinkError e) {
+                disable_dynloading = true;
+            }
+
+            if (!disable_dynloading)
+                NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
+                                                "java_uno");
+        } else
+            NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
+                                            "java_uno");
     }
     protected static ClassLoader s_classloader =
         JNI_proxy.class.getClassLoader();
@@ -204,3 +221,5 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
                            && m_oid.equals(UnoRuntime.generateOid(obj)));
     }
 }
+
+// vim:set shiftwidth=4 softtabstop=4 expandtab: