Skip to content

Commit

Permalink
[build] Bump Android SDK components for Android 8.1 (#1273)
Browse files Browse the repository at this point in the history
Fixes: #1266
  • Loading branch information
atsushieno authored and jonpryor committed Feb 5, 2018
1 parent 74d4154 commit 383c12e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<AllSupported32BitTargetAndroidAbis>armeabi;armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
<AllSupported64BitTargetAndroidAbis>arm64-v8a;x86_64</AllSupported64BitTargetAndroidAbis>
<AllSupportedTargetAndroidAbis>$(AllSupported32BitTargetAndroidAbis);$(AllSupported64BitTargetAndroidAbis)</AllSupportedTargetAndroidAbis>
<XABuildToolsVersion>26.0.1</XABuildToolsVersion>
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">26.0.1</XABuildToolsFolder>
<XABuildToolsVersion>27.0.3</XABuildToolsVersion>
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">27.0.3</XABuildToolsFolder>
<XAIntegratedTests Condition="'$(XAIntegratedTests)' == ''">False</XAIntegratedTests>
<PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
<TestsAotName Condition=" '$(AotAssemblies)' == 'true' ">-Aot</TestsAotName>
Expand Down
12 changes: 6 additions & 6 deletions build-tools/android-toolchain/android-toolchain.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<HostOS>Linux</HostOS>
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r26.0.0-linux.zip">
<AndroidSdkItem Include="platform-tools_r27.0.1-linux.zip">
<HostOS>Linux</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="sdk-tools-linux-3952940.zip">
<AndroidSdkItem Include="sdk-tools-linux-4333796.zip">
<HostOS>Linux</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
Expand All @@ -34,11 +34,11 @@
<HostOS>Darwin</HostOS>
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r26.0.0-darwin.zip">
<AndroidSdkItem Include="platform-tools_r27.0.1-darwin.zip">
<HostOS>Darwin</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="sdk-tools-darwin-3952940.zip">
<AndroidSdkItem Include="sdk-tools-darwin-4333796.zip">
<HostOS>Darwin</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
Expand All @@ -53,11 +53,11 @@
<HostOS>Windows</HostOS>
<DestDir>build-tools\$(XABuildToolsFolder)</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r26.0.0-windows.zip">
<AndroidSdkItem Include="platform-tools_r27.0.1-windows.zip">
<HostOS>Windows</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="sdk-tools-windows-3952940.zip">
<AndroidSdkItem Include="sdk-tools-windows-4333796.zip">
<HostOS>Windows</HostOS>
<DestDir>tools</DestDir>
</AndroidSdkItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
Disable generation to avoid "bizarre" build errors. -->
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">23.0.0</AndroidSdkBuildToolsVersion>
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">25.0.5</AndroidSdkPlatformToolsVersion>
<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">25.2.5</AndroidSdkToolsVersion>
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">27.0.3</AndroidSdkBuildToolsVersion>
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">27.0.1</AndroidSdkPlatformToolsVersion>
<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>
<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">r14b</AndroidNdkVersion>

<!-- Obsolete -->
Expand Down

0 comments on commit 383c12e

Please sign in to comment.