From e561db712b5632f404ef92b1a861fab487525ed8 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Fri, 9 Jun 2023 14:10:29 -0400 Subject: [PATCH] [build] Bump `$(XABuildToolsVersion)`=34 Context: https://github.com/android/ndk/issues/1299 Context: https://developer.android.com/tools/releases/build-tools Similar to the Android NDK (android/ndk#1299), `aapt2` from the Android SDK build-tools package is also a native binary. `aapt2` from build-tools_r32 only contains an x64 slice: % file aapt2 aapt2: Mach-O 64-bit executable x86_64 `aapt2` in build-tools_r33 and build-tools_r34 contains both x64 and arm64 slices: % file aapt2 aapt2: Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] aapt2 (for architecture x86_64): Mach-O 64-bit executable x86_64 aapt2 (for architecture arm64): Mach-O 64-bit executable arm64 Update `$(XABuildToolsVersion)`=34, so that we redistribute this newer `aapt2` binary. This will remove *a* place that Rosetta 2 is required to use .NET Android. --- Configuration.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configuration.props b/Configuration.props index c570a01528b..a73e81fc9ac 100644 --- a/Configuration.props +++ b/Configuration.props @@ -130,13 +130,13 @@ For some reason, the URL for platform-tools/build-tools 32.0.0 is prefixed with what appears to be a GIT commit hash or some other checksum... Linux packages don't have any prefix, but this forces us to have *some* mechanism to handle this... --> - 5219cc671e844de73762e969ace287c29d2e14cd. - 210b77e4bc623bd4cdda4dae790048f227972bd2. + + $(XABuildToolsPackagePrefixMacOS) $(XABuildToolsPackagePrefixWindows) - 32 - 32.0.0 + 34 + 34.0.0 f6d24b187cc6bd534c6c37604205171784ac5621. 91936d4ee3ccc839f0addd53c9ebf087b1e39251.