> Built on top of https://github.com/openjdk/jfx/pull/2175, will be updated 
> after merge.
> 
> Adds missing `JNI_OnLoad` functions:
> - Was missing for the new Metal API
> - Decora
> - Swing (prism_common)
> - Moncole, which also was a bit inconsistent regarding the `#ifdef 
> STATIC_BUILD`
> 
> Add missing `JNIEXPORT` (only two locations).
> 
> ---------
> - [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 11 commits:

 - merge
 - Merge branch 'master' of https://github.com/openjdk/jfx into 
8393056-Add/Fix-missing-or-wrong-JNI_OnLoad-implementations
   
   # Conflicts:
   #    modules/javafx.graphics/src/android/native/VMLauncher.c
   #    modules/javafx.graphics/src/main/native-glass/monocle/EGL.c
   #    
modules/javafx.graphics/src/main/native-prism-es2/monocle/MonocleGLFactory.c
   #    modules/javafx.web/src/ios/native/WebViewImpl.m
 - #ifdef STATIC_BUILD for monocle as well
 - add missing JNIEXPORT
 - Missing JNI_OnLoad
 - remove comment
 - Merge branch 'master' of https://github.com/openjdk/jfx into 
JDK-8385270-Bump-JNI_VERSION-to-1.8-everywhere
 - assign javavm
 - 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
 - ... and 1 more: https://git.openjdk.org/jfx/compare/02e80b83...646805f0

-------------

Changes: https://git.openjdk.org/jfx/pull/2328/files
  Webrev: https://webrevs.openjdk.org/?repo=jfx&pr=2328&range=01
  Stats: 40 lines in 10 files changed: 32 ins; 2 del; 6 mod
  Patch: https://git.openjdk.org/jfx/pull/2328.diff
  Fetch: git fetch https://git.openjdk.org/jfx.git pull/2328/head:pull/2328

PR: https://git.openjdk.org/jfx/pull/2328

Reply via email to