Include 'libmono-native.so' in .apk

dotnet · Feb 9, 2019 · cd7e209 · cd7e209
1 parent 23d74f3
commit cd7e209
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
@@ -411,6 +411,9 @@ void AddRuntimeLibraries (ZipArchiveEx apk, string supportedAbis)
 					// include the sgen
 					AddNativeLibrary (apk, abi, "libmonosgen-2.0.so");
 				}
+				// add "System.Native" PAL library
+				AddNativeLibrary (apk, abi, "libmono-native.so");
+
 				AddBtlsLibs (apk, abi);
 				AddProfilers (apk, abi);
 			}

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2845,7 +2845,7 @@ because xbuild doesn't support framework reference assemblies.
 	<ItemGroup>
 		<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)\lib\*\libsqlite3_xamarin.so" Condition="$(_Assemblies.Contains('Mono.Data.Sqlite.dll'))" />
 		<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)\lib\*\libMonoPosixHelper.so" Condition="$(_Assemblies.Contains('Mono.Posix.dll'))" />
-		<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)\lib\*\libmono-native.so" Condition="$(_Assemblies.Contains('mscorlib.dll'))" />
+		<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)\lib\*\libmono-native.so"  />
 	</ItemGroup>
 </Target>