From 1f2e8d2bb692a0aa9e6d29faedcc204f9076d63f Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 16 Feb 2022 19:43:33 -0500
Subject: [PATCH] [Xamarin.Android.Tools.AndroidSdk] Update SDK component for
 API-32

Context: https://dl-ssl.google.com/android/repository/repository2-3.xml
Context: https://github.com/xamarin/xamarin-android/commit/e4b3adb389f54bc3d23b38a260093ec3fb53d88e

Update the preferred Android SDK component versions to the current latest
versions listed in the [Android Repository file][0]:

  * `$(AndroidSdkPlatformToolsVersion)`/platform-tools to 32.0.0
  * `$(AndroidSdkPlatformVersion)`/platform to android-32
  * `$(AndroidNdkVersion)`/NDK to 23.1.7779620

`$(AndroidSdkBuildToolsVersion)` is left at 30.0.3, even though
32.0.0 exists, so that `dx` can continue to be used, and because the
default Android SDK packages within Visual Studio only includes
30.0.3.  (The package list needs to be updated.)

[0]: https://dl-ssl.google.com/android/repository/repository2-3.xml
---
 .../Xamarin.Android.Tools.Versions.props                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
index 592b0c6..6489e29 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
+++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
@@ -11,10 +11,10 @@
     -->
     <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">30.0.3</AndroidSdkBuildToolsVersion>
     <AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">5.0</AndroidCommandLineToolsVersion>
-    <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">31.0.3</AndroidSdkPlatformToolsVersion>
+    <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">32.0.0</AndroidSdkPlatformToolsVersion>
     <AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
-    <AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-31</AndroidSdkPlatformVersion>
-    <AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">22.1.7171670</AndroidNdkVersion>
+    <AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-32</AndroidSdkPlatformVersion>
+    <AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">23.1.7779620</AndroidNdkVersion>
 
     <!-- obsolete; should consider removing eventually -->
     <AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>