From 0bf0cc5f93cd8010396da0ddae5c5987f0cdcb66 Mon Sep 17 00:00:00 2001
From: alalamav <alalamav@users.noreply.github.com>
Date: Thu, 10 Sep 2020 18:59:44 -0400
Subject: [PATCH] Update android build docker image

---
 tools/build/Dockerfile | 26 ++++++++++++++------------
 tools/build/build.sh   |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/build/Dockerfile b/tools/build/Dockerfile
index df17aaf25d0..5a9712fe45d 100644
--- a/tools/build/Dockerfile
+++ b/tools/build/Dockerfile
@@ -38,21 +38,23 @@ ENV CI=true
 # trial and error, old pinball machine parts, and various
 # Dockerfiles lying around Github. Bitrise, in particular,
 # maintains images with many useful hints:
-#   https://github.com/bitrise-docker/android 
-
-# Android SDK ("command line tools only"):
-#   https://developer.android.com/studio/index.html#downloads
-# This is version 26.1.1.
-RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
-    mkdir /opt/android-sdk && \
-    unzip /tmp/android-tools.zip -d /opt/android-sdk && \
-    rm /tmp/android-tools.zip
-ENV PATH ${PATH}:/opt/android-sdk/tools/bin
-ENV ANDROID_HOME /opt/android-sdk
+#   https://github.com/bitrise-docker/android
+
+# Download Android Command Line Tools:
+#   https://developer.android.com/studio/command-line
+# This is version 2.1.
+ENV ANDROID_SDK_ROOT /opt/android-sdk
+RUN cd /opt \
+    && wget -q https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O android-commandline-tools.zip \
+    && mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools \
+    && unzip -q android-commandline-tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
+    && rm android-commandline-tools.zip
+
+ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin
 
 # Android SDK Build Tools:
 #   https://developer.android.com/studio/releases/build-tools.html
 # To find the latest version's label:
 #   sdkmanager --list|grep build-tools
-ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
+ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2
 RUN yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
diff --git a/tools/build/build.sh b/tools/build/build.sh
index 559d2a0607d..f889ae3c179 100755
--- a/tools/build/build.sh
+++ b/tools/build/build.sh
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-readonly IMAGE_NAME="quay.io/outline/build-android:2019-02-01@sha256:83e3e5fa46926f1c4f87a59c185f5e17b3c870887931cd6358d81a357330fff3"
+readonly IMAGE_NAME="quay.io/outline/build-android:2020-09-10@sha256:c4922e575a41c6c02e89be243087e419c7a284b49e361b58e69f15d304fedd1a"
+
 BUILD=false
 PUBLISH=false