From 824f0a07e26082e54b10474974a52988663c75b3 Mon Sep 17 00:00:00 2001 From: yilsem Date: Wed, 7 Oct 2026 20:54:18 +0300 Subject: [PATCH] ci: accept package licenses at explicit SDK root and verify installation --- scripts/setup-android-ci.ps1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/setup-android-ci.ps1 b/scripts/setup-android-ci.ps1 index 8c164f27..01bab44b 100644 --- a/scripts/setup-android-ci.ps1 +++ b/scripts/setup-android-ci.ps1 @@ -26,9 +26,15 @@ Move-Item -LiteralPath $source -Destination $destination $env:ANDROID_HOME = $sdkRoot $env:ANDROID_SDK_ROOT = $sdkRoot $manager = Join-Path $destination 'bin\sdkmanager.bat' -1..100 | ForEach-Object { 'y' } | & $manager --licenses | Out-Null +$answers = ('y' + [Environment]::NewLine) * 100 +$answers | & $manager "--sdk_root=$sdkRoot" --licenses | Out-Null if ($LASTEXITCODE -ne 0) { throw 'Android SDK license setup failed' } -& $manager 'platform-tools' 'platforms;android-37.0' 'build-tools;37.0.0' +$answers | & $manager "--sdk_root=$sdkRoot" 'platform-tools' 'platforms;android-37.0' 'build-tools;37.0.0' if ($LASTEXITCODE -ne 0) { throw 'Android SDK installation failed' } +foreach ($required in @('platforms\android-37.0\android.jar', 'build-tools\37.0.0\aapt2.exe', 'licenses\android-sdk-license')) { + if (-not (Test-Path -LiteralPath (Join-Path $sdkRoot $required))) { + throw "Android SDK setup incomplete: $required" + } +} "ANDROID_HOME=$sdkRoot" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append "ANDROID_SDK_ROOT=$sdkRoot" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append