Commit 36d7fee
authored
JetBrains OpenJDK 11 detection (#82)
Context: https://bintray.com/jetbrains/intellij-jdk/openjdk11-osx-x64
OpenJDK 11 from JetBrains does not have the `jre` directory which, so
far, has been required by the `JdkInfo` class. Instead, there's just
the `lib` directory which should be searched for the JVM libraries
instead of `jre`.
Modify `JdkInfo` so that it first checks the `jre` directory and,
failing to find it, looks for the `lib` directory in the OpenJDK
installation root.
These changes allow Xamarin.Android.Tools tp detect
JetBrains OpenJDK 11 properly.1 parent 12f52ac commit 36d7fee
1 file changed
+20
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
| |||
52 | 56 | | |
53 | 57 | | |
54 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
55 | 73 | | |
56 | | - | |
57 | | - | |
| 74 | + | |
| 75 | + | |
58 | 76 | | |
59 | 77 | | |
60 | 78 | | |
| |||
0 commit comments