@@ -58,26 +58,29 @@ public NativeRuntimeComponents (ITaskItem[] monoComponents)
58
58
this . monoComponents = monoComponents ;
59
59
KnownArchives = new ( ) {
60
60
// Mono components
61
- new MonoComponentArchive ( "libmono-component-diagnostics_tracing-static.a" , "diagnostics_tracing" , MonoComponentPresent ) ,
62
- new MonoComponentArchive ( "libmono-component-diagnostics_tracing-stub-static.a" , "diagnostics_tracing" , MonoComponentAbsent ) ,
63
- new MonoComponentArchive ( "libmono-component-marshal-ilgen-static.a" , "marshal-ilgen" , MonoComponentPresent ) ,
64
- new MonoComponentArchive ( "libmono-component-marshal-ilgen-stub-static.a" , "marshal-ilgen" , MonoComponentAbsent ) ,
61
+ new MonoComponentArchive ( "libmono-component-debugger-static.a" , "debugger" , IncludeIfMonoComponentPresent ) ,
62
+ new MonoComponentArchive ( "libmono-component-debugger-stub-static.a" , "debugger" , IncludeIfMonoComponentAbsent ) ,
63
+ new MonoComponentArchive ( "libmono-component-diagnostics_tracing-static.a" , "diagnostics_tracing" , IncludeIfMonoComponentPresent ) ,
64
+ new MonoComponentArchive ( "libmono-component-diagnostics_tracing-stub-static.a" , "diagnostics_tracing" , IncludeIfMonoComponentAbsent ) ,
65
+ new MonoComponentArchive ( "libmono-component-hot_reload-static.a" , "hot_reload" , IncludeIfMonoComponentPresent ) ,
66
+ new MonoComponentArchive ( "libmono-component-hot_reload-stub-static.a" , "hot_reload" , IncludeIfMonoComponentAbsent ) ,
67
+ new MonoComponentArchive ( "libmono-component-marshal-ilgen-static.a" , "marshal-ilgen" , IncludeIfMonoComponentPresent ) ,
68
+ new MonoComponentArchive ( "libmono-component-marshal-ilgen-stub-static.a" , "marshal-ilgen" , IncludeIfMonoComponentAbsent ) ,
65
69
66
70
// MonoVM runtime + BCL
67
71
new Archive ( "libmonosgen-2.0.a" ) ,
68
72
new BclArchive ( "libSystem.Globalization.Native.a" ) ,
69
73
new BclArchive ( "libSystem.IO.Compression.Native.a" ) ,
70
74
new BclArchive ( "libSystem.Native.a" ) ,
71
-
72
- // Can't link whole archive for this one because it contains conflicting JNI_OnLoad
73
- new BclArchive ( "libSystem.Security.Cryptography.Native.Android.a" , wholeArchive : false ) ,
75
+ new BclArchive ( "libSystem.Security.Cryptography.Native.Android.a" ) ,
74
76
75
77
// .NET for Android
76
- new AndroidArchive ( "libruntime-base.a" ) ,
77
- new AndroidArchive ( "libxa-java-interop.a" ) ,
78
- new AndroidArchive ( "libxa-lz4.a" ) ,
79
- new AndroidArchive ( "libxa-shared-bits.a" ) ,
80
- new AndroidArchive ( "libmono-android.release-static.a" ) ,
78
+ new AndroidArchive ( "libpinvoke-override-dynamic-release.a" ) ,
79
+ new AndroidArchive ( "libruntime-base-release.a" ) ,
80
+ new AndroidArchive ( "libxa-java-interop-release.a" ) ,
81
+ new AndroidArchive ( "libxa-lz4-release.a" ) ,
82
+ new AndroidArchive ( "libxa-shared-bits-release.a" ) ,
83
+ new AndroidArchive ( "libmono-android.release-static-release.a" ) ,
81
84
} ;
82
85
83
86
// Just the base names of libraries to link into the unified runtime. Must have all the dependencies of all the static archives we
@@ -111,12 +114,12 @@ bool MonoComponentExists (Archive archive)
111
114
return false ;
112
115
}
113
116
114
- bool MonoComponentAbsent ( Archive archive )
117
+ bool IncludeIfMonoComponentAbsent ( Archive archive )
115
118
{
116
119
return ! MonoComponentExists ( archive ) ;
117
120
}
118
121
119
- bool MonoComponentPresent ( Archive archive )
122
+ bool IncludeIfMonoComponentPresent ( Archive archive )
120
123
{
121
124
return MonoComponentExists ( archive ) ;
122
125
}
0 commit comments