Commit 5fe28cd
authored
[java-interop] Selectively keep DylibMono for Xamarin.Android (dotnet#473)
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.1 parent ffbb2dc commit 5fe28cd
2 files changed
Lines changed: 33 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
271 | 278 | | |
272 | 279 | | |
273 | 280 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
6 | 30 | | |
7 | 31 | | |
8 | 32 | | |
| |||
15 | 39 | | |
16 | 40 | | |
17 | 41 | | |
| 42 | + | |
| 43 | + | |
18 | 44 | | |
19 | 45 | | |
20 | 46 | | |
| |||
0 commit comments