Skip to content

Revert "[mono-sdks] Use for android toolchain" #2087

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

Merged
luhenry merged 1 commit into from
Aug 27, 2018
Merged

Revert "[mono-sdks] Use for android toolchain" #2087

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
106 changes: 0 additions & 106 deletions build-tools/android-toolchain/android-toolchain-windows.targets
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions build-tools/android-toolchain/android-toolchain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="android-toolchain.projitems" />
<Import Project="..\scripts\RequiredPrograms.targets" />
<Import Project="android-toolchain.targets" Condition=" '$(HostOS)' != 'Windows' " />
<Import Project="android-toolchain-windows.targets" Condition=" '$(HostOS)' == 'Windows' " />
<Import Project="android-toolchain.targets" />
<ItemGroup>
<ProjectReference Include="..\xa-prep-tasks\xa-prep-tasks.csproj">
<Project>{7CE69551-BD73-4726-ACAA-AAF89C84BAF8}</Project>
Expand Down
24 changes: 17 additions & 7 deletions build-tools/android-toolchain/android-toolchain.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<HostOS>Linux</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="emulator-linux-4773671">
<AndroidSdkItem Include="emulator-linux-4266726">
<HostOS>Linux</HostOS>
<DestDir>emulator</DestDir>
</AndroidSdkItem>
Expand All @@ -42,7 +42,7 @@
<HostOS>Darwin</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="emulator-darwin-4773671">
<AndroidSdkItem Include="emulator-darwin-4266726">
<HostOS>Darwin</HostOS>
<DestDir>emulator</DestDir>
</AndroidSdkItem>
Expand All @@ -61,22 +61,32 @@
<HostOS>Windows</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="emulator-windows-4773671">
<AndroidSdkItem Include="emulator-windows-4266726">
<HostOS>Windows</HostOS>
<DestDir>emulator</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="android-2.3.3_r02-linux">
<HostOS></HostOS>
<DestDir>platforms\android-10</DestDir>
</AndroidSdkItem>

<!-- Note: if the version is changed here (which forces the change of path), make sure to update Configuration.props! -->
<AndroidSdkItem Include="cmake-3.6.4111459-linux-x86_64">
<HostOS>Linux</HostOS>
<DestDir>cmake\3.6.4111459</DestDir>
<NoSubdirectory>True</NoSubdirectory>
</AndroidSdkItem>
<AndroidSdkItem Include="cmake-3.6.4111459-darwin-x86_64">
<HostOS>Darwin</HostOS>
<DestDir>cmake\3.6.4111459</DestDir>
<NoSubdirectory>True</NoSubdirectory>
</AndroidSdkItem>
<AndroidSdkItem Include="cmake-3.6.4111459-windows-x86_64">
<HostOS>Windows</HostOS>
<DestDir>cmake\3.6.4111459</DestDir>
<NoSubdirectory>True</NoSubdirectory>
</AndroidSdkItem>

<AndroidSdkItem Include="android-2.3.3_r02-linux">
<HostOS></HostOS>
<DestDir>platforms\android-10</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="android-15_r03">
<HostOS></HostOS>
<DestDir>platforms\android-15</DestDir>
Expand Down
92 changes: 80 additions & 12 deletions build-tools/android-toolchain/android-toolchain.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<BuildDependsOn>
ResolveReferences;
_CopyBootstrapTasksAssembly;
_CreateAndroidToolchains;
_DownloadItems;
_UnzipFiles;
_CreateMxeToolchains;
_AcceptAndroidSdkLicenses;
</BuildDependsOn>
Expand All @@ -18,26 +19,93 @@
Properties="OutputPath=$(AndroidToolchainDirectory)\"
/>
</Target>
<Target Name="_PrepareAndroidToolchainItems">
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" />
<Target Name="_DetermineItems">
<CreateItem
Include="@(AndroidSdkItem)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_PlatformAndroidSdkItem"/>
</CreateItem>
<CreateItem
Include="@(AndroidNdkItem)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_PlatformAndroidNdkItem"/>
</CreateItem>
<CreateItem
Include="@(AntItem)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_PlatformAntItem"/>
</CreateItem>
<ItemGroup>
<_AndroidSdkStampFiles Include="@(AndroidSdkItem->'$(AndroidToolchainDirectory)\sdk\.stamp-%(Identity)')" Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' " />
<_AndroidNdkStampFiles Include="@(AndroidNdkItem->'$(AndroidToolchainDirectory)\ndk\.stamp-%(Identity)')" Condition=" '%(AndroidNdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidNdkItem.HostOS)' == '' " />
<_AntStampFiles Include="@(AntItem->'$(AndroidToolchainDirectory)\ant\.stamp-%(Identity)')" Condition=" '%(AntItem.HostOS)' == '$(HostOS)' Or '%(AntItem.HostOS)' == '' " />
<_SdkStampFiles Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainDirectory)\sdk\.stamp-%(Identity)')" />
</ItemGroup>
<ItemGroup>
<_SdkStampFiles Include="@(_PlatformAntItem->'$(AntDirectory)\.stamp-%(Identity)')" />
</ItemGroup>
<ItemGroup>
<_DownloadedItem Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
<_DownloadedItem Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
<_DownloadedItem Include="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
</ItemGroup>
</Target>
<Target Name="_CreateAndroidToolchains"
DependsOnTargets="_PrepareAndroidToolchainItems"
Outputs="@(_AndroidSdkStampFiles);@(_AndroidNdkStampFiles);@(_AntStampFiles)">
<Exec
Command="make $(MakeConcurrency) provision-android DISABLE_IOS=1 ANDROID_TOOLCHAIN_DIR=&quot;$(AndroidToolchainDirectory)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(AndroidToolchainCacheDirectory)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(AndroidToolchainDirectory)\toolchains&quot; ANDROID_BUILD_TOOLS_VERSION=&quot;$(XABuildToolsVersion)&quot; ANDROID_BUILD_TOOLS_DIR=&quot;$(XABuildToolsFolder)&quot; ANDROID_PLATFORM_TOOLS=&quot;$(XAPlatformToolsVersion)&quot;"
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
<Target Name="_DownloadItems"
DependsOnTargets="_DetermineItems"
Outputs="@(_DownloadedItem)">
<MakeDir Directories="$(AndroidToolchainCacheDirectory)" />
<DownloadUri
SourceUris="@(_PlatformAndroidSdkItem->'$(AndroidUri)/%(RelUrl)%(Identity).zip');@(_PlatformAndroidNdkItem->'$(AndroidUri)/%(RelUrl)%(Identity).zip')"
DestinationFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
/>
<DownloadUri
SourceUris="@(_PlatformAntItem->'$(AntUri)/%(RelUrl)%(Identity).zip')"
DestinationFiles="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
/>
</Target>
<Target Name="_UnzipFiles"
DependsOnTargets="_DetermineItems"
Inputs="@(_DownloadedItem)"
Outputs="@(_SdkStampFiles);$(AndroidToolchainDirectory)\ndk\.stamp-ndk">
<CreateItem
Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidSdkItem.Identity).zip'">
<Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
</CreateItem>
<CreateItem
Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidNdkItem.Identity).zip'"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_AndroidNdkItems"/>
</CreateItem>

<RemoveDir Directories="$(AndroidSdkDirectory);$(AndroidNdkDirectory);$(AntDirectory)" />
<MakeDir Directories="$(AndroidSdkDirectory);$(AndroidNdkDirectory);$(AntDirectory)" />

<UnzipDirectoryChildren
HostOS="$(HostOS)"
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
SourceFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
DestinationFolder="$(AndroidToolchainDirectory)\sdk"
/>
<UnzipDirectoryChildren
HostOS="$(HostOS)"
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
SourceFiles="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
DestinationFolder="$(AndroidToolchainDirectory)\ndk"
/>
<UnzipDirectoryChildren
HostOS="$(HostOS)"
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
SourceFiles="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
DestinationFolder="$(AntDirectory)"
/>
<Touch
Files="@(_SdkStampFiles);$(AndroidToolchainDirectory)\ndk\.stamp-ndk"
AlwaysCreate="True"
/>
</Target>
<Target Name="_AcceptAndroidSdkLicenses">
<AcceptAndroidSdkLicenses AndroidSdkDirectory="$(AndroidSdkDirectory)" JavaSdkDirectory="$(JavaSdkDirectory)" />
</Target>
<Target Name="_CreateMxeToolchains"
Condition=" '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')))"
Condition=" '$(HostOS)' != 'Windows' And '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')))"
Outputs="$(AndroidMxeFullPath)\.stamp">
<GitCommitHash
WorkingDirectory="..\..\external\mxe"
Expand Down
4 changes: 1 addition & 3 deletions src/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@
<_MonoSdksAndroidToolchainDir>$(AndroidToolchainDirectory)</_MonoSdksAndroidToolchainDir>
<_MonoSdksAndroidToolchainCacheDir>$(AndroidToolchainCacheDirectory)</_MonoSdksAndroidToolchainCacheDir>
<_MonoSdksAndroidToolchainPrefix>$(AndroidToolchainDirectory)\toolchains</_MonoSdksAndroidToolchainPrefix>
<_MonoSdksAndroidBuildToolsVersion>$(XABuildToolsVersion)</_MonoSdksAndroidBuildToolsVersion>
<_MonoSdksAndroidBuildToolsDir>$(XABuildToolsFolder)</_MonoSdksAndroidBuildToolsDir>
<_MonoSdksLlvmSrc>$(MSBuildThisFileDirectory)..\..\external\llvm</_MonoSdksLlvmSrc>
<_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)</_MonoSdksMxePrefixDir>
<_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe</_MonoSdksMxeSrc>

<_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; ANDROID_BUILD_TOOLS_VERSION=&quot;$(_MonoSdksAndroidBuildToolsVersion)&quot; ANDROID_BUILD_TOOLS_DIR=&quot;$(_MonoSdksAndroidBuildToolsDir)&quot; LLVM_SRC=&quot;$(_MonoSdksLlvmSrc)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
<_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; LLVM_SRC=&quot;$(_MonoSdksLlvmSrc)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
</PropertyGroup>
<PropertyGroup>
<ForceBuildDependsOn>
Expand Down