On Thu, 8 Oct 2026 16:08:50 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, 25.1 and 25.4)
>>
>> 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 incrementally with one additional
> commit since the last revision:
>
> revert webkit
LGTM. I left one comment inline and will reapprove if you make changes.
modules/javafx.web/src/android/native/android_webview.c line 54:
> 52: JNIEnv *env;
> 53: LOGV(TAG, "ONLOAD WEB");
> 54: LOGI("ONLOAD WEB");
This file now has whitespace-only changes. It would be cleaner to revert it
entirely.
-------------
Marked as reviewed by kcr (Lead).
PR Review: https://git.openjdk.org/jfx/pull/2175#pullrequestreview-5460289346
PR Review Comment: https://git.openjdk.org/jfx/pull/2175#discussion_r4221964532
