stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8344134: Use static property in SystemLookup

Browse Source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Per Minborg 2024-11-18 16:20:06 +00:00
parent 162d66adac
commit 207832952b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
View File

@ -35,6 +35,7 @@ import java.util.function.Function;
import jdk.internal.loader.NativeLibrary; import jdk.internal.loader.NativeLibrary;
import jdk.internal.loader.RawNativeLibraries; import jdk.internal.loader.RawNativeLibraries;
import jdk.internal.util.OperatingSystem; import jdk.internal.util.OperatingSystem;
import jdk.internal.util.StaticProperty;
import static java.lang.foreign.ValueLayout.ADDRESS; import static java.lang.foreign.ValueLayout.ADDRESS;
@ -125,7 +126,7 @@ public final class SystemLookup implements SymbolLookup {
* Returns the path of the given library name from JDK * Returns the path of the given library name from JDK
*/ */
private static Path jdkLibraryPath(String name) { private static Path jdkLibraryPath(String name) {
Path javahome = Path.of(System.getProperty("java.home")); Path javahome = Path.of(StaticProperty.javaHome());
String lib = OperatingSystem.isWindows() ? "bin" : "lib"; String lib = OperatingSystem.isWindows() ? "bin" : "lib";
String libname = System.mapLibraryName(name); String libname = System.mapLibraryName(name);
return javahome.resolve(lib).resolve(libname); return javahome.resolve(lib).resolve(libname);