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

Merge branch 'master' into 690_Moby_buildx

Browse Source
This commit is contained in:
Andy Mishechkin
2020-04-21 23:56:06 +04:00
parent d37793ddc8 8bf608b1c2
commit 6456d6d7ff
18 changed files with 205 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/linux/scripts/installers/1604/android.sh
View File

@@ -37,11 +37,12 @@ else
exit 1
fi
# Add required permissions
chmod -R a+X ${ANDROID_SDK_ROOT}
# Install the following SDKs and build tools, passing in "y" to accept licenses.
echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"ndk-bundle" \
"ndk;20.0.5594570" \
"platform-tools" \
"platforms;android-29" \
"platforms;android-28" \
@@ -161,6 +162,5 @@ DocumentInstalledItem "Android SDK Build-Tools 20.0.0"
DocumentInstalledItem "Android SDK Build-Tools 19.1.0"
DocumentInstalledItem "Android SDK Build-Tools 17.0.0"
DocumentInstalledItem "Android NDK $(cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | cut -d ' ' -f 3)"
DocumentInstalledItem "Android NDK 20.0.5594570"
DocumentInstalledItem "Android ConstraintLayout 1.0.2"
DocumentInstalledItem "Android ConstraintLayout 1.0.1"

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

@@ -27,6 +27,9 @@ wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux
unzip android-sdk.zip -d ${ANDROID_SDK_ROOT}
rm -f android-sdk.zip
# Add required permissions
chmod -R a+X ${ANDROID_SDK_ROOT}
# Check sdk manager installation
/usr/local/lib/android/sdk/tools/bin/sdkmanager --list 1>/dev/null
if [ $? -eq 0 ]
@@ -40,7 +43,6 @@ fi
# Install the following SDKs and build tools, passing in "y" to accept licenses.
echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager \
"ndk-bundle" \
"ndk;20.0.5594570" \
"platform-tools" \
"platforms;android-29" \
"platforms;android-28" \
@@ -150,4 +152,3 @@ DocumentInstalledItem "Android SDK Build-Tools 20.0.0"
DocumentInstalledItem "Android SDK Build-Tools 19.1.0"
DocumentInstalledItem "Android SDK Build-Tools 17.0.0"
DocumentInstalledItem "Android NDK $(cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | cut -d ' ' -f 3)"
DocumentInstalledItem "Android NDK 20.0.5594570"