From a5e9522d54de1ef980da1fc93b885198c3f7ed0d Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Tue, 21 Apr 2020 18:22:29 +0300
Subject: [PATCH] Revert "Pre-install Android NDK 20 on Ubuntu (#711)"

This reverts commit 8abd45c3a8c2f777498e0df36853faf163558b15.
---
 images/linux/scripts/installers/1604/android.sh | 2 --
 images/linux/scripts/installers/1804/android.sh | 2 --
 2 files changed, 4 deletions(-)

diff --git a/images/linux/scripts/installers/1604/android.sh b/images/linux/scripts/installers/1604/android.sh
index 074c7ce1b..0c4aee53c 100644
--- a/images/linux/scripts/installers/1604/android.sh
+++ b/images/linux/scripts/installers/1604/android.sh
@@ -43,7 +43,6 @@ 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" \
@@ -163,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"
diff --git a/images/linux/scripts/installers/1804/android.sh b/images/linux/scripts/installers/1804/android.sh
index 657e9045e..a4a94566c 100644
--- a/images/linux/scripts/installers/1804/android.sh
+++ b/images/linux/scripts/installers/1804/android.sh
@@ -43,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" \
@@ -153,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"