From 8abd45c3a8c2f777498e0df36853faf163558b15 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Tue, 14 Apr 2020 15:13:37 +0300 Subject: [PATCH] Pre-install Android NDK 20 on Ubuntu (#711) * added ndk 20 Co-authored-by: Nikita Bykov --- images/linux/scripts/installers/1604/android.sh | 2 ++ images/linux/scripts/installers/1804/android.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh index 8dd2d6fa4..beb5cdc73 100644 --- a/images/linux/scripts/installers/1604/android.sh +++ b/images/linux/scripts/installers/1604/android.sh @@ -41,6 +41,7 @@ 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" \ @@ -160,5 +161,6 @@ 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" diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh index 0bb58fb8e..60d216434 100644 --- a/images/linux/scripts/installers/1804/android.sh +++ b/images/linux/scripts/installers/1804/android.sh @@ -40,6 +40,7 @@ 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" \ @@ -149,3 +150,4 @@ 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"