actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-19 08:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

added ANDROID_NDK_HOME and ANDROID_NDK_ROOT (#2472)

Browse Source 
Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
This commit is contained in:
Nikita Bykov
2021-01-20 12:40:57 +03:00
committed by GitHub
parent c63f698e70
commit 29847cd01a
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/linux/scripts/installers/android.sh
View File

@@ -27,11 +27,16 @@ function filter_components_by_version {
# Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables) # Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables)
ANDROID_ROOT=/usr/local/lib/android ANDROID_ROOT=/usr/local/lib/android
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
# ANDROID_HOME is deprecated, but older versions of Gradle rely on it # ANDROID_HOME is deprecated, but older versions of Gradle rely on it
echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
# Set env variables for NDK Root
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" | tee -a /etc/environment
echo "ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" | tee -a /etc/environment
# Create android sdk directory # Create android sdk directory
mkdir -p ${ANDROID_SDK_ROOT} mkdir -p ${ANDROID_SDK_ROOT}

1
images/macos/provision/configuration/environment/bashrc
View File

@@ -5,6 +5,7 @@ export LANG=en_US.UTF-8
export ANDROID_HOME=${HOME}/Library/Android/sdk export ANDROID_HOME=${HOME}/Library/Android/sdk
export ANDROID_SDK_ROOT=${HOME}/Library/Android/sdk export ANDROID_SDK_ROOT=${HOME}/Library/Android/sdk
export ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle export ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle
export ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle
export NUNIT_BASE_PATH=/Library/Developer/nunit export NUNIT_BASE_PATH=/Library/Developer/nunit
export NUNIT3_PATH=/Library/Developer/nunit/3.6.0 export NUNIT3_PATH=/Library/Developer/nunit/3.6.0

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

@@ -83,6 +83,7 @@ if (Test-Path $ndkRoot) {
setx ANDROID_SDK_ROOT $sdkRoot /M setx ANDROID_SDK_ROOT $sdkRoot /M
setx ANDROID_NDK_HOME $ndkRoot /M setx ANDROID_NDK_HOME $ndkRoot /M
setx ANDROID_NDK_PATH $ndkRoot /M setx ANDROID_NDK_PATH $ndkRoot /M
setx ANDROID_NDK_ROOT $ndkRoot /M
(Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd" (Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd"
} else { } else {
Write-Host "NDK is not installed at path $ndk_root" Write-Host "NDK is not installed at path $ndk_root"