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.

Sign up for GitHub

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

Jump to bottom

[monodroid] Fix builds when $(AndroidSupportedAbis) contains host #58

Merged
merged 1 commit into from
Jun 7, 2016
Merged

[monodroid] Fix builds when $(AndroidSupportedAbis) contains host #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
<PropertyGroup>
<AndroidMxeFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidMxeInstallPrefix)'))</AndroidMxeFullPath>
</PropertyGroup>
<ItemGroup>
<HostOSName Include="host-Darwin" />
<HostOSName Include="host-Linux" />
<HostOSName Include="host-win64" />
</ItemGroup>
<!--
"Fixup" $(AndroidSupportedAbis) so that Condition attributes elsewhere
can use `:ABI-NAME:`, to avoid substring mismatches.
Expand Down
2 changes: 1 addition & 1 deletion src/monodroid/monodroid.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<_SupportedAbis>$(AndroidSupportedAbis.Replace(':', ';'))</_SupportedAbis>
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="$(_SupportedAbis)" />
<_MonoRuntime Include="$(_SupportedAbis)" Exclude="@(HostOSName)" />
</ItemGroup>
<ItemGroup>
<_RequiredProgram Include="xxd" />
Expand Down
2 changes: 1 addition & 1 deletion src/monodroid/monodroid.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Outputs="@(_MonoRuntime->'$(OutputPath)\%(Identity)\libmono-android.$(_Conf).so')">
<Which Program="%(_RequiredProgram.Identity)" Required="True" />
<PropertyGroup>
<_AppAbi>$(AndroidSupportedAbis.Replace(':', ' '))</_AppAbi>
<_AppAbi>@(_MonoRuntime->'%(Identity)', ' ')</_AppAbi>
Copy link
Member

Choose a reason for hiding this comment

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

What is this doing?

Copy link
Member Author

Choose a reason for hiding this comment

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

The intent is to create a (space)-separated list of ABI names.@(_MonoRuntime)could be e.g.armeabi-v7a;x86, but$(AppApi)would need to bearmeabi-v7a x86(s/;/ /g).

</PropertyGroup>
<WriteLinesToFile
File="jni\Application.mk"
Expand Down