|
4 | 4 | <Import Project="android-toolchain.projitems" /> |
5 | 5 | <Import Project="..\scripts\RequiredPrograms.targets" /> |
6 | 6 | <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.AcceptAndroidSdkLicenses" /> |
| 7 | + <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" /> |
7 | 8 | <Target Name="_CopyBootstrapTasksAssembly" |
8 | 9 | Outputs="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll"> |
9 | 10 | <MSBuild |
|
135 | 136 | Condition=" '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')))" |
136 | 137 | Inputs="..\..\external\mxe\Makefile" |
137 | 138 | Outputs="@(_AndroidMxeOutput)"> |
| 139 | + <GitCommitHash |
| 140 | + WorkingDirectory="..\..\external\mxe" |
| 141 | + ToolPath="$(GitToolPath)" |
| 142 | + ToolExe="$(GitToolExe)"> |
| 143 | + <Output TaskParameter="AbbreviatedCommitHash" PropertyName="_MxeHash" /> |
| 144 | + </GitCommitHash> |
| 145 | + <Error |
| 146 | + Condition=" !$(AndroidMxeFullPath.EndsWith ($(_MxeHash))) " |
| 147 | + Text="%24(AndroidMxeFullPath) value of `$(AndroidMxeFullPath)` MUST end with `$(_MxeHash)`!" |
| 148 | + /> |
138 | 149 | <Exec |
139 | 150 | Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:'))" |
140 | | - Command="make MXE_TARGETS="$(MingwCommandPrefix32)" gcc cmake zlib pthreads dlfcn-win32 mman-win32 PREFIX="$(AndroidMxeFullPath)"" |
| 151 | + Command="make MXE_TARGETS="$(MingwCommandPrefix32)" gcc cmake zlib pthreads dlfcn-win32 mman-win32 PREFIX="$(AndroidMxeFullPath)" OS_SHORT_NAME="disable-native-plugins"" |
141 | 152 | WorkingDirectory="..\..\external\mxe" |
142 | 153 | /> |
143 | 154 | <Exec |
144 | 155 | Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))" |
145 | | - Command="make MXE_TARGETS="$(MingwCommandPrefix64)" gcc cmake zlib pthreads dlfcn-win32 mman-win32 PREFIX="$(AndroidMxeFullPath)"" |
| 156 | + Command="make MXE_TARGETS="$(MingwCommandPrefix64)" gcc cmake zlib pthreads dlfcn-win32 mman-win32 PREFIX="$(AndroidMxeFullPath)" OS_SHORT_NAME="disable-native-plugins"" |
146 | 157 | WorkingDirectory="..\..\external\mxe" |
147 | 158 | /> |
148 | 159 | <Touch Files="@(_AndroidMxeOutput)" /> |
|
0 commit comments