diff options
Diffstat (limited to 'test-rig')
| -rw-r--r-- | test-rig/Dockerfile | 4 | ||||
| -rw-r--r-- | test-rig/sdk-packages.txt | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test-rig/Dockerfile b/test-rig/Dockerfile index 759a09d..a9ffa23 100644 --- a/test-rig/Dockerfile +++ b/test-rig/Dockerfile @@ -1,7 +1,9 @@ # scrcpy-android test image. # -# Bundles JDK 17, Android cmdline-tools, platform 35, build-tools 35, +# Bundles JDK 17, Android cmdline-tools, platform 35, build-tools 34+35, # emulator, and an x86_64 default API-35 system image (for e2e). +# build-tools 34 is AGP 8.7's internal pin; pre-installing it keeps +# gradle from downloading it into the SDK at test time. # Project is mounted at /work; runs in --rm mode. FROM debian:bookworm-slim diff --git a/test-rig/sdk-packages.txt b/test-rig/sdk-packages.txt index 97ed4a6..8a7f0ff 100644 --- a/test-rig/sdk-packages.txt +++ b/test-rig/sdk-packages.txt @@ -1,5 +1,6 @@ platform-tools platforms;android-35 +build-tools;34.0.0 build-tools;35.0.0 emulator system-images;android-35;default;x86_64 |