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

8343293: Remove the check for <apphome>/jre/lib/libjava.dylib from the launcher's java_md_macosx.m

Browse Source 
Reviewed-by: bpb, rriggs
This commit is contained in:
Jaikiran Pai 2024-11-08 04:04:34 +00:00
parent f621f26cd1
commit 068f4ce8bc
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java.base/macosx/native/libjli/java_md_macosx.m
View File

@ -415,6 +415,8 @@ GetJDKInstallRoot(char *path, jint pathsize, jboolean speculative)
{ {
char libjava[MAXPATHLEN]; char libjava[MAXPATHLEN];
JLI_TraceLauncher("Attempt to get JDK installation root from launcher executable path\n");
if (GetApplicationHome(path, pathsize)) { if (GetApplicationHome(path, pathsize)) {
/* Is the JDK co-located with the application? */ /* Is the JDK co-located with the application? */
if (JLI_IsStaticallyLinked()) { if (JLI_IsStaticallyLinked()) {
@ -429,18 +431,6 @@ GetJDKInstallRoot(char *path, jint pathsize, jboolean speculative)
return JNI_TRUE; return JNI_TRUE;
} }
} }
/* ensure storage for path + /jre + NULL */
if ((JLI_StrLen(path) + 4 + 1) > (size_t) pathsize) {
JLI_TraceLauncher("Insufficient space to store JRE path\n");
return JNI_FALSE;
}
/* Does the app ship a private JRE in <apphome>/jre directory? */
JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path);
if (access(libjava, F_OK) == 0) {
JLI_StrCat(path, "/jre");
JLI_TraceLauncher("JRE path is %s\n", path);
return JNI_TRUE;
}
} }
/* try to find ourselves instead */ /* try to find ourselves instead */