From 4894280dfdca10f01d12196d8ff76749b0398f5e Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Tue, 21 Aug 2018 12:55:31 -0400 Subject: [PATCH] Revert "[mono-sdks] Use for android toolchain" This reverts commit fef45412d6b852afe654764bb38a2ad3ab5871c2. --- .../android-toolchain-windows.targets | 106 ------------------ .../android-toolchain.csproj | 3 +- .../android-toolchain.projitems | 24 ++-- .../android-toolchain.targets | 92 +++++++++++++-- src/mono-runtimes/mono-runtimes.targets | 4 +- 5 files changed, 99 insertions(+), 130 deletions(-) delete mode 100644 build-tools/android-toolchain/android-toolchain-windows.targets diff --git a/build-tools/android-toolchain/android-toolchain-windows.targets b/build-tools/android-toolchain/android-toolchain-windows.targets deleted file mode 100644 index c5b28b53e69..00000000000 --- a/build-tools/android-toolchain/android-toolchain-windows.targets +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - ResolveReferences; - _CopyBootstrapTasksAssembly; - _DownloadItems; - _UnzipFiles; - _AcceptAndroidSdkLicenses; - - - - - - - - - - - - - - <_SdkStampFiles Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainDirectory)\sdk\.stamp-%(Identity)')" /> - - - <_SdkStampFiles Include="@(_PlatformAntItem->'$(AntDirectory)\.stamp-%(Identity)')" /> - - - <_DownloadedItem Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> - <_DownloadedItem Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> - <_DownloadedItem Include="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-tools/android-toolchain/android-toolchain.csproj b/build-tools/android-toolchain/android-toolchain.csproj index 6b432b215d5..842439ec6b3 100644 --- a/build-tools/android-toolchain/android-toolchain.csproj +++ b/build-tools/android-toolchain/android-toolchain.csproj @@ -16,8 +16,7 @@ - - + {7CE69551-BD73-4726-ACAA-AAF89C84BAF8} diff --git a/build-tools/android-toolchain/android-toolchain.projitems b/build-tools/android-toolchain/android-toolchain.projitems index ad5a37fd618..8c9e9934e24 100644 --- a/build-tools/android-toolchain/android-toolchain.projitems +++ b/build-tools/android-toolchain/android-toolchain.projitems @@ -23,7 +23,7 @@ Linux tools - + Linux emulator @@ -42,7 +42,7 @@ Darwin tools - + Darwin emulator @@ -61,22 +61,32 @@ Windows tools - + Windows emulator - - - platforms\android-10 - + + Linux + cmake\3.6.4111459 + True + + + Darwin + cmake\3.6.4111459 + True + Windows cmake\3.6.4111459 True + + + platforms\android-10 + platforms\android-15 diff --git a/build-tools/android-toolchain/android-toolchain.targets b/build-tools/android-toolchain/android-toolchain.targets index 904141636ce..552148285eb 100644 --- a/build-tools/android-toolchain/android-toolchain.targets +++ b/build-tools/android-toolchain/android-toolchain.targets @@ -6,7 +6,8 @@ ResolveReferences; _CopyBootstrapTasksAssembly; - _CreateAndroidToolchains; + _DownloadItems; + _UnzipFiles; _CreateMxeToolchains; _AcceptAndroidSdkLicenses; @@ -18,26 +19,93 @@ Properties="OutputPath=$(AndroidToolchainDirectory)\" /> - + + + + + + + + + + + - <_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)')" /> + + + <_SdkStampFiles Include="@(_PlatformAntItem->'$(AntDirectory)\.stamp-%(Identity)')" /> + + + <_DownloadedItem Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> + <_DownloadedItem Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> + <_DownloadedItem Include="@(_PlatformAntItem->'$(AndroidToolchainCacheDirectory)\%(Identity).zip')" /> - - + + + + + + + + + + + + + + + + + + + $(AndroidToolchainDirectory) <_MonoSdksAndroidToolchainCacheDir>$(AndroidToolchainCacheDirectory) <_MonoSdksAndroidToolchainPrefix>$(AndroidToolchainDirectory)\toolchains - <_MonoSdksAndroidBuildToolsVersion>$(XABuildToolsVersion) - <_MonoSdksAndroidBuildToolsDir>$(XABuildToolsFolder) <_MonoSdksLlvmSrc>$(MSBuildThisFileDirectory)..\..\external\llvm <_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory) <_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe - <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" ANDROID_BUILD_TOOLS_VERSION="$(_MonoSdksAndroidBuildToolsVersion)" ANDROID_BUILD_TOOLS_DIR="$(_MonoSdksAndroidBuildToolsDir)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)" + <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PACKAGE_LLVM=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)"