Kaydet (Commit) 41e8c36d authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist

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

Change-Id: I6a5eefe86e23499b555b34c6ba2ebe131e109304
üst b247950e
// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
/*
* This file is part of the LibreOffice project.
*
......@@ -31,7 +32,22 @@ import com.sun.star.uno.RuntimeException;
*/
public class RegistryServiceFactory {
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(
......@@ -157,3 +173,4 @@ public class RegistryServiceFactory {
}
}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
/*
* 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";
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(
......@@ -148,3 +164,4 @@ public class SharedLibraryLoader {
}
}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment