|
|
@ -385,9 +385,9 @@ public final class NativeLibraryLoader { |
|
|
|
String fileNameInJarWithoutExtension |
|
|
|
String fileNameInJarWithoutExtension |
|
|
|
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf(".")); |
|
|
|
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf(".")); |
|
|
|
|
|
|
|
|
|
|
|
if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) { |
|
|
|
// if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) {
|
|
|
|
fileNameInJarWithoutExtension += "64"; |
|
|
|
// fileNameInJarWithoutExtension += "64";
|
|
|
|
} |
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
String systemJniExtension; |
|
|
|
String systemJniExtension; |
|
|
|
String dummyLib = mapLibraryName_emulated("", platform); |
|
|
|
String dummyLib = mapLibraryName_emulated("", platform); |
|
|
@ -510,11 +510,11 @@ public final class NativeLibraryLoader { |
|
|
|
String fileNameInJarWithoutExtension |
|
|
|
String fileNameInJarWithoutExtension |
|
|
|
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf(".")); |
|
|
|
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf(".")); |
|
|
|
|
|
|
|
|
|
|
|
if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) { |
|
|
|
// if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) {
|
|
|
|
// This is to avoid conflicts with 32-bit versions of the
|
|
|
|
// // This is to avoid conflicts with 32-bit versions of the
|
|
|
|
// same library when extracting.
|
|
|
|
// // same library when extracting.
|
|
|
|
fileNameInJarWithoutExtension += "64"; |
|
|
|
// fileNameInJarWithoutExtension += "64";
|
|
|
|
} |
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
String systemJniExtension; |
|
|
|
String systemJniExtension; |
|
|
|
String dummyLib = System.mapLibraryName(""); |
|
|
|
String dummyLib = System.mapLibraryName(""); |
|
|
|