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

8236448: Remove unused and repair broken Android/Dalvik code #75

Closed
wants to merge 4 commits into from

Conversation

@johanvos
Copy link
Collaborator

johanvos commented Dec 30, 2019

This allows to build the JavaFX jars and native libraries for Android devices

Progress

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

Issue

JDK-8236448: Remove unused and repair broken Android/Dalvik code

Approvers

  • Kevin Rushforth (kcr - Reviewer)
This allows to build the JavaFX jars and native libraries for Android devices
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 30, 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 Dec 30, 2019
@mlbridge
Copy link

mlbridge bot commented Dec 30, 2019

Webrevs

Copy link
Member

kevinrushforth left a comment

I did a test build on Linux since there were changes to the shared Monocle classes. I didn't really look at the android.gradle changes or the new android/nativeBridge.c file, but I don't have any concerns. I did leave a couple minor formatting comments and one copyright year issue.

@@ -59,7 +59,7 @@ public static void gotTouchEventFromNative(int count, int[] actions, int[] ids,
touchState.addPoint(p);
}
}
instance.gotTouchEvent(touchState);
Platform.runLater( () -> instance.gotTouchEvent(touchState));

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Jan 3, 2020

Member

Minor: normally we wouldn't put a space between the initial ( and the ()

ns.getScale(), ns.getScale(),
ns.getScale(), ns.getScale());
ns.getWidth(), ns.getHeight(),
1.f,1.f, ns.getScale(), ns.getScale());

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Jan 3, 2020

Member

Minor: add a space after the first ,

@@ -172,7 +172,6 @@ void repaintAll() {

static void repaintFromNative () {
Platform.runLater(new Runnable () {

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Jan 3, 2020

Member

Other than removing the one blank line above, this file is unchanged. Perhaps it could be reverted?

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.

This comment has been minimized.

Copy link
@kevinrushforth

kevinrushforth Jan 3, 2020

Member

That should be 2012, 2019, Oracle... so as not to lose the initial year (well actually 2012, 2020, Oracle... as of Jan 1, but that will get updated the next time I run my copyright script, which I plan to do right before RDP2, so either 2019 or 2020 for the last-modified year is fine).

Copy link
Member

kevinrushforth left a comment

Looks good.

@openjdk openjdk bot removed the rfr label Jan 7, 2020
@openjdk
Copy link

openjdk bot commented Jan 7, 2020

@johanvos This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8236448: Remove unused and repair broken Android/Dalvik code

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

Since the source branch of this PR was last updated there have been 11 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these 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 Jan 7, 2020
@johanvos
Copy link
Collaborator Author

johanvos commented Jan 8, 2020

/integrate

@openjdk openjdk bot closed this Jan 8, 2020
@openjdk openjdk bot added integrated and removed ready labels Jan 8, 2020
@openjdk
Copy link

openjdk bot commented Jan 8, 2020

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

  • c9519b6: 8232589: Remove CoreAudio Utility Classes
  • df8b3c5: 8233798: Ctrl-L character mistakenly removed from gstreamer.md
  • e0b45f8: 8236648: javadoc warning on Text::tabSizeProperty method
  • 587f195: 8234474: [macos 10.15] Crash in file dialog in sandbox mode
  • f1108b0: 8233747: JVM crash in com.sun.webkit.dom.DocumentImpl.createAttribute
  • 3c4d68d: 8236626: Update copyright header for files modified in 2019
  • 580a2a9: 8087980: Add property to disable Monocle cursor
  • 3bbcbfb: 8225571: Port DND source to use GTK instead of GDK
  • 1952606: 8232811: Dialog's preferred size no longer accommodates multi-line strings
  • 4c6ebfb: 8236484: Compile error in monocle dispman
  • 8367e1a: 8130738: Add tabSize property to Text and TextFlow

Your commit was automatically rebased without conflicts.

Pushed as commit e6587ff.

@mlbridge
Copy link

mlbridge bot commented Jan 8, 2020

Mailing list message from Johan Vos on openjfx-dev:

Changeset: e6587ff
Author: Johan Vos <jvos at openjdk.org>
Date: 2020-01-08 14:20:28 +0000
URL: https://git.openjdk.java.net/jfx/commit/e6587ff0

8236448: Remove unused and repair broken Android/Dalvik code

Reviewed-by: kcr

! buildSrc/android.gradle
! modules/javafx.graphics/src/main/java/com/sun/glass/ui/android/DalvikInput.java
! modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/AndroidInputDeviceRegistry.java
! modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java
! modules/javafx.graphics/src/main/native-glass/monocle/EGL.c
! modules/javafx.graphics/src/main/native-glass/monocle/android/AndroidScreen.c
- modules/javafx.graphics/src/main/native-glass/monocle/android/dalvikInput.c
- modules/javafx.graphics/src/main/native-glass/monocle/android/dalvikInput.h
! modules/javafx.graphics/src/main/native-glass/monocle/android/dalvikUtils.c
+ modules/javafx.graphics/src/main/native-glass/monocle/android/nativeBridge.c
+ modules/javafx.graphics/src/main/native-glass/monocle/android/nativeBridge.h
! modules/javafx.graphics/src/main/native-prism-es2/monocle/MonocleGLFactory.c
! modules/javafx.graphics/src/main/native-prism-es2/monocle/eglUtils.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.