Add build-tools 36.0.0 to the Android SDK bundle we cache/download + test against and upload this newer Android SDK bundle to CIPD.
Updating test apps to AGP 9.0.1 (#186200) likely resulted in flaky integration test timeouts (see issue #187096). By default, AGP 9.0.1 expects a specific set of SDK tooling versions, notably build-tools 36.0.0, as outlined in the AGP 9.0.0 release notes. If these exact tooling versions are missing from the pre-bundled Android SDK provisioned via CIPD, AGP (execution via Gradle) will attempt to download them on-demand from the network. The downloading leads to test timeouts.
To prevent these network downloads and avoid timeouts, we must ensure the provisioned Android SDK bundle in CIPD includes the default tooling versions expected by AGP 9.0.1. Currently, the Android SDK package tested against in CI (provisioned via flutter/android/sdk/all/mac-amd64 under tag version:36v8unmodified) is missing build-tools 36.0.0. It looks like AGP still looks for build-tools 36.0.0 even though some internal build-tools default was replaced by 36.1.0 in a prior update (see PR #179963).
While tracking changes to raw binary CIPD packages is difficult, we can maintain clear visibility of their contents by using our SDK packaging infrastructure. We should always use the create_cipd_packages.sh script to generate these bundles and record configuration changes in packages.txt. This workflow ensures consistent file structures across uploads and preserves a clear paper trail of our Android SDK tooling contents directly in the repository history (see PR #180653 as an example).
Add
build-tools 36.0.0to the Android SDK bundle we cache/download + test against and upload this newer Android SDK bundle to CIPD.Updating test apps to AGP 9.0.1 (#186200) likely resulted in flaky integration test timeouts (see issue #187096). By default, AGP 9.0.1 expects a specific set of SDK tooling versions, notably
build-tools 36.0.0, as outlined in the AGP 9.0.0 release notes. If these exact tooling versions are missing from the pre-bundled Android SDK provisioned via CIPD, AGP (execution via Gradle) will attempt to download them on-demand from the network. The downloading leads to test timeouts.To prevent these network downloads and avoid timeouts, we must ensure the provisioned Android SDK bundle in CIPD includes the default tooling versions expected by AGP 9.0.1. Currently, the Android SDK package tested against in CI (provisioned via flutter/android/sdk/all/mac-amd64 under tag
version:36v8unmodified) is missingbuild-tools 36.0.0. It looks like AGP still looks for build-tools36.0.0even though some internal build-tools default was replaced by36.1.0in a prior update (see PR #179963).While tracking changes to raw binary CIPD packages is difficult, we can maintain clear visibility of their contents by using our SDK packaging infrastructure. We should always use the create_cipd_packages.sh script to generate these bundles and record configuration changes in packages.txt. This workflow ensures consistent file structures across uploads and preserves a clear paper trail of our Android SDK tooling contents directly in the repository history (see PR #180653 as an example).