Skip to content

Commit 9c641b3

Browse files
authored
[Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-32 (#169)
Context: https://dl-ssl.google.com/android/repository/repository2-3.xml Context: dotnet/android@e4b3adb Update the preferred Android SDK component versions to the current latest versions listed in the [Android Repository file][0] which *also* pass the xamarin-android unit tests. * `$(AndroidCommandLineToolsVersion)`/cmdline-tools to 7.0 * `$(AndroidNdkVersion)`/NDK to 24.0.8215888 * `$(AndroidSdkBuildToolsVersion)`/build-tools to 32.0.0 * `$(AndroidSdkPlatformToolsVersion)`/platform-tools to 33.0.2 * `$(AndroidSdkPlatformVersion)`/platform to android-32 NDK 24.0.8215888 is the current latest non-preview version, and is currently available on [GitHub Actions Virtual Environments][1] as `$(ANDROID_NDK_LATEST_HOME)`. Finally, commit ec346d0 forgot to update the unit tests for NDK r24; update `AndroidSdkInfoTests.Ndk_MultipleNdkVersionsInSdk()` to ensure that NDK r24 is preferred. [0]: https://dl-ssl.google.com/android/repository/repository2-3.xml [1]: https://github.com/actions/virtual-environments/blob/9cf1ebd754807fba137c8ce9fa2140311609fdd6/images/win/Windows2022-Readme.md
1 parent ec346d0 commit 9c641b3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
If this file is changed the submodule for androidtools should be updated,
1010
along with any other repo which references androidtools.
1111
-->
12-
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">30.0.3</AndroidSdkBuildToolsVersion>
13-
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">5.0</AndroidCommandLineToolsVersion>
14-
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">31.0.3</AndroidSdkPlatformToolsVersion>
12+
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">32.0.0</AndroidSdkBuildToolsVersion>
13+
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">7.0</AndroidCommandLineToolsVersion>
14+
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">33.0.2</AndroidSdkPlatformToolsVersion>
1515
<AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
16-
<AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-31</AndroidSdkPlatformVersion>
17-
<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">22.1.7171670</AndroidNdkVersion>
16+
<AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-32</AndroidSdkPlatformVersion>
17+
<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">24.0.8215888</AndroidNdkVersion>
1818

1919
<!-- obsolete; should consider removing eventually -->
2020
<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>

tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void Ndk_MultipleNdkVersionsInSdk ()
7171
{
7272
// Must match like-named constants in AndroidSdkBase
7373
const int MinimumCompatibleNDKMajorVersion = 16;
74-
const int MaximumCompatibleNDKMajorVersion = 23;
74+
const int MaximumCompatibleNDKMajorVersion = 24;
7575

7676
CreateSdks(out string root, out string jdk, out string ndk, out string sdk);
7777

@@ -93,8 +93,10 @@ public void Ndk_MultipleNdkVersionsInSdk ()
9393
"22.0.7026061",
9494
"22.1.7171670",
9595
"23.1.7779620",
96+
"24.0.8215888",
97+
"25.0.3735928559", // 0xdeadbeef
9698
};
97-
string expectedVersion = "23.1.7779620";
99+
string expectedVersion = "24.0.8215888";
98100
string expectedNdkPath = Path.Combine (sdk, "ndk", expectedVersion);
99101

100102
try {

0 commit comments

Comments
 (0)