From 6f987f16c808242b61263d76bd7d72e148a0af24 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 18 Aug 2019 23:53:27 +0200 Subject: Bug 1363: Java 11: Complete renaming JEP 178 compatible native lib basename gluegen-rt -> gluegen_rt - Fix finding native library for Elf parsing - Fix one unit test - Fix comments Completes commit 330dad069dee5a0cc0480cf5cd9052000004223a --- src/java/jogamp/common/os/MachineDataInfoRuntime.java | 2 +- src/java/jogamp/common/os/PlatformPropsImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/java/jogamp/common') diff --git a/src/java/jogamp/common/os/MachineDataInfoRuntime.java b/src/java/jogamp/common/os/MachineDataInfoRuntime.java index 625e537..0b920f5 100644 --- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java +++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java @@ -128,7 +128,7 @@ public class MachineDataInfoRuntime { private static MachineDataInfo getRuntimeImpl() { try { - Platform.initSingleton(); // loads native gluegen-rt library + Platform.initSingleton(); // loads native gluegen_rt library } catch (final UnsatisfiedLinkError err) { return null; } diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java index 2900c99..1d38f30 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -405,7 +405,7 @@ public abstract class PlatformPropsImpl { * For Elf parsing one of the following binaries is used: * *

@@ -417,7 +417,7 @@ public abstract class PlatformPropsImpl { File file = null; try { if( OSType.ANDROID == osType ) { - file = new File(NativeLibrary.findLibrary("gluegen-rt", PlatformPropsImpl.class.getClassLoader())); + file = new File(NativeLibrary.findLibrary("gluegen_rt", PlatformPropsImpl.class.getClassLoader())); } else { if( OSType.LINUX == osType ) { file = new File("/proc/self/exe"); -- cgit v1.2.3