Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mono-2018-10] Include 'libmono-native.so' in .apk #2719

Merged
merged 1 commit into from
Feb 11, 2019

Conversation

alexischr
Copy link
Contributor

No description provided.

@alexischr alexischr added the full-mono-integration-build For PRs; run a full build (~6-10h for mono bumps), not the faster PR subset (~2h for mono bumps) label Feb 9, 2019
@alexischr alexischr changed the title Include 'libmono-native.so' in .apk [mono-2018-10] Include 'libmono-native.so' in .apk Feb 9, 2019
@alexischr alexischr force-pushed the mono-2018-10-mono-native-buildapk branch from f285baf to cd7e209 Compare February 9, 2019 00:47
@alexischr
Copy link
Contributor Author

This patch also contains this amendment suggested here: #2658 (comment).

Now libmono-native.so is definitely included in the apk (before it wasn't when I was building HelloWorld.csproj locally). However I am getting new test failures:

/Users/builder/jenkins/workspace/xamarin-android-pr-builder-debug/xamarin-android/bin/Debug/lib/xamarin.android/xbuild/Xamarin/Android/lib/armeabi-v7a/libmono-native.so : warning XA4301: Apk already contains the item lib/armeabi-v7a/libmono-native.so; ignoring. [/Users/builder/jenkins/workspace/xamarin-android-pr-builder-debug/xamarin-android/bin/TestDebug/temp/CheckSignApk(True,False)/UnnamedProject.csproj]

@jonp and others: Do you think that the BuildApk.cs change is superfluous after the Condition was "fixed"? If I were to keep one of the changes, which one should I try? (I have trouble testing this locally, and these builds take 6 hours). Or is the extra adding unrelated?

(Also: the FileSystemWatcher tests still fail, so the libmono-native entry points are still not being found)

@alexischr alexischr requested a review from jonpryor February 9, 2019 15:46
@@ -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" />
Copy link
Member

Choose a reason for hiding this comment

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

I believe that this line is superfluous with BuildApk.cs line 415: Only one of the two lines should be needed, not both, as @(AndroidNativeLibrary) should cause an AddNativeLibrary() invocation to occur.

@alexischr alexischr force-pushed the mono-2018-10-mono-native-buildapk branch from cd7e209 to c9a61a0 Compare February 11, 2019 08:24
@alexischr alexischr merged commit c8df7e0 into mono-2018-10 Feb 11, 2019
@jpobst jpobst deleted the mono-2018-10-mono-native-buildapk branch March 8, 2021 17:03
@github-actions github-actions bot locked and limited conversation to collaborators Feb 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
full-mono-integration-build For PRs; run a full build (~6-10h for mono bumps), not the faster PR subset (~2h for mono bumps)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants