mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No juh library to load in the disable-dynloading case (on Android)

Browse Source 
Change-Id: I6a5eefe86e23499b555b34c6ba2ebe131e109304
This commit is contained in:
Tor Lillqvist
2012-09-21 14:23:24 +03:00
committed by Tor Lillqvist
parent b247950eee
commit 41e8c36d09
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
View File

@@ -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. * This file is part of the LibreOffice project.
* *
@@ -31,7 +32,22 @@ import com.sun.star.uno.RuntimeException;
*/ */
public class RegistryServiceFactory { public class RegistryServiceFactory {
static { static {
System.loadLibrary("juh"); 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)
System.loadLibrary("juh");
} else
System.loadLibrary("juh");
} }
private static native Object createRegistryServiceFactory( private static native Object createRegistryServiceFactory(
@@ -157,3 +173,4 @@ public class RegistryServiceFactory {
} }
} }
// vim:set shiftwidth=4 softtabstop=4 expandtab:

19
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
View File

@@ -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. * This file is part of the LibreOffice project.
* *
@@ -45,7 +46,22 @@ public class SharedLibraryLoader {
public static final String DEFAULT_IMPLEMENTATION = "com.sun.star.comp.stoc.DLLComponentLoader"; public static final String DEFAULT_IMPLEMENTATION = "com.sun.star.comp.stoc.DLLComponentLoader";
static { static {
System.loadLibrary("juh"); 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)
System.loadLibrary("juh");
} else
System.loadLibrary("juh");
} }
private static native boolean component_writeInfo( private static native boolean component_writeInfo(
@@ -148,3 +164,4 @@ public class SharedLibraryLoader {
} }
} }
// vim:set shiftwidth=4 softtabstop=4 expandtab: