-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Xamarin.Android.Tools.AndroidSdk] JdkInfo + JDK11 + Windows (#88)
Context: dotnet/android#4567 Commit 36d7fee added support for JetBrains OpenJDK 11 detection on macOS and Linux. Lacking was *Windows* support for JetBrains OpenJDK 11, because of course it has to be different. In particular, OpenJDK 11 *moves the `jvm` library* for Windows. We checked for it in `{HomePath}\jre\**\jvm.dll` or `{HomePath}\lib\**\jvm.dll`, but neither of those exist. Instead, OpenJDK 11 has `jvm.dll` in `{HomePath}\bin\server\jvm.dll`, which is also the only `.dll` file in the `.tar.gz` which exports the symbol `JNI_CreateJavaVM`. Update `JdkInfo` so that it looks for `{HomePath}\bin\server\jvm.dll` to populate `JdkInfo.JdkJvmPath`.
- Loading branch information
Showing
1 changed file
with
23 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters