Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 316090 - GREImpl.loadDependentLibraries hardcodes the list, and turn javaxpcom on by default for XULRunner, patch by jhpedemonte and myself with co-review

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@186108 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-12-15 14:17:20 +00:00
parent de961c8143
commit 3d655c48df
17 changed files with 674 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/extensions/java/xpcom/src/GREImpl.java
View File

@@ -45,35 +45,14 @@ public class GREImpl implements IGRE {
public void initEmbedding(File aLibXULDirectory, File aAppDirectory,
IAppFileLocProvider aAppDirProvider) {
loadDependentLibraries(aLibXULDirectory);
initEmbeddingNative(aLibXULDirectory, aAppDirectory, aAppDirProvider);
}
private void loadDependentLibraries(File binPath) {
// load JNI library
String path = "";
if (binPath != null) {
path = binPath + File.separator;
if (aLibXULDirectory != null) {
path = aLibXULDirectory + File.separator;
}
System.load(path + System.mapLibraryName("javaxpcomglue"));
System.load(path + System.mapLibraryName("nspr4"));
System.load(path + System.mapLibraryName("plds4"));
System.load(path + System.mapLibraryName("plc4"));
try {
/* try loading Win32 DLL */
System.load(path + System.mapLibraryName("js3250"));
} catch (UnsatisfiedLinkError e) { }
try {
/* try loading Linux DLL */
System.load(path + System.mapLibraryName("mozjs"));
} catch (UnsatisfiedLinkError e) { }
System.load(path + System.mapLibraryName("softokn3"));
System.load(path + System.mapLibraryName("nss3"));
System.load(path + System.mapLibraryName("smime3"));
System.load(path + System.mapLibraryName("ssl3"));
System.load(path + System.mapLibraryName("xul"));
System.load(path + System.mapLibraryName("xpcom"));
System.load(path + System.mapLibraryName("javaxpcom"));
initEmbeddingNative(aLibXULDirectory, aAppDirectory, aAppDirProvider);
}
public native void initEmbeddingNative(File aLibXULDirectory,