Skip to content

Conversation

@atsushieno
Copy link
Contributor

Basically this is the same kind of fix as https://github.com/xamarin/monodroid/commit/c6371f6b

Copy link

@directhex directhex left a comment

Choose a reason for hiding this comment

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

Changes are fine, a few unchanged bits that concern me & ought to get fixed as part of this PR

_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

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's true. Removed.


endif # Linux

$(JI_JVM_PATH):

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

@jonpryor jonpryor merged commit 21309fe into dotnet:master Sep 21, 2016
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)
@github-actions github-actions bot locked and limited conversation to collaborators Apr 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants