From 16c9adca0c42c6e54acf1c06d23f529cc00c9e88 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Tue, 2 Jul 2024 12:27:30 -0400
Subject: [PATCH] [build] Bump `$(XABuildToolsVersion)`=35 (#9071)

Context: https://developer.android.com/tools/releases/build-tools
Context: https://dl.google.com/android/repository/repository2-3.xml

Update `$(XABuildToolsVersion)` to 35, which is the latest version of
the Android SDK Build Tools.

The `build-tools_r35*.zip` packages changed their filename convention
from `build-tools_{version}-{os}.zip` to
`build-tools_{version}_{os}.zip`; note `_` instead of `-` between
version and OS.  Update build-tools/xaprepare and src/aapt2
accordingly.
---
 Configuration.props                                         | 4 ++--
 .../ConfigAndData/Dependencies/AndroidToolchain.cs          | 2 +-
 .../xaprepare/Steps/Step_Get_Android_BuildTools.cs          | 6 +++---
 src/aapt2/aapt2.targets                                     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index a1549fe5086..ab5dc694c80 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -121,8 +121,8 @@
     <XABuildToolsPackagePrefixLinux></XABuildToolsPackagePrefixLinux>
     <XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">$(XABuildToolsPackagePrefixMacOS)</XABuildToolsPackagePrefix>
     <XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildToolsPackagePrefixWindows)</XABuildToolsPackagePrefix>
-    <XABuildToolsVersion>34</XABuildToolsVersion>
-    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
+    <XABuildToolsVersion>35</XABuildToolsVersion>
+    <XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">35.0.0</XABuildToolsFolder>
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
     <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
index e54b3fff55f..4f0672a5ac7 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
@@ -103,7 +103,7 @@ public AndroidToolchain ()
 					buildToolName: $"android-ndk-r{AndroidNdkVersion}",
 					buildToolVersion: AndroidPkgRevision
 				),
-				new AndroidToolchainComponent ($"{XABuildToolsPackagePrefix}build-tools_r{XABuildToolsVersion}-{altOsTag}",
+				new AndroidToolchainComponent ($"{XABuildToolsPackagePrefix}build-tools_r{XABuildToolsVersion}_{altOsTag}",
 					destDir: Path.Combine ("build-tools", XABuildToolsFolder),
 					isMultiVersion: true,
 					buildToolName: "android-sdk-build-tools",
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs b/build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs
index ee0cff61fb5..21078bcfd34 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_Get_Android_BuildTools.cs
@@ -18,9 +18,9 @@ public Step_Get_Android_BuildTools ()
 			string XABuildToolsPackagePrefixWindows = Context.Instance.Properties [KnownProperties.XABuildToolsPackagePrefixWindows] ?? string.Empty;
 			string XABuildToolsPackagePrefixLinux = Context.Instance.Properties [KnownProperties.XABuildToolsPackagePrefixLinux] ?? string.Empty;
 
-			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-macosx.zip", prefix: XABuildToolsPackagePrefixMacOS));
-			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-windows.zip", prefix: XABuildToolsPackagePrefixWindows));
-			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}-linux.zip", prefix: XABuildToolsPackagePrefixLinux));
+			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_macosx.zip", prefix: XABuildToolsPackagePrefixMacOS));
+			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_windows.zip", prefix: XABuildToolsPackagePrefixWindows));
+			packages.Add ((package: $"build-tools_r{XABuildToolsVersion}_linux.zip", prefix: XABuildToolsPackagePrefixLinux));
 		}
 
 		protected override async Task<bool> Execute (Context context)
diff --git a/src/aapt2/aapt2.targets b/src/aapt2/aapt2.targets
index 8ad59224c75..d2a0f4c0992 100644
--- a/src/aapt2/aapt2.targets
+++ b/src/aapt2/aapt2.targets
@@ -7,17 +7,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)-macosx.zip">
+    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)_macosx.zip">
       <Platform>osx</Platform>
       <HostOS>Darwin</HostOS>
       <FilesToExtract>aapt2</FilesToExtract>
     </_BuildTools>
-    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)-linux.zip">
+    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)_linux.zip">
       <Platform>linux</Platform>
       <HostOS>Linux</HostOS>
       <FilesToExtract>aapt2</FilesToExtract>
     </_BuildTools>
-    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)-windows.zip">
+    <_BuildTools Include="build-tools_r$(XABuildToolsVersion)_windows.zip">
       <Platform>windows</Platform>
       <HostOS></HostOS>
       <FilesToExtract>aapt2.exe</FilesToExtract>