Skip to content

8359163: Fix path to current module on ios #39

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

Closed
wants to merge 1 commit into from

Conversation

johanvos
Copy link
Collaborator

@johanvos johanvos commented Jul 29, 2025

Minimize ios-specific logic to calculate the location for java_home.
The java_home property should be based on the jvm_path, and not on the user_home

Fix JDK-8359163

This patch still has ios-specific logic, e.g. we don't have a {client/server} suffix to the jvm home. More important, though, is that we do not want to point to userspace for the location of the jvm modules etc itself. Those should be derived from the installed application location, which matches the jvm_home property.
Applying this patch removes one more location where the mobile repository differs from upstream jdk.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8359163: Fix path to current module on ios (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/mobile.git pull/39/head:pull/39
$ git checkout pull/39

Update a local copy of the PR:
$ git checkout pull/39
$ git pull https://git.openjdk.org/mobile.git pull/39/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 39

View PR using the GUI difftool:
$ git pr show -t 39

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/mobile/pull/39.diff

Using Webrev

Link to Webrev Comment

The java_home property should be based on the jvm_path, and not on the
user_home

Fix JDK-8359163
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 29, 2025

👋 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. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jul 29, 2025

@johanvos This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8359163: Fix path to current module on ios

Reviewed-by: ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 863 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr label Jul 29, 2025
@mlbridge
Copy link

mlbridge bot commented Jul 29, 2025

Webrevs

@johanvos
Copy link
Collaborator Author

@magicus can you review this?

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. There is still a couple of #ifndef __IOS__ left so the diff towards main is unfortunately mostly there. :( But sure, just ifdeffing out code is superior to adding new logic so it's definitely a step in the right direction.

@openjdk openjdk bot added the ready label Aug 14, 2025
@johanvos
Copy link
Collaborator Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 14, 2025

Going to push as commit 4c77792.
Since your change was applied there have been 863 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Aug 14, 2025
@openjdk openjdk bot closed this Aug 14, 2025
@openjdk
Copy link

openjdk bot commented Aug 14, 2025

@johanvos Pushed as commit 4c77792.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@johanvos
Copy link
Collaborator Author

LGTM. There is still a couple of #ifndef __IOS__ left so the diff towards main is unfortunately mostly there. :( But sure, just ifdeffing out code is superior to adding new logic so it's definitely a step in the right direction.

Agree. There is more work to be done. I'm not 100% sure though about the best approach to fix the other IOS specific logic. There are a couple of options, and I try to avoid commiting option A only to realize later that option B would have been better.
But with this PR, we can run HelloWorld without much boilerplate code, and we can gain experience and feedback now.
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants