[java-interop] Selectively keep DylibMono for Xamarin.Android #473
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
jonpryor
force-pushed
the
jonp-revert-285a32b3
branch
from
7da8ecd to
17788db
Compare
jonpryor
changed the title
Context: dotnet/android#3504 Context: dotnet/android#3223 When bumping xamarin-android/master to 2abfc1e, the build broke because of commit 285a32b: In file included from /Users/vsts/agent/2.155.1/work/1/s/external/Java.Interop/src/java-interop/java-interop-mono.cc:2: ../../../../../external/Java.Interop/src/java-interop/java-interop-mono.h:10:11: fatal error: 'mono/metadata/assembly.h' file not found #include <mono/metadata/assembly.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. We need to continue supporting the DylibMono backend for integration purposes (dotnet/android#3504) *while also* allowing for the *removal* of DylibMono (dotnet/android#3223). Attempt to support these divergent needs by replacing this: #if defined (ANDROID) || defined (XAMARIN_ANDROID_DYLIB_MONO) with this: #if defined (XAMARIN_ANDROID_DYLIB_MONO) removing the check for the `ANDROID` define. This will allow dotnet/android#3223 to *remove* the `XAMARIN_ANDROID_DYLIB_MONO` definition in order to introduce it's desired behavior, removing DylibMono use. This partially reverts commit 285a32b.
jonpryor
force-pushed
the
jonp-revert-285a32b3
branch
from
17788db to
14858f7
Compare
grendello
approved these changes
Aug 16, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Context: dotnet/android#3504
Context: dotnet/android#3223
When bumping xamarin-android/master to 2abfc1e, the build broke
because of commit 285a32b:
We need to continue supporting the DylibMono backend for integration
purposes (dotnet/android#3504) while also allowing for the
removal of DylibMono (dotnet/android#3223).
Attempt to support these divergent needs by replacing this:
with this:
removing the check for the
ANDROIDdefine.This will allow dotnet/android#3223 to remove the
XAMARIN_ANDROID_DYLIB_MONOdefinition in order to introduce it'sdesired behavior, removing DylibMono use.
This partially reverts commit 285a32b.