[build] Update stable Android SDK packages - #12371
Open
jonathanpeppers wants to merge 8 commits into
Open
Conversation
Update the Android SDK package catalog, versions, and SHA-256 hashes while retaining NDK r28c and Android platform 37.0. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the in-repo Android SDK “bootstrap” package catalog used by src/androidsdk/ so the toolchain downloads (platforms, tools, emulator, CMake, sources) match newer stable revisions, including introducing separate macOS command-line tools archives per architecture.
Changes:
- Bumped platform package revisions (API 28–37) and updated corresponding SHA-256 hashes.
- Updated toolchain component versions/hashes (build-tools, platform-tools, command-line tools, emulator, CMake) and added a macOS arm64 command-line tools package entry.
- Switched the downloaded “sources” zip to the latest stable platform revision.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/androidsdk/androidsdk.targets | Updates platform catalog entries and toolchain package download list (including macOS arch-specific cmdline-tools and new sources zip). |
| Configuration.props | Bumps tool versions (CMake/build-tools/platform-tools/cmdline-tools/emulator) and refreshes SHA-256 hashes, adding a new macOS arm64 cmdline-tools hash. |
Keep Android sources in the API-level directory expected by the build and avoid escaping CMake source-path quotes on Windows. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
Seed workload installation from the SDK package produced by the current build so reused PR versions cannot resolve stale feed content. Omit the avdmanager device profile unless tests explicitly request one. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
The deterministic fix is pre-seeding the isolated package directory from the current build. The workload install no-cache flag did not prevent same-version feed substitution and is unnecessary. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 99896160-5e3c-4560-9ab4-026504cdd4e9
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
devices.xmlTesting
dotnet build .\build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj -v:minimaldotnet build .\src\androidsdk\androidsdk.csproj --no-restore -v:minimaldotnet build .\build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj -c Release -v:minimaldotnet build .\src\native\cmake-config\cmake-config.csproj -c Release -v:minimalnative-mono.csprojfrom clean outputs with CMake 3.30.3 and 4.1.2 using NDK r28c; all 28.sooutputs across four ABIs had identical sizes and SHA-256 hashesRunParallelCmds; preset discovery succeeded with CMake 4.1.2_GenerateXACommonPropsregenerates an existing SDK props file across a simulated build-tools 36.0.0 → 37.0.0 transition--device pixel_4emits the CIdevices.xmlerrors, while omitting it succeeds cleanlyPackageDownloadrestore from the current build artifact seeds an isolated NuGet package cache with SDK metadata containing build-tools 37.0.0