actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-15 14:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Android SDK 29.0.1 and NDK 21 (#913)

Browse Source 
* added android sdk and ndk

* added ndk-bundle instead of NDK version

* ndk_root_path

* removed new lines.
This commit is contained in:
Darii Nurgaleev
2020-05-26 16:36:27 +07:00
committed by GitHub
parent 5e7a5aeedd
commit c1ad396b6a
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
images/win/scripts/Installers/Update-AndroidSDK.ps1
View File

@@ -36,24 +36,6 @@ Expand-Archive -Path .\android-sdk-licenses.zip -DestinationPath 'C:\Program Fil
$sdk_root = "C:\Program Files (x86)\Android\android-sdk" $sdk_root = "C:\Program Files (x86)\Android\android-sdk"
# The NDK is installed by Visual Studio at this location:
$ndk_root = "C:\Microsoft\AndroidNDK64\"
if(Test-Path $ndk_root){
$androidNDKs = Get-ChildItem -Path $ndk_root | Sort-Object -Property Name -Descending | Select-Object -First 1
$latestAndroidNDK = $androidNDKs.FullName;
setx ANDROID_HOME $sdk_root /M
setx ANDROID_NDK_HOME $latestAndroidNDK /M
setx ANDROID_NDK_PATH $latestAndroidNDK /M
}
else {
Write-Host "NDK is not installed at path $ndk_root"
exit 1
}
Push-Location -Path $sdk.FullName Push-Location -Path $sdk.FullName
& '.\tools\bin\sdkmanager.bat' --sdk_root=$sdk_root ` & '.\tools\bin\sdkmanager.bat' --sdk_root=$sdk_root `
@@ -70,6 +52,7 @@ Push-Location -Path $sdk.FullName
"platforms;android-19" ` "platforms;android-19" `
"build-tools;29.0.3" ` "build-tools;29.0.3" `
"build-tools;29.0.2" ` "build-tools;29.0.2" `
"build-tools;29.0.1" `
"build-tools;29.0.0" ` "build-tools;29.0.0" `
"build-tools;28.0.3" ` "build-tools;28.0.3" `
"build-tools;28.0.2" ` "build-tools;28.0.2" `
@@ -111,11 +94,23 @@ Push-Location -Path $sdk.FullName
"add-ons;addon-google_apis-google-21" ` "add-ons;addon-google_apis-google-21" `
"cmake;3.6.4111459" ` "cmake;3.6.4111459" `
"cmake;3.10.2.4988404" ` "cmake;3.10.2.4988404" `
"patcher;v4" "patcher;v4" `
"ndk-bundle"
# Android NDK root path.
$ndk_root = "C:\Program Files (x86)\Android\android-sdk\ndk-bundle"
if (Test-Path $ndk_root){
setx ANDROID_HOME $sdk_root /M
setx ANDROID_NDK_HOME $ndk_root /M
setx ANDROID_NDK_PATH $ndk_root /M
} else {
Write-Host "NDK is not installed at path $ndk_root"
exit 1
}
Pop-Location Pop-Location
# Adding description of the software to Markdown # Adding description of the software to Markdown
$Header = @" $Header = @"