Fix Java path probing issue on Linux. #84
Merged
Conversation
This file contains hidden or 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
directhex
reviewed
Sep 20, 2016
| @@ -91,20 +91,23 @@ endif # Darwin | |||
| ifeq ($(OS),Linux) | |||
|
|
|||
| # This is for Ubuntu and derivatives (possibly Debian too) | |||
| _LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include/ | |||
| _DEFAULT_LINUX_JAVA_INCLUDE_DIRS = /usr/lib/jvm/default-java/include/ | |||
| _LINUX_JAVA_FALLBACK_DIRS = /usr/lib/jvm/java* | |||
| _LINUX_JAVA_JNI_INCLUDE_DIR = include | |||
| _LINUX_JAVA_JNI_OS_INCLUDE_DIR = $(DESKTOP_JAVA_JNI_INCLUDE_DIR)/linux | |||
There was a problem hiding this comment.
Let's get rid of this definition here. _LINUX_JAVA_JNI_OS_INCLUDE_DIR isn't used and DESKTOP_JAVA_JNI_INCLUDE_DIR isn't set. The whole line is noise
There was a problem hiding this comment.
That's true. Removed.
| endif | ||
|
|
||
| JI_JDK_INCLUDE_PATHS = $(_DESKTOP_JAVA_INCLUDE_DIRS) $(_DESKTOP_JAVA_INCLUDE_DIRS)/linux | ||
|
|
||
| endif # Linux | ||
|
|
||
| $(JI_JVM_PATH): |
There was a problem hiding this comment.
Seems this isn't set on Linux, so the build will fail? Seems to live in jre/lib/amd64/server/libjvm.so for me, relative to the java home location
There was a problem hiding this comment.
It still builds, fails to run tests that depend on "jvm.dll" (which I guess is replaced by dll configs). It could be done in different PR.
Basically this is the same kind of fix as https://github.com/xamarin/monodroid/commit/c6371f6b
atsushieno
force-pushed
the
fix-linux-java-paths
branch
from
41a9b74 to
aeddbbd
Compare
jonpryor
added a commit
to jonpryor/java.interop
that referenced
this pull request
Jun 4, 2020
Changes: dotnet/android-tools@f5fcb9f...3974fc3 * dotnet/android-tools@3974fc3: [Xamarin.Android.Tools.AndroidSdk] JdkInfo + JDK11 + Windows (dotnet#88) * dotnet/android-tools@5552b07: [Xamarin.Android.Tools.AndroidSdk] Improve utility of JDK warnings (dotnet#87) * dotnet/android-tools@13cc497: [Xamarin.Android.Tools.AndroidSdk] Prefer JAVA_HOME (dotnet#86) * dotnet/android-tools@967c278: Delete NuGet.Config * dotnet/android-tools@2d3690e: [Xamarin.Android.Tools.AndroidSdk] Nullable Reference Type support (dotnet#84) * dotnet/android-tools@2020b20: [Xamarin.Android.Tools.AndroidSdk] Preview Build-Tools are Last (dotnet#85)
jonpryor
added a commit
that referenced
this pull request
Jun 4, 2020
Changes: dotnet/android-tools@f5fcb9f...3974fc3 * dotnet/android-tools@3974fc3: [Xamarin.Android.Tools.AndroidSdk] JdkInfo + JDK11 + Windows (#88) * dotnet/android-tools@5552b07: [Xamarin.Android.Tools.AndroidSdk] Improve utility of JDK warnings (#87) * dotnet/android-tools@13cc497: [Xamarin.Android.Tools.AndroidSdk] Prefer JAVA_HOME (#86) * dotnet/android-tools@967c278: Delete NuGet.Config * dotnet/android-tools@2d3690e: [Xamarin.Android.Tools.AndroidSdk] Nullable Reference Type support (#84) * dotnet/android-tools@2020b20: [Xamarin.Android.Tools.AndroidSdk] Preview Build-Tools are Last (#85)
jonpryor
added a commit
that referenced
this pull request
Jun 11, 2020
Changes: dotnet/android-tools@23c4fe0...017078f * dotnet/android-tools@017078f: [Xamarin.Android.Tools.AndroidSdk] JdkInfo + JDK11 + Windows (#88) * dotnet/android-tools@852e4a3: [Xamarin.Android.Tools.AndroidSdk] Improve utility of JDK warnings (#87) * dotnet/android-tools@b055edf: [Xamarin.Android.Tools.AndroidSdk] Prefer JI_JAVA_HOME (#86) * dotnet/android-tools@ef31658: [Xamarin.Android.Tools.AndroidSdk] Nullable Reference Type support (#84) * dotnet/android-tools@b8efdae: [Xamarin.Android.Tools.AndroidSdk] Preview Build-Tools are Last (#85)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically this is the same kind of fix as https://github.com/xamarin/monodroid/commit/c6371f6b