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

Bump to mono:2018-02 #1289

Merged
merged 71 commits into from
Apr 25, 2018
Merged

Bump to mono:2018-02 #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
9da4a6d
Bump to mono:2017-12
luhenry Dec 11, 2017
e064e11
Fix compilation errors with mono:2017-12
luhenry Dec 13, 2017
c48be82
Fix compilation errors with mono:2017-12
luhenry Dec 20, 2017
665022b
Merge remote-tracking branch 'origin/master' into mono-2017-12
luhenry Dec 22, 2017
0edb4b3
Bump to mono/2017-12
luhenry Jan 12, 2018
a19d1ea
Merge branch 'master' of github.com:xamarin/xamarin-android into HEAD
luhenry Jan 12, 2018
07b188d
Copy XUnit assemblies from a different location than NUnit assemblies
luhenry Jan 19, 2018
89444df
Bump to mono/2017-12
luhenry Jan 19, 2018
f0ab475
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Jan 19, 2018
678818f
Bump to mono/2017-12
luhenry Jan 22, 2018
221b7a7
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Jan 22, 2018
30e7561
Bump to mono/2017-12
luhenry Jan 24, 2018
64af858
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Jan 24, 2018
4ab19ee
Bump to mono/2017-12
luhenry Jan 31, 2018
533c7c0
Bump to Java.Interop/mono-2017-12
luhenry Jan 31, 2018
d1f741d
Merge remote-tracking branch 'origin/master' into mono-2017-12
luhenry Jan 31, 2018
def9f75
Fix msbuild variable for copying mono tests
luhenry Feb 1, 2018
c5d00d4
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Feb 1, 2018
a7f3c95
Fix compilation of monodroid_corlib_xunit-test.dll
luhenry Feb 2, 2018
99ff423
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Feb 2, 2018
aa9abcb
Exclude System.Runtime.CompilerServices.Unsafe from install
luhenry Feb 2, 2018
d5fbc29
Fix compilation of monodroid_corlib_xunit-test.dll (second attempt)
luhenry Feb 2, 2018
c303aa3
Fix missing System.Runtime.CompilerServices.Unsafe.pdb
luhenry Feb 3, 2018
6dada7c
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Feb 5, 2018
991c315
Bump to mono:2018-02
luhenry Feb 6, 2018
6f4cf7f
Fix missed MonoRequiredDarwinMinimumVersion for bumping
luhenry Feb 6, 2018
c308714
Bump Mono to 7126712f8632560b4909e224d35be3a64255b037.
Feb 9, 2018
c96d238
Update _DarwinMonoFramework.
Feb 9, 2018
e83851c
Update Xamarin.Android.Build.Tasks.csproj to reflect linker changes.
Feb 9, 2018
2658937
Bump Mono.
Feb 13, 2018
6480118
Merge branch 'master' into mono-2018-02
Feb 13, 2018
9fd1f4d
Fix package version.
Feb 14, 2018
fb36c74
Update DarwinMinimumUrl.
Feb 14, 2018
e9c3690
linkeranalyzer -> illinkanalyzer
Feb 21, 2018
faee6c6
Squashed commit of the following:
Feb 21, 2018
02684ad
Bump Mono.
Feb 21, 2018
d41ba7e
Make it build.
Feb 21, 2018
6d5cd94
Merge remote-tracking branch 'origin/master' into mono-2018-02
luhenry Feb 26, 2018
676104b
FIXME: ignore missing symbol files.
Feb 27, 2018
754f8c7
Revert "FIXME: ignore missing symbol files."
Mar 1, 2018
8ffe624
Bump Mono.
Mar 1, 2018
5fb2e06
Make it build.
Mar 1, 2018
a545097
Bump Mono.
Mar 5, 2018
fc09397
Update DarwinMinimumUrl.
Mar 5, 2018
c7a0724
Fix package url.
Mar 6, 2018
1b04260
Bump to mono:2018-02
luhenry Mar 8, 2018
5badf17
Bump system mono to `mono:2018-02`
luhenry Mar 9, 2018
8ef1c38
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Mar 9, 2018
371664e
Bump to mono:2018-02
luhenry Mar 9, 2018
3ca43b3
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Mar 16, 2018
c923c7b
Bump to mono:2018-02
luhenry Mar 16, 2018
a8de9a6
Bump to mono:2018-02
lewurm Mar 20, 2018
5f657aa
Bump to mono:2018-02
lewurm Mar 21, 2018
a04af17
Merge remote-tracking branch 'origin/master' into mono-2018-02
lewurm Mar 21, 2018
32f17a6
Bump to mono/2017-12/95cc49a6
luhenry Apr 3, 2018
781b38d
Merge remote-tracking branch 'origin/master' into mono-2018-02
luhenry Apr 3, 2018
3905b8c
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 5, 2018
58e8407
Bump to mono/2017-12/2c564f83
luhenry Apr 5, 2018
01d74e7
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 11, 2018
e720152
Bump to mono/2017-12/02390a74
luhenry Apr 11, 2018
f011998
Fix ndk strip command path
luhenry Apr 11, 2018
8857dc8
Bump to mono/2018-02/dbf27d49
luhenry Apr 11, 2018
4637ab3
Fix ndk strip command path (2nd attempt)
luhenry Apr 11, 2018
32abd6c
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 13, 2018
207a75f
Bump to mono/2018-02/763e7f9d
luhenry Apr 13, 2018
c48c5c7
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 18, 2018
4dc0734
Bump to mono/2018-02/64ec2dd3
luhenry Apr 18, 2018
b8e55af
Bump to mono/2018-02/6c5b8bcc
luhenry Apr 18, 2018
2da0be9
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 19, 2018
bbe0a2d
Bump to mono/2018-02/638a7ed3
luhenry Apr 19, 2018
a770051
Merge branch 'master' of github.com:xamarin/xamarin-android into mono…
luhenry Apr 24, 2018
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[submodule "external/mono"]
path = external/mono
url = https://github.com/mono/mono.git
branch = 2017-12
branch = 2018-02
[submodule "external/mxe"]
path = external/mxe
url = https://github.com/xamarin/mxe.git
Expand Down
6 changes: 3 additions & 3 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
<JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
<LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
<MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.10.0</MonoRequiredMinimumVersion>
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.11.0</MonoRequiredMaximumVersion>
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.12.0</MonoRequiredMinimumVersion>
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.13.0</MonoRequiredMaximumVersion>
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
<MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).22</MonoRequiredDarwinMinimumVersion>
<MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).0</MonoRequiredDarwinMinimumVersion>
<LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</LinkerSourceDirectory>
<OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
<LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>
Expand Down
4 changes: 2 additions & 2 deletions build-tools/dependencies/dependencies.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_DarwinMonoFramework>MonoFramework-MDK-5.10.0.47.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_DarwinMonoFramework>MonoFramework-MDK-5.12.0.210.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_AptGetInstall>apt-get -f -u install</_AptGetInstall>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -59,7 +59,7 @@
<MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion>
<DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
<CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
<DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/41/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-02/177/9bbc930d620487446f537e729f018eb965523fcd/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
</RequiredProgram>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 701 files
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static LinkContext CreateLinkContext (LinkerOptions options, Pipeline pipeline,
if (prepareDependenciesDump != null)
prepareDependenciesDump.Invoke (context.Annotations, null);
}
context.LogInternalExceptions = true;
context.LogMessages = true;
context.Logger = logger;
context.CoreAction = AssemblyAction.Link;
context.UserAction = AssemblyAction.Link;
Expand Down
72 changes: 36 additions & 36 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,103 +324,103 @@
<Compile Include="Utilities\XDocumentExtensions.cs" />
<Compile Include="Linker\MonoDroid.Tuner\PreserveRuntimeSerialization.cs" />
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Annotations.cs">
<Link>Linker\Mono.Linker\Annotations.cs</Link>
<Link>Linker\Linker\Annotations.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyAction.cs">
<Link>Linker\Mono.Linker\AssemblyAction.cs</Link>
<Link>Linker\Linker\AssemblyAction.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyResolver.cs">
<Link>Linker\Mono.Linker\AssemblyResolver.cs</Link>
<Link>Linker\Linker\AssemblyResolver.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\I18nAssemblies.cs">
<Link>Linker\Mono.Linker\I18nAssemblies.cs</Link>
<Link>Linker\Linker\I18nAssemblies.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\IXApiVisitor.cs">
<Link>Linker\Mono.Linker\IXApiVisitor.cs</Link>
<Link>Linker\Linker\IXApiVisitor.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\LinkContext.cs">
<Link>Linker\Mono.Linker\LinkContext.cs</Link>
<Link>Linker\Linker\LinkContext.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodAction.cs">
<Link>Linker\Mono.Linker\MethodAction.cs</Link>
<Link>Linker\Linker\MethodAction.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodReferenceExtensions.cs">
<Link>Linker\Mono.Linker\MethodReferenceExtensions.cs</Link>
<Link>Linker\Linker\MethodReferenceExtensions.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Pipeline.cs">
<Link>Linker\Mono.Linker\Pipeline.cs</Link>
<Link>Linker\Linker\Pipeline.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypePreserve.cs">
<Link>Linker\Mono.Linker\TypePreserve.cs</Link>
<Link>Linker\Linker\TypePreserve.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypeReferenceExtensions.cs">
<Link>Linker\Mono.Linker\TypeReferenceExtensions.cs</Link>
<Link>Linker\Linker\TypeReferenceExtensions.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\XApiReader.cs">
<Link>Linker\Mono.Linker\XApiReader.cs</Link>
<Link>Linker\Linker\XApiReader.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BlacklistStep.cs">
<Link>Linker\Mono.Linker.Steps\BlacklistStep.cs</Link>
<Link>Linker\Linker.Steps\BlacklistStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BaseStep.cs">
<Link>Linker\Mono.Linker.Steps\BaseStep.cs</Link>
<Link>Linker\Linker.Steps\BaseStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\CleanStep.cs">
<Link>Linker\Mono.Linker.Steps\CleanStep.cs</Link>
<Link>Linker\Linker.Steps\CleanStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\IStep.cs">
<Link>Linker\Mono.Linker.Steps\IStep.cs</Link>
<Link>Linker\Linker.Steps\IStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadI18nAssemblies.cs">
<Link>Linker\Mono.Linker.Steps\LoadI18nAssemblies.cs</Link>
<Link>Linker\Linker.Steps\LoadI18nAssemblies.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadReferencesStep.cs">
<Link>Linker\Mono.Linker.Steps\LoadReferencesStep.cs</Link>
<Link>Linker\Linker.Steps\LoadReferencesStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\OutputStep.cs">
<Link>Linker\Mono.Linker.Steps\OutputStep.cs</Link>
<Link>Linker\Linker.Steps\OutputStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\RegenerateGuidStep.cs">
<Link>Linker\Mono.Linker.Steps\RegenerateGuidStep.cs</Link>
<Link>Linker\Linker.Steps\RegenerateGuidStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs</Link>
<Link>Linker\Linker.Steps\ResolveFromAssemblyStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXApiStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromXApiStep.cs</Link>
<Link>Linker\Linker.Steps\ResolveFromXApiStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXmlStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromXmlStep.cs</Link>
<Link>Linker\Linker.Steps\ResolveFromXmlStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveStep.cs</Link>
<Link>Linker\Linker.Steps\ResolveStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\TypeMapStep.cs">
<Link>Linker\Mono.Linker.Steps\TypeMapStep.cs</Link>
<Link>Linker\Linker.Steps\TypeMapStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\SweepStep.cs">
<Link>Linker\Mono.Linker.Steps\SweepStep.cs</Link>
<Link>Linker\Linker.Steps\SweepStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\MarkStep.cs">
<Link>Linker\Mono.Linker.Steps\MarkStep.cs</Link>
<Link>Linker\Linker.Stepsq\MarkStep.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\LoadException.cs">
<Link>Linker\Mono.Linker\LoadException.cs</Link>
<Link>Linker\Linker\LoadException.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkException.cs">
<Link>Linker\Mono.Linker\MarkException.cs</Link>
<Link>Linker\Linker\MarkException.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\ConsoleLogger.cs">
<Link>Linker\Mono.Linker\ConsoleLogger.cs</Link>
<Link>Linker\Linker\ConsoleLogger.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\ILogger.cs">
<Link>Linker\Mono.Linker\ILogger.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
<Link>Linker\Mono.Linker\MarkingHelpers.cs</Link>
<Link>Linker\Linker\ILogger.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\Tracer.cs">
<Link>Linker\Mono.Linker\Tracer.cs</Link>
<Link>Linker\Linker\Tracer.cs</Link>
</Compile>
<Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
<Link>Linker\Linker\MarkingHelpers.cs</Link>
</Compile>
<Compile Include="Tasks\MergeResources.cs" />
<Compile Include="Tasks\GetConvertedJavaLibraries.cs" />
Expand Down Expand Up @@ -712,7 +712,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="pdb2mdb\" />
<Folder Include="Linker\Mono.Linker\" />
<Folder Include="Linker\Linker\" />
<Folder Include="utils\" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/mono-runtimes/mono-runtimes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="armeabi" Condition=" '$(_ArmeabiRuntimeConfigure)' == 'true' ">
<Strip>$(_ArmStrip)</Strip>
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-clang\bin\arm-linux-androideabi-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
Expand All @@ -29,7 +29,7 @@
<!-- Cross compiler doesn't need this one, it uses the 'armeabi' build above. Thus no PropertyGroup here. -->
<ItemGroup>
<_MonoRuntime Include="armeabi-v7a" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
<Strip>$(_ArmStrip)</Strip>
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
Expand All @@ -46,7 +46,7 @@
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="arm64-v8a" Condition=" '$(_Arm64RuntimeConfigure)' == 'true' ">
<Strip>$(_Arm64Strip)</Strip>
<Strip>$(AndroidToolchainDirectory)\toolchains\arm64-v8a-clang\bin\aarch64-linux-android-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
Expand All @@ -63,7 +63,7 @@
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="x86" Condition=" '$(_X86RuntimeConfigure)' == 'true' ">
<Strip>$(_X86Strip)</Strip>
<Strip>$(AndroidToolchainDirectory)\toolchains\x86-clang\bin\i686-linux-android-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputMonoBtlsFilename>libmono-btls-shared</OutputMonoBtlsFilename>
Expand All @@ -80,7 +80,7 @@
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="x86_64" Condition=" '$(_X8664RuntimeConfigure)' == 'true' ">
<Strip>$(_X86_64Strip)</Strip>
<Strip>$(AndroidToolchainDirectory)\toolchains\x86_64-clang\bin\x86_64-linux-android-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
Expand Down
12 changes: 0 additions & 12 deletions src/mono-runtimes/mono-runtimes.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,6 @@
</PropertyGroup>

<!-- Mono runtimes settings -->
<PropertyGroup>
<_ArmStrip>$(AndroidToolchainDirectory)\toolchains\arm-linux-androideabi-clang\bin\arm-linux-androideabi-strip</_ArmStrip>
</PropertyGroup>
<PropertyGroup>
<_Arm64Strip>$(AndroidToolchainDirectory)\toolchains\aarch64-linux-android-clang\bin\aarch64-linux-android-strip</_Arm64Strip>
</PropertyGroup>
<PropertyGroup>
<_X86Strip>$(AndroidToolchainDirectory)\toolchains\i686-linux-android-clang\bin\i686-linux-android-strip</_X86Strip>
</PropertyGroup>
<PropertyGroup>
<_X86_64Strip>$(AndroidToolchainDirectory)\toolchains\x86_64-linux-android-clang\bin\x86_64-linux-android-strip</_X86_64Strip>
</PropertyGroup>
<PropertyGroup>
<_HostWin64CFlags>$(_HostWinCFlags)</_HostWin64CFlags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
/>
</ItemGroup>
<ItemGroup>
<_MonoUtility Include="linkeranalyzer.exe" />
<_MonoUtility Include="illinkanalyzer.exe" />
<_MonoUtility Include="mono-symbolicate.exe" />
<_MonoUtility Include="mkbundle.exe" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/illinkanalyzer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ BINDIR=`dirname "$0"`
MANDROID_DIR="$BINDIR/.."

unset MONO_PATH
exec mono $MONO_OPTIONS "$MANDROID_DIR/linkeranalyzer.exe" "$@"
exec mono $MONO_OPTIONS "$MANDROID_DIR/illinkanalyzer.exe" "$@"