On Thu, 30 Jul 2026 22:49:40 GMT, Marius Hanl <[email protected]> wrote:
>> This replaces all `JNI_VERSION` version strings with `JNI_VERSION_1_8`.
>> All of JavaFX is `JNI_VERSION_1_8` now.
>>
>> - Tested with JLink+JPackage (with and without JMods)
>> - Tested with GraalVM (newest version 25)
>>
>> Sometimes this allowed to replace code that was always built like this:
>>
>>
>> #ifdef JNI_VERSION_1_8
>> //min. returned JNI_VERSION required by JDK8 for builtin libraries
>> JNIEnv *env;
>> if ((*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_8) != JNI_OK) {
>> return JNI_VERSION_1_4;
>> }
>> ...
>>
>>
>> with:
>>
>> return JNI_VERSION_1_8;
>>
>>
>> **Question -> Will do as Follow-up**
>>
>> ~There are a few locations where we have the following pattern;~
>>
>> if (jvm->GetEnv((void **)&env, JNI_VERSION_1_8)) {
>> return JNI_ERR; /* JNI version not supported */
>> }
>>
>> ~which should not happen anymore, right?
>> Most of the code locations do not have this check and just do:~
>>
>> jvm->GetEnv(&env, JNI_VERSION_1_8);
>>
>> ~Should I follow that pattern for the few locations left?~
>>
>> ---------
>> - [x] I confirm that I make this contribution in accordance with the
>> [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai).
>
> Marius Hanl has updated the pull request with a new target base due to a
> merge or a rebase. The pull request now contains three commits:
>
> - Merge branch 'master' of https://github.com/openjdk/jfx into
> JDK-8385270-Bump-JNI_VERSION-to-1.8-everywhere
>
> # Conflicts:
> # modules/javafx.graphics/src/main/native-iio/jpegloader.c
> - Merge branch 'master' of https://github.com/openjdk/jfx into
> JDK-8385270-Bump-JNI_VERSION-to-1.8-everywhere
> - 8385270: Bump JNI_VERSION to 1.8 everywhere
modules/javafx.graphics/src/main/native-glass/monocle/EGL.c line 35:
> 33: //Builtin library entrypoint
> 34: JNIEXPORT jint JNICALL JNI_OnLoad_glass_monocle(JavaVM *vm, void
> *reserved) {
> 35: fprintf(stderr, "In JNI_OnLoad_glass)monocle\n");
BTW: Do we want to keep that print here? Seems weird to me but kept it for now
-------------
PR Review Comment: https://git.openjdk.org/jfx/pull/2175#discussion_r3842612071
