ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-14 21:28:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

load libmawt.so proactively when booting the VM for OpenJDK

Browse Source 
This library is placed in the xawt subdirectory of jre/lib/$arch on
POSIX systems, so it isn't found automatically when third-party
libraries which depend on it are loaded.  The simplest way to ensure
that it's found seems to be to just load it when the VM starts up.
This commit is contained in:
Joel Dice
2012-12-20 12:25:13 -07:00
parent b75497c8ff
commit 9f22a701cc
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/classpath-openjdk.cpp
View File

@ -439,17 +439,20 @@ class MyClasspath : public Classpath {
unsigned libraryPathOffset = sb.offset;
sb.append(javaHome);
#ifdef PLATFORM_WINDOWS
sb.append("/bin");
# define LIB_DIR "/bin"
#elif defined __APPLE__
sb.append("/lib");
# define LIB_DIR "/lib"
#elif defined ARCH_x86_64
sb.append("/lib/amd64");
# define LIB_DIR "/lib/amd64"
#elif defined ARCH_arm
sb.append("/lib/arm");
# define LIB_DIR "/lib/arm"
#else
// todo: handle other architectures
sb.append("/lib/i386");
# define LIB_DIR "/lib/i386"
#endif
sb.append(LIB_DIR ":");
sb.append(javaHome);
sb.append(LIB_DIR "/xawt");
sb.append('\0');
unsigned tzMappingsOffset = sb.offset;
@ -635,6 +638,7 @@ class MyClasspath : public Classpath {
#else // not AVIAN_OPENJDK_SRC
expect(t, loadLibrary(t, libraryPath, "verify", true, true));
expect(t, loadLibrary(t, libraryPath, "java", true, true));
loadLibrary(t, libraryPath, "mawt", true, true);
#endif // not AVIAN_OPENJDK_SRC
{ object assertionLock = resolveField