From 285850163d276ce58ed8db52b0f5909877e0bdbc Mon Sep 17 00:00:00 2001 From: atsushieno Date: Tue, 31 Dec 2019 01:24:24 +0900 Subject: [PATCH] Add Android SDK cmake 3.10.2 component to ubuntu16.04, 18.04 and windows. Android SDK gradle plugin supports fixed versions of cmake, which are either 3.6.4111459 or 3.10.2. 4988404, and on Github Actions our apps fail to build if their build.gradle specify cmake 3.10.2 because Android Gradle Plugin tries to download and install it if it's missing (and causes file write access violation, at least on Ubuntu). --- images/linux/scripts/installers/1604/android.sh | 1 + images/linux/scripts/installers/1804/android.sh | 1 + images/win/scripts/Installers/Update-AndroidSDK.ps1 | 1 + 3 files changed, 3 insertions(+) diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh index 95a44edc..aaf2ad39 100644 --- a/images/linux/scripts/installers/1604/android.sh +++ b/images/linux/scripts/installers/1604/android.sh @@ -82,6 +82,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \ "add-ons;addon-google_apis-google-22" \ "add-ons;addon-google_apis-google-21" \ "cmake;3.6.4111459" \ + "cmake;3.10.2.4988404" \ "patcher;v4" # Document what was added to the image diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh index 716f8bb1..a0fbb2eb 100644 --- a/images/linux/scripts/installers/1804/android.sh +++ b/images/linux/scripts/installers/1804/android.sh @@ -76,6 +76,7 @@ echo "y" | ${ANDROID_ROOT}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} \ "add-ons;addon-google_apis-google-22" \ "add-ons;addon-google_apis-google-21" \ "cmake;3.6.4111459" \ + "cmake;3.10.2.4988404" \ "patcher;v4" # Document what was added to the image diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 0487bb4e..4a04b0b6 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1 @@ -110,6 +110,7 @@ Push-Location -Path $sdk.FullName "add-ons;addon-google_apis-google-22" ` "add-ons;addon-google_apis-google-21" ` "cmake;3.6.4111459" ` + "cmake;3.10.2.4988404" ` "patcher;v4" Pop-Location