Skip to content

Commit 4894280

Browse files
luhenryluhenry
committed
Revert "[mono-sdks] Use for android toolchain"
This reverts commit fef4541.
1 parent e972c08 commit 4894280

File tree

5 files changed

+99
-130
lines changed

5 files changed

+99
-130
lines changed

‎build-tools/android-toolchain/android-toolchain-windows.targets‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎build-tools/android-toolchain/android-toolchain.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1717
<Import Project="android-toolchain.projitems" />
1818
<Import Project="..\scripts\RequiredPrograms.targets" />
19-
<Import Project="android-toolchain.targets" Condition=" '$(HostOS)' != 'Windows' " />
20-
<Import Project="android-toolchain-windows.targets" Condition=" '$(HostOS)' == 'Windows' " />
19+
<Import Project="android-toolchain.targets" />
2120
<ItemGroup>
2221
<ProjectReference Include="..\xa-prep-tasks\xa-prep-tasks.csproj">
2322
<Project>{7CE69551-BD73-4726-ACAA-AAF89C84BAF8}</Project>

‎build-tools/android-toolchain/android-toolchain.projitems‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<HostOS>Linux</HostOS>
2424
<DestDir>tools</DestDir>
2525
</AndroidSdkItem>
26-
<AndroidSdkItem Include="emulator-linux-4773671">
26+
<AndroidSdkItem Include="emulator-linux-4266726">
2727
<HostOS>Linux</HostOS>
2828
<DestDir>emulator</DestDir>
2929
</AndroidSdkItem>
@@ -42,7 +42,7 @@
4242
<HostOS>Darwin</HostOS>
4343
<DestDir>tools</DestDir>
4444
</AndroidSdkItem>
45-
<AndroidSdkItem Include="emulator-darwin-4773671">
45+
<AndroidSdkItem Include="emulator-darwin-4266726">
4646
<HostOS>Darwin</HostOS>
4747
<DestDir>emulator</DestDir>
4848
</AndroidSdkItem>
@@ -61,22 +61,32 @@
6161
<HostOS>Windows</HostOS>
6262
<DestDir>tools</DestDir>
6363
</AndroidSdkItem>
64-
<AndroidSdkItem Include="emulator-windows-4773671">
64+
<AndroidSdkItem Include="emulator-windows-4266726">
6565
<HostOS>Windows</HostOS>
6666
<DestDir>emulator</DestDir>
6767
</AndroidSdkItem>
68-
<AndroidSdkItem Include="android-2.3.3_r02-linux">
69-
<HostOS></HostOS>
70-
<DestDir>platforms\android-10</DestDir>
71-
</AndroidSdkItem>
7268

7369
<!-- Note: if the version is changed here (which forces the change of path), make sure to update Configuration.props! -->
70+
<AndroidSdkItem Include="cmake-3.6.4111459-linux-x86_64">
71+
<HostOS>Linux</HostOS>
72+
<DestDir>cmake\3.6.4111459</DestDir>
73+
<NoSubdirectory>True</NoSubdirectory>
74+
</AndroidSdkItem>
75+
<AndroidSdkItem Include="cmake-3.6.4111459-darwin-x86_64">
76+
<HostOS>Darwin</HostOS>
77+
<DestDir>cmake\3.6.4111459</DestDir>
78+
<NoSubdirectory>True</NoSubdirectory>
79+
</AndroidSdkItem>
7480
<AndroidSdkItem Include="cmake-3.6.4111459-windows-x86_64">
7581
<HostOS>Windows</HostOS>
7682
<DestDir>cmake\3.6.4111459</DestDir>
7783
<NoSubdirectory>True</NoSubdirectory>
7884
</AndroidSdkItem>
7985

86+
<AndroidSdkItem Include="android-2.3.3_r02-linux">
87+
<HostOS></HostOS>
88+
<DestDir>platforms\android-10</DestDir>
89+
</AndroidSdkItem>
8090
<AndroidSdkItem Include="android-15_r03">
8191
<HostOS></HostOS>
8292
<DestDir>platforms\android-15</DestDir>

‎build-tools/android-toolchain/android-toolchain.targets‎

Lines changed: 80 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<BuildDependsOn>
77
ResolveReferences;
88
_CopyBootstrapTasksAssembly;
9-
_CreateAndroidToolchains;
9+
_DownloadItems;
10+
_UnzipFiles;
1011
_CreateMxeToolchains;
1112
_AcceptAndroidSdkLicenses;
1213
</BuildDependsOn>
@@ -18,26 +19,93 @@
1819
Properties="OutputPath=$(AndroidToolchainDirectory)\"
1920
/>
2021
</Target>
21-
<Target Name="_PrepareAndroidToolchainItems">
22+
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" />
23+
<Target Name="_DetermineItems">
24+
<CreateItem
25+
Include="@(AndroidSdkItem)"
26+
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
27+
<Output TaskParameter="Include" ItemName="_PlatformAndroidSdkItem"/>
28+
</CreateItem>
29+
<CreateItem
30+
Include="@(AndroidNdkItem)"
31+
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
32+
<Output TaskParameter="Include" ItemName="_PlatformAndroidNdkItem"/>
33+
</CreateItem>
34+
<CreateItem
35+
Include="@(AntItem)"
36+
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
37+
<Output TaskParameter="Include" ItemName="_PlatformAntItem"/>
38+
</CreateItem>
2239
<ItemGroup>
23-
<_AndroidSdkStampFiles Include="@(AndroidSdkItem->'$(AndroidToolchainDirectory)\sdk\.stamp-%(Identity)')" Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' " />
24-
<_AndroidNdkStampFiles Include="@(AndroidNdkItem->'$(AndroidToolchainDirectory)\ndk\.stamp-%(Identity)')" Condition=" '%(AndroidNdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidNdkItem.HostOS)' == '' " />
25-
<_AntStampFiles Include="@(AntItem->'$(AndroidToolchainDirectory)\ant\.stamp-%(Identity)')" Condition=" '%(AntItem.HostOS)' == '$(HostOS)' Or '%(AntItem.HostOS)' == '' " />
40+
<_SdkStampFiles Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainDirectory)\sdk\.stamp-%(Identity)')" />
41+
</ItemGroup>
42+
<ItemGroup>
43+
<_SdkStampFiles Include="@(_PlatformAntItem->'$(AntDirectory)\.stamp-%(Identity)')" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<_DownloadedItem Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
47+
<_DownloadedItem Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
48+
<_DownloadedItem Include="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" />
2649
</ItemGroup>
2750
</Target>
28-
<Target Name="_CreateAndroidToolchains"
29-
DependsOnTargets="_PrepareAndroidToolchainItems"
30-
Outputs="@(_AndroidSdkStampFiles);@(_AndroidNdkStampFiles);@(_AntStampFiles)">
31-
<Exec
32-
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;"
33-
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
51+
<Target Name="_DownloadItems"
52+
DependsOnTargets="_DetermineItems"
53+
Outputs="@(_DownloadedItem)">
54+
<MakeDir Directories="$(AndroidToolchainCacheDirectory)" />
55+
<DownloadUri
56+
SourceUris="@(_PlatformAndroidSdkItem->'$(AndroidUri)/%(RelUrl)%(Identity).zip');@(_PlatformAndroidNdkItem->'$(AndroidUri)/%(RelUrl)%(Identity).zip')"
57+
DestinationFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
58+
/>
59+
<DownloadUri
60+
SourceUris="@(_PlatformAntItem->'$(AntUri)/%(RelUrl)%(Identity).zip')"
61+
DestinationFiles="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
62+
/>
63+
</Target>
64+
<Target Name="_UnzipFiles"
65+
DependsOnTargets="_DetermineItems"
66+
Inputs="@(_DownloadedItem)"
67+
Outputs="@(_SdkStampFiles);$(AndroidToolchainDirectory)\ndk\.stamp-ndk">
68+
<CreateItem
69+
Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidSdkItem.Identity).zip'">
70+
<Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
71+
</CreateItem>
72+
<CreateItem
73+
Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidNdkItem.Identity).zip'"
74+
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
75+
<Output TaskParameter="Include" ItemName="_AndroidNdkItems"/>
76+
</CreateItem>
77+
78+
<RemoveDir Directories="$(AndroidSdkDirectory);$(AndroidNdkDirectory);$(AntDirectory)" />
79+
<MakeDir Directories="$(AndroidSdkDirectory);$(AndroidNdkDirectory);$(AntDirectory)" />
80+
81+
<UnzipDirectoryChildren
82+
HostOS="$(HostOS)"
83+
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
84+
SourceFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
85+
DestinationFolder="$(AndroidToolchainDirectory)\sdk"
86+
/>
87+
<UnzipDirectoryChildren
88+
HostOS="$(HostOS)"
89+
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
90+
SourceFiles="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
91+
DestinationFolder="$(AndroidToolchainDirectory)\ndk"
92+
/>
93+
<UnzipDirectoryChildren
94+
HostOS="$(HostOS)"
95+
NoSubdirectory="%(_PlatformAndroidSdkItem.NoSubdirectory)"
96+
SourceFiles="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')"
97+
DestinationFolder="$(AntDirectory)"
98+
/>
99+
<Touch
100+
Files="@(_SdkStampFiles);$(AndroidToolchainDirectory)\ndk\.stamp-ndk"
101+
AlwaysCreate="True"
34102
/>
35103
</Target>
36104
<Target Name="_AcceptAndroidSdkLicenses">
37105
<AcceptAndroidSdkLicenses AndroidSdkDirectory="$(AndroidSdkDirectory)" JavaSdkDirectory="$(JavaSdkDirectory)" />
38106
</Target>
39107
<Target Name="_CreateMxeToolchains"
40-
Condition=" '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')))"
108+
Condition=" '$(HostOS)' != 'Windows' And '$(NeedMxe)' == 'true' And ($(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) Or $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')))"
41109
Outputs="$(AndroidMxeFullPath)\.stamp">
42110
<GitCommitHash
43111
WorkingDirectory="..\..\external\mxe"

‎src/mono-runtimes/mono-runtimes.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,11 @@
4040
<_MonoSdksAndroidToolchainDir>$(AndroidToolchainDirectory)</_MonoSdksAndroidToolchainDir>
4141
<_MonoSdksAndroidToolchainCacheDir>$(AndroidToolchainCacheDirectory)</_MonoSdksAndroidToolchainCacheDir>
4242
<_MonoSdksAndroidToolchainPrefix>$(AndroidToolchainDirectory)\toolchains</_MonoSdksAndroidToolchainPrefix>
43-
<_MonoSdksAndroidBuildToolsVersion>$(XABuildToolsVersion)</_MonoSdksAndroidBuildToolsVersion>
44-
<_MonoSdksAndroidBuildToolsDir>$(XABuildToolsFolder)</_MonoSdksAndroidBuildToolsDir>
4543
<_MonoSdksLlvmSrc>$(MSBuildThisFileDirectory)..\..\external\llvm</_MonoSdksLlvmSrc>
4644
<_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)</_MonoSdksMxePrefixDir>
4745
<_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe</_MonoSdksMxeSrc>
4846

49-
<_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>
47+
<_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>
5048
</PropertyGroup>
5149
<PropertyGroup>
5250
<ForceBuildDependsOn>

0 commit comments

Comments
 (0)