Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8232687: No static JNI loader for libprism-sw #19

Closed
wants to merge 3 commits into from

Conversation

@johanvos
Copy link
Collaborator

johanvos commented Oct 21, 2019

This PR adds a JNI_OnLoad_prism_sw call to the static lib libprism_sw.a.
This approach is similar to the addition of e.g. JNI_OnLoad_prism_es2 that has been done as part of https://bugs.openjdk.java.net/browse/JDK-8223760

Unless -PSTATIC_BUILD is provided when building, this patch has no impact.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

JDK-8232687: No static JNI loader for libprism-sw

Approvers

  • Kevin Rushforth (kcr - Reviewer) Note! Review applies to f34a99a
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 21, 2019

👋 Welcome back jvos! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@openjdk openjdk bot added the rfr label Oct 21, 2019
@mlbridge
Copy link

mlbridge bot commented Oct 21, 2019

Webrevs

Copy link
Member

kevinrushforth left a comment

Looks good. One minor formatting comment.

Approved. This one is simple enough I don't think it needs a second review.

@@ -169,7 +169,7 @@ MAC.prism = [:]
MAC.prism.javahInclude = ["com/sun/prism/impl/**/*", "com/sun/prism/PresentableState*"]
MAC.prism.nativeSource = file("${project("graphics").projectDir}/src/main/native-prism")
MAC.prism.compiler = compiler
MAC.prism.ccFlags = ["-O3", "-DINLINE=inline", "-c", ccBaseFlags].flatten()
MAC.prism.ccFlags = ["-O3", "-DINLINE=inline", "-c", IS_STATIC_BUILD? "-DSTATIC_BUILD" : "", ccBaseFlags].flatten()

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Oct 21, 2019

Member

Minor: normally we would put a space before the ? although we are a bit more lax in the gradle files. Up to you whether you want to fix it.

@openjdk openjdk bot removed the rfr label Oct 21, 2019
@openjdk
Copy link

openjdk bot commented Oct 21, 2019

@johanvos This change can now be integrated. The commit message will be:

8232687: No static JNI loader for libprism-sw

Reviewed-by: kcr
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

  • a09a0fa: 8232522: FX: Update copyright year in docs, readme files to 2020

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Oct 21, 2019
@johanvos
Copy link
Collaborator Author

johanvos commented Oct 22, 2019

/integrate

@openjdk openjdk bot closed this Oct 22, 2019
@openjdk openjdk bot added the integrated label Oct 22, 2019
@openjdk
Copy link

openjdk bot commented Oct 22, 2019

@johanvos The following commits have been pushed to master since your change was applied:

  • a09a0fa: 8232522: FX: Update copyright year in docs, readme files to 2020

Your commit was automatically rebased without conflicts.

Pushed as commit 2ae171a.

@openjdk openjdk bot removed the ready label Oct 22, 2019
@mlbridge
Copy link

mlbridge bot commented Oct 22, 2019

Mailing list message from Johan Vos jvos@openjdk.org

Changeset: 2ae171a
Author: Johan Vos
Date: 2019-10-22 11:44:12 +0000
URL: https://git.openjdk.java.net/jfx/commit/2ae171a2

8232687: No static JNI loader for libprism-sw

Reviewed-by: kcr

! buildSrc/mac.gradle
! modules/javafx.graphics/src/main/native-prism-sw/JNIUtil.c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.