xamarin
/
xamarin-android
зеркало из https://github.com/xamarin/xamarin-android.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bump to mono/2017-10/7e85cfa5 (#943) 

Bump to xamarin-android-api-compatibility/master/c050ba3c. Updates
expected APIs for BCL assemblies.

Use `azureedge.net` instead of `blob.core.windows.net`. It's behind
a CDN and way faster outside US.

Use the new profiler init symbol name, `mono_profiler_init()`.

Avoid dumping the content of `libmono-profiler-log.so` when tests
fail. The binary contents aren't meaningful, and needlessly bloat the
output log.

Fix `eglib` path, as mono changed it's location.

Don't skip errors from mono's `make test` target anymore.

Stop building Mono's `net_4_x` profile. It isn't required to build
the `monodroid` profile and *not* building it saves lots of time.
The tools needed by XA are taken from the new `monodroid_tools`
profile instead.

Update Mono version phrasing in `README.md`. Using an explicit
version is just a recipe for outdated info, instead rewrite it to be
generic since the build will complain on an outdated Mono anyway.

Add more exclusions to `LinkerDescription.xml` for BCL tests, which
are used in the new `System.Reflection.Emit.SaveTest()`.

Update `.gitignore` for some paths. `Xamarin.Android.Common.props` is
generated as part of the build, and the `.rawproto` files created by
gradle should be ignored.

Context: https://bugzilla.xamarin.com/show_bug.cgi?id=4786
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=5798
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=5804
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=11696
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=17325
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=23153
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=25755
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=36053
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=36634
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=40556
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=41279
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=43172
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=43563
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=44266
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=46683
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=52157
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=52621
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=55603
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56653
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=56684
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57069
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57160
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57197
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57222
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57232
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57301
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57476
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57488
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57496
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57505
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57528
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57629
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57691
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57744
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57796
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57850
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57851
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57887
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57918
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57930
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57936
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=57959
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58100
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58168
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58210
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58291
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58317
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58344
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58361
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58379
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58399
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58411
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58421
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58423
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58454
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58612
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58621
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58728
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58738
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58770
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58782
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58793
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58809
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58829
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58877
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58901
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58911
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=58965
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59039
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59154
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59180
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59235
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59281
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59364
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59436
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59608
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59664
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=59824
Context: https://bugzilla.xamarin.com/show_bug.cgi?id=60233
This commit is contained in:
Alexander Köplinger 2017-10-31 16:55:44 +01:00 коммит произвёл Jonathan Pryor
Родитель 9254af3315
Коммит c43c5e671a
17 изменённых файлов: 50 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.gitmodules поставляемый
Просмотреть файл

@ -5,7 +5,7 @@
[submodule "external/mono"] [submodule "external/mono"]
path = external/mono path = external/mono
url = https://github.com/mono/mono.git url = https://github.com/mono/mono.git
branch = 2017-06 branch = 2017-10
[submodule "external/mxe"] [submodule "external/mxe"]
path = external/mxe path = external/mxe
url = https://github.com/xamarin/mxe.git url = https://github.com/xamarin/mxe.git

6
Configuration.props
Просмотреть файл

@ -54,10 +54,10 @@
<JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory> <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
<LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory> <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
<MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory> <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.4.0</MonoRequiredMinimumVersion> <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.8.0</MonoRequiredMinimumVersion>
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.6.0</MonoRequiredMaximumVersion> <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.9.0</MonoRequiredMaximumVersion>
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion> <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
<MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).147</MonoRequiredDarwinMinimumVersion> <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).22</MonoRequiredDarwinMinimumVersion>
<LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\linker</LinkerSourceDirectory> <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\linker</LinkerSourceDirectory>
<OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory> <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
<LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory> <LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>

11
README.md
Просмотреть файл

@ -48,7 +48,7 @@ Xamarin.Android provides open-source bindings of the Android SDK for use with
Building Xamarin.Android requires: Building Xamarin.Android requires:
* [Mono 4.4 or later](#mono-sdk) * [Latest Mono](#mono-sdk)
* [The Java Development Kit (JDK)](#jdk) * [The Java Development Kit (JDK)](#jdk)
* [Autotools (`autoconf`, `automake`, etc.)](#autotools) * [Autotools (`autoconf`, `automake`, etc.)](#autotools)
* [The Android SDK and NDK](#ndk) * [The Android SDK and NDK](#ndk)
@ -70,10 +70,8 @@ to provide install instructions to obtain the missing dependency, e.g.:
## Mono MDK ## Mono MDK
Mono 4.4 or later is required to build on [OS X][osx-mono] and Linux. Latest Mono is required to build on [OS X][osx-mono] and Linux.
The build will tell you if your version is outdated.
(This is because the build system uses the [XmlPeek][xmlpeek] task, which
was first added in Mono 4.4.)
[osx-mono]: http://www.mono-project.com/download/#download-mac [osx-mono]: http://www.mono-project.com/download/#download-mac
[xmlpeek]: https://msdn.microsoft.com/en-us/library/ff598684.aspx [xmlpeek]: https://msdn.microsoft.com/en-us/library/ff598684.aspx
@ -210,8 +208,7 @@ Overridable MSBuild properties include:
supported in order to allow a build to continue. Policy is to require a supported in order to allow a build to continue. Policy is to require a
system mono which corresponds vaguely to the [`external/mono`](external) system mono which corresponds vaguely to the [`external/mono`](external)
version. This is not strictly required; older mono versions *may* work, they version. This is not strictly required; older mono versions *may* work, they
just are not tested, and thus not guaranteed or supported. just are not tested, and thus not guaranteed or supported.
By default this is `5.4.0`.
* `$(MonoRequiredMaximumVersion)`: The max *system* mono version that is * `$(MonoRequiredMaximumVersion)`: The max *system* mono version that is
required. This is so that we can ensure a stable build environment by required. This is so that we can ensure a stable build environment by
making sure we dont install unstable versions. making sure we dont install unstable versions.

4
build-tools/dependencies/dependencies.projitems
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_DarwinMonoFramework>MonoFramework-MDK-5.4.0.147.macos10.xamarin.universal.pkg</_DarwinMonoFramework> <_DarwinMonoFramework>MonoFramework-MDK-5.8.0.22.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
<_AptGetInstall>apt-get -f -u install</_AptGetInstall> <_AptGetInstall>apt-get -f -u install</_AptGetInstall>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -59,7 +59,7 @@
<MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion> <MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion>
<DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion> <DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
<CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand> <CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
<DarwinMinimumUrl>https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/28/28a417c2c0d1a2d1231d8b0a5beea3201208b57d/$(_DarwinMonoFramework)</DarwinMinimumUrl> <DarwinMinimumUrl>https://bosstoragemirror.azureedge.net/wrench/mono-2017-10/7e/7e85cfa5d228cd5148e59cde1d4d663457f96966/$(_DarwinMonoFramework)</DarwinMinimumUrl>
<DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall> <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
</RequiredProgram> </RequiredProgram>
</ItemGroup> </ItemGroup>

4
build-tools/mono-runtimes/mono-runtimes.projitems
Просмотреть файл

@ -211,7 +211,7 @@
<RanLib>ranlib</RanLib> <RanLib>ranlib</RanLib>
<Strip>strip</Strip> <Strip>strip</Strip>
<StripFlags>-S</StripFlags> <StripFlags>-S</StripFlags>
<ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile2=no --with-profile4=no --with-profile4_5=yes --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags> <ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile4_x=no --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename> <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>dylib</NativeLibraryExtension> <NativeLibraryExtension>dylib</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename> <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
@ -232,7 +232,7 @@
<RanLib>ranlib</RanLib> <RanLib>ranlib</RanLib>
<Strip>strip</Strip> <Strip>strip</Strip>
<StripFlags>-S</StripFlags> <StripFlags>-S</StripFlags>
<ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile2=no --with-profile4=no --with-profile4_5=yes --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags> <ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile4_x=no --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename> <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension> <NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename> <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>

2
build-tools/mono-runtimes/mono-runtimes.props
Просмотреть файл

@ -6,7 +6,7 @@
<_HostWinCFlags Condition=" '$(Configuration)' == 'Debug' ">-ggdb3 -O0 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags> <_HostWinCFlags Condition=" '$(Configuration)' == 'Debug' ">-ggdb3 -O0 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags>
<_HostWinCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags> <_HostWinCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags>
<_BtlsConfigureFlags>--enable-dynamic-btls --with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk</_BtlsConfigureFlags> <_BtlsConfigureFlags>--enable-dynamic-btls --with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk</_BtlsConfigureFlags>
<_CommonConfigureFlags>--without-ikvm-native --enable-maintainer-mode --with-profile2=no --with-profile4=no --with-profile4_5=no --with-monodroid --enable-nls=no --with-sigaltstack=yes --with-tls=pthread mono_cv_uscore=yes</_CommonConfigureFlags> <_CommonConfigureFlags>--without-ikvm-native --enable-maintainer-mode --with-profile4_x=no --with-monodroid --enable-nls=no --with-sigaltstack=yes --with-tls=pthread mono_cv_uscore=yes</_CommonConfigureFlags>
<_TargetConfigureFlags>$(_CommonConfigureFlags) --enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv --disable-boehm $(_BtlsConfigureFlags)</_TargetConfigureFlags> <_TargetConfigureFlags>$(_CommonConfigureFlags) --enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv --disable-boehm $(_BtlsConfigureFlags)</_TargetConfigureFlags>
<_SecurityCFlags>-fstack-protector</_SecurityCFlags> <_SecurityCFlags>-fstack-protector</_SecurityCFlags>
<_TargetCFlags>$(_SecurityCFlags) -DMONODROID=1</_TargetCFlags> <_TargetCFlags>$(_SecurityCFlags) -DMONODROID=1</_TargetCFlags>

8
build-tools/mono-runtimes/mono-runtimes.targets
Просмотреть файл

@ -31,7 +31,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir> <_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
<_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\net_4_x</_MonoOutputDir> <_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid_tools</_MonoOutputDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ForceBuildDependsOn> <ForceBuildDependsOn>
@ -274,11 +274,11 @@
/> />
<_RuntimeEglibHeaderSource <_RuntimeEglibHeaderSource
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\config.h');@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\src\eglib-config.h')" Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\mono\eglib\eglib-config.h')"
/> />
<_RuntimeEglibHeaderOutput <_RuntimeEglibHeaderOutput
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\config.h');@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')" Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')"
/> />
<_MonoConstsSource <_MonoConstsSource
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
@ -305,7 +305,7 @@
Files="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)" Files="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)"
/> />
<Exec <Exec
Command="make $(MakeConcurrency) -i test # %(_MonoRuntime.Identity)" Command="make $(MakeConcurrency) test # %(_MonoRuntime.Identity)"
IgnoreStandardErrorWarningFormat="True" IgnoreStandardErrorWarningFormat="True"
WorkingDirectory="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\runtime" WorkingDirectory="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\runtime"
/> />

2
build-tools/xa-prep-tasks/xa-prep-tasks.targets
Просмотреть файл

@ -5,7 +5,7 @@
<Import Project="..\bundle\bundle-path.targets" /> <Import Project="..\bundle\bundle-path.targets" />
<Import Project="..\scripts\XAVersionInfo.targets" /> <Import Project="..\scripts\XAVersionInfo.targets" />
<PropertyGroup> <PropertyGroup>
<_AzureBaseUri>https://xamjenkinsartifact.blob.core.windows.net/xamarin-android/xamarin-android/bin/</_AzureBaseUri> <_AzureBaseUri>https://xamjenkinsartifact.azureedge.net/xamarin-android/xamarin-android/bin/</_AzureBaseUri>
<_NuGetUri>https://dist.nuget.org/win-x86-commandline/latest/nuget.exe</_NuGetUri> <_NuGetUri>https://dist.nuget.org/win-x86-commandline/latest/nuget.exe</_NuGetUri>
<_NuGetPath>$(MSBuildThisFileDirectory)\..\..\.nuget</_NuGetPath> <_NuGetPath>$(MSBuildThisFileDirectory)\..\..\.nuget</_NuGetPath>
</PropertyGroup> </PropertyGroup>

2
external/mono поставляемый

@ -1 +1 @@
Subproject commit fbc487ff424c479c25d0bbd24110d34890ffd793 Subproject commit 9f86587ade83efdad9901a02073131f12d7de50f

2
external/xamarin-android-api-compatibility поставляемый

@ -1 +1 @@
Subproject commit 021f4ca3efbd86c6a4871f9676cfe018f7d736c7 Subproject commit c050ba3c124f628bee550756512a9ea7fbf4b4b7

1
src/Xamarin.Android.Build.Tasks/.gitignore поставляемый Normal file
Просмотреть файл

@ -0,0 +1 @@
/Xamarin.Android.Common.props

6
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
Просмотреть файл

@ -1085,9 +1085,11 @@ namespace App1
Assert.AreEqual (runtime.Size, inApkRuntime.Size, "expected {0} got {1}", expectedRuntime, inApkRuntime.Runtime); Assert.AreEqual (runtime.Size, inApkRuntime.Size, "expected {0} got {1}", expectedRuntime, inApkRuntime.Runtime);
inApk = ZipHelper.ReadFileFromZip (apk, string.Format ("lib/{0}/libmono-profiler-log.so", abi)); inApk = ZipHelper.ReadFileFromZip (apk, string.Format ("lib/{0}/libmono-profiler-log.so", abi));
if (string.Compare (expectedRuntime, "debug", StringComparison.OrdinalIgnoreCase) == 0) { if (string.Compare (expectedRuntime, "debug", StringComparison.OrdinalIgnoreCase) == 0) {
Assert.IsNotNull (inApk, "libmono-profiler-log.so should exist in the apk."); if (inApk == null)
Assert.Fail ("libmono-profiler-log.so should exist in the apk.");
} else { } else {
Assert.IsNull (inApk, "libmono-profiler-log.so should not exist in the apk."); if (inApk != null)
Assert.Fail ("libmono-profiler-log.so should not exist in the apk.");
} }
} }
} }

2
src/monodroid/jni/Android.mk
Просмотреть файл

@ -38,7 +38,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
$(LOCAL_PATH)/../../../bin/$(CONFIGURATION)/include \ $(LOCAL_PATH)/../../../bin/$(CONFIGURATION)/include \
$(LOCAL_PATH)/../../../bin/$(CONFIGURATION)/include/$(TARGET_ARCH_ABI)/eglib \ $(LOCAL_PATH)/../../../bin/$(CONFIGURATION)/include/$(TARGET_ARCH_ABI)/eglib \
"$(MONO_PATH)/eglib/src" \ "$(MONO_PATH)/mono/eglib" \
$(LOCAL_PATH)/zip $(LOCAL_PATH)/zip
LOCAL_LDLIBS := -llog -lz -lstdc++ LOCAL_LDLIBS := -llog -lz -lstdc++

14
src/monodroid/jni/monodroid-glue.c
Просмотреть файл

@ -3426,7 +3426,7 @@ set_trace_options (void)
/* Profiler support cribbed from mono/metadata/profiler.c */ /* Profiler support cribbed from mono/metadata/profiler.c */
typedef void (*ProfilerInitializer) (const char*); typedef void (*ProfilerInitializer) (const char*);
#define INITIALIZER_NAME "mono_profiler_startup" #define INITIALIZER_NAME "mono_profiler_init"
static mono_bool static mono_bool
load_profiler (void *handle, const char *desc, const char *symbol) load_profiler (void *handle, const char *desc, const char *symbol)
@ -3470,7 +3470,7 @@ load_embedded_profiler (const char *desc, const char *name)
} }
static mono_bool static mono_bool
load_profiler_from_directory (const char *directory, const char *libname, const char *desc) load_profiler_from_directory (const char *directory, const char *libname, const char *desc, const char *name)
{ {
char *full_name = path_combine (directory, libname); char *full_name = path_combine (directory, libname);
int exists = file_exists (full_name); int exists = file_exists (full_name);
@ -3485,7 +3485,9 @@ load_profiler_from_directory (const char *directory, const char *libname, const
free (full_name); free (full_name);
if (h) { if (h) {
mono_bool result = load_profiler (h, desc, INITIALIZER_NAME); char *symbol = monodroid_strdup_printf ("%s_%s", INITIALIZER_NAME, name);
mono_bool result = load_profiler (h, desc, symbol);
free (symbol);
if (result) if (result)
return 1; return 1;
dlclose (h); dlclose (h);
@ -3515,18 +3517,18 @@ monodroid_profiler_load (const char *libmono_path, const char *desc, const char
for (oi = 0; oi < MAX_OVERRIDES; ++oi) { for (oi = 0; oi < MAX_OVERRIDES; ++oi) {
if (!directory_exists (override_dirs [oi])) if (!directory_exists (override_dirs [oi]))
continue; continue;
if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc))) if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc, mname)))
break; break;
} }
do { do {
if (found) if (found)
break; break;
if ((found = load_profiler_from_directory (app_libdir, libname, desc))) if ((found = load_profiler_from_directory (app_libdir, libname, desc, mname)))
break; break;
if ((found = load_embedded_profiler (desc, mname))) if ((found = load_embedded_profiler (desc, mname)))
break; break;
if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc))) if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc, mname)))
break; break;
} while (0); } while (0);

2
src/monodroid/monodroid.props
Просмотреть файл

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<_DebugCFlags>-ggdb3 -O0 -fno-omit-frame-pointer</_DebugCFlags> <_DebugCFlags>-ggdb3 -O0 -fno-omit-frame-pointer</_DebugCFlags>
<_ReleaseCFlags>-g -O2</_ReleaseCFlags> <_ReleaseCFlags>-g -O2</_ReleaseCFlags>
<_CommonCFlags>-Ijni -Ijni/zip "-I$(MonoSourceFullPath)\eglib\src" -std=c99 -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion) -D_REENTRANT -DHAVE_CONFIG_H -DMONO_DLL_EXPORT -DJI_DLL_EXPORT -fno-strict-aliasing -ffunction-sections -fvisibility=hidden -Wformat -Werror=format-security</_CommonCFlags> <_CommonCFlags>-Ijni -Ijni/zip "-I$(MonoSourceFullPath)\mono\eglib" -std=c99 -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion) -D_REENTRANT -DHAVE_CONFIG_H -DMONO_DLL_EXPORT -DJI_DLL_EXPORT -fno-strict-aliasing -ffunction-sections -fvisibility=hidden -Wformat -Werror=format-security</_CommonCFlags>
<_HostUnixCFlags>$(_CommonCFlags) -Wa,--noexecstack</_HostUnixCFlags> <_HostUnixCFlags>$(_CommonCFlags) -Wa,--noexecstack</_HostUnixCFlags>
<_HostUnixLdFlags>-Wall -lstdc++ -lz -shared -fpic</_HostUnixLdFlags> <_HostUnixLdFlags>-Wall -lstdc++ -lz -shared -fpic</_HostUnixLdFlags>
<_HostCommonWinCFlags>$(_CommonCFlags) -DWINDOWS -DNTDDI_VERSION=NTDDI_VISTA -D_WIN32_WINNT=_WIN32_WINNT_VISTA -fomit-frame-pointer</_HostCommonWinCFlags> <_HostCommonWinCFlags>$(_CommonCFlags) -DWINDOWS -DNTDDI_VERSION=NTDDI_VISTA -D_WIN32_WINNT=_WIN32_WINNT_VISTA -fomit-frame-pointer</_HostCommonWinCFlags>

1
tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/java/JavaLib/.gitignore поставляемый Normal file
Просмотреть файл

@ -0,0 +1 @@
build/

14
tests/Xamarin.Android.Bcl-Tests/Resources/LinkerDescription.xml
Просмотреть файл

@ -37,6 +37,20 @@
<type fullname="System.Reflection.AssemblyKeyNameAttribute"> <type fullname="System.Reflection.AssemblyKeyNameAttribute">
<method name=".ctor"/> <method name=".ctor"/>
</type> </type>
<type fullname="System.Reflection.AssemblyKeyFileAttribute">
<method name=".ctor"/>
</type>
<type fullname="System.AttributeUsageAttribute">
<method name=".ctor"/>
<method name="get_AllowMultiple"/>
<method name="set_AllowMultiple"/>
</type>
<type fullname="System.Runtime.InteropServices.MarshalAsAttribute">
<method name=".ctor"/>
<field signature="System.Int32 SizeConst"/>
<field signature="System.Type MarshalTypeRef"/>
<field signature="System.String MarshalCookie"/>
</type>
<type fullname="System.Runtime.CompilerServices.MethodImplAttribute"> <type fullname="System.Runtime.CompilerServices.MethodImplAttribute">
<method name=".ctor"/> <method name=".ctor"/>
</type> </type>